sync 144

IndustryEssentials · May 16, 2023 · 1d2d17f · 1d2d17f
1 parent b6b477c
commit 1d2d17f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ymir/backend/src/ymir_app/app/crud/crud_dataset_group.py b/ymir/backend/src/ymir_app/app/crud/crud_dataset_group.py
@@ -45,7 +45,7 @@ def get_multi_dataset_groups(
         is_desc = pagination.is_desc
 
         query = db.query(self.model)
-        query = query.filter(self.model.user_id == user_id, self.model.visible_datasets, not_(self.model.is_deleted))
+        query = query.filter(self.model.user_id == user_id, self.model.datasets, not_(self.model.is_deleted))
 
         if start_time and end_time:
             _start_time = datetime.utcfromtimestamp(start_time)

diff --git a/ymir/backend/src/ymir_app/app/crud/crud_model_group.py b/ymir/backend/src/ymir_app/app/crud/crud_model_group.py
@@ -48,7 +48,7 @@ def get_multi_model_groups(
         is_desc = pagination.is_desc
 
         query = db.query(self.model)
-        query = query.filter(self.model.user_id == user_id, self.model.visible_models, not_(self.model.is_deleted))
+        query = query.filter(self.model.user_id == user_id, self.model.models, not_(self.model.is_deleted))
 
         if start_time and end_time:
             _start_time = datetime.utcfromtimestamp(start_time)

diff --git a/ymir/backend/src/ymir_app/app/models/dataset_group.py b/ymir/backend/src/ymir_app/app/models/dataset_group.py
@@ -17,14 +17,14 @@ class DatasetGroup(Base):
     project_id = Column(Integer, index=True, nullable=False)
     user_id = Column(Integer, index=True, nullable=False)
 
-    datasets = relationship(
+    all_datasets = relationship(
         "Dataset",
         primaryjoin="foreign(Dataset.dataset_group_id)==DatasetGroup.id",
         backref="group",
         uselist=True,
         viewonly=True,
     )
-    visible_datasets = relationship(
+    datasets = relationship(
         "Dataset",
         primaryjoin="and_(foreign(Dataset.dataset_group_id)==DatasetGroup.id, foreign(Dataset.is_visible))",
         uselist=True,
@@ -42,4 +42,4 @@ class DatasetGroup(Base):
 
     @property
     def is_visible(self) -> bool:
-        return bool(self.visible_datasets)
+        return bool(self.datasets)
diff --git a/ymir/backend/src/ymir_app/app/models/model_group.py b/ymir/backend/src/ymir_app/app/models/model_group.py
@@ -18,14 +18,14 @@ class ModelGroup(Base):
     project_id = Column(Integer, index=True, nullable=False)
     training_dataset_id = Column(Integer, index=True)
 
-    models = relationship(
+    all_models = relationship(
         "Model",
         primaryjoin="foreign(Model.model_group_id)==ModelGroup.id",
         backref="group",
         uselist=True,
         viewonly=True,
     )
-    visible_models = relationship(
+    models = relationship(
         "Model",
         primaryjoin="and_(foreign(Model.model_group_id)==ModelGroup.id, foreign(Model.is_visible))",
         uselist=True,
@@ -43,4 +43,4 @@ class ModelGroup(Base):
 
     @property
     def is_visible(self) -> bool:
-        return bool(self.visible_models)
+        return bool(self.models)