zou 0.20.16__tar.gz → 0.20.18__tar.gz

{zou-0.20.16/zou.egg-info → zou-0.20.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.16
+Version: 0.20.18
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -21,10 +21,9 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Multimedia :: Graphics
 Requires-Python: >=3.9, <3.14
 License-File: LICENSE
-Requires-Dist: audioop-lts==0.2.1; python_version >= "3.13"
 Requires-Dist: babel==2.17.0
 Requires-Dist: click==8.1.8
-Requires-Dist: discord.py==2.4.0
+Requires-Dist: discord.py==2.5.0
 Requires-Dist: email-validator==2.2.0
 Requires-Dist: ffmpeg-python==0.2.0
 Requires-Dist: fido2==1.2.0
@@ -41,7 +40,7 @@ Requires-Dist: flask-jwt-extended==4.7.1
 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.26
+Requires-Dist: gazu==0.10.28
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
@@ -50,18 +49,18 @@ Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: Jinja2==3.1.5
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
-Requires-Dist: meilisearch==0.33.1
+Requires-Dist: meilisearch==0.34.0
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.2.2; python_version >= "3.10"
+Requires-Dist: numpy==2.2.3; 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.15
 Requires-Dist: pillow==11.1.0
-Requires-Dist: psutil==6.1.1
+Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.4
 Requires-Dist: pyotp==2.9.0
-Requires-Dist: pysaml2==7.5.0
+Requires-Dist: pysaml2==7.5.2
 Requires-Dist: python-nomad==2.1.0
 Requires-Dist: python-slugify==8.0.4
 Requires-Dist: python-socketio==5.12.1
@@ -80,14 +79,14 @@ Requires-Dist: gevent; extra == "prod"
 Provides-Extra: dev
 Requires-Dist: wheel; extra == "dev"
 Provides-Extra: test
-Requires-Dist: fakeredis==2.26.2; extra == "test"
+Requires-Dist: fakeredis==2.27.0; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==6.0.0; extra == "test"
 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.20.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.22.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"

{zou-0.20.16 → zou-0.20.18}/setup.cfg

@@ -27,10 +27,9 @@ classifiers =
 zip_safe = False
 packages = find:
 install_requires = 
-	audioop-lts==0.2.1; python_version>='3.13'
 	babel==2.17.0
 	click==8.1.8
-	discord.py==2.4.0
+	discord.py==2.5.0
 	email-validator==2.2.0
 	ffmpeg-python==0.2.0
 	fido2==1.2.0
@@ -47,7 +46,7 @@ install_requires =
 	flask-migrate==4.1.0
 	flask-socketio==5.5.1
 	flask==3.1.0
-	gazu==0.10.26
+	gazu==0.10.28
 	gevent-websocket==0.10.1
 	gevent==24.11.1
 	gunicorn==23.0.0
@@ -56,18 +55,18 @@ install_requires =
 	Jinja2==3.1.5
 	ldap3==2.9.1
 	matterhook==0.2
-	meilisearch==0.33.1
+	meilisearch==0.34.0
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.2.2; python_version >= '3.10'
+	numpy==2.2.3; python_version >= '3.10'
 	opencv-python==4.11.0.86
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
 	orjson==3.10.15
 	pillow==11.1.0
-	psutil==6.1.1
+	psutil==7.0.0
 	psycopg[binary]==3.2.4
 	pyotp==2.9.0
-	pysaml2==7.5.0
+	pysaml2==7.5.2
 	python-nomad==2.1.0
 	python-slugify==8.0.4
 	python-socketio==5.12.1
@@ -94,14 +93,14 @@ prod =
 dev = 
 	wheel
 test = 
-	fakeredis==2.26.2
+	fakeredis==2.27.0
 	mixer==7.2.2
 	pytest-cov==6.0.0
 	pytest==8.3.4
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.20.0
+	sentry-sdk==2.22.0
 lint = 
 	autoflake==2.3.1
 	black==25.1.0

zou-0.20.18/zou/__init__.py

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

{zou-0.20.16 → zou-0.20.18}/zou/app/blueprints/comments/resources.py

@@ -83,9 +83,10 @@ class DownloadAttachmentResource(Resource):
                 ),
             )
         except Exception:
-            current_app.logger.error(
-                f"Attachment file was not found for: {attachment_file_id}"
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    f"Attachment file was not found for: {attachment_file_id}"
+                )
             abort(404)
 
 

{zou-0.20.16 → zou-0.20.18}/zou/app/blueprints/previews/resources.py

@@ -653,9 +653,10 @@ class PreviewFileMovieResource(BasePreviewFileResource):
                 instance_id, last_modified=self.last_modified
             )
         except FileNotFound:
-            current_app.logger.error(
-                "Movie file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Movie file was not found for: %s" % instance_id
+                )
             abort(404)
 
 
@@ -698,9 +699,10 @@ class PreviewFileLowMovieResource(BasePreviewFileResource):
                     instance_id, last_modified=self.last_modified
                 )
             except FileNotFound:
-                current_app.logger.error(
-                    "Movie file was not found for: %s" % instance_id
-                )
+                if config.LOG_FILE_NOT_FOUND:
+                    current_app.logger.error(
+                        "Movie file was not found for: %s" % instance_id
+                    )
                 abort(404)
 
 
@@ -740,9 +742,10 @@ class PreviewFileMovieDownloadResource(BasePreviewFileResource):
                 last_modified=self.last_modified,
             )
         except FileNotFound:
-            current_app.logger.error(
-                "Movie file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Movie file was not found for: %s" % instance_id
+                )
             abort(404)
 
 
@@ -800,9 +803,10 @@ class PreviewFileResource(BasePreviewFileResource):
                 )
 
         except FileNotFound:
-            current_app.logger.error(
-                "Non-movie file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Non-movie file was not found for: %s" % instance_id
+                )
             abort(404)
 
 
@@ -869,9 +873,10 @@ class PreviewFileDownloadResource(BasePreviewFileResource):
                     last_modified=self.last_modified,
                 )
         except FileNotFound:
-            current_app.logger.error(
-                "Standard file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Standard file was not found for: %s" % instance_id
+                )
             abort(404)
 
 
@@ -935,10 +940,11 @@ class AttachmentThumbnailResource(Resource):
                 ),
             )
         except FileNotFound:
-            current_app.logger.error(
-                "Picture file was not found for attachment: %s"
-                % (attachment_file_id)
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Picture file was not found for attachment: %s"
+                    % (attachment_file_id)
+                )
             abort(404)
 
 
@@ -982,9 +988,10 @@ class BasePreviewPictureResource(BasePreviewFileResource):
                 last_modified=self.last_modified,
             )
         except FileNotFound:
-            current_app.logger.error(
-                "Picture file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Picture file was not found for: %s" % instance_id
+                )
             abort(404)
 
 
@@ -1166,14 +1173,13 @@ class BaseThumbnailResource(Resource):
                 ),
             )
         except FileNotFound:
-            current_app.logger.error(
-                "Thumbnail file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Thumbnail file was not found for: %s" % instance_id
+                )
             abort(404)
-        except IOError:
-            current_app.logger.error(
-                "Thumbnail file was not found for: %s" % instance_id
-            )
+        except IOError as e:
+            current_app.logger.error(e)
             abort(404)
 
 
@@ -1680,9 +1686,11 @@ class PreviewBackgroundFileResource(Resource):
                 ),
             )
         except FileNotFound:
-            current_app.logger.error(
-                "Preview background file was not found for: %s" % instance_id
-            )
+            if config.LOG_FILE_NOT_FOUND:
+                current_app.logger.error(
+                    "Preview background file was not found for: %s"
+                    % instance_id
+                )
             raise PreviewBackgroundFileNotFoundException
 
 

{zou-0.20.16 → zou-0.20.18}/zou/app/config.py

@@ -142,6 +142,7 @@ LOGS_MODE = os.getenv("LOGS_MODE", "default")
 LOGS_HOST = os.getenv("LOGS_HOST", "localhost")
 LOGS_PORT = os.getenv("LOGS_PORT", 2202)
 LOGS_TOKEN = os.getenv("LOGS_TOKEN")
+LOG_FILE_NOT_FOUND = envtobool("LOG_FILE_NOT_FOUND", False)
 
 SENTRY_ENABLED = envtobool("SENTRY_ENABLED", False)
 SENTRY_DSN = os.getenv("SENTRY_DSN", "")

{zou-0.20.16 → zou-0.20.18}/zou/app/models/comment.py

@@ -6,21 +6,19 @@ from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
 
 
-preview_link_table = db.Table(
-    "comment_preview_link",
-    db.Column(
-        "comment",
+class CommentPreviewLink(db.Model):
+    comment = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("comment.id"),
         primary_key=True,
-    ),
-    db.Column(
-        "preview_file",
+        index=True,
+    )
+    preview_file = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("preview_file.id"),
         primary_key=True,
-    ),
-)
+        index=True,
+    )
 
 
 mentions_table = db.Table(
@@ -107,7 +105,9 @@ class Comment(db.Model, BaseMixin, SerializerMixin):
         UUIDType(binary=False), db.ForeignKey("preview_file.id")
     )
     previews = db.relationship(
-        "PreviewFile", secondary=preview_link_table, backref="comments"
+        "PreviewFile",
+        secondary=CommentPreviewLink.__table__,
+        backref="comments",
     )
     mentions = db.relationship("Person", secondary=mentions_table)
     department_mentions = db.relationship(

{zou-0.20.16 → zou-0.20.18}/zou/app/models/project.py

@@ -29,10 +29,16 @@ PROJECT_STYLES = [
 class ProjectPersonLink(db.Model):
     __tablename__ = "project_person_link"
     project_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("project.id"), primary_key=True
+        UUIDType(binary=False),
+        db.ForeignKey("project.id"),
+        primary_key=True,
+        index=True,
     )
     person_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("person.id"), primary_key=True
+        UUIDType(binary=False),
+        db.ForeignKey("person.id"),
+        primary_key=True,
+        index=True,
     )
     shotgun_id = db.Column(db.Integer)
 
@@ -40,10 +46,16 @@ class ProjectPersonLink(db.Model):
 class ProjectTaskTypeLink(db.Model, BaseMixin, SerializerMixin):
     __tablename__ = "project_task_type_link"
     project_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("project.id"), primary_key=True
+        UUIDType(binary=False),
+        db.ForeignKey("project.id"),
+        primary_key=True,
+        index=True,
     )
     task_type_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("task_type.id"), primary_key=True
+        UUIDType(binary=False),
+        db.ForeignKey("task_type.id"),
+        primary_key=True,
+        index=True,
     )
     priority = db.Column(db.Integer, default=None)
 
@@ -57,12 +69,16 @@ class ProjectTaskTypeLink(db.Model, BaseMixin, SerializerMixin):
 class ProjectTaskStatusLink(db.Model, BaseMixin, SerializerMixin):
     __tablename__ = "project_task_status_link"
     project_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("project.id"), primary_key=True
+        UUIDType(binary=False),
+        db.ForeignKey("project.id"),
+        primary_key=True,
+        index=True,
     )
     task_status_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("task_status.id"),
         primary_key=True,
+        index=True,
     )
     priority = db.Column(db.Integer, default=None)
     roles_for_board = db.Column(
@@ -92,12 +108,16 @@ class ProjectAssetTypeLink(db.Model):
 class ProjectStatusAutomationLink(db.Model):
     __tablename__ = "project_status_automation_link"
     project_id = db.Column(
-        UUIDType(binary=False), db.ForeignKey("project.id"), primary_key=True
+        UUIDType(binary=False),
+        db.ForeignKey("project.id"),
+        primary_key=True,
+        index=True,
     )
     status_automation_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("status_automation.id"),
         primary_key=True,
+        index=True,
     )
 
 

{zou-0.20.16 → zou-0.20.18}/zou/app/services/assets_service.py

@@ -202,6 +202,7 @@ def get_assets_and_tasks(criterions={}, with_episode_ids=False):
         Task.due_date,
         Task.done_date,
         Task.last_comment_date,
+        Task.last_preview_file_id,
         Task.difficulty,
         assignees_table.columns.person,
     ).order_by(EntityType.name, Entity.name)
@@ -294,6 +295,7 @@ def get_assets_and_tasks(criterions={}, with_episode_ids=False):
         task_due_date,
         task_done_date,
         task_last_comment_date,
+        task_last_preview_file_id,
         task_difficulty,
         person_id,
     ) in query_result:
@@ -346,6 +348,7 @@ def get_assets_and_tasks(criterions={}, with_episode_ids=False):
                     "last_comment_date": fields.serialize_value(
                         task_last_comment_date
                     ),
+                    "last_preview_file_id": str(task_last_preview_file_id or ""),
                     "priority": task_priority or 0,
                     "real_start_date": fields.serialize_value(
                         task_real_start_date

{zou-0.20.16 → zou-0.20.18}/zou/app/services/edits_service.py

@@ -106,6 +106,7 @@ def get_edits_and_tasks(criterions={}):
             Task.start_date,
             Task.due_date,
             Task.last_comment_date,
+            Task.last_preview_file_id,
             Task.nb_assets_ready,
             assignees_table.columns.person,
             Project.id,
@@ -153,6 +154,7 @@ def get_edits_and_tasks(criterions={}):
         task_start_date,
         task_due_date,
         task_last_comment_date,
+        task_last_preview_file_id,
         task_nb_assets_ready,
         person_id,
         project_id,
@@ -203,6 +205,7 @@ def get_edits_and_tasks(criterions={}):
                         "end_date": task_end_date,
                         "estimation": task_estimation,
                         "last_comment_date": task_last_comment_date,
+                        "last_preview_file_id": task_last_preview_file_id,
                         "is_subscribed": subscription_map.get(task_id, False),
                         "nb_assets_ready": task_nb_assets_ready,
                         "priority": task_priority or 0,

{zou-0.20.16 → zou-0.20.18}/zou/app/services/entities_service.py

@@ -251,6 +251,7 @@ def get_entities_and_tasks(criterions={}):
             Task.due_date,
             Task.done_date,
             Task.last_comment_date,
+            Task.last_preview_file_id,
             Task.difficulty,
             assignees_table.columns.person,
         )
@@ -282,6 +283,7 @@ def get_entities_and_tasks(criterions={}):
         task_due_date,
         task_done_date,
         task_last_comment_date,
+        task_last_preview_file_id,
         task_difficulty,
         person_id,
     ) in query.all():
@@ -322,6 +324,7 @@ def get_entities_and_tasks(criterions={}):
                         "duration": task_duration,
                         "is_subscribed": subscription_map.get(task_id, False),
                         "last_comment_date": task_last_comment_date,
+                        "last_preview_file_id": task_last_preview_file_id,
                         "priority": task_priority or 0,
                         "real_start_date": task_real_start_date,
                         "retake_count": task_retake_count,

{zou-0.20.16 → zou-0.20.18}/zou/app/services/shots_service.py

@@ -253,6 +253,7 @@ def get_shots_and_tasks(criterions={}):
             Task.due_date,
             Task.done_date,
             Task.last_comment_date,
+            Task.last_preview_file_id,
             Task.nb_assets_ready,
             Task.difficulty,
             assignees_table.columns.person,
@@ -304,6 +305,7 @@ def get_shots_and_tasks(criterions={}):
         task_due_date,
         task_done_date,
         task_last_comment_date,
+        task_last_preview_file_id,
         task_nb_assets_ready,
         task_difficulty,
         person_id,
@@ -364,6 +366,7 @@ def get_shots_and_tasks(criterions={}):
                         "estimation": task_estimation,
                         "is_subscribed": subscription_map.get(task_id, False),
                         "last_comment_date": task_last_comment_date,
+                        "last_preview_file_id": task_last_preview_file_id,
                         "nb_assets_ready": task_nb_assets_ready,
                         "priority": task_priority or 0,
                         "real_start_date": task_real_start_date,

{zou-0.20.16 → zou-0.20.18}/zou/app/services/tasks_service.py

@@ -15,7 +15,7 @@ from zou.app.models.comment import (
     acknowledgements_table,
     mentions_table,
     department_mentions_table,
-    preview_link_table,
+    CommentPreviewLink,
 )
 from zou.app.models.department import Department
 from zou.app.models.entity import Entity, EntityLink
@@ -686,9 +686,9 @@ def _build_department_mention_map_for_comments(comment_ids):
 def _build_preview_map_for_comments(comment_ids, is_client=False):
     preview_map = {}
     query = (
-        PreviewFile.query.join(preview_link_table)
-        .filter(preview_link_table.c.comment.in_(comment_ids))
-        .add_columns(preview_link_table.c.comment)
+        PreviewFile.query.join(CommentPreviewLink)
+        .filter(CommentPreviewLink.comment.in_(comment_ids))
+        .add_columns(CommentPreviewLink.comment)
     )
     for preview, comment_id in query.all():
         comment_id = str(comment_id)

{zou-0.20.16 → zou-0.20.18}/zou/app/services/user_service.py

@@ -1105,6 +1105,7 @@ def get_user_filter_groups(current_user_id):
             )
         )
         .filter(or_(build_open_project_filter(), Project.id == None))
+        .order_by(SearchFilterGroup.created_at.desc())
         .all()
     )
 

{zou-0.20.16 → zou-0.20.18}/zou/app/utils/fs.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 import time
+from flask_fs.errors import FileNotFound
 
 import errno
 
@@ -44,6 +45,8 @@ def get_file_path_and_file(
 ):
     if config.FS_BACKEND == "local":
         file_path = get_local_path(prefix, instance_id)
+        if is_unvalid_file(file_path, file_size):
+            raise FileNotFound
     else:
         file_path = os.path.join(
             config.TMP_DIR, "cache-%s-%s.%s" % (prefix, instance_id, extension)

{zou-0.20.16 → zou-0.20.18}/zou/app/utils/monitoring.py

@@ -1,6 +1,7 @@
 from flask_jwt_extended.exceptions import NoAuthorizationError
 from jwt import ExpiredSignatureError
 from werkzeug.exceptions import Forbidden, NotFound
+from flask_fs.errors import FileNotFound
 
 from zou.app import config
 from zou.app.utils import permissions
@@ -37,6 +38,7 @@ def init_monitoring(app):
                 NotFound,
                 Forbidden,
                 ExpiredSignatureError,
+                FileNotFound,
             ],
         )