zou 0.20.50__py3-none-any.whl → 0.20.51__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.50"
+__version__ = "0.20.51"

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/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/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/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.dist-info → zou-0.20.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.50
+Version: 0.20.51
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

{zou-0.20.50.dist-info → zou-0.20.51.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=j9fVrpQ67n0_aPzEmSWoe1Lq3AYE5iGwQdtuvN8qakI,24
+zou/__init__.py,sha256=jKuoU0n-XXsegDJBRz_IGknA1tJmBjiSh3HA8TFJDGg,24
 zou/cli.py,sha256=W7nhMII-gyl8AlL6zgDmverSdFphDV_WnuN3BHrHc8w,22448
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=yTU1Z3r55SiYm8Y5twtJIo5kTnhbBK-XKc8apdgvzNw,8291
@@ -112,7 +112,7 @@ zou/app/blueprints/source/csv/casting.py,sha256=zUlwEnSheoCMTIgvRlKJgNv3hYPDjfSr
 zou/app/blueprints/source/csv/edits.py,sha256=yL1RcClBxPNakLt326M2aJk6pVv0H7CrNXALuKHkDZ8,8386
 zou/app/blueprints/source/csv/persons.py,sha256=QciJ47B3rAPyUQTAeToCUAhEai16J4s37oOErjdC_Vw,2582
 zou/app/blueprints/source/csv/shots.py,sha256=5OI0IBY8C72aBbDFrIkvN-ZkWWCHsvOGUQ0Z9rWsnDs,9748
-zou/app/blueprints/source/csv/task_type_estimations.py,sha256=FBD0dWh635yjEPXWQlidc3XunWhw29qhObTPpmpA5qA,5840
+zou/app/blueprints/source/csv/task_type_estimations.py,sha256=L4urkpixLQv3wqpZKgJl8QcNz30D1ZW6OAr-pytnau8,6205
 zou/app/blueprints/source/shotgun/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/blueprints/source/shotgun/assets.py,sha256=vuRvy0oUszImYRawrbWC2h7CHYSBvGXDJPoa6ZqpG_U,4980
 zou/app/blueprints/source/shotgun/base.py,sha256=Y0sX8X3oN0AQWiBqjLX-cijnBZH8UzZp4iC8BQpf_tk,6193
@@ -200,7 +200,7 @@ zou/app/services/custom_actions_service.py,sha256=fWISEOOdthadrxeHuacEel5Xj6msn0
 zou/app/services/deletion_service.py,sha256=jZzNzyfmKJK1Sro9PUV0v9cVh6QQ2qh-0bQ4Ajuk77I,17434
 zou/app/services/edits_service.py,sha256=P3-eBoHSikYjtuHeulTv_WuILEe502sU4qFObfokcQY,12114
 zou/app/services/emails_service.py,sha256=i9EP3zw02ZteVt9OZTvkfaoU19_T4kLhRmrhIvYw2SQ,11965
-zou/app/services/entities_service.py,sha256=SbLET7DmyrGzUe-R5T3sEWHW61jDtckHXINj3BgEJy8,17340
+zou/app/services/entities_service.py,sha256=tiKZpv28PMJqTT0S4W6T_4E_gOGytps2QhENB5IvOwQ,17373
 zou/app/services/events_service.py,sha256=Ew-bY5hqrWLmpbVj1_xd3E2S3JtyAGzdgw2XjudTZjc,2700
 zou/app/services/exception.py,sha256=miD3RCXUgGezLvm2hqZfNqGEdodybu1TTLifPKgb5-E,4349
 zou/app/services/file_tree_service.py,sha256=8JNBDgnXtV-AmSJ3gnUGB4oSwLjPgi1WYyL0Kc98JRE,33875
@@ -210,10 +210,10 @@ zou/app/services/names_service.py,sha256=TOSrintROmxcAlcFQE0i2E3PBLnw81GAztNselp
 zou/app/services/news_service.py,sha256=eOXkvLhOcgncI2NrgiJEccV28oxZX5CsZVqaE-l4kWQ,9084
 zou/app/services/notifications_service.py,sha256=7GDRio_mGaRYV5BHOAdpxBZjA_LLYUfVpbwZqy1n9pI,15685
 zou/app/services/persons_service.py,sha256=HjV-su80Y2BO9l5zoBKHMNF0mDGtkWqPhEOs3nQ3nlI,16566
-zou/app/services/playlists_service.py,sha256=Z0EDxKCH9Widi3-Bx8svpQaRtreXKizzrL9wZq-YXjs,33182
+zou/app/services/playlists_service.py,sha256=IKjvT3RZigwXsrhsRFqaWWlm-tZSN6-jgMDf0Hn3w3Q,33179
 zou/app/services/plugins_service.py,sha256=dbU-2f7t3eo6VISQBsASM8Or4Y8ha6Vt8ZHgtizdOi0,1917
 zou/app/services/preview_files_service.py,sha256=673xVNvyK2LoMqWZ6b-g6n1krXOPFVFUh2wonDNLyck,36030
-zou/app/services/projects_service.py,sha256=ayJBDbw9kuxuU5a2SQVnVquB3Ja0f0VPsG_AqpK27dc,21849
+zou/app/services/projects_service.py,sha256=TF9WcGLxQUzZkVIp3q4p8uALn2i0JEutvFtkJ0HvMt0,21840
 zou/app/services/scenes_service.py,sha256=iXN19HU4njPF5VtZXuUrVJ-W23ZQuQNPC3ADXltbWtU,992
 zou/app/services/schedule_service.py,sha256=E99HKYsXgnK2sw58fw-NNHXWBgVJiA60upztjkNSCaM,6989
 zou/app/services/shots_service.py,sha256=MfBvw0hhVwi_KSQVnM-V4O3LnNkJB2imJWF6n9J6xfc,54747
@@ -446,9 +446,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.50.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.50.dist-info/METADATA,sha256=KKo_aN4MZvc9psbD4mzukGDh3sAVReibA_TojI4ciOQ,6698
-zou-0.20.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-0.20.50.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.50.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.50.dist-info/RECORD,,
+zou-0.20.51.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.51.dist-info/METADATA,sha256=2-YCRFAvnrZKvyN8gJiTnGublubTooVWfmLl4A6dyOQ,6698
+zou-0.20.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-0.20.51.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.51.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.51.dist-info/RECORD,,