zou 0.20.58__py3-none-any.whl → 0.20.60__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.58"
+__version__ = "0.20.60"

zou/app/blueprints/crud/schedule_item.py

@@ -28,8 +28,8 @@ class ScheduleItemResource(BaseModelResource):
         BaseModelResource.__init__(self, ScheduleItem)
 
     def check_update_permissions(self, instance, data):
-        return user_service.check_supervisor_schedule_item_access(
-            instance, data
+        return user_service.check_supervisor_project_task_type_access(
+            instance["project_id"], instance["task_type_id"]
         )
 
     def update_data(self, data, instance_id):

zou/app/blueprints/source/csv/task_type_estimations.py

@@ -9,12 +9,22 @@ from zou.app.services import (
     shots_service,
     tasks_service,
     persons_service,
+    user_service,
 )
 
 from zou.app.utils import date_helpers
 
 
 class TaskTypeEstimationsCsvImportResource(BaseCsvProjectImportResource):
+    """
+    Import the estimations of task-types for given project.
+    """
+
+    def check_permissions(self, project_id, task_type, episode_id=None):
+        return user_service.check_supervisor_project_task_type_access(
+            project_id, task_type["id"]
+        )
+
     def post(self, project_id, task_type_id, episode_id=None):
         """
         Import the estimations of task-types for given project.

zou/app/models/preview_file.py

@@ -99,3 +99,14 @@ class PreviewFile(db.Model, BaseMixin, SerializerMixin):
                 "created_at": self.created_at,
             }
         )
+
+    def present_minimal(self):
+        return fields.serialize_dict(
+            {
+                "id": self.id,
+                "name": self.name,
+                "extension": self.extension,
+                "revision": self.revision,
+                "position": self.position,
+            }
+        )

zou/app/services/news_service.py

@@ -169,6 +169,7 @@ def get_last_news_for_project(
         Task.entity_id,
         PreviewFile.extension,
         PreviewFile.annotations,
+        PreviewFile.revision,
         Entity.preview_file_id,
     )
 
@@ -187,6 +188,7 @@ def get_last_news_for_project(
         task_entity_id,
         preview_file_extension,
         preview_file_annotations,
+        preview_file_revision,
         entity_preview_file_id,
     ) in news_list:
         full_entity_name, episode_id, _ = names_service.get_full_entity_name(
@@ -206,7 +208,7 @@ def get_last_news_for_project(
                     "task_entity_id": task_entity_id,
                     "preview_file_id": news.preview_file_id,
                     "preview_file_extension": preview_file_extension,
-                    "preview_file_annotations": preview_file_annotations,
+                    "preview_file_revision": preview_file_revision,
                     "project_id": project_id,
                     "project_name": project_name,
                     "created_at": news.created_at,
@@ -217,6 +219,30 @@ def get_last_news_for_project(
                 }
             )
         )
+
+    if only_preview:
+        task_ids = [
+            news["task_id"] for news in result if news["task_id"] is not None
+        ]
+        revisions = [news["preview_file_revision"] for news in result]
+        preview_files = (
+            PreviewFile.query.filter(PreviewFile.task_id.in_(task_ids))
+            .filter(PreviewFile.revision.in_(revisions))
+            .order_by(
+                PreviewFile.task_id, PreviewFile.revision, PreviewFile.position
+            )
+        )
+        preview_files_map = {}
+        for preview_file in preview_files:
+            key = f"{str(preview_file.task_id)}-{preview_file.revision}"
+            if not key in preview_files_map:
+                preview_files_map[key] = []
+            preview_files_map[key].append(preview_file.present_minimal())
+
+        for entry in result:
+            key = f"{entry['task_id']}-{entry['preview_file_revision']}"
+            entry["preview_files"] = preview_files_map[key]
+
     return {
         "data": result,
         "total": total,

zou/app/services/user_service.py

@@ -519,8 +519,31 @@ def check_task_action_access(task_id):
                     ]
                     in user["departments"]
                 )
-    else:
-        is_allowed = False
+
+    if not is_allowed:
+        raise permissions.PermissionDenied
+    return is_allowed
+
+
+def check_supervisor_project_task_type_access(project_id, task_type_id):
+    """
+    Return true if current user can have access to a task type.
+    """
+    is_allowed = False
+    if permissions.has_admin_permissions() or (
+        permissions.has_manager_permissions()
+        and check_belong_to_project(project_id)
+    ):
+        is_allowed = True
+    elif permissions.has_supervisor_permissions() and check_belong_to_project(
+        project_id
+    ):
+        user = persons_service.get_current_user(relations=True)
+        is_allowed = (
+            user["departments"] == []
+            or tasks_service.get_task_type(task_type_id)["department_id"]
+            in user["departments"]
+        )
 
     if not is_allowed:
         raise permissions.PermissionDenied
@@ -664,38 +687,6 @@ def check_supervisor_task_access(task, new_data={}):
     return is_allowed
 
 
-def check_supervisor_schedule_item_access(schedule_item, new_data={}):
-    """
-    Return true if current user is a manager and has a task assigned related
-    to the project of this task or is a supervisor and can modify data accorded
-    to his departments
-    """
-    is_allowed = False
-    if permissions.has_admin_permissions() or (
-        permissions.has_manager_permissions()
-        and check_belong_to_project(schedule_item["project_id"])
-    ):
-        is_allowed = True
-    elif permissions.has_supervisor_permissions() and check_belong_to_project(
-        schedule_item["project_id"]
-    ):
-        user_departments = persons_service.get_current_user(relations=True)[
-            "departments"
-        ]
-        if (
-            user_departments == []
-            or tasks_service.get_task_type(schedule_item["task_type_id"])[
-                "department_id"
-            ]
-            in user_departments
-        ):
-            is_allowed = True
-
-    if not is_allowed:
-        raise permissions.PermissionDenied
-    return is_allowed
-
-
 def check_metadata_department_access(entity, new_data={}):
     """
     Return true if current user is a manager and has a task assigned for this

zou/event_stream.py

@@ -267,7 +267,6 @@ def on_change_version(data):
     emit("preview-room:comparison-panzoom-changed", data, room=room_id)
 
 
-
 if __name__ == "__main__":
     socketio.run(
         app,

{zou-0.20.58.dist-info → zou-0.20.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.58
+Version: 0.20.60
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -49,13 +49,12 @@ Requires-Dist: Jinja2==3.1.6
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.36.0
-Requires-Dist: numpy==2.2.6; python_version == "3.10"
-Requires-Dist: numpy==2.3.1; python_version >= "3.11"
-Requires-Dist: opencv-python==4.11.0.86
+Requires-Dist: numpy==2.2.6
+Requires-Dist: opencv-python==4.12.0.88
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
 Requires-Dist: orjson==3.10.18
-Requires-Dist: pillow==11.2.1
+Requires-Dist: pillow==11.3.0
 Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.9
 Requires-Dist: pyotp==2.9.0
@@ -69,7 +68,7 @@ Requires-Dist: requests==2.32.4
 Requires-Dist: rq==2.4.0
 Requires-Dist: semver==3.0.4
 Requires-Dist: slackclient==2.9.4
-Requires-Dist: spdx-license-list==3.26.0
+Requires-Dist: spdx-license-list==3.27.0
 Requires-Dist: sqlalchemy_utils==0.41.2
 Requires-Dist: sqlalchemy==2.0.41
 Requires-Dist: tabulate==0.9.0

{zou-0.20.58.dist-info → zou-0.20.60.dist-info}/RECORD

@@ -1,7 +1,7 @@
-zou/__init__.py,sha256=5N6GyHyKynWvCcfY7xFn4CwfJiEcy8iljLFjtzWXQ-0,24
+zou/__init__.py,sha256=8OpoYx3Rq00iLT1VQD4WsjWu5M2FZ-ZO7V7xTgrBfnA,24
 zou/cli.py,sha256=W7nhMII-gyl8AlL6zgDmverSdFphDV_WnuN3BHrHc8w,22448
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
-zou/event_stream.py,sha256=YOWVGAgseVQKC6usoYDW4T9iRVrG7R8TvP-Nr2AKi6k,8576
+zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
 zou/job_settings.py,sha256=_aqBhujt2Q8sXRWIbgbDf-LUdXRdBimdtTc-fZbiXoY,202
 zou/app/__init__.py,sha256=zGmaBGBHSS_Px34I3_WZmcse62G_AZJArjm4F6TwmRk,7100
 zou/app/api.py,sha256=Esgni_0-tAaE3msWxNMEdUS_wwIdElM0P2GrjhaHbCk,3727
@@ -53,7 +53,7 @@ zou/app/blueprints/crud/preview_file.py,sha256=c-WTDdSbeXmlQalW0s0bTTgixD-tvfV0K
 zou/app/blueprints/crud/project.py,sha256=g8kWGzgWyVk7s6Y-41DRAGjIegxS36W4SbP1FMJTQDM,8428
 zou/app/blueprints/crud/project_status.py,sha256=XIiIsAfaD5sLZA6wT3UL4FZQpnoOcqPzYfFIWrp9Svs,540
 zou/app/blueprints/crud/salary_scale.py,sha256=CLvY6DJhSaOZnSqzyLwrEmqRb7Hru2qDC4iB0bKM168,2436
-zou/app/blueprints/crud/schedule_item.py,sha256=1dbNKbftNG3if38Hzh1uslCAu3BE4jOqWhLV0590A90,1400
+zou/app/blueprints/crud/schedule_item.py,sha256=O5qPiFw4D1z_E8df7Xtst9k1Hc3RUcOiKbc7YG4PB2E,1438
 zou/app/blueprints/crud/search_filter.py,sha256=qR0crZFfaOd2YxFcPMKhAj1SXCc-YW9Wk4UA07dDgMQ,393
 zou/app/blueprints/crud/search_filter_group.py,sha256=bdCLP1EmSatSNQXW8qYjqXQ1_dqluxUeEe7wEpcP_R0,424
 zou/app/blueprints/crud/software.py,sha256=oKFINQh3DcVTd0Ap_cvgsgvhrIbGPjVBKucwkRpcI3Q,1974
@@ -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=L4urkpixLQv3wqpZKgJl8QcNz30D1ZW6OAr-pytnau8,6205
+zou/app/blueprints/source/csv/task_type_estimations.py,sha256=pFH1kwW5OyElDFc9RtTFLZBgv1bB4oN7dfJJ7DtER9Q,6495
 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
@@ -169,7 +169,7 @@ zou/app/models/person.py,sha256=xRjoPL2OayjmwUJcvbD7BJY7atxm-daIzPfEhgr5LbU,8107
 zou/app/models/playlist.py,sha256=YGgAk84u0_fdIEY02Dal4kfk8APVZvWFwWYV74qvrio,1503
 zou/app/models/plugin.py,sha256=zNs9Qi1h_v_6edZs5GHRSKItaAG4Gnlk1FQKumiiv68,766
 zou/app/models/preview_background_file.py,sha256=j8LgRmY7INnlB07hFwwB-8ssQrRC8vsb8VcpsTbt6tA,559
-zou/app/models/preview_file.py,sha256=eDPXw0QIdJze_E4kAS8SsyabrefWhIIdwuGmjss7iXo,3282
+zou/app/models/preview_file.py,sha256=ofN0aTvjc7eYBMj7OjUs3Yhw9_HZGOYB9ftbH3XAVCM,3587
 zou/app/models/project.py,sha256=mXoLK7fEwDRGd21AoQadgV9K0AgoxYwTb5Sdf_cezlY,9203
 zou/app/models/project_status.py,sha256=pExaHH7x4Eu8xOqD3_mRRbMzjT2jJZ8rm-9jo7yUGXA,390
 zou/app/models/salary_scale.py,sha256=3TaOtgJkGq2sPUAmE9nbzAqgkPzZYiSLZw-YSv-oLyc,814
@@ -207,7 +207,7 @@ zou/app/services/file_tree_service.py,sha256=8JNBDgnXtV-AmSJ3gnUGB4oSwLjPgi1WYyL
 zou/app/services/files_service.py,sha256=df1_9v-vwE5HVi9XjtilTPWHuiWunvrwPyQh_IXupNM,28517
 zou/app/services/index_service.py,sha256=IaffQz_oj6GPEbuDp4a2qnSc6n-hhIcmA_LrTm3Wots,10201
 zou/app/services/names_service.py,sha256=TOSrintROmxcAlcFQE0i2E3PBLnw81GAztNselpTn18,2947
-zou/app/services/news_service.py,sha256=eOXkvLhOcgncI2NrgiJEccV28oxZX5CsZVqaE-l4kWQ,9084
+zou/app/services/news_service.py,sha256=uYzk8PwJ6khWy6OCnTFx4Su5yQkPXMJ5Qu4MSDDFj8U,10097
 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=IKjvT3RZigwXsrhsRFqaWWlm-tZSN6-jgMDf0Hn3w3Q,33179
@@ -223,7 +223,7 @@ zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0Oe
 zou/app/services/tasks_service.py,sha256=gRD-xODi7tCAyHdi5yJohKavWdODK6TwvDGR9pa82BM,69831
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/time_spents_service.py,sha256=8sYnepgeo4yohNFRNiEedqFfL2vuJ78GZSHOpRmp52Q,16502
-zou/app/services/user_service.py,sha256=wdi2b2kvct5b_Qi9XdrNEhz9JL4WoI9EpT-8_UOSXnE,52070
+zou/app/services/user_service.py,sha256=VaxYb8tmsNCyIDiKwneSCX-6BnLBElGxQwYPvkcjM2k,51774
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
 zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
@@ -447,9 +447,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.58.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.58.dist-info/METADATA,sha256=4RwRbOeyIMqXRm-G7TvNpWKYSYLrM2gM0IHrcsaGtPA,6778
-zou-0.20.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-0.20.58.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.58.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.58.dist-info/RECORD,,
+zou-0.20.60.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.60.dist-info/METADATA,sha256=UGpY4_MFusHKn9eLGc0oAbc9g7X48ViObYsUAOHhMJ0,6698
+zou-0.20.60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-0.20.60.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.60.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.60.dist-info/RECORD,,