zou 0.19.63__tar.gz → 0.19.65__tar.gz

{zou-0.19.63/zou.egg-info → zou-0.19.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.63
+Version: 0.19.65
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -41,7 +41,7 @@ Requires-Dist: flask-socketio==5.4.1
 Requires-Dist: flask==3.0.3
 Requires-Dist: gazu==0.10.16
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==24.10.3
+Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -50,11 +50,11 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.31.6
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.1.2; python_version >= "3.10"
+Requires-Dist: numpy==2.1.3; 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.10
+Requires-Dist: orjson==3.10.11
 Requires-Dist: pillow==11.0.0
 Requires-Dist: psutil==6.1.0
 Requires-Dist: psycopg[binary]==3.2.3
@@ -80,12 +80,12 @@ Requires-Dist: wheel; extra == "dev"
 Provides-Extra: test
 Requires-Dist: fakeredis==2.26.1; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
-Requires-Dist: pytest-cov==5.0.0; extra == "test"
+Requires-Dist: pytest-cov==6.0.0; extra == "test"
 Requires-Dist: pytest==8.3.3; 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.17.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.18.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"

{zou-0.19.63 → zou-0.19.65}/setup.cfg

@@ -47,7 +47,7 @@ install_requires =
 	flask==3.0.3
 	gazu==0.10.16
 	gevent-websocket==0.10.1
-	gevent==24.10.3
+	gevent==24.11.1
 	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
@@ -56,11 +56,11 @@ install_requires =
 	matterhook==0.2
 	meilisearch==0.31.6
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.1.2; python_version >= '3.10'
+	numpy==2.1.3; python_version >= '3.10'
 	opencv-python==4.10.0.84
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.10
+	orjson==3.10.11
 	pillow==11.0.0
 	psutil==6.1.0
 	psycopg[binary]==3.2.3
@@ -94,12 +94,12 @@ dev =
 test = 
 	fakeredis==2.26.1
 	mixer==7.2.2
-	pytest-cov==5.0.0
+	pytest-cov==6.0.0
 	pytest==8.3.3
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.17.0
+	sentry-sdk==2.18.0
 lint = 
 	autoflake==2.3.1
 	black==24.10.0

zou-0.19.65/zou/__init__.py

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

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/base.py

@@ -127,7 +127,7 @@ class BaseModelsResource(Resource, ArgsMixin):
 
         return query
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return permissions.check_admin_permissions()
 
     def add_project_permission_filter(self, query):
@@ -165,13 +165,14 @@ class BaseModelsResource(Resource, ArgsMixin):
                 description: Permission denied
         """
         try:
-            self.check_read_permissions()
             query = self.model.query
             if not request.args:
+                self.check_read_permissions()
                 query = self.add_project_permission_filter(query)
                 return self.all_entries(query)
             else:
                 options = request.args
+                self.check_read_permissions(options)
                 query = self.apply_filters(query, options)
                 query = self.add_project_permission_filter(query)
                 page = int(options.get("page", "-1"))

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/comments.py

@@ -28,6 +28,19 @@ class CommentsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Comment)
 
+    def check_read_permissions(self, options=None):
+        if options is not None:
+            if "project_id" in options:
+                user_service.check_project_access(options["project_id"])
+                if (
+                    permissions.has_vendor_permissions()
+                    or permissions.has_client_permissions()
+                ):
+                    raise permissions.PermissionDenied
+                else:
+                    return True
+        return permissions.check_admin_permissions()
+
 
 class CommentResource(BaseModelResource):
     def __init__(self):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/custom_action.py

@@ -9,7 +9,7 @@ class CustomActionsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, CustomAction)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         user_service.block_access_to_vendor()
         return True
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/department.py

@@ -9,7 +9,7 @@ class DepartmentsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Department)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def post_creation(self, instance):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/entity.py

@@ -61,7 +61,7 @@ class EntitiesResource(BaseModelsResource, EntityEventMixin):
     def emit_create_event(self, entity_dict):
         self.emit_event("new", entity_dict)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def add_project_permission_filter(self, query):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/entity_type.py

@@ -20,7 +20,7 @@ class EntityTypesResource(BaseModelsResource):
             for asset_type in query.all()
         ]
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def emit_create_event(self, instance_dict):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/file_status.py

@@ -6,7 +6,7 @@ class FileStatusesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, FileStatus)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/metadata_descriptor.py

@@ -6,6 +6,7 @@ from zou.app.models.metadata_descriptor import (
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 from zou.app.utils import permissions
 from zou.app.models.project import Project
+from zou.app.services import user_service
 
 from zou.app.services.exception import (
     WrongParameterException,
@@ -16,7 +17,7 @@ class MetadataDescriptorsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, MetadataDescriptor)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return not permissions.has_vendor_permissions()
 
     def add_project_permission_filter(self, query):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/organisation.py

@@ -8,7 +8,7 @@ class OrganisationsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Organisation)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/output_file.py

@@ -17,7 +17,7 @@ class OutputFilesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, OutputFile)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         user_service.block_access_to_vendor()
         return True
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/output_type.py

@@ -12,7 +12,7 @@ class OutputTypesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, OutputType)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/person.py

@@ -52,7 +52,7 @@ class PersonsResource(BaseModelsResource):
                 for person in query.all()
             ]
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def check_create_permissions(self, data):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/playlist.py

@@ -9,7 +9,7 @@ class PlaylistsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Playlist)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def check_create_permissions(self, playlist):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/preview_background_file.py

@@ -9,7 +9,7 @@ class PreviewBackgroundFilesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, PreviewBackgroundFile)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def update_data(self, data):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/preview_file.py

@@ -37,7 +37,7 @@ class PreviewFilesResource(BaseModelsResource):
 
         return query
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/project.py

@@ -31,7 +31,7 @@ class ProjectsResource(BaseModelsResource):
         else:
             return query.filter(user_service.build_related_projects_filter())
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def check_creation_integrity(self, data):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/project_status.py

@@ -6,7 +6,7 @@ class ProjectStatussResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, ProjectStatus)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/software.py

@@ -12,7 +12,7 @@ class SoftwaresResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Software)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/status_automation.py

@@ -13,7 +13,7 @@ class StatusAutomationsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, StatusAutomation)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         user_service.block_access_to_vendor()
         return True
 

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/studio.py

@@ -9,7 +9,7 @@ class StudiosResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Studio)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def post_creation(self, instance):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/task.py

@@ -28,7 +28,7 @@ class TasksResource(BaseModelsResource, ArgsMixin):
     def __init__(self):
         BaseModelsResource.__init__(self, Task)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def add_project_permission_filter(self, query):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/task_status.py

@@ -7,7 +7,7 @@ class TaskStatusesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, TaskStatus)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def post_creation(self, instance):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/task_type.py

@@ -9,7 +9,7 @@ class TaskTypesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, TaskType)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         return True
 
     def update_data(self, data):

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/crud/working_file.py

@@ -16,7 +16,7 @@ class WorkingFilesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, WorkingFile)
 
-    def check_read_permissions(self):
+    def check_read_permissions(self, options=None):
         """
         Overriding so that people without admin credentials can still access
         this resource.

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/news/resources.py

@@ -2,7 +2,12 @@ from flask_restful import Resource, inputs
 from flask_jwt_extended import jwt_required
 
 from zou.app.mixin import ArgsMixin
-from zou.app.services import news_service, projects_service, user_service
+from zou.app.services import (
+    news_service,
+    projects_service,
+    user_service,
+    persons_service,
+)
 from zou.app.services.exception import NewsNotFoundException
 from zou.app.utils import permissions
 
@@ -21,6 +26,8 @@ class NewsMixin(ArgsMixin):
             before,
         ) = self.get_arguments()
 
+        current_user = persons_service.get_current_user_raw()
+
         after = self.parse_date_parameter(after)
         before = self.parse_date_parameter(before)
         result = news_service.get_last_news_for_project(
@@ -34,6 +41,7 @@ class NewsMixin(ArgsMixin):
             page_size=page_size,
             after=after,
             before=before,
+            current_user=current_user,
         )
         stats = news_service.get_news_stats_for_project(
             project_ids=project_ids,
@@ -44,6 +52,7 @@ class NewsMixin(ArgsMixin):
             author_id=person_id,
             after=after,
             before=before,
+            current_user=current_user,
         )
         result["stats"] = stats
         return result

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/search/resources.py

@@ -78,12 +78,24 @@ class SearchResource(Resource, ArgsMixin):
                 query, limit=limit, offset=offset
             )
         if "assets" in index_names:
-            results["assets"] = index_service.search_assets(
-                query, project_ids, limit=limit, offset=offset
-            )
+            if (
+                len(project_ids) == 0
+                and not permissions.has_admin_permissions()
+            ):
+                results["assets"] = []
+            else:
+                results["assets"] = index_service.search_assets(
+                    query, project_ids, limit=limit, offset=offset
+                )
         if "shots" in index_names:
-            results["shots"] = index_service.search_shots(
-                query, project_ids, limit=limit, offset=offset
-            )
+            if (
+                len(project_ids) == 0
+                and not permissions.has_admin_permissions()
+            ):
+                results["shots"] = []
+            else:
+                results["shots"] = index_service.search_shots(
+                    query, project_ids, limit=limit, offset=offset
+                )
 
         return results

{zou-0.19.63 → zou-0.19.65}/zou/app/blueprints/tasks/resources.py

@@ -1518,7 +1518,6 @@ class ProjectCommentsResource(Resource, ArgsMixin):
     """
 
     @jwt_required()
-    @permissions.require_admin
     def get(self, project_id):
         """
         Retrieve all comments to tasks related to given project.
@@ -1538,6 +1537,12 @@ class ProjectCommentsResource(Resource, ArgsMixin):
                 description: All comments to tasks related to given project
         """
         projects_service.get_project(project_id)
+        user_service.check_project_access(project_id)
+        if (
+            permissions.has_vendor_permissions()
+            or permissions.has_client_permissions()
+        ):
+            raise permissions.PermissionDenied
         page = self.get_page()
         return tasks_service.get_comments_for_project(project_id, page)
 

{zou-0.19.63 → zou-0.19.65}/zou/app/services/breakdown_service.py

@@ -829,7 +829,9 @@ def _get_task_type_priority_map(project_id):
 
 def _is_asset_ready(asset, task, priority_map):
     is_ready = False
-    if "ready_for" in asset and asset["ready_for"] is not None:
+    if asset["is_shared"] and asset["project_id"] != str(task.project_id):
+        is_ready = True
+    elif "ready_for" in asset and asset["ready_for"] is not None:
         priority_ready = priority_map.get(asset["ready_for"], -1) or -1
         priority_task = priority_map.get(str(task.task_type_id), 0) or 0
         is_ready = priority_task <= priority_ready

{zou-0.19.63 → zou-0.19.65}/zou/app/services/chats_service.py

@@ -155,8 +155,8 @@ def create_chat_message(chat_id, person_id, message, files=None):
         "chat:new-message",
         data={
             "chat_id": chat_id,
-            "chat_message_id": str(message.id),
-            "last_message": chat.last_message,
+            "chat_message_id": serialized_message["id"],
+            "last_message": serialized_message["created_at"],
         },
         persist=False,
     )

{zou-0.19.63 → zou-0.19.65}/zou/app/services/news_service.py

@@ -96,6 +96,7 @@ def get_last_news_for_project(
     before=None,
     after=None,
     episode_id=None,
+    current_user=None,
 ):
     """
     Return last 50 news for given project. Add related information to make it
@@ -120,6 +121,9 @@ def get_last_news_for_project(
 
     if len(project_ids) > 0:
         query = query.filter(Project.id.in_(project_ids))
+    elif current_user is not None:
+        if current_user.role.code != "admin":
+            query = query.filter(Project.team.contains(current_user))
 
     if entity_id is not None:
         query = query.filter(Entity.id == entity_id)
@@ -239,6 +243,7 @@ def get_news_stats_for_project(
     author_id=None,
     before=None,
     after=None,
+    current_user=None,
 ):
     """
     Return the number of news by task status for given project and filters.
@@ -262,6 +267,9 @@ def get_news_stats_for_project(
 
     if len(project_ids) > 0:
         query = query.filter(Project.id.in_(project_ids))
+    elif current_user is not None:
+        if current_user.role.code != "admin":
+            query = query.filter(Project.team.contains(current_user))
 
     if task_status_id is not None:
         query = query.filter(Comment.task_status_id == task_status_id)

{zou-0.19.63 → zou-0.19.65/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.63
+Version: 0.19.65
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -41,7 +41,7 @@ Requires-Dist: flask-socketio==5.4.1
 Requires-Dist: flask==3.0.3
 Requires-Dist: gazu==0.10.16
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==24.10.3
+Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -50,11 +50,11 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.31.6
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.1.2; python_version >= "3.10"
+Requires-Dist: numpy==2.1.3; 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.10
+Requires-Dist: orjson==3.10.11
 Requires-Dist: pillow==11.0.0
 Requires-Dist: psutil==6.1.0
 Requires-Dist: psycopg[binary]==3.2.3
@@ -80,12 +80,12 @@ Requires-Dist: wheel; extra == "dev"
 Provides-Extra: test
 Requires-Dist: fakeredis==2.26.1; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
-Requires-Dist: pytest-cov==5.0.0; extra == "test"
+Requires-Dist: pytest-cov==6.0.0; extra == "test"
 Requires-Dist: pytest==8.3.3; 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.17.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.18.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"

{zou-0.19.63 → zou-0.19.65}/zou.egg-info/requires.txt

@@ -19,7 +19,7 @@ flask-socketio==5.4.1
 flask==3.0.3
 gazu==0.10.16
 gevent-websocket==0.10.1
-gevent==24.10.3
+gevent==24.11.1
 gunicorn==23.0.0
 isoweek==1.3.3
 itsdangerous==2.2.0
@@ -30,7 +30,7 @@ meilisearch==0.31.6
 opencv-python==4.10.0.84
 OpenTimelineIO==0.17.0
 OpenTimelineIO-Plugins==0.17.0
-orjson==3.10.10
+orjson==3.10.11
 pillow==11.0.0
 psutil==6.1.0
 psycopg[binary]==3.2.3
@@ -53,7 +53,7 @@ werkzeug==3.0.6
 numpy==2.0.1
 
 [:python_version >= "3.10"]
-numpy==2.1.2
+numpy==2.1.3
 
 [dev]
 wheel
@@ -66,7 +66,7 @@ pre-commit==4.0.1
 [monitoring]
 prometheus-flask-exporter==0.23.1
 pygelf==0.4.2
-sentry-sdk==2.17.0
+sentry-sdk==2.18.0
 
 [prod]
 gunicorn
@@ -75,5 +75,5 @@ gevent
 [test]
 fakeredis==2.26.1
 mixer==7.2.2
-pytest-cov==5.0.0
+pytest-cov==6.0.0
 pytest==8.3.3

zou-0.19.63/zou/__init__.py

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