zou 0.20.8__tar.gz → 0.20.12__tar.gz

{zou-0.20.8/zou.egg-info → zou-0.20.12}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: zou
-Version: 0.20.8
+Version: 0.20.12
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -36,12 +36,12 @@ Requires-Dist: flask_mail==0.10.0
 Requires-Dist: flask_principal==0.4.0
 Requires-Dist: flask_restful==0.3.10
 Requires-Dist: flask_sqlalchemy==3.1.1
-Requires-Dist: flask-fs2[s3,swift]==0.7.27
+Requires-Dist: flask-fs2[s3,swift]==0.7.28
 Requires-Dist: flask-jwt-extended==4.7.1
-Requires-Dist: flask-migrate==4.0.7
+Requires-Dist: flask-migrate==4.1.0
 Requires-Dist: flask-socketio==5.5.1
 Requires-Dist: flask==3.1.0
-Requires-Dist: gazu==0.10.22
+Requires-Dist: gazu==0.10.23
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
@@ -52,14 +52,14 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.33.1
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.2.1; python_version >= "3.10"
-Requires-Dist: opencv-python==4.10.0.84
+Requires-Dist: numpy==2.2.2; python_version >= "3.10"
+Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
-Requires-Dist: orjson==3.10.13
+Requires-Dist: orjson==3.10.15
 Requires-Dist: pillow==11.1.0
 Requires-Dist: psutil==6.1.1
-Requires-Dist: psycopg[binary]==3.2.3
+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
@@ -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.36
+Requires-Dist: sqlalchemy==2.0.37
 Requires-Dist: ua-parser==1.0.0
 Requires-Dist: werkzeug==3.1.3
 Provides-Extra: prod
@@ -87,11 +87,12 @@ Requires-Dist: pytest==8.3.4; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.1; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.19.2; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.20.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"
 Requires-Dist: pre-commit==4.0.1; extra == "lint"
+Dynamic: requires-python
 
 .. figure:: https://zou.cg-wire.com/kitsu.png
    :alt: Kitsu Logo

{zou-0.20.8 → zou-0.20.12}/setup.cfg

@@ -42,12 +42,12 @@ install_requires =
 	flask_principal==0.4.0
 	flask_restful==0.3.10
 	flask_sqlalchemy==3.1.1
-	flask-fs2[swift, s3]==0.7.27
+	flask-fs2[swift, s3]==0.7.28
 	flask-jwt-extended==4.7.1
-	flask-migrate==4.0.7
+	flask-migrate==4.1.0
 	flask-socketio==5.5.1
 	flask==3.1.0
-	gazu==0.10.22
+	gazu==0.10.23
 	gevent-websocket==0.10.1
 	gevent==24.11.1
 	gunicorn==23.0.0
@@ -58,14 +58,14 @@ install_requires =
 	matterhook==0.2
 	meilisearch==0.33.1
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.2.1; python_version >= '3.10'
-	opencv-python==4.10.0.84
+	numpy==2.2.2; python_version >= '3.10'
+	opencv-python==4.11.0.86
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.13
+	orjson==3.10.15
 	pillow==11.1.0
 	psutil==6.1.1
-	psycopg[binary]==3.2.3
+	psycopg[binary]==3.2.4
 	pyotp==2.9.0
 	pysaml2==7.5.0
 	python-nomad==2.0.1
@@ -77,7 +77,7 @@ install_requires =
 	rq==2.1.0
 	slackclient==2.9.4
 	sqlalchemy_utils==0.41.2
-	sqlalchemy==2.0.36
+	sqlalchemy==2.0.37
 	ua-parser==1.0.0
 	werkzeug==3.1.3
 
@@ -101,7 +101,7 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.19.2
+	sentry-sdk==2.20.0
 lint = 
 	autoflake==2.3.1
 	black==24.10.0

zou-0.20.12/zou/__init__.py

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

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/comments/resources.py

@@ -57,9 +57,7 @@ class DownloadAttachmentResource(Resource):
         )
         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"])
+            user_service.check_task_access(comment["object_id"])
         elif attachment_file["chat_message_id"] is not None:
             message = chats_service.get_chat_message(
                 attachment_file["chat_message_id"]
@@ -122,9 +120,7 @@ class AckCommentResource(Resource):
             200:
                 description: Comment acknowledged
         """
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         return comments_service.acknowledge_comment(comment_id)
 
 
@@ -193,9 +189,7 @@ class CommentTaskResource(Resource):
             links,
         ) = self.get_arguments()
 
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         user_service.check_task_status_access(task_status_id)
         files = request.files
 
@@ -496,9 +490,7 @@ class ReplyCommentResource(Resource, ArgsMixin):
             ]
         )
 
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         return comments_service.reply_comment(comment_id, args["text"])
 
 
@@ -537,9 +529,7 @@ class DeleteReplyCommentResource(Resource):
             200:
                 description: Given comment reply deleted
         """
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(task_id)
         reply = comments_service.get_reply(comment_id, reply_id)
         current_user = persons_service.get_current_user()
         if reply["person_id"] != current_user["id"]:

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/crud/attachment_file.py

@@ -20,15 +20,12 @@ class AttachmentFileResource(BaseModelResource):
         attachment_file = instance
         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"])
+            user_service.check_task_access(comment["object_id"])
         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()

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/crud/project.py

@@ -207,6 +207,8 @@ class ProjectTaskTypeLinksResource(Resource, ArgsMixin):
             ]
         )
 
+        user_service.check_manager_project_access(args["project_id"])
+
         task_type_link = projects_service.create_project_task_type_link(
             args["project_id"],
             args["task_type_id"],
@@ -234,6 +236,8 @@ class ProjectTaskStatusLinksResource(Resource, ArgsMixin):
             ]
         )
 
+        user_service.check_manager_project_access(args["project_id"])
+
         task_status_link = projects_service.create_project_task_status_link(
             args["project_id"],
             args["task_status_id"],

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/crud/working_file.py

@@ -8,7 +8,7 @@ from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 from zou.app.models.entity import Entity
 from zou.app.models.project import Project
 from zou.app.models.working_file import WorkingFile
-from zou.app.services import user_service, tasks_service, files_service
+from zou.app.services import user_service, files_service
 from zou.app.utils import permissions
 
 
@@ -46,16 +46,12 @@ class WorkingFileResource(BaseModelResource):
 
     def check_read_permissions(self, instance):
         working_file = files_service.get_working_file(instance["id"])
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         return True
 
     def check_update_permissions(self, instance, data):
         working_file = files_service.get_working_file(instance["id"])
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         return True
 
     @jwt_required()

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/files/resources.py

@@ -91,9 +91,7 @@ class WorkingFileFileResource(Resource):
 
     def check_access(self, working_file_id):
         working_file = files_service.get_working_file(working_file_id)
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         return working_file
 
     def save_uploaded_file_in_temporary_folder(self, working_file_id):
@@ -556,10 +554,8 @@ class LastWorkingFilesResource(Resource):
               description: Last working files revision for each file name for given task
         """
         result = {}
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
-        result = files_service.get_last_working_files_for_task(task["id"])
+        user_service.check_task_access(task_id)
+        result = files_service.get_last_working_files_for_task(task_id)
 
         return result
 
@@ -588,10 +584,8 @@ class TaskWorkingFilesResource(Resource):
               description: Last working files revision for each file name for given task
         """
         result = {}
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
-        result = files_service.get_working_files_for_task(task["id"])
+        user_service.check_task_access(task_id)
+        result = files_service.get_working_files_for_task(task_id)
 
         return result
 
@@ -774,9 +768,7 @@ class ModifiedFileResource(Resource):
               description: Working file modification date updated
         """
         working_file = files_service.get_working_file(working_file_id)
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         working_file = files_service.update_working_file(
             working_file_id,
             {"updated_at": date_helpers.get_utc_now_datetime()},
@@ -827,9 +819,7 @@ class CommentWorkingFileResource(Resource, ArgsMixin):
         )
 
         working_file = files_service.get_working_file(working_file_id)
-        task = tasks_service.get_task(working_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(working_file["task_id"])
         working_file = self.update_comment(working_file_id, args["comment"])
         return working_file
 

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/previews/__init__.py

@@ -2,7 +2,8 @@ from flask import Blueprint
 from zou.app.utils.api import configure_api_from_blueprint
 
 from zou.app.blueprints.previews.resources import (
-    AddCommentsPreviewsResource,
+    AddTaskBatchCommentResource,
+    AddTasksBatchCommentResource,
     AttachmentThumbnailResource,
     CreatePreviewFilePictureResource,
     PreviewFileLowMovieResource,
@@ -39,8 +40,12 @@ routes = [
         CreatePreviewFilePictureResource,
     ),
     (
-        "/actions/tasks/<task_id>/add-comments-previews",
-        AddCommentsPreviewsResource,
+        "/actions/tasks/<task_id>/batch-comment",
+        AddTaskBatchCommentResource,
+    ),
+    (
+        "/actions/tasks/batch-comment",
+        AddTasksBatchCommentResource,
     ),
     (
         "/movies/originals/preview-files/<instance_id>.mp4",

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/previews/resources.py

@@ -397,11 +397,8 @@ class CreatePreviewFilePictureResource(
             200:
                 description: Preview added
         """
-        if not self.is_exist(instance_id):
-            abort(404)
-
-        if not self.is_allowed(instance_id):
-            abort(403)
+        self.is_exist(instance_id)
+        self.is_allowed(instance_id)
 
         return (
             self.process_uploaded_file(
@@ -421,10 +418,8 @@ class CreatePreviewFilePictureResource(
             )
             raise PreviewFileReuploadNotAllowedException
 
-        task = tasks_service.get_task(preview_file["task_id"])
         try:
-            user_service.check_project_access(task["project_id"])
-            user_service.check_entity_access(task["entity_id"])
+            user_service.check_task_access(preview_file["task_id"])
             return True
         except permissions.PermissionDenied:
             return False
@@ -436,47 +431,17 @@ class CreatePreviewFilePictureResource(
         return files_service.get_preview_file(preview_file_id) is not None
 
 
-class AddCommentsPreviewsResource(
-    BaseNewPreviewFilePicture, Resource, ArgsMixin
-):
+class BaseBatchComment(BaseNewPreviewFilePicture, ArgsMixin):
     """
-    Creates new comments for given task. Each comments requires a text, a
-    task_status and a person as arguments.
+    Base class to add comments/previews/attachments.
     """
 
-    @jwt_required()
-    def post(self, task_id):
+    def get_comments_args(self):
         """
-        Creates new comments for given task. Each comments requires a text, a
-        task_status and a person as arguments.
-        ---
-        tags:
-        - Comments
-        description: Creates new comments for given task. Each comments requires
-                     a text, a task_status and a person as arguments.
-        parameters:
-          - in: path
-            name: task_id
-            required: True
-            type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: body
-            name: Comment
-            description: person ID, name, comment, revision and change status of task
-            schema:
-                type: object
-                required:
-                    - comments
-                properties:
-                    comments:
-                        type: string
-        responses:
-            201:
-                description: New comments created
+        Return comments arguments.
         """
         if request.is_json:
-            args = self.get_args(
+            return self.get_args(
                 [
                     {
                         "name": "comments",
@@ -500,22 +465,31 @@ class AddCommentsPreviewsResource(
                 ],
             )
             args["comments"] = json.loads(args["comments"])
+            return args
 
-        task = tasks_service.get_task(task_id)
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+    def process_comments(self, task_id=None):
+        """
+        Process comments.
+        """
+        args = self.get_comments_args()
+
+        if task_id is not None:
+            user_service.check_task_access(task_id)
 
         new_comments = []
         for i, comment in enumerate(args["comments"]):
             user_service.check_task_status_access(comment["task_status_id"])
 
+            if task_id is None:
+                user_service.check_task_access(comment["task_id"])
+
             if not permissions.has_manager_permissions():
                 comment["person_id"] = None
                 comment["created_at"] = None
 
             new_comment = comments_service.create_comment(
                 comment.get("person_id", None),
-                task_id,
+                task_id or comment["task_id"],
                 comment["task_status_id"],
                 comment["text"],
                 comment.get("checklist", []),
@@ -537,7 +511,7 @@ class AddCommentsPreviewsResource(
                 new_preview_file = tasks_service.add_preview_file_to_comment(
                     new_comment["id"],
                     new_comment["person_id"],
-                    task_id,
+                    task_id or comment["task_id"],
                 )
                 new_preview_file = self.process_uploaded_file(
                     new_preview_file["id"],
@@ -552,6 +526,80 @@ class AddCommentsPreviewsResource(
         return new_comments, 201
 
 
+class AddTaskBatchCommentResource(BaseBatchComment, Resource):
+    """
+    Creates new comments for given task. Each comments requires a text, a
+    task_status and a person as arguments.
+    """
+
+    @jwt_required()
+    def post(self, task_id):
+        """
+        Creates new comments for given task. Each comments requires a text, a
+        task_status and a person as arguments.
+        ---
+        tags:
+        - Comments
+        description: Creates new comments for given task. Each comments requires
+                     a text, a task_status and a person as arguments.
+        parameters:
+          - in: path
+            name: task_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: body
+            name: Comment
+            description: person ID, name, comment, revision and change status of task
+            schema:
+                type: object
+                required:
+                    - comments
+                properties:
+                    comments:
+                        type: string
+        responses:
+            201:
+                description: New comments created
+        """
+        return self.process_comments(task_id)
+
+
+class AddTasksBatchCommentResource(BaseBatchComment, Resource):
+    """
+    Creates new comments for given tasks. Each comments requires a task_id,
+    text, a task_status and a person as arguments.
+    """
+
+    @jwt_required()
+    def post(self):
+        """
+        Creates new comments for given task. Each comments requires a task_id,
+        text, a task_status and a person as arguments.
+        ---
+        tags:
+        - Comments
+        description: Creates new comments for given task. Each comments requires
+                     a task_id, a text, a task_status and a person as arguments.
+        parameters:
+          - in: body
+            name: Comment
+            description: person ID, name, comment, revision and change status of task
+            schema:
+                type: object
+                required:
+                    - comments
+                properties:
+                    comments:
+                        type: string
+        responses:
+            201:
+                description: New comments created
+        """
+        return self.process_comments()
+
+
 class BasePreviewFileResource(Resource):
     """
     Base class to download a preview file.
@@ -564,9 +612,7 @@ class BasePreviewFileResource(Resource):
 
     def is_allowed(self, preview_file_id):
         self.preview_file = files_service.get_preview_file(preview_file_id)
-        task = tasks_service.get_task(self.preview_file["task_id"])
-        user_service.check_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(self.preview_file["task_id"])
         self.last_modified = date_helpers.get_datetime_from_string(
             self.preview_file["updated_at"]
         )
@@ -843,9 +889,7 @@ class AttachmentThumbnailResource(Resource):
             comment = tasks_service.get_comment(
                 self.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"])
+            user_service.check_task_access(comment["object_id"])
         elif self.attachment_file["chat_message_id"] is not None:
             message = chats_service.get_chat_message(
                 self.attachment_file["chat_message_id"]
@@ -1272,9 +1316,7 @@ class UpdatePreviewPositionResource(Resource, ArgsMixin):
         """
         args = self.get_args([{"name": "position", "default": 0, "type": int}])
         preview_file = files_service.get_preview_file(preview_file_id)
-        task = tasks_service.get_task(preview_file["task_id"])
-        user_service.check_manager_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(preview_file["task_id"])
         return preview_files_service.update_preview_file_position(
             preview_file_id, args["position"]
         )
@@ -1424,9 +1466,7 @@ class ExtractTileFromPreview(Resource):
     @jwt_required()
     def get(self, preview_file_id):
         preview_file = files_service.get_preview_file(preview_file_id)
-        task = tasks_service.get_task(preview_file["task_id"])
-        user_service.check_manager_project_access(task["project_id"])
-        user_service.check_entity_access(task["entity_id"])
+        user_service.check_task_access(preview_file["task_id"])
         extracted_tile_path = (
             preview_files_service.extract_tile_from_preview_file(preview_file)
         )

{zou-0.20.8 → zou-0.20.12}/zou/app/blueprints/projects/resources.py

@@ -11,6 +11,7 @@ from zou.app.services import (
 )
 from zou.app.utils import permissions
 from zou.app.services.exception import WrongParameterException
+from zou.app.models.metadata_descriptor import METADATA_DESCRIPTOR_TYPES
 
 
 class OpenProjectsResource(Resource, ArgsMixin):
@@ -715,6 +716,10 @@ class ProductionMetadataDescriptorsResource(Resource, ArgsMixin):
         if len(args["name"]) == 0:
             raise WrongParameterException("Name cannot be empty.")
 
+        types = [type_name for type_name, _ in METADATA_DESCRIPTOR_TYPES]
+        if args["data_type"] not in types:
+            raise WrongParameterException("Invalid data_type")
+
         return (
             projects_service.add_metadata_descriptor(
                 project_id,
@@ -828,6 +833,10 @@ class ProductionMetadataDescriptorResource(Resource, ArgsMixin):
         if len(args["name"]) == 0:
             raise WrongParameterException("Name cannot be empty.")
 
+        types = [type_name for type_name, _ in METADATA_DESCRIPTOR_TYPES]
+        if args["data_type"] not in types:
+            raise WrongParameterException("Invalid data_type")
+
         args["for_client"] = args["for_client"] == "True"
 
         return projects_service.update_metadata_descriptor(descriptor_id, args)