zou 0.20.68__tar.gz → 0.20.69__tar.gz

{zou-0.20.68/zou.egg-info → zou-0.20.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.68
+Version: 0.20.69
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -23,7 +23,7 @@ License-File: LICENSE
 Requires-Dist: babel==2.17.0
 Requires-Dist: click==8.2.1
 Requires-Dist: discord.py==2.6.2
-Requires-Dist: email-validator==2.2.0
+Requires-Dist: email-validator==2.3.0
 Requires-Dist: ffmpeg-python==0.2.0
 Requires-Dist: fido2==2.0.0
 Requires-Dist: flasgger==0.9.7.1
@@ -41,7 +41,7 @@ Requires-Dist: flask-socketio==5.5.1
 Requires-Dist: flask==3.1.2
 Requires-Dist: gazu==0.10.36
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==25.5.1
+Requires-Dist: gevent==25.8.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -53,7 +53,7 @@ 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.11.2
+Requires-Dist: orjson==3.11.3
 Requires-Dist: pillow==11.3.0
 Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.9

{zou-0.20.68 → zou-0.20.69}/setup.cfg

@@ -29,7 +29,7 @@ install_requires =
 	babel==2.17.0
 	click==8.2.1
 	discord.py==2.6.2
-	email-validator==2.2.0
+	email-validator==2.3.0
 	ffmpeg-python==0.2.0
 	fido2==2.0.0
 	flasgger==0.9.7.1
@@ -47,7 +47,7 @@ install_requires =
 	flask==3.1.2
 	gazu==0.10.36
 	gevent-websocket==0.10.1
-	gevent==25.5.1
+	gevent==25.8.1
 	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
@@ -59,7 +59,7 @@ install_requires =
 	opencv-python==4.12.0.88
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.11.2
+	orjson==3.11.3
 	pillow==11.3.0
 	psutil==7.0.0
 	psycopg[binary]==3.2.9

zou-0.20.69/zou/__init__.py

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

{zou-0.20.68 → zou-0.20.69}/zou/app/blueprints/comments/resources.py

@@ -322,6 +322,13 @@ class AddAttachmentToCommentResource(Resource):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: reply_id
+            type: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
+            required: True
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
           - in: formData
             name: files
             type: file
@@ -337,7 +344,9 @@ class AddAttachmentToCommentResource(Resource):
             user_service.check_manager_project_access(task["project_id"])
 
         files = request.files
-        comment = comments_service.add_attachments_to_comment(comment, files)
+        comment = comments_service.add_attachments_to_comment(
+            comment, files, reply_id=None
+        )
         return comment["attachment_files"], 201
 
 
@@ -487,12 +496,6 @@ class ReplyCommentResource(Resource, ArgsMixin):
             200:
                 description: Reply to given comment
         """
-        args = self.get_args(
-            [
-                ("text", "", False),
-            ]
-        )
-
         comment = tasks_service.get_comment(comment_id)
         current_user = persons_service.get_current_user()
         if comment["person_id"] != current_user["id"]:
@@ -500,7 +503,17 @@ class ReplyCommentResource(Resource, ArgsMixin):
                 raise permissions.PermissionDenied()
             user_service.check_task_action_access(task_id)
 
-        return comments_service.reply_comment(comment_id, args["text"])
+        args = self.get_args(
+            [
+                ("text", "", False),
+            ]
+        )
+        files = request.files
+        return comments_service.reply_comment(
+            comment_id,
+            args["text"],
+            files=files
+        )
 
 
 class DeleteReplyCommentResource(Resource):

{zou-0.20.68 → zou-0.20.69}/zou/app/blueprints/shots/resources.py

@@ -64,10 +64,13 @@ class ShotResource(Resource, ArgsMixin):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: body
-            name: data
-            required: True
-            type: object
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                description: Shot data to update
         responses:
             200:
                 description: Update given shot
@@ -711,23 +714,32 @@ class ProjectShotsResource(Resource, ArgsMixin):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: name
-            required: True
-            type: string
-            example: Name of shot
-          - in: formData
-            name: description
-            type: string
-            example: Description of shot
-          - in: formData
-            name: sequence_id
-            type: string
-            format: uuid
-            example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: nb_frames
-            type: integer
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - name
+                properties:
+                  name:
+                    type: string
+                    required: true
+                    example: "Name of shot"
+                  description:
+                    type: string
+                    required: false
+                    example: "Description of shot"
+                  sequence_id:
+                    type: string
+                    format: uuid
+                    required: false
+                    example: a24a6ea4-ce75-4665-a070-57453082c25
+                  nb_frames:
+                    type: integer
+                    required: false
+                    example: 24
         responses:
             201:
                 description: Shot created for given project
@@ -812,16 +824,24 @@ class ProjectSequencesResource(Resource, ArgsMixin):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: name
-            required: True
-            type: string
-            example: Name of sequence
-          - in: formData
-            name: episode_id
-            type: string
-            format: uuid
-            example: a24a6ea4-ce75-4665-a070-57453082c25
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - name
+                properties:
+                  name:
+                    type: string
+                    required: true
+                    example: "Name of sequence"
+                  episode_id:
+                    type: string
+                    format: uuid
+                    required: false
+                    example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Sequence created for given project
@@ -896,16 +916,24 @@ class ProjectEpisodesResource(Resource, ArgsMixin):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: name
-            required: True
-            type: string
-            example: Name of the episode
-          - in: formData
-            name: description
-            required: True
-            type: string
-            example: Description of the episode
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - name
+                  - description
+                properties:
+                  name:
+                    type: string
+                    required: true
+                    example: "Name of the episode"
+                  description:
+                    type: string
+                    required: true
+                    example: "Description of the episode"
         responses:
             201:
                 description: Episode created for given project
@@ -1309,17 +1337,25 @@ class ProjectScenesResource(Resource, ArgsMixin):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: name
-            required: True
-            type: string
-            example: Name of scene
-          - in: formData
-            name: sequence_id
-            required: True
-            type: string
-            format: uuid
-            example: a24a6ea4-ce75-4665-a070-57453082c25
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - name
+                  - sequence_id
+                properties:
+                  name:
+                    type: string
+                    required: true
+                    example: "Name of scene"
+                  sequence_id:
+                    type: string
+                    format: uuid
+                    required: true
+                    example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Scene created for given project
@@ -1453,11 +1489,20 @@ class SceneShotsResource(Resource, ArgsMixin):
             type: string
             format: uuid
             example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: shot_id
-            type: string
-            format: uuid
-            example: a24a6ea4-ce75-4665-a070-57453082c25
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - shot_id
+                properties:
+                  shot_id:
+                    type: string
+                    format: uuid
+                    required: true
+                    example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Given scene marked as source of given shot
@@ -1696,21 +1741,28 @@ class SetShotsFramesResource(Resource, ArgsMixin):
         ---
         tags:
         - Shots
-        parameters:
-          - in: formData
-            name: shots
-            required: True
-            type: array
-            items:
-              type: object
-              properties:
-                shot_id:
-                  type: string
-                  format: uuid
-                  example: a24a6ea4-ce75-4665-a070-57453082c25
-                nb_frames:
-                  type: integer
-                  example: 24
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - shots
+                properties:
+                  shots:
+                    type: array
+                    required: true
+                    items:
+                      type: object
+                      properties:
+                        shot_id:
+                          type: string
+                          format: uuid
+                          example: a24a6ea4-ce75-4665-a070-57453082c25
+                        nb_frames:
+                          type: integer
+                          example: 24
         responses:
             200:
                 description: Frames set for given shots

{zou-0.20.68 → zou-0.20.69}/zou/app/blueprints/tasks/resources.py

@@ -1625,7 +1625,7 @@ class PersonsTasksDatesResource(Resource, ArgsMixin):
                 description: For each person, the first start date of all tasks of assigned to this person and the last end date.
         """
         permissions.check_admin_permissions()
-        args = self.get_args([("project_id", None, True, str)])
+        args = self.get_args([("project_id", None, False, str)])
         return tasks_service.get_persons_tasks_dates(
             project_id=args["project_id"]
         )

{zou-0.20.68 → zou-0.20.69}/zou/app/models/attachment_file.py

@@ -21,6 +21,10 @@ class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
         index=True,
         nullable=True,
     )
+    reply_id = db.Column(
+        UUIDType(binary=False),
+        nullable=True,
+    )
     chat_message_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("chat_message.id"),

{zou-0.20.68 → zou-0.20.69}/zou/app/services/comments_service.py

@@ -19,6 +19,7 @@ from zou.app.services import (
     assets_service,
     base_service,
     breakdown_service,
+    deletion_service,
     entities_service,
     news_service,
     notifications_service,
@@ -355,7 +356,7 @@ def reset_mentions(comment):
     return comment_dict
 
 
-def create_attachment(comment, uploaded_file, randomize=False):
+def create_attachment(comment, uploaded_file, randomize=False, reply_id=None):
     tmp_folder = current_app.config["TMP_DIR"]
     filename = uploaded_file.filename
     mimetype = uploaded_file.mimetype
@@ -366,11 +367,19 @@ def create_attachment(comment, uploaded_file, randomize=False):
         filename = f"{filename[:len(filename) - len(extension) - 1]}"
         filename += f"-{random_str}.{extension}"
 
+    if reply_id is not None:
+        is_reply_present = any(
+            reply["id"] == reply_id for reply in comment.get("replies", [])
+        )
+        if not is_reply_present:
+            reply_id = None
+
     attachment_file = AttachmentFile.create(
         name=filename,
         size=0,
         extension=extension,
         mimetype=mimetype,
+        reply_id=reply_id,
         comment_id=comment["id"],
     )
     attachment_file_id = str(attachment_file.id)
@@ -455,7 +464,7 @@ def _send_ack_event(project_id, comment, user_id, name="acknowledge"):
     )
 
 
-def reply_comment(comment_id, text, person_id=None):
+def reply_comment(comment_id, text, person_id=None, files={}):
     """
     Add a reply entry to the JSONB field of given comment model. Create
     notifications needed for this.
@@ -469,6 +478,7 @@ def reply_comment(comment_id, text, person_id=None):
     task = tasks_service.get_task(comment.object_id, relations=True)
     if comment.replies is None:
         comment.replies = []
+
     reply = {
         "id": str(fields.gen_uuid()),
         "date": date_helpers.get_now(),
@@ -483,18 +493,26 @@ def reply_comment(comment_id, text, person_id=None):
     replies = list(comment.replies)
     replies.append(reply)
     comment.update({"replies": replies})
+    if len(files.keys()) > 0:
+        comment = comment.serialize(relations=True)
+        new_attachment_files = add_attachments_to_comment(
+            comment, files, reply_id=reply["id"]
+        )
+        for new_attachment_file in new_attachment_files:
+            new_attachment_file["reply_id"] = reply["id"]
+        reply["attachment_files"] = new_attachment_files
     tasks_service.clear_comment_cache(comment_id)
     events.emit(
         "comment:reply",
         {
             "task_id": task["id"],
-            "comment_id": str(comment.id),
+            "comment_id": comment_id,
             "reply_id": reply["id"],
         },
         project_id=task["project_id"],
     )
     notifications_service.create_notifications_for_task_and_reply(
-        task, comment.serialize(), reply
+        task, comment, reply
     )
     return reply
 
@@ -508,6 +526,14 @@ def get_reply(comment_id, reply_id):
 def delete_reply(comment_id, reply_id):
     comment = tasks_service.get_comment_raw(comment_id)
     task = tasks_service.get_task(comment.object_id)
+
+    if comment.attachment_files is None:
+        comment.attachment_files = []
+        for attachment_file in comment.attachment_files:
+            if attachment_file.reply_id == reply_id:
+                deletion_service.remove_attachment_file_by_id(
+                    attachment_file["id"]
+                )
     if comment.replies is None:
         comment.replies = []
     comment.replies = [
@@ -567,19 +593,25 @@ def get_comment_department_mention_ids(project_id, text):
     ]
 
 
-def add_attachments_to_comment(comment, files):
+def add_attachments_to_comment(comment, files, reply_id=None):
     """
     Create an attachment entry and for each given uploaded files and tie it
     to given comment.
     """
-    comment["attachment_files"] = []
+    if comment["attachment_files"] is None:
+        comment["attachment_files"] = []
+    new_attachment_files = []
     for uploaded_file in files.values():
         try:
-            attachment_file = create_attachment(comment, uploaded_file)
+            attachment_file = create_attachment(
+                comment, uploaded_file, reply_id=reply_id
+            )
             comment["attachment_files"].append(attachment_file)
+            new_attachment_files.append(attachment_file)
         except IntegrityError:
             attachment_file = create_attachment(
-                comment, uploaded_file, randomize=True
+                comment, uploaded_file, randomize=True, reply_id=reply_id
             )
             comment["attachment_files"].append(attachment_file)
-    return comment
+            new_attachment_files.append(attachment_file)
+    return new_attachment_files

{zou-0.20.68 → zou-0.20.69}/zou/app/services/tasks_service.py

@@ -752,6 +752,7 @@ def _build_attachment_map_for_comments(comment_ids):
                 "id": attachment_file_id,
                 "name": attachment_file.name,
                 "extension": attachment_file.extension,
+                "reply_id": attachment_file.reply_id,
                 "size": attachment_file.size,
             }
         )

zou-0.20.69/zou/migrations/versions/1b0ab951adca_add_reply_id_to_attachments.py

@@ -0,0 +1,44 @@
+"""add reply id to attachments
+
+Revision ID: 1b0ab951adca
+Revises: ce7f46f445dc
+Create Date: 2025-08-27 14:14:16.237272
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = '1b0ab951adca'
+down_revision = 'ce7f46f445dc'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('attachment_file', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('reply_id', sqlalchemy_utils.types.uuid.UUIDType(binary=False), default=uuid.uuid4, nullable=True))
+
+    with op.batch_alter_table('software', schema=None) as batch_op:
+        batch_op.alter_column('version',
+               existing_type=sa.VARCHAR(length=20),
+               nullable=True)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('software', schema=None) as batch_op:
+        batch_op.alter_column('version',
+               existing_type=sa.VARCHAR(length=20),
+               nullable=False)
+
+    with op.batch_alter_table('attachment_file', schema=None) as batch_op:
+        batch_op.drop_column('reply_id')
+
+    # ### end Alembic commands ###

{zou-0.20.68 → zou-0.20.69/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.68
+Version: 0.20.69
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -23,7 +23,7 @@ License-File: LICENSE
 Requires-Dist: babel==2.17.0
 Requires-Dist: click==8.2.1
 Requires-Dist: discord.py==2.6.2
-Requires-Dist: email-validator==2.2.0
+Requires-Dist: email-validator==2.3.0
 Requires-Dist: ffmpeg-python==0.2.0
 Requires-Dist: fido2==2.0.0
 Requires-Dist: flasgger==0.9.7.1
@@ -41,7 +41,7 @@ Requires-Dist: flask-socketio==5.5.1
 Requires-Dist: flask==3.1.2
 Requires-Dist: gazu==0.10.36
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==25.5.1
+Requires-Dist: gevent==25.8.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -53,7 +53,7 @@ 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.11.2
+Requires-Dist: orjson==3.11.3
 Requires-Dist: pillow==11.3.0
 Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.9

{zou-0.20.68 → zou-0.20.69}/zou.egg-info/SOURCES.txt

@@ -297,6 +297,7 @@ zou/migrations/versions/10cf267d95c9_fix_schedule_item.py
 zou/migrations/versions/16328eae4b5f_add_new_constraint_for_timespent.py
 zou/migrations/versions/16df47d76c64_add_some_indexes.py
 zou/migrations/versions/17ef8f7be758_disallow_null_choicetype.py
+zou/migrations/versions/1b0ab951adca_add_reply_id_to_attachments.py
 zou/migrations/versions/1bb55759146f_add_table_studio.py
 zou/migrations/versions/1cb44194db49_add_file_size_field_to_preview_file.py
 zou/migrations/versions/1e150c2cea4d_add_nb_entities_out.py

{zou-0.20.68 → zou-0.20.69}/zou.egg-info/requires.txt

@@ -1,7 +1,7 @@
 babel==2.17.0
 click==8.2.1
 discord.py==2.6.2
-email-validator==2.2.0
+email-validator==2.3.0
 ffmpeg-python==0.2.0
 fido2==2.0.0
 flasgger==0.9.7.1
@@ -19,7 +19,7 @@ flask-socketio==5.5.1
 flask==3.1.2
 gazu==0.10.36
 gevent-websocket==0.10.1
-gevent==25.5.1
+gevent==25.8.1
 gunicorn==23.0.0
 isoweek==1.3.3
 itsdangerous==2.2.0
@@ -31,7 +31,7 @@ numpy==2.2.6
 opencv-python==4.12.0.88
 OpenTimelineIO==0.17.0
 OpenTimelineIO-Plugins==0.17.0
-orjson==3.11.2
+orjson==3.11.3
 pillow==11.3.0
 psutil==7.0.0
 psycopg[binary]==3.2.9

zou-0.20.68/zou/__init__.py

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