zou 0.20.50__tar.gz → 0.20.52__tar.gz

{zou-0.20.50/zou.egg-info → zou-0.20.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.50
+Version: 0.20.52
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -84,7 +84,7 @@ Provides-Extra: test
 Requires-Dist: fakeredis==2.29.0; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
+Requires-Dist: pytest==8.4.0; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"

{zou-0.20.50 → zou-0.20.52}/setup.cfg

@@ -98,7 +98,7 @@ test =
 	fakeredis==2.29.0
 	mixer==7.2.2
 	pytest-cov==6.1.1
-	pytest==8.3.5
+	pytest==8.4.0
 monitoring = 
 	prometheus-flask-exporter==0.23.2
 	pygelf==0.4.2

zou-0.20.52/zou/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.20.52"

{zou-0.20.50 → zou-0.20.52}/zou/app/blueprints/source/csv/task_type_estimations.py

@@ -46,56 +46,60 @@ class TaskTypeEstimationsCsvImportResource(BaseCsvProjectImportResource):
             400:
                 description: Format error
         """
-        return super().post(project_id, task_type_id, episode_id)
+        task_type = tasks_service.get_task_type(task_type_id)
+        return super().post(project_id, task_type, episode_id)
 
-    def prepare_import(self, project_id, task_type_id, episode_id=None):
+    def prepare_import(self, project_id, task_type, episode_id=None):
         self.organisation = persons_service.get_organisation()
         self.assets_map = {}
         self.shots_map = {}
         self.tasks_map = {}
 
-        asset_types_map = {}
-        asset_types = assets_service.get_asset_types_for_project(project_id)
-        for asset_type in asset_types:
-            asset_types_map[asset_type["id"]] = slugify(asset_type["name"])
-
-        criterions_assets = {"project_id": project_id}
-        if episode_id is not None and episode_id not in ["main", "all"]:
-            criterions_assets["source_id"] = episode_id
-        assets = assets_service.get_assets(criterions_assets)
-        for asset in assets:
-            key = "%s%s" % (
-                asset_types_map[asset["entity_type_id"]],
-                slugify(asset["name"]),
+        if task_type["for_entity"] == "Asset":
+            asset_types_map = {}
+            asset_types = assets_service.get_asset_types_for_project(
+                project_id
             )
-            self.assets_map[key] = asset["id"]
-
-        sequences_map = {}
-        criterions_sequences = {"project_id": project_id}
-        if episode_id is not None and episode_id not in ["main", "all"]:
-            criterions_sequences["parent_id"] = episode_id
-        sequences = shots_service.get_sequences(criterions_sequences)
-        for sequence in sequences:
-            sequences_map[sequence["id"]] = slugify(sequence["name"])
-
-        shots = shots_service.get_shots({"project_id": project_id})
-        for shot in shots:
-            sequence_key = sequences_map.get(shot["parent_id"])
-            if sequence_key is not None:
-                key = "%s%s" % (sequence_key, slugify(shot["name"]))
-                self.shots_map[key] = shot["id"]
+            for asset_type in asset_types:
+                asset_types_map[asset_type["id"]] = slugify(asset_type["name"])
+
+            criterions_assets = {"project_id": project_id}
+            if episode_id is not None and episode_id not in ["main", "all"]:
+                criterions_assets["source_id"] = episode_id
+            assets = assets_service.get_assets(criterions_assets)
+            for asset in assets:
+                key = "%s%s" % (
+                    asset_types_map[asset["entity_type_id"]],
+                    slugify(asset["name"]),
+                )
+                self.assets_map[key] = asset["id"]
+        elif task_type["for_entity"] == "Shot":
+            sequences_map = {}
+            criterions_sequences = {"project_id": project_id}
+            if episode_id is not None and episode_id not in ["main", "all"]:
+                criterions_sequences["parent_id"] = episode_id
+            sequences = shots_service.get_sequences(criterions_sequences)
+            for sequence in sequences:
+                sequences_map[sequence["id"]] = slugify(sequence["name"])
+
+            shots = shots_service.get_shots({"project_id": project_id})
+            for shot in shots:
+                sequence_key = sequences_map.get(shot["parent_id"])
+                if sequence_key is not None:
+                    key = "%s%s" % (sequence_key, slugify(shot["name"]))
+                    self.shots_map[key] = shot["id"]
 
         for task in tasks_service.get_tasks_for_project_and_task_type(
-            project_id, task_type_id
+            project_id, task_type["id"]
         ):
             self.tasks_map[task["entity_id"]] = task["id"]
 
-    def import_row(self, row, project_id, task_type_id, episode_id=None):
+    def import_row(self, row, project_id, task_type, episode_id=None):
         key = slugify("%s%s" % (row["Parent"], row["Entity"]))
 
-        if self.assets_map.get(key):
+        if task_type["for_entity"] == "Asset" and self.assets_map.get(key):
             entity_id = self.assets_map[key]
-        elif self.shots_map.get(key):
+        elif task_type["for_entity"] == "Shot" and self.shots_map.get(key):
             entity_id = self.shots_map[key]
         else:
             raise RowException(f"Entity {key} not found")

{zou-0.20.50 → zou-0.20.52}/zou/app/services/entities_service.py

@@ -149,7 +149,11 @@ def get_for_entity_from_task(task):
     entity_type = get_entity_type(entity["entity_type_id"])
     for_entity = entity_type["name"]
     if for_entity.lower() not in [
-        "shot", "sequence", "episode", "edit", "concept"
+        "shot",
+        "sequence",
+        "episode",
+        "edit",
+        "concept",
     ]:
         for_entity = "Asset"
     return for_entity

{zou-0.20.50 → zou-0.20.52}/zou/app/services/playlists_service.py

@@ -887,7 +887,7 @@ def generate_playlisted_entity_from_task(task_id, task_type_links):
         ]
         if len(available_task_types) > 0:
             task_type_id = available_task_types[0]
-            preview_file = preview_files[   task_type_id][0]
+            preview_file = preview_files[task_type_id][0]
 
     if preview_file is not None:
         playlisted_entity.update(

{zou-0.20.50 → zou-0.20.52}/zou/app/services/projects_service.py

@@ -705,8 +705,7 @@ def get_task_type_links(project_id, for_entity="Asset"):
     Return a lisk of links for given project and entity type.
     """
     task_type_links = (
-        ProjectTaskTypeLink.query
-        .join(TaskType)
+        ProjectTaskTypeLink.query.join(TaskType)
         .filter(ProjectTaskTypeLink.project_id == project_id)
         .filter(TaskType.for_entity == for_entity)
         .order_by(ProjectTaskTypeLink.priority.desc())

{zou-0.20.50 → zou-0.20.52/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.50
+Version: 0.20.52
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -84,7 +84,7 @@ Provides-Extra: test
 Requires-Dist: fakeredis==2.29.0; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
+Requires-Dist: pytest==8.4.0; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"

{zou-0.20.50 → zou-0.20.52}/zou.egg-info/requires.txt

@@ -75,4 +75,4 @@ gevent
 fakeredis==2.29.0
 mixer==7.2.2
 pytest-cov==6.1.1
-pytest==8.3.5
+pytest==8.4.0

zou-0.20.50/zou/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.20.50"