zou 0.20.0__tar.gz → 0.20.1__tar.gz

{zou-0.20.0/zou.egg-info → zou-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.20.0
+Version: 0.20.1
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -56,15 +56,15 @@ Requires-Dist: numpy==2.2.1; python_version >= "3.10"
 Requires-Dist: opencv-python==4.10.0.84
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
-Requires-Dist: orjson==3.10.12
-Requires-Dist: pillow==11.0.0
+Requires-Dist: orjson==3.10.13
+Requires-Dist: pillow==11.1.0
 Requires-Dist: psutil==6.1.1
 Requires-Dist: psycopg[binary]==3.2.3
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.0
 Requires-Dist: python-nomad==2.0.1
 Requires-Dist: python-slugify==8.0.4
-Requires-Dist: python-socketio==5.12.0
+Requires-Dist: python-socketio==5.12.1
 Requires-Dist: pytz==2024.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3

{zou-0.20.0 → zou-0.20.1}/setup.cfg

@@ -62,15 +62,15 @@ install_requires =
 	opencv-python==4.10.0.84
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.12
-	pillow==11.0.0
+	orjson==3.10.13
+	pillow==11.1.0
 	psutil==6.1.1
 	psycopg[binary]==3.2.3
 	pyotp==2.9.0
 	pysaml2==7.5.0
 	python-nomad==2.0.1
 	python-slugify==8.0.4
-	python-socketio==5.12.0
+	python-socketio==5.12.1
 	pytz==2024.2
 	redis==5.2.1
 	requests==2.32.3

zou-0.20.1/zou/__init__.py

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

{zou-0.20.0 → zou-0.20.1}/zou/app/blueprints/index/resources.py

@@ -8,7 +8,7 @@ from flask_restful import Resource
 from zou import __version__
 
 from zou.app import app, config
-from zou.app.utils import permissions, shell, date_helpers
+from zou.app.utils import permissions, shell, date_helpers, redis
 from zou.app.services import projects_service, stats_service, persons_service
 
 from flask_jwt_extended import jwt_required
@@ -62,15 +62,7 @@ class BaseStatusResource(Resource):
 
         is_jq_up = True
         try:
-            host = config.KEY_VALUE_STORE["host"]
-            port = config.KEY_VALUE_STORE["port"]
-            db = config.KV_JOB_DB_INDEX
-            password = config.KEY_VALUE_STORE["password"]
-            if password:
-                url = "redis://:%s@%s:%s/%s" % (password, host, port, db)
-            else:
-                url = "redis://%s:%s/%s" % (host, port, db)
-            args = ["rq", "info", "--url", url]
+            args = ["rq", "info", "--url", redis.get_redis_url()]
             out = shell.run_command(args)
             is_jq_up = b"0 workers" not in out
         except Exception:

{zou-0.20.0 → zou-0.20.1}/zou/app/blueprints/previews/__init__.py

@@ -2,6 +2,7 @@ from flask import Blueprint
 from zou.app.utils.api import configure_api_from_blueprint
 
 from zou.app.blueprints.previews.resources import (
+    AddCommentsPreviewsResource,
     AttachmentThumbnailResource,
     CreatePreviewFilePictureResource,
     PreviewFileLowMovieResource,
@@ -37,6 +38,10 @@ routes = [
         "/pictures/preview-files/<instance_id>",
         CreatePreviewFilePictureResource,
     ),
+    (
+        "/actions/tasks/<task_id>/add-comments-previews",
+        AddCommentsPreviewsResource,
+    ),
     (
         "/movies/originals/preview-files/<instance_id>.mp4",
         PreviewFileMovieResource,

{zou-0.20.0 → zou-0.20.1}/zou/app/blueprints/previews/resources.py

@@ -1,4 +1,5 @@
 import os
+import orjson as json
 
 from flask import abort, request, current_app
 from flask import send_file as flask_send_file
@@ -207,107 +208,11 @@ def send_storage_file(
         raise FileNotFound
 
 
-class CreatePreviewFilePictureResource(Resource, ArgsMixin):
+class BaseNewPreviewFilePicture:
     """
-    Main resource to add a preview. It stores the preview file and generates
-    three picture files matching preview when it's possible: a square thumbnail,
-    a rectangle thumbnail and a midsize file.
+    Base class to add previews.
     """
 
-    @jwt_required()
-    def post(self, instance_id):
-        """
-        Main resource to add a preview.
-        ---
-        tags:
-          - Previews
-        description: "It stores the preview file and generates three picture files matching preview when it's possible: a square thumbnail, a rectangle thumbnail and a midsize file."
-        consumes:
-          - multipart/form-data
-          - image/png
-          - application/pdf
-        parameters:
-          - in: path
-            name: instance_id
-            required: True
-            type: string
-            format: UUID
-            x-example: a24a6ea4-ce75-4665-a070-57453082c25
-          - in: formData
-            name: file
-            required: True
-            type: file
-        responses:
-            200:
-                description: Preview added
-        """
-        if not self.is_exist(instance_id):
-            abort(404)
-
-        if not self.is_allowed(instance_id):
-            abort(403)
-
-        uploaded_file = request.files["file"]
-
-        file_name_parts = uploaded_file.filename.split(".")
-        extension = file_name_parts.pop().lower()
-        original_file_name = ".".join(file_name_parts)
-
-        if extension in ALLOWED_PICTURE_EXTENSION:
-            metadada = self.save_picture_preview(instance_id, uploaded_file)
-            preview_file = preview_files_service.update_preview_file(
-                instance_id,
-                {
-                    "extension": "png",
-                    "original_name": original_file_name,
-                    "width": metadada["width"],
-                    "height": metadada["height"],
-                    "file_size": metadada["file_size"],
-                    "status": "ready",
-                },
-            )
-            tasks_service.update_preview_file_info(preview_file)
-            self.emit_app_preview_event(instance_id)
-            return preview_file, 201
-
-        elif extension in ALLOWED_MOVIE_EXTENSION:
-            try:
-                normalize = self.get_bool_parameter("normalize", "true")
-                self.save_movie_preview(instance_id, uploaded_file, normalize)
-            except Exception as e:
-                current_app.logger.error(e, exc_info=1)
-                current_app.logger.error("Normalization failed.")
-                deletion_service.remove_preview_file_by_id(
-                    instance_id, force=True
-                )
-                abort(400, "Normalization failed.")
-            preview_file = preview_files_service.update_preview_file(
-                instance_id,
-                {"extension": "mp4", "original_name": original_file_name},
-            )
-            self.emit_app_preview_event(instance_id)
-            return preview_file, 201
-
-        elif extension in ALLOWED_FILE_EXTENSION:
-            self.save_file_preview(instance_id, uploaded_file, extension)
-            preview_file = preview_files_service.update_preview_file(
-                instance_id,
-                {
-                    "extension": extension,
-                    "original_name": original_file_name,
-                    "status": "ready",
-                },
-            )
-            self.emit_app_preview_event(instance_id)
-            return preview_file, 201
-
-        else:
-            current_app.logger.info(
-                "Wrong file format, extension: %s", extension
-            )
-            deletion_service.remove_preview_file_by_id(instance_id)
-            abort(400, "Wrong file format, extension: %s" % extension)
-
     def save_picture_preview(self, instance_id, uploaded_file):
         """
         Get uploaded picture, build thumbnails then save everything in the file
@@ -396,6 +301,115 @@ class CreatePreviewFilePictureResource(Resource, ArgsMixin):
                 project_id=task["project_id"],
             )
 
+    def process_uploaded_file(
+        self, instance_id, uploaded_file, abort_on_failed=False
+    ):
+        file_name_parts = uploaded_file.filename.split(".")
+        extension = file_name_parts.pop().lower()
+        original_file_name = ".".join(file_name_parts)
+        preview_file = None
+        if extension in ALLOWED_PICTURE_EXTENSION:
+            metadada = self.save_picture_preview(instance_id, uploaded_file)
+            preview_file = preview_files_service.update_preview_file(
+                instance_id,
+                {
+                    "extension": "png",
+                    "original_name": original_file_name,
+                    "width": metadada["width"],
+                    "height": metadada["height"],
+                    "file_size": metadada["file_size"],
+                    "status": "ready",
+                },
+            )
+            tasks_service.update_preview_file_info(preview_file)
+        elif extension in ALLOWED_MOVIE_EXTENSION:
+            try:
+                normalize = self.get_bool_parameter("normalize", "true")
+                self.save_movie_preview(instance_id, uploaded_file, normalize)
+            except Exception as e:
+                current_app.logger.error(e, exc_info=1)
+                current_app.logger.error("Normalization failed.")
+                deletion_service.remove_preview_file_by_id(
+                    instance_id, force=True
+                )
+                if abort_on_failed:
+                    abort(400, "Normalization failed.")
+            preview_file = preview_files_service.update_preview_file(
+                instance_id,
+                {"extension": "mp4", "original_name": original_file_name},
+            )
+        elif extension in ALLOWED_FILE_EXTENSION:
+            self.save_file_preview(instance_id, uploaded_file, extension)
+            preview_file = preview_files_service.update_preview_file(
+                instance_id,
+                {
+                    "extension": extension,
+                    "original_name": original_file_name,
+                    "status": "ready",
+                },
+            )
+
+        if preview_file is None:
+            current_app.logger.info(
+                "Wrong file format, extension: %s", extension
+            )
+            deletion_service.remove_preview_file_by_id(instance_id)
+            if abort_on_failed:
+                abort(400, "Wrong file format, extension: %s" % extension)
+        else:
+            self.emit_app_preview_event(instance_id)
+        return preview_file
+
+
+class CreatePreviewFilePictureResource(
+    BaseNewPreviewFilePicture, Resource, ArgsMixin
+):
+    """
+    Main resource to add a preview. It stores the preview file and generates
+    three picture files matching preview when it's possible: a square thumbnail,
+    a rectangle thumbnail and a midsize file.
+    """
+
+    @jwt_required()
+    def post(self, instance_id):
+        """
+        Main resource to add a preview.
+        ---
+        tags:
+          - Previews
+        description: "It stores the preview file and generates three picture files matching preview when it's possible: a square thumbnail, a rectangle thumbnail and a midsize file."
+        consumes:
+          - multipart/form-data
+          - image/png
+          - application/pdf
+        parameters:
+          - in: path
+            name: instance_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: file
+            required: True
+            type: file
+        responses:
+            200:
+                description: Preview added
+        """
+        if not self.is_exist(instance_id):
+            abort(404)
+
+        if not self.is_allowed(instance_id):
+            abort(403)
+
+        return (
+            self.process_uploaded_file(
+                instance_id, request.files["file"], abort_on_failed=True
+            ),
+            201,
+        )
+
     def is_allowed(self, preview_file_id):
         """
         Return true if user is allowed to add a preview.
@@ -422,6 +436,122 @@ class CreatePreviewFilePictureResource(Resource, ArgsMixin):
         return files_service.get_preview_file(preview_file_id) is not None
 
 
+class AddCommentsPreviewsResource(
+    BaseNewPreviewFilePicture, Resource, ArgsMixin
+):
+    """
+    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
+        """
+        if request.is_json:
+            args = self.get_args(
+                [
+                    {
+                        "name": "comments",
+                        "required": True,
+                        "default": [],
+                        "type": dict,
+                        "action": "append",
+                        "help": "List of comments to add",
+                    }
+                ],
+            )
+        else:
+            args = self.get_args(
+                [
+                    {
+                        "name": "comments",
+                        "required": True,
+                        "default": "[]",
+                        "help": "List of comments to add",
+                    }
+                ],
+            )
+            args["comments"] = json.loads(args["comments"])
+
+        task = tasks_service.get_task(task_id)
+        user_service.check_project_access(task["project_id"])
+        user_service.check_entity_access(task["entity_id"])
+
+        new_comments = []
+        for i, comment in enumerate(args["comments"]):
+            user_service.check_task_status_access(comment["task_status_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,
+                comment["task_status_id"],
+                comment["text"],
+                comment.get("checklist", []),
+                {
+                    k: v
+                    for (k, v) in request.files.items()
+                    if f"attachment_file-{i}" in k
+                },
+                comment.get("created_at", None),
+                comment.get("links", []),
+            )
+
+            new_comment["preview_files"] = []
+            for uploaded_preview_file in {
+                k: v
+                for (k, v) in request.files.items()
+                if f"preview_file-{i}" in k
+            }.values():
+                new_preview_file = tasks_service.add_preview_file_to_comment(
+                    new_comment["id"],
+                    new_comment["person_id"],
+                    task_id,
+                )
+                new_preview_file = self.process_uploaded_file(
+                    new_preview_file["id"],
+                    uploaded_preview_file,
+                    abort_on_failed=False,
+                )
+                if new_preview_file:
+                    new_comment["preview_files"].append(new_preview_file)
+
+            new_comments.append(new_comment)
+
+        return new_comments, 201
+
+
 class BasePreviewFileResource(Resource):
     """
     Base class to download a preview file.

{zou-0.20.0 → zou-0.20.1}/zou/app/blueprints/tasks/__init__.py

@@ -94,8 +94,7 @@ routes = [
         AddPreviewResource,
     ),
     (
-        "/actions/tasks/<task_id>/comments/<comment_id>/preview-files/"
-        "<preview_file_id>",
+        "/actions/tasks/<task_id>/comments/<comment_id>/preview-files/<preview_file_id>",
         AddExtraPreviewResource,
     ),
     ("/actions/tasks/<task_id>/to-review", ToReviewResource),

{zou-0.20.0 → zou-0.20.1}/zou/app/blueprints/tasks/resources.py

@@ -73,9 +73,6 @@ class AddPreviewResource(Resource, ArgsMixin):
         user_service.check_project_access(task["project_id"])
         user_service.check_entity_access(task["entity_id"])
 
-        tasks_service.clear_comment_cache(comment_id)
-        comment = tasks_service.get_comment(comment_id)
-        tasks_service.get_task_status(comment["task_status_id"])
         person = persons_service.get_current_user()
         preview_file = tasks_service.add_preview_file_to_comment(
             comment_id, person["id"], task_id, args["revision"]

{zou-0.20.0 → zou-0.20.1}/zou/app/services/comments_service.py

@@ -74,9 +74,9 @@ def create_comment(
     task_id,
     task_status_id,
     text,
-    checklist,
-    files,
-    created_at,
+    checklist=[],
+    files={},
+    created_at="",
     links=[],
 ):
     """

{zou-0.20.0 → zou-0.20.1}/zou/app/stores/publisher_store.py

@@ -3,15 +3,7 @@ import redis
 from flask_socketio import SocketIO
 
 from zou.app import config
-
-host = config.KEY_VALUE_STORE["host"]
-port = config.KEY_VALUE_STORE["port"]
-redis_db = config.KV_EVENTS_DB_INDEX
-password = config.KEY_VALUE_STORE["password"]
-if password:
-    redis_url = "redis://:%s@%s:%s/%s" % (password, host, port, redis_db)
-else:
-    redis_url = "redis://%s:%s/%s" % (host, port, redis_db)
+from zou.app.utils.redis import get_redis_url
 
 socketio = None
 
@@ -31,15 +23,15 @@ def init():
 
     try:
         publisher_store = redis.StrictRedis(
-            host=host,
-            port=port,
-            db=redis_db,
-            password=password,
+            host=config.KEY_VALUE_STORE["host"],
+            port=config.KEY_VALUE_STORE["port"],
+            db=config.KV_EVENTS_DB_INDEX,
+            password=config.KEY_VALUE_STORE["password"],
             decode_responses=True,
         )
         publisher_store.get("test")
         socketio = SocketIO(
-            message_queue=redis_url,
+            message_queue=get_redis_url(),
             cors_allowed_origins=[],
             cors_credentials=False,
         )

zou-0.20.1/zou/app/utils/redis.py

@@ -0,0 +1,11 @@
+from zou.app import config
+
+
+def get_redis_url():
+    redis_host = config.KEY_VALUE_STORE["host"]
+    redis_port = config.KEY_VALUE_STORE["port"]
+    db_index = config.KV_EVENTS_DB_INDEX
+    redis_password = config.KEY_VALUE_STORE["password"] or ""
+    if redis_password:
+        redis_password += "@"
+    return f"redis://{redis_password}{redis_host}:{redis_port}/{db_index}"

{zou-0.20.0 → zou-0.20.1}/zou/event_stream.py

@@ -2,7 +2,7 @@ from gevent import monkey
 
 monkey.patch_all()
 
-from flask import Flask, jsonify
+from flask import jsonify
 from flask_jwt_extended import (
     get_jwt_identity,
     jwt_required,
@@ -10,19 +10,15 @@ from flask_jwt_extended import (
     JWTManager,
 )
 from flask_socketio import SocketIO, disconnect, join_room, emit
-from flask_sqlalchemy import SQLAlchemy
 
-from zou.app import config
+from zou.app import config, app
 from zou.app.stores import auth_tokens_store
-from zou.app.utils.monitoring import init_monitoring
-from zou.app.utils.flask import ORJSONProvider
 from zou.app.services import persons_service
+from zou.app.utils.redis import get_redis_url
 
 server_stats = {"nb_connections": 0}
 rooms_data = {}
 
-# Review room helpers
-
 
 def _get_empty_room(current_frame=0):
     return {
@@ -79,28 +75,6 @@ def _update_room_playing_status(data, room):
     return room
 
 
-# Database helpers
-
-
-def get_redis_url():
-    redis_host = config.KEY_VALUE_STORE["host"]
-    redis_port = config.KEY_VALUE_STORE["port"]
-    db_index = config.KV_EVENTS_DB_INDEX
-    redis_password = config.KEY_VALUE_STORE["password"]
-    if redis_password:
-        return "redis://:%s@%s:%s/%s" % (
-            redis_password,
-            redis_host,
-            redis_port,
-            db_index,
-        )
-    else:
-        return "redis://%s:%s/%s" % (redis_host, redis_port, db_index)
-
-
-# Routes
-
-
 def set_info_routes(socketio, app):
     @app.route("/", methods=["GET"])
     def index():
@@ -227,12 +201,6 @@ def create_app():
     socketio = SocketIO(
         logger=True, cors_allowed_origins=[], cors_credentials=False
     )
-    app = Flask(__name__)
-    app.json = ORJSONProvider(app)
-    app.config.from_object(config)
-    init_monitoring(app)
-    db = SQLAlchemy(app)
-    app.extensions["sqlalchemy"].db = db
     set_info_routes(socketio, app)
     set_application_routes(socketio, app)
     set_playlist_room_routes(socketio, app)

{zou-0.20.0 → zou-0.20.1/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.20.0
+Version: 0.20.1
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -56,15 +56,15 @@ Requires-Dist: numpy==2.2.1; python_version >= "3.10"
 Requires-Dist: opencv-python==4.10.0.84
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
-Requires-Dist: orjson==3.10.12
-Requires-Dist: pillow==11.0.0
+Requires-Dist: orjson==3.10.13
+Requires-Dist: pillow==11.1.0
 Requires-Dist: psutil==6.1.1
 Requires-Dist: psycopg[binary]==3.2.3
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.0
 Requires-Dist: python-nomad==2.0.1
 Requires-Dist: python-slugify==8.0.4
-Requires-Dist: python-socketio==5.12.0
+Requires-Dist: python-socketio==5.12.1
 Requires-Dist: pytz==2024.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3

{zou-0.20.0 → zou-0.20.1}/zou.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ zou/__init__.py
 zou/cli.py
 zou/debug.py
 zou/event_stream.py
-zou/job_settings.py
 zou.egg-info/PKG-INFO
 zou.egg-info/SOURCES.txt
 zou.egg-info/dependency_links.txt
@@ -253,6 +252,7 @@ zou/app/utils/logs.py
 zou/app/utils/monitoring.py
 zou/app/utils/permissions.py
 zou/app/utils/query.py
+zou/app/utils/redis.py
 zou/app/utils/remote_job.py
 zou/app/utils/saml.py
 zou/app/utils/shell.py

{zou-0.20.0 → zou-0.20.1}/zou.egg-info/requires.txt

@@ -30,15 +30,15 @@ meilisearch==0.33.0
 opencv-python==4.10.0.84
 OpenTimelineIO==0.17.0
 OpenTimelineIO-Plugins==0.17.0
-orjson==3.10.12
-pillow==11.0.0
+orjson==3.10.13
+pillow==11.1.0
 psutil==6.1.1
 psycopg[binary]==3.2.3
 pyotp==2.9.0
 pysaml2==7.5.0
 python-nomad==2.0.1
 python-slugify==8.0.4
-python-socketio==5.12.0
+python-socketio==5.12.1
 pytz==2024.2
 redis==5.2.1
 requests==2.32.3

zou-0.20.0/zou/__init__.py

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

zou-0.20.0/zou/job_settings.py

@@ -1,6 +0,0 @@
-from zou.app import config
-
-REDIS_HOST = config.KEY_VALUE_STORE["host"]
-REDIS_PORT = config.KEY_VALUE_STORE["port"]
-REDIS_DB = config.KV_JOB_DB_INDEX
-REDIS_PASSWORD = config.KEY_VALUE_STORE["password"]