zou 0.20.15__py3-none-any.whl → 0.20.16__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.15"
+__version__ = "0.20.16"

zou/app/blueprints/assets/resources.py

@@ -140,7 +140,6 @@ class AssetsAndTasksResource(Resource, ArgsMixin):
             description: All assets with tasks
         """
         criterions = query.get_query_criterions_from_request(request)
-        page = self.get_page()
         check_criterion_access(criterions)
         if permissions.has_vendor_permissions():
             criterions["assigned_to"] = persons_service.get_current_user()[
@@ -150,7 +149,7 @@ class AssetsAndTasksResource(Resource, ArgsMixin):
                 str(department.id)
                 for department in persons_service.get_current_user_raw().departments
             ]
-        return assets_service.get_assets_and_tasks(criterions, page)
+        return assets_service.get_assets_and_tasks(criterions)
 
 
 class AssetTypeResource(Resource):

zou/app/blueprints/crud/task.py

@@ -47,8 +47,6 @@ class TasksResource(BaseModelsResource, ArgsMixin):
             name_filter,
             criterions,
         ) = super().build_filters(options)
-        if "project_id" in criterions:
-            del criterions["project_id"]
         if "episode_id" in criterions:
             del criterions["episode_id"]
         return (
@@ -61,7 +59,6 @@ class TasksResource(BaseModelsResource, ArgsMixin):
     def apply_filters(self, query, options):
         query = super().apply_filters(query, options)
 
-        project_id = options.get("project_id", None)
         episode_id = options.get("episode_id", None)
         if episode_id is not None:
             Sequence = aliased(Entity)
@@ -70,10 +67,6 @@ class TasksResource(BaseModelsResource, ArgsMixin):
                 .join(Sequence, Entity.parent_id == Sequence.id)
                 .filter(Sequence.parent_id == episode_id)
             )
-        elif project_id is not None:
-            query = query.join(Entity, Task.entity_id == Entity.id).filter(
-                Entity.project_id == project_id
-            )
 
         return query
 

zou/app/models/attachment_file.py

@@ -3,6 +3,7 @@ from sqlalchemy_utils import UUIDType
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
+from zou.app.utils import fields
 
 
 class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
@@ -31,12 +32,14 @@ class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
         return "<AttachmentFile %s>" % self.id
 
     def present(self):
-        return {
-            "id": str(self.id),
-            "name": self.name,
-            "extension": self.extension,
-            "size": self.size,
-        }
+        return fields.serialize_dict(
+            {
+                "id": self.id,
+                "name": self.name,
+                "extension": self.extension,
+                "size": self.size,
+            }
+        )
 
     @classmethod
     def create_from_import(cls, data):

zou/app/models/chat.py

@@ -3,6 +3,7 @@ from sqlalchemy_utils import UUIDType
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
+from zou.app.utils import fields
 
 
 class ChatParticipant(db.Model):
@@ -37,8 +38,10 @@ class Chat(db.Model, BaseMixin, SerializerMixin):
         return "<Message of %s>" % self.object_id
 
     def present(self):
-        return {
-            "id": str(self.id),
-            "object_id": str(self.object_id),
-            "last_message": self.last_message,
-        }
+        return fields.serialize_dict(
+            {
+                "id": self.id,
+                "object_id": self.object_id,
+                "last_message": self.last_message,
+            }
+        )

zou/app/models/preview_file.py

@@ -3,6 +3,7 @@ from sqlalchemy_utils import UUIDType, ChoiceType
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
+from zou.app.utils import fields
 
 from sqlalchemy.dialects.postgresql import JSONB
 
@@ -82,16 +83,19 @@ class PreviewFile(db.Model, BaseMixin, SerializerMixin):
             return (previous_data, True)
 
     def present(self):
-        return {
-            "id": str(self.id),
-            "name": self.name,
-            "original_name": self.original_name,
-            "extension": self.extension,
-            "revision": self.revision,
-            "position": self.position,
-            "file_size": self.file_size,
-            "status": str(self.status),
-            "validation_status": str(self.validation_status),
-            "task_id": str(self.task_id),
-            "person_id": str(self.person_id),
-        }
+        return fields.serialize_dict(
+            {
+                "id": self.id,
+                "name": self.name,
+                "original_name": self.original_name,
+                "extension": self.extension,
+                "revision": self.revision,
+                "position": self.position,
+                "file_size": self.file_size,
+                "status": self.status,
+                "validation_status": self.validation_status,
+                "task_id": self.task_id,
+                "person_id": self.person_id,
+                "created_at": self.created_at,
+            }
+        )

zou/app/services/assets_service.py

@@ -169,7 +169,7 @@ def get_full_assets(criterions={}):
     return assets
 
 
-def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
+def get_assets_and_tasks(criterions={}, with_episode_ids=False):
     """
     Get all assets for given criterions with related tasks for each asset.
     """

zou/app/services/playlists_service.py

@@ -188,7 +188,9 @@ def get_playlist_with_preview_file_revisions(playlist_id):
                 shot["preview_file_status"] = preview_file["status"]
                 shot["preview_file_annotations"] = preview_file["annotations"]
                 shot["preview_file_task_id"] = preview_file["task_id"]
-                shot["preview_file_previews"] = preview_file["previews"]
+                shot["preview_file_previews"] = preview_file.get(
+                    "previews", []
+                )
             else:
                 del shot["preview_file_id"]
         except Exception as e:
@@ -234,7 +236,6 @@ def set_preview_files_for_entities(playlist_dict):
         .all()
     )
 
-    is_pictures = False
     for preview_file, task_type_id, entity_id in preview_files:
         entity_id = str(entity_id)
         task_type_id = str(task_type_id)
@@ -244,9 +245,6 @@ def set_preview_files_for_entities(playlist_dict):
         if task_type_id not in previews[entity_id]:
             previews[entity_id][task_type_id] = []
 
-        if preview_file.extension == "png":
-            is_pictures = True
-
         task_id = str(preview_file.task_id)
         preview_file_id = str(preview_file.id)
 
@@ -265,12 +263,11 @@ def set_preview_files_for_entities(playlist_dict):
         previews[entity_id][task_type_id].append(light_preview_file)
         preview_file_map[preview_file_id] = light_preview_file
 
-    if is_pictures:
-        for entity_id in previews.keys():
-            for task_type_id in previews[entity_id].keys():
-                previews[entity_id][task_type_id] = mix_preview_file_revisions(
-                    previews[entity_id][task_type_id]
-                )
+    for entity_id in previews.keys():
+        for task_type_id in previews[entity_id].keys():
+            previews[entity_id][task_type_id] = mix_preview_file_revisions(
+                previews[entity_id][task_type_id]
+            )
 
     for entity in playlist_dict["shots"]:
         if str(entity["id"]) in previews:

{zou-0.20.15.dist-info → zou-0.20.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.15
+Version: 0.20.16
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -62,7 +62,7 @@ Requires-Dist: psutil==6.1.1
 Requires-Dist: psycopg[binary]==3.2.4
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.0
-Requires-Dist: python-nomad==2.0.1
+Requires-Dist: python-nomad==2.1.0
 Requires-Dist: python-slugify==8.0.4
 Requires-Dist: python-socketio==5.12.1
 Requires-Dist: pytz==2025.1
@@ -71,7 +71,7 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: rq==2.1.0
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: sqlalchemy_utils==0.41.2
-Requires-Dist: sqlalchemy==2.0.37
+Requires-Dist: sqlalchemy==2.0.38
 Requires-Dist: ua-parser==1.0.1
 Requires-Dist: werkzeug==3.1.3
 Provides-Extra: prod

{zou-0.20.15.dist-info → zou-0.20.16.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=qx2qBaxijq_GGtI51BGXX5lmkBS7HlcGbPCmaum1Gf8,24
+zou/__init__.py,sha256=H2uay8S6RdWs70UCbs9-a4OHr3MS43oLxQlRC2LPME4,24
 zou/cli.py,sha256=8JyGrWm7-Ykshv5IBjwlBMn8JkFpHPCADChA9n8loTI,18755
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=EpohqFJwWL0zs-Ic_W5dX5_XSDeCrqHQPL5Re39OnQ0,6382
@@ -10,7 +10,7 @@ zou/app/mixin.py,sha256=eYwfS_CUFvNmldaQXrjsN5mK_gX0wYrBFykfx60uUM8,4897
 zou/app/swagger.py,sha256=Jr7zsMqJi0V4FledODOdu-aqqVE02jMFzhqVxHK0_2c,54158
 zou/app/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/blueprints/assets/__init__.py,sha256=T2zhDagHjXF6jRwOQ8vqokZTkBHyY7XtTI0Rlooamjs,2931
-zou/app/blueprints/assets/resources.py,sha256=y1fMLrgO8vFXoJT4srh-FP4IFlGvh_E0NxhQ5AK-9O0,25600
+zou/app/blueprints/assets/resources.py,sha256=Cqdot0vR6ccHNC5b0FVDq2x_Ujankk61N3EKV0A4q3M,25563
 zou/app/blueprints/auth/__init__.py,sha256=xP874bMWUnLIirOPSEbpe-Q2fBBQrxZGKd0tLZmNJXk,1128
 zou/app/blueprints/auth/resources.py,sha256=YIhdEVK9WQ7fCYtknwh3dR3TdSdURRm7rBpDxpNSGK0,45608
 zou/app/blueprints/breakdown/__init__.py,sha256=Dp6GWSGxxWIedpyzTTEKpCRUYEo8oVNVyQhwNvTMmQM,1888
@@ -56,7 +56,7 @@ zou/app/blueprints/crud/software.py,sha256=oKFINQh3DcVTd0Ap_cvgsgvhrIbGPjVBKucwk
 zou/app/blueprints/crud/status_automation.py,sha256=BY846JKmFMpTZBZ0DlWXpQ-LHwCpOwAWU8qekK89yk0,2361
 zou/app/blueprints/crud/studio.py,sha256=N0JjQ92ilFuPcFsq2WYBeaeeXHyPDXf_-UtSQpSFN4A,951
 zou/app/blueprints/crud/subscription.py,sha256=xFV_nvRg2ow6E0JWo4VHgeK_SkKX3K8i80thY3qRCl0,392
-zou/app/blueprints/crud/task.py,sha256=7ZMetDs4Z-ZxO0IjyM4y1kmzQUGyLvf0ga6pxZOrNsA,5793
+zou/app/blueprints/crud/task.py,sha256=ZYHngIDkxAOGRPUf7O1i7K8lKq1eeqtMwzDZqZYR0kc,5485
 zou/app/blueprints/crud/task_status.py,sha256=roRbBJtyoaNrXv5nkVIPLH6K5vdJjGQtiWFvqlfbo9s,1482
 zou/app/blueprints/crud/task_type.py,sha256=9DUtBaNZqC0yHmunKX_CaUyo-bHjNTX3B-g4zyU5uKc,1815
 zou/app/blueprints/crud/time_spent.py,sha256=9tfoKJ77OEDTnpKHshO3UMDz_KCoyLq1CWquInm5DY0,3057
@@ -136,10 +136,10 @@ zou/app/indexer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/indexer/indexing.py,sha256=s8Jx62itbeptPlxnl1tFozF3e5HKxEMq-pOnwomVumE,3718
 zou/app/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/models/asset_instance.py,sha256=ajfyA3qe6IjoNvd3mM8yr7wk9p4R9WO0qTfqT9ijntg,1714
-zou/app/models/attachment_file.py,sha256=d3gldEyKhRyLqGQHBbWVwtmPgtq7oxipxHanZUKWVGI,1377
+zou/app/models/attachment_file.py,sha256=26SAjgGncoUbpgyygXg8tigEBWMgaz9wfn8Kx6dLueM,1470
 zou/app/models/base.py,sha256=vZoPzdixyRbk0SoDJGEbQ9LFouBaDCA7gVSZ1o_SIhI,8808
 zou/app/models/build_job.py,sha256=aW6KZXkyMP9d3g8fvcOYk9EAoNMw-6IleZdWbaqLLVw,1286
-zou/app/models/chat.py,sha256=yeKqe6o7RRAExx8xD-7dRXzUPhq_dwZffrbIG4HQp1w,1189
+zou/app/models/chat.py,sha256=u-IZB67IYlMMoPooFSKJX2kpXFdshlmRKf7UuwAcA6c,1273
 zou/app/models/chat_message.py,sha256=8w7xtoqCW_CRoGKrF4ba5w-oyAHIRh-2ms3p5sQQor4,874
 zou/app/models/comment.py,sha256=sJxLnMNhdgvqm_nlcaRauxsMgFUQyMLxcCK8JkeJQJE,5875
 zou/app/models/custom_action.py,sha256=wx5ASKJ2oG-ivASZbVf1nLiL7zELgQBJ8U1jDdvGkuU,578
@@ -162,7 +162,7 @@ zou/app/models/output_type.py,sha256=us_lCUCEvuP4vi_XmmOcEl1J2MtZhMX5ZheBqEFCgWA
 zou/app/models/person.py,sha256=txHmSzokaS-tET_MIjGHxhNNS8CPt-GzUPIhp5baDmU,7714
 zou/app/models/playlist.py,sha256=YGgAk84u0_fdIEY02Dal4kfk8APVZvWFwWYV74qvrio,1503
 zou/app/models/preview_background_file.py,sha256=j8LgRmY7INnlB07hFwwB-8ssQrRC8vsb8VcpsTbt6tA,559
-zou/app/models/preview_file.py,sha256=Ur45Wau2X3qyKULh04EUcMbnBmaQc8y4IMs5NgELiAQ,3134
+zou/app/models/preview_file.py,sha256=eDPXw0QIdJze_E4kAS8SsyabrefWhIIdwuGmjss7iXo,3282
 zou/app/models/project.py,sha256=T2gTImmbd5O-U5GySWSwzkR0r_cY2RDr1niwSfOPqeA,8900
 zou/app/models/project_status.py,sha256=pExaHH7x4Eu8xOqD3_mRRbMzjT2jJZ8rm-9jo7yUGXA,390
 zou/app/models/schedule_item.py,sha256=coY5uDDuBoctaMICnfCzx4zT5om2E1uu4iq5MDWAPlY,1444
@@ -179,7 +179,7 @@ zou/app/models/task_type.py,sha256=IsixVAfz3pyMf0eQw8x-uFNM9OHNkZpsPLEz_VNQ0hA,1
 zou/app/models/time_spent.py,sha256=n7i3FO9g1eE_zATkItoCgrGVqq3iMSfdlKSveEZPloc,795
 zou/app/models/working_file.py,sha256=q0LM3s1ziw_9AmmPDCkwyf1-TJkWTBMgo2LdHyVRwxg,1509
 zou/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zou/app/services/assets_service.py,sha256=WOV0XTp5JKNclI9MnYH_4wcWk_u3UYObberaX78Q8u4,23995
+zou/app/services/assets_service.py,sha256=VSGZp2EtFZzaqaT_ysOSDAmnYcp1UYdhY1-WlISxvl8,23987
 zou/app/services/auth_service.py,sha256=hQpNb21xlr5EiTrXnzpFb4W4GDtglubqA2z_-YIBfnk,22897
 zou/app/services/backup_service.py,sha256=_ZtZp6wkcVYnHxBosziwLGdrTvsUttXGphiydq53iy8,4840
 zou/app/services/base_service.py,sha256=OZd0STFh-DyBBdwsmA7DMMnrwv4C8wJUbShvZ1isndU,1383
@@ -201,7 +201,7 @@ 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=ccPP1_anu2J4zH54LKeP7dt1VyVpiYvzfgOS1xXhLrQ,16564
-zou/app/services/playlists_service.py,sha256=pAlPHET4jNdST5jsmJrFUkf1SVhfSoML9zdNpZ_88l4,32439
+zou/app/services/playlists_service.py,sha256=Gs5K6jDJmnbdWqNvM3J0cOn0Lfxh_JtoPdEmqYXFSWk,32345
 zou/app/services/preview_files_service.py,sha256=Yk-vwzHuKTzNkEZfl9DhQRdDuRU006uwZxJ-RKajEkI,35842
 zou/app/services/projects_service.py,sha256=aIbYaFomy7OX2Pxvkf9w5qauDvkjuc9ummSGNYIpQMY,21249
 zou/app/services/scenes_service.py,sha256=iXN19HU4njPF5VtZXuUrVJ-W23ZQuQNPC3ADXltbWtU,992
@@ -416,9 +416,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.15.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.15.dist-info/METADATA,sha256=o4r3Y9W25b_qntiXtCV0Eqr052SS0LXNSkzNw98Mge0,6733
-zou-0.20.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-zou-0.20.15.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.15.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.15.dist-info/RECORD,,
+zou-0.20.16.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.16.dist-info/METADATA,sha256=Y3kFPwIc_wcpvLRJuqwDa1N7PhokrXxeYtZjvnj1jgo,6733
+zou-0.20.16.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+zou-0.20.16.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.16.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.16.dist-info/RECORD,,