zou 0.19.39__py3-none-any.whl → 0.19.41__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.19.39"
+__version__ = "0.19.41"

zou/app/blueprints/comments/resources.py

@@ -60,13 +60,15 @@ class DownloadAttachmentResource(Resource):
             task = tasks_service.get_task(comment["object_id"])
             user_service.check_project_access(task["project_id"])
             user_service.check_entity_access(task["entity_id"])
-        else:
+        elif attachment_file["chat_message_id"] is not None:
             message = chats_service.get_chat_message(
                 attachment_file["chat_message_id"]
             )
             chat = chats_service.get_chat_by_id(message["chat_id"])
             entity = entities_service.get_entity(chat["object_id"])
             user_service.check_project_access(entity["project_id"])
+        else:
+            raise permissions.PermissionDenied()
         try:
             file_path = comments_service.get_attachment_file_path(
                 attachment_file

zou/app/blueprints/crud/attachment_file.py

@@ -4,6 +4,8 @@ from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
 from zou.app.services import chats_service, tasks_service, user_service
 
+from zou.app.utils.permissions import PermissionDenied
+
 
 class AttachmentFilesResource(BaseModelsResource):
     def __init__(self):
@@ -16,17 +18,18 @@ class AttachmentFileResource(BaseModelResource):
 
     def check_read_permissions(self, instance):
         attachment_file = instance
-        if attachment_file["comment_id"]:
+        if attachment_file["comment_id"] is not None:
             comment = tasks_service.get_comment(attachment_file["comment_id"])
             task = tasks_service.get_task(comment["object_id"])
             user_service.check_project_access(task["project_id"])
             user_service.check_entity_access(task["entity_id"])
-        else:
+        elif attachment_file["chat_message_id"] is not None:
             message = chats_service.get_chat_message(
                 attachment_file["chat_message_id"]
             )
             chat = chats_service.get_chat(message["chat_id"])
             print(chat)
             user_service.check_entity_access(chat["object_id"])
-
+        else:
+            raise PermissionDenied()
         return True

zou/app/blueprints/previews/resources.py

@@ -695,7 +695,7 @@ class AttachmentThumbnailResource(Resource):
             task = tasks_service.get_task(comment["object_id"])
             user_service.check_project_access(task["project_id"])
             user_service.check_entity_access(task["entity_id"])
-        else:
+        elif attachment_file["chat_message_id"] is not None:
             message = chats_service.get_chat_message(
                 attachment_file["chat_message_id"]
             )
@@ -703,6 +703,8 @@ class AttachmentThumbnailResource(Resource):
             entity = entities_service.get_entity(chat["object_id"])
             user_service.check_project_access(entity["project_id"])
             user_service.check_entity_access(chat["object_id"])
+        else:
+            return False
         return True
 
     @jwt_required()

zou/app/services/comments_service.py

@@ -136,43 +136,51 @@ def _get_comment_author(person_id):
 
 
 def _manage_status_change(task_status, task, comment):
-    status_changed = task_status["id"] != task["task_status_id"]
-    new_data = {
-        "task_status_id": task_status["id"],
-        "last_comment_date": comment["created_at"],
-    }
-    if status_changed:
-        if task_status["is_retake"]:
-            retake_count = task["retake_count"]
-            if retake_count is None or retake_count == "NoneType":
-                retake_count = 0
-            new_data["retake_count"] = retake_count + 1
-
-        if task_status["is_feedback_request"]:
-            new_data["end_date"] = date_helpers.get_utc_now_datetime()
-
-        if (
-            task_status["short_name"] == "wip"
-            and task["real_start_date"] is None
-        ):
-            new_data["real_start_date"] = datetime.datetime.now(
-                datetime.timezone.utc
-            )
+    is_last_comment = (
+        task["last_comment_date"] is None
+        or task["last_comment_date"] < comment["created_at"]
+    )
+    if not is_last_comment:
+        status_changed = False
+        task = tasks_service.reset_task_data(task["id"])
+    else:
+        status_changed = task_status["id"] != task["task_status_id"]
+        new_data = {
+            "task_status_id": task_status["id"],
+            "last_comment_date": comment["created_at"],
+        }
+        if status_changed:
+            if task_status["is_retake"]:
+                retake_count = task["retake_count"]
+                if retake_count is None or retake_count == "NoneType":
+                    retake_count = 0
+                new_data["retake_count"] = retake_count + 1
+
+            if task_status["is_feedback_request"]:
+                new_data["end_date"] = date_helpers.get_utc_now_datetime()
+
+            if (
+                task_status["short_name"] == "wip"
+                and task["real_start_date"] is None
+            ):
+                new_data["real_start_date"] = datetime.datetime.now(
+                    datetime.timezone.utc
+                )
 
-    tasks_service.update_task(task["id"], new_data)
-
-    if status_changed:
-        events.emit(
-            "task:status-changed",
-            {
-                "task_id": task["id"],
-                "new_task_status_id": new_data["task_status_id"],
-                "previous_task_status_id": task["task_status_id"],
-                "person_id": comment["person_id"],
-            },
-            project_id=task["project_id"],
-        )
-    task.update(new_data)
+        tasks_service.update_task(task["id"], new_data)
+
+        if status_changed:
+            events.emit(
+                "task:status-changed",
+                {
+                    "task_id": task["id"],
+                    "new_task_status_id": new_data["task_status_id"],
+                    "previous_task_status_id": task["task_status_id"],
+                    "person_id": comment["person_id"],
+                },
+                project_id=task["project_id"],
+            )
+        task.update(new_data)
     return task, status_changed
 
 

zou/app/services/sync_service.py

@@ -1148,19 +1148,19 @@ def download_preview_background_from_another_instance(
     """
     Download all files link to preview background file entry.
     """
-    extension = preview_background.extension
-
     preview_background_file_id = str(preview_background.id)
     for prefix in [
         "thumbnails",
         "preview-backgrounds",
     ]:
+        extension = (
+            "png" if prefix == "thumbnails" else preview_background.extension
+        )
         if prefix == "preview-backgrounds":
             path = f"/pictures/preview-background-files/{preview_background_file_id}.{extension}"
         elif prefix == "thumbnails":
             path = f"/pictures/thumbnails/preview-background-files/{preview_background_file_id}.png"
 
-        extension = "png" if prefix == "thumbnails" else extension
         file_path = f"/tmp/{prefix}-{preview_background_file_id}.{extension}"
         download_file_from_another_instance(
             path,
@@ -1173,9 +1173,9 @@ def download_preview_background_from_another_instance(
             force,
             dict_errors,
         )
-        logger.info(
-            f"{index:0{len(str(total))}}/{total} Preview background file {preview_background_file_id} processed."
-        )
+    logger.info(
+        f"{index:0{len(str(total))}}/{total} Preview background file {preview_background_file_id} processed."
+    )
 
 
 def download_attachment_files_from_another_instance(

zou/app/services/tasks_service.py

@@ -1812,7 +1812,7 @@ def reset_task_data(task_id):
     )
     project_id = str(task.project_id)
     events.emit("task:update", {"task_id": task.id}, project_id)
-    return task.serialize()
+    return task.serialize(relations=True)
 
 
 def get_persons_tasks_dates():

{zou-0.19.39.dist-info → zou-0.19.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.39
+Version: 0.19.41
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -24,7 +24,7 @@ License-File: LICENSE
 Requires-Dist: babel ==2.15.0
 Requires-Dist: click ==8.1.7
 Requires-Dist: discord.py ==2.3.2
-Requires-Dist: email-validator ==2.1.1
+Requires-Dist: email-validator ==2.2.0
 Requires-Dist: ffmpeg-python ==0.2.0
 Requires-Dist: fido2 ==1.1.3
 Requires-Dist: flasgger ==0.9.7.1
@@ -40,7 +40,7 @@ Requires-Dist: flask-jwt-extended ==4.6.0
 Requires-Dist: flask-migrate ==4.0.7
 Requires-Dist: flask-socketio ==5.3.6
 Requires-Dist: flask ==3.0.3
-Requires-Dist: gazu ==0.10.9
+Requires-Dist: gazu ==0.10.10
 Requires-Dist: gevent-websocket ==0.10.1
 Requires-Dist: gevent ==24.2.1
 Requires-Dist: gunicorn ==22.0.0
@@ -49,28 +49,28 @@ Requires-Dist: itsdangerous ==2.2.0
 Requires-Dist: Jinja2 ==3.1.4
 Requires-Dist: ldap3 ==2.9.1
 Requires-Dist: matterhook ==0.2
-Requires-Dist: meilisearch ==0.31.2
-Requires-Dist: opencv-python ==4.10.0.82
+Requires-Dist: meilisearch ==0.31.3
+Requires-Dist: opencv-python ==4.10.0.84
 Requires-Dist: OpenTimelineIO ==0.16.0
-Requires-Dist: orjson ==3.10.3
+Requires-Dist: orjson ==3.10.5
 Requires-Dist: pillow ==10.3.0
-Requires-Dist: psutil ==5.9.8
+Requires-Dist: psutil ==6.0.0
 Requires-Dist: psycopg[binary] ==3.1.19
 Requires-Dist: pyotp ==2.9.0
 Requires-Dist: python-nomad ==2.0.1
 Requires-Dist: python-slugify ==8.0.4
-Requires-Dist: python-socketio ==5.11.2
+Requires-Dist: python-socketio ==5.11.3
 Requires-Dist: pytz ==2024.1
-Requires-Dist: redis ==5.0.5
+Requires-Dist: redis ==5.0.6
 Requires-Dist: requests ==2.32.3
 Requires-Dist: rq ==1.16.2
 Requires-Dist: slackclient ==2.9.4
 Requires-Dist: sqlalchemy-utils ==0.41.2
-Requires-Dist: sqlalchemy ==2.0.30
+Requires-Dist: sqlalchemy ==2.0.31
 Requires-Dist: ua-parser ==0.18.0
 Requires-Dist: werkzeug ==3.0.3
 Requires-Dist: numpy ==1.24.4 ; python_version == "3.8"
-Requires-Dist: numpy ==1.26.4 ; python_version >= "3.9"
+Requires-Dist: numpy ==2.0.0 ; python_version >= "3.9"
 Provides-Extra: dev
 Requires-Dist: wheel ; extra == 'dev'
 Provides-Extra: lint
@@ -80,7 +80,7 @@ Requires-Dist: pre-commit ==3.7.1 ; (python_version >= "3.9") and extra == 'lint
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter ==0.23.0 ; extra == 'monitoring'
 Requires-Dist: pygelf ==0.4.2 ; extra == 'monitoring'
-Requires-Dist: sentry-sdk ==2.5.0 ; extra == 'monitoring'
+Requires-Dist: sentry-sdk ==2.6.0 ; extra == 'monitoring'
 Provides-Extra: prod
 Requires-Dist: gunicorn ; extra == 'prod'
 Requires-Dist: gevent ; extra == 'prod'

{zou-0.19.39.dist-info → zou-0.19.41.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=LE4pg4oO9YkOg9Q9t1uDXO9-QKb1HTG_hkao-rhuIAs,24
+zou/__init__.py,sha256=dgzwiYNneoa6Prr4yKokUkQAc0JeTED_l3OscWCs9CM,24
 zou/cli.py,sha256=mnY9MoD0SjY4KFa1qyYS4E5bjEqk1UIZpH0iYeZPGh8,17508
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=zgob2dZKray2lxPa11hdRNmOg8XRlKDdRcGdF80ylwg,8245
@@ -18,12 +18,12 @@ zou/app/blueprints/breakdown/resources.py,sha256=JY3j17kv7xPKV9S-XoOxNYivpGHlfZk
 zou/app/blueprints/chats/__init__.py,sha256=YGmwGvddg3MgSYVIh-hmkX8t2em9_LblxBeJzFqFJD4,558
 zou/app/blueprints/chats/resources.py,sha256=1THB-UNgMcedspNfB9-3-Tsr6rJ_PUl6Y2s_y0Ww0jk,5910
 zou/app/blueprints/comments/__init__.py,sha256=WqpJ7-_dK1cInGTFJAxQ7syZtPCotwq2oO20UEnk1h4,1532
-zou/app/blueprints/comments/resources.py,sha256=wtFRE94g_ivTAw0uknUG0b_lZPhUUpAeb4u2c5BZeaM,19161
+zou/app/blueprints/comments/resources.py,sha256=nKR_2XsxKIqmqpkf5LBI23O55t0JRc22q4Ow9Ue8gjM,19271
 zou/app/blueprints/concepts/__init__.py,sha256=sP_P4mfYvfMcgeE6MHZYP3eD0Lz0Lwit5-CFuVnA-Jg,894
 zou/app/blueprints/concepts/resources.py,sha256=maJNrBAWX0bKbDKtOZc3YFp4nTVtIdkkAA4H9WA9n1Y,10140
 zou/app/blueprints/crud/__init__.py,sha256=qn7xkEh2EG0mPS_RBmm0GgYr0O1jnmI8ymXZnFWZCz8,8361
 zou/app/blueprints/crud/asset_instance.py,sha256=va3mw79aPKry2m9PYAmjVePTScigewDjwD1c672f0y0,1335
-zou/app/blueprints/crud/attachment_file.py,sha256=k1S9CdGU7TdMbpt12fnaO6-24LIYtSQJs5FGwGhRyLw,1181
+zou/app/blueprints/crud/attachment_file.py,sha256=FJA5nKli-9l4p-Mka-tNRNRFil6dNC7QMN3N2MBBN_w,1346
 zou/app/blueprints/crud/base.py,sha256=nz1-iOyxPPzkF0bivlgQ-bubUfxmiwsLd9pX9kLHr54,16005
 zou/app/blueprints/crud/chat.py,sha256=Sq1r0y9ANjS113PUpwgAhnjYsxxLKMCM-a7DJ_icF00,344
 zou/app/blueprints/crud/chat_message.py,sha256=bEEUoV0sNzu5sntNS6fpLh5NC6wWiycWCXtTE-t4yG4,387
@@ -91,7 +91,7 @@ zou/app/blueprints/persons/resources.py,sha256=-5J8ZswusYEBTNmX4I7fLFDZVMKyO0qhO
 zou/app/blueprints/playlists/__init__.py,sha256=vuEk1F3hFHsmuKWhdepMoLyOzmNKDn1YrjjfcaIz0lQ,1596
 zou/app/blueprints/playlists/resources.py,sha256=alRlMHypUFErXLsEYxpFK84cdjFJ3YWwamZtW0KcwLY,17211
 zou/app/blueprints/previews/__init__.py,sha256=CazwYCIg-iGSLcOH2NYcgflH7zipHfCF9MD1fP93mOI,4363
-zou/app/blueprints/previews/resources.py,sha256=DRxnhXgAKIEyRWQ0WhisS5h45OhabLVfQ16rlBl9Cmc,48241
+zou/app/blueprints/previews/resources.py,sha256=wteYWoD_Rdp3z7D3TQxk_3sC4KkqighYpm86R6vNa5A,48327
 zou/app/blueprints/projects/__init__.py,sha256=Pn3fA5bpNFEPBzxTKJ2foV6osZFflXXSM2l2uZh3ktM,3927
 zou/app/blueprints/projects/resources.py,sha256=v9_TLh3mujL-p7QcGkfSOJnNojzoJA15jhqAHz5kEIc,31552
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
@@ -185,7 +185,7 @@ zou/app/services/backup_service.py,sha256=_ZtZp6wkcVYnHxBosziwLGdrTvsUttXGphiydq
 zou/app/services/base_service.py,sha256=OZd0STFh-DyBBdwsmA7DMMnrwv4C8wJUbShvZ1isndU,1383
 zou/app/services/breakdown_service.py,sha256=p93HncjC36qbmvZiB259QGRtciS37N-s_7IWVAQx5eE,26727
 zou/app/services/chats_service.py,sha256=V1RmQeQnsH1xvtbs6wcjEpudQS547eJBM7bgJr9-qYM,8270
-zou/app/services/comments_service.py,sha256=d7-St48KSl4gH4EFzrXoWmGHpXUpQgQ-QdB_9cVGWZs,18215
+zou/app/services/comments_service.py,sha256=87UXq8zPfx-oDQzcHXR-REzNUbHAIxuLwpp6jRU6kHQ,18606
 zou/app/services/concepts_service.py,sha256=KGvk6lF5udj3SWn40X9KE8OAigrLCZUKEz9_CW7EMgQ,11440
 zou/app/services/custom_actions_service.py,sha256=fWISEOOdthadrxeHuacEel5Xj6msn0yWXJQDG1gzvsY,297
 zou/app/services/deletion_service.py,sha256=ddaup7i_CTugcJDrynczNcfhjSKgDeGhPQjQ68We_l8,17255
@@ -209,8 +209,8 @@ zou/app/services/schedule_service.py,sha256=E99HKYsXgnK2sw58fw-NNHXWBgVJiA60upzt
 zou/app/services/shots_service.py,sha256=3L5lhmwPudQ8R40hYopx4cn8OxEy0HWYQ-2yrRITV9I,47921
 zou/app/services/stats_service.py,sha256=cAlc92i9d6eYtsuwe3hYHYwdytg8KEMi1-TADfysJwM,11733
 zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_KNP96hT1o0X7XcGF4,715
-zou/app/services/sync_service.py,sha256=vjqX6u7ra-jbBlglftThYokbThSeJyeMFw1GtHkOxGY,41769
-zou/app/services/tasks_service.py,sha256=L9wIhk-QHm7sS3e_yQQDHcMiimyrA2u55XfZS_76Zu0,67783
+zou/app/services/sync_service.py,sha256=gtYRSTK3GzraMEETErW9g_dog9BlXkBg1OZ2VnpC7s4,41754
+zou/app/services/tasks_service.py,sha256=05Vy7cBhHFr7PYBuTNiggw1TydtOhP5ekuBoTZLTLOA,67797
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/time_spents_service.py,sha256=TBLC1O9Dg_UbciG5Nw-dejqX2-5n6q44lACeN6OnUkQ,15206
 zou/app/services/user_service.py,sha256=BiOhPV7O-vowet7jOksjXk2V4yxZkdqsIyNboJ-Oz_A,46595
@@ -405,9 +405,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=u9LCEOvmkxwm-KiZ6jKNdB9LSC6XXUDwJpVx8LkDwJg,16416
-zou-0.19.39.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.19.39.dist-info/METADATA,sha256=Arhapd-NWzlG_MMeTPe4OVRgAyHo6xks7zVwrTEVqaY,6678
-zou-0.19.39.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-zou-0.19.39.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.19.39.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.19.39.dist-info/RECORD,,
+zou-0.19.41.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.19.41.dist-info/METADATA,sha256=1FpQO4yRb6Vnjh-WRIRJHy5oomUM079NszNxHU8P1BM,6678
+zou-0.19.41.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+zou-0.19.41.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.19.41.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.19.41.dist-info/RECORD,,

{zou-0.19.39.dist-info → zou-0.19.41.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any