zou 0.20.25__tar.gz → 0.20.27__tar.gz

{zou-0.20.25/zou.egg-info → zou-0.20.27}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: zou
-Version: 0.20.25
+Version: 0.20.27
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -51,26 +51,26 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.34.0
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.2.3; python_version >= "3.10"
+Requires-Dist: numpy==2.2.4; 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: orjson==3.10.16
 Requires-Dist: pillow==11.1.0
 Requires-Dist: psutil==7.0.0
-Requires-Dist: psycopg[binary]==3.2.5
+Requires-Dist: psycopg[binary]==3.2.6
 Requires-Dist: pyotp==2.9.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
-Requires-Dist: pytz==2025.1
+Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: rq==2.1.0
+Requires-Dist: rq==2.2.0
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: sqlalchemy_utils==0.41.2
-Requires-Dist: sqlalchemy==2.0.38
+Requires-Dist: sqlalchemy==2.0.39
 Requires-Dist: ua-parser==1.0.1
 Requires-Dist: werkzeug==3.1.3
 Provides-Extra: prod
@@ -84,13 +84,14 @@ Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==6.0.0; extra == "test"
 Requires-Dist: pytest==8.3.5; extra == "test"
 Provides-Extra: monitoring
-Requires-Dist: prometheus-flask-exporter==0.23.1; extra == "monitoring"
+Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.22.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.24.1; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"
-Requires-Dist: pre-commit==4.1.0; extra == "lint"
+Requires-Dist: pre-commit==4.2.0; extra == "lint"
+Dynamic: license-file
 Dynamic: requires-python
 
 .. figure:: https://zou.cg-wire.com/kitsu.png

{zou-0.20.25 → zou-0.20.27}/setup.cfg

@@ -57,26 +57,26 @@ install_requires =
 	matterhook==0.2
 	meilisearch==0.34.0
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.2.3; python_version >= '3.10'
+	numpy==2.2.4; python_version >= '3.10'
 	opencv-python==4.11.0.86
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.15
+	orjson==3.10.16
 	pillow==11.1.0
 	psutil==7.0.0
-	psycopg[binary]==3.2.5
+	psycopg[binary]==3.2.6
 	pyotp==2.9.0
 	pysaml2==7.5.2
 	python-nomad==2.1.0
 	python-slugify==8.0.4
 	python-socketio==5.12.1
-	pytz==2025.1
+	pytz==2025.2
 	redis==5.2.1
 	requests==2.32.3
-	rq==2.1.0
+	rq==2.2.0
 	slackclient==2.9.4
 	sqlalchemy_utils==0.41.2
-	sqlalchemy==2.0.38
+	sqlalchemy==2.0.39
 	ua-parser==1.0.1
 	werkzeug==3.1.3
 
@@ -98,13 +98,13 @@ test =
 	pytest-cov==6.0.0
 	pytest==8.3.5
 monitoring = 
-	prometheus-flask-exporter==0.23.1
+	prometheus-flask-exporter==0.23.2
 	pygelf==0.4.2
-	sentry-sdk==2.22.0
+	sentry-sdk==2.24.1
 lint = 
 	autoflake==2.3.1
 	black==25.1.0
-	pre-commit==4.1.0
+	pre-commit==4.2.0
 
 [options.entry_points]
 console_scripts = 

zou-0.20.27/zou/__init__.py

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

{zou-0.20.25 → zou-0.20.27}/zou/app/blueprints/comments/resources.py

@@ -332,7 +332,8 @@ class AddAttachmentToCommentResource(Resource):
         user = persons_service.get_current_user()
         comment = tasks_service.get_comment(comment_id)
         if comment["person_id"] != user["id"]:
-            permissions.check_admin_permissions()
+            task = tasks_service.get_task(task_id)
+            user_service.check_manager_project_access(task["project_id"])
 
         files = request.files
         comment = comments_service.add_attachments_to_comment(comment, files)

{zou-0.20.25 → zou-0.20.27}/zou/app/blueprints/persons/resources.py

@@ -532,7 +532,7 @@ class PersonDayTimeSpentsResource(PersonDurationTimeSpentsResource):
             abort(404)
 
 
-class PersonQuotaMixin:
+class PersonQuotaMixin(ArgsMixin):
 
     def get_quota_arguments(self):
         project_id = self.get_project_id()
@@ -546,14 +546,48 @@ class PersonQuotaMixin:
         feedback = "done" not in count_mode
         weighted = "weighted" in count_mode
 
-        return (project_id, task_type_id, count_mode, feedback, weighted)
+        return (project_id, task_type_id, feedback, weighted)
+
+    def check_permissions(self, person_id, project_id=None):
+        if permissions.has_manager_permissions():
+            user_service.check_manager_project_access(project_id)
+        else:
+            user_service.check_person_access(person_id)
+
+    def get_person_quotas(self):
+        pass
+
+    @jwt_required()
+    def get(self, person_id, **kwargs):
+        user_service.check_person_is_not_bot(person_id)
+        (project_id, task_type_id, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+        self.check_permissions(person_id, project_id)
+
+        try:
+            return self.get_person_quotas(
+                person_id,
+                **kwargs,
+                project_id=project_id,
+                task_type_id=task_type_id,
+                feedback=feedback,
+                weighted=weighted,
+            )
+        except WrongDateFormatException:
+            abort(404)
 
 
-class PersonMonthQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
+class PersonMonthQuotaShotsResource(Resource, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this month.
     """
 
+    def get_person_quotas(self, person_id, year, month, **kwargs):
+        return shots_service.get_month_quota_shots(
+            person_id, year, month, **kwargs
+        )
+
     @jwt_required()
     def get(self, person_id, year, month):
         """
@@ -592,31 +626,19 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
             404:
                 description: Wrong date format
         """
-        user_service.check_person_is_not_bot(person_id)
-        user_service.check_person_access(person_id)
-        (project_id, task_type_id, count_mode, feedback, weighted) = (
-            self.get_quota_arguments()
-        )
+        super().get(person_id, year, month)
 
-        try:
-            return shots_service.get_month_quota_shots(
-                person_id,
-                year,
-                month,
-                project_id=project_id,
-                task_type_id=task_type_id,
-                weighted=weighted,
-                feedback=feedback,
-            )
-        except WrongDateFormatException:
-            abort(404)
 
-
-class PersonWeekQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
+class PersonWeekQuotaShotsResource(Resource, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this week.
     """
 
+    def get_person_quotas(self, person_id, year, week, **kwargs):
+        return shots_service.get_week_quota_shots(
+            person_id, year, week, **kwargs
+        )
+
     @jwt_required()
     def get(self, person_id, year, week):
         """
@@ -655,31 +677,19 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
             404:
                 description: Wrong date format
         """
-        user_service.check_person_is_not_bot(person_id)
-        user_service.check_person_access(person_id)
-        (project_id, task_type_id, count_mode, feedback, weighted) = (
-            self.get_quota_arguments()
-        )
-
-        try:
-            return shots_service.get_week_quota_shots(
-                person_id,
-                year,
-                week,
-                project_id=project_id,
-                task_type_id=task_type_id,
-                weighted=weighted,
-                feedback=feedback,
-            )
-        except WrongDateFormatException:
-            abort(404)
+        super().get(person_id, year, week)
 
 
-class PersonDayQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
+class PersonDayQuotaShotsResource(Resource, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this day.
     """
 
+    def get_person_quotas(self, person_id, year, month, day, **kwargs):
+        return shots_service.get_day_quota_shots(
+            person_id, year, month, day, **kwargs
+        )
+
     @jwt_required()
     def get(self, person_id, year, month, day):
         """
@@ -725,25 +735,7 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
             404:
                 description: Wrong date format
         """
-        user_service.check_person_is_not_bot(person_id)
-        user_service.check_person_access(person_id)
-        (project_id, task_type_id, count_mode, feedback, weighted) = (
-            self.get_quota_arguments()
-        )
-
-        try:
-            return shots_service.get_day_quota_shots(
-                person_id,
-                year,
-                month,
-                day,
-                project_id=project_id,
-                task_type_id=task_type_id,
-                weighted=weighted,
-                feedback=feedback,
-            )
-        except WrongDateFormatException:
-            abort(404)
+        super().get(person_id, year, month, day)
 
 
 class TimeSpentDurationResource(Resource, ArgsMixin):
@@ -1008,9 +1000,7 @@ class PersonWeekDayOffResource(Resource, ArgsMixin):
                 description: All day off recorded for given week and person
         """
         user_service.check_person_is_not_bot(person_id)
-        user_id = persons_service.get_current_user()["id"]
-        if person_id != user_id:
-            permissions.check_admin_permissions()
+        user_service.check_person_access(person_id)
         return time_spents_service.get_person_day_offs_for_week(
             person_id, year, week
         )
@@ -1052,9 +1042,7 @@ class PersonMonthDayOffResource(Resource, ArgsMixin):
                 description: All day off recorded for given month and person
         """
         user_service.check_person_is_not_bot(person_id)
-        user_id = persons_service.get_current_user()["id"]
-        if person_id != user_id:
-            permissions.check_admin_permissions()
+        user_service.check_person_access(person_id)
         return time_spents_service.get_person_day_offs_for_month(
             person_id, year, month
         )
@@ -1089,9 +1077,7 @@ class PersonYearDayOffResource(Resource, ArgsMixin):
                 description: All day off recorded for given year and person
         """
         user_service.check_person_is_not_bot(person_id)
-        user_id = persons_service.get_current_user()["id"]
-        if person_id != user_id:
-            permissions.check_admin_permissions()
+        user_service.check_person_access(person_id)
         return time_spents_service.get_person_day_offs_for_year(
             person_id, year
         )
@@ -1121,9 +1107,7 @@ class PersonDayOffResource(Resource, ArgsMixin):
                 description: All day off recorded for given person.
         """
         user_service.check_person_is_not_bot(person_id)
-        user_id = persons_service.get_current_user()["id"]
-        if person_id != user_id:
-            permissions.check_admin_permissions()
+        user_service.check_person_access(person_id)
         return time_spents_service.get_day_offs_between(
             person_id=person_id,
         )

{zou-0.20.25 → zou-0.20.27}/zou/app/blueprints/previews/resources.py

@@ -1192,11 +1192,7 @@ class PersonThumbnailResource(BaseThumbnailResource):
         )
 
     def check_allowed_to_post(self, instance_id):
-        is_current_user = (
-            persons_service.get_current_user()["id"] == instance_id
-        )
-        if not is_current_user and not permissions.has_admin_permissions():
-            raise permissions.PermissionDenied
+        user_service.check_person_access(instance_id)
 
     def prepare_creation(self, instance_id):
         self.model = self.update_model_func(

{zou-0.20.25 → zou-0.20.27}/zou/app/services/comments_service.py

@@ -330,7 +330,11 @@ def new_comment(
     add_attachments_to_comment(comment, files)
     events.emit(
         "comment:new",
-        {"comment_id": comment["id"], "task_id": task_id},
+        {
+            "comment_id": comment["id"],
+            "task_id": task_id,
+            "task_status_id": task_status_id
+        },
         project_id=task["project_id"],
     )
     return comment

{zou-0.20.25 → zou-0.20.27}/zou/app/services/shots_service.py

@@ -1433,7 +1433,7 @@ def get_month_quota_shots(
     feedback=True,
 ):
     """
-    Return shots that are included in quota comptutation for given
+    Return shots that are included in quota computation for given
     person and month.
     """
     start, end = date_helpers.get_month_interval(year, month)

{zou-0.20.25 → zou-0.20.27}/zou/app/services/user_service.py

@@ -395,8 +395,10 @@ def check_person_access(person_id):
     """
     Return True if user is an admin or is matching given person id.
     """
-    current_user = persons_service.get_current_user()
-    if permissions.has_admin_permissions() or current_user["id"] == person_id:
+    if (
+        permissions.has_admin_permissions()
+        or persons_service.get_current_user()["id"] == person_id
+    ):
         return True
     else:
         raise permissions.PermissionDenied

{zou-0.20.25 → zou-0.20.27/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: zou
-Version: 0.20.25
+Version: 0.20.27
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -51,26 +51,26 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.34.0
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.2.3; python_version >= "3.10"
+Requires-Dist: numpy==2.2.4; 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: orjson==3.10.16
 Requires-Dist: pillow==11.1.0
 Requires-Dist: psutil==7.0.0
-Requires-Dist: psycopg[binary]==3.2.5
+Requires-Dist: psycopg[binary]==3.2.6
 Requires-Dist: pyotp==2.9.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
-Requires-Dist: pytz==2025.1
+Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: rq==2.1.0
+Requires-Dist: rq==2.2.0
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: sqlalchemy_utils==0.41.2
-Requires-Dist: sqlalchemy==2.0.38
+Requires-Dist: sqlalchemy==2.0.39
 Requires-Dist: ua-parser==1.0.1
 Requires-Dist: werkzeug==3.1.3
 Provides-Extra: prod
@@ -84,13 +84,14 @@ Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==6.0.0; extra == "test"
 Requires-Dist: pytest==8.3.5; extra == "test"
 Provides-Extra: monitoring
-Requires-Dist: prometheus-flask-exporter==0.23.1; extra == "monitoring"
+Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.22.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.24.1; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"
-Requires-Dist: pre-commit==4.1.0; extra == "lint"
+Requires-Dist: pre-commit==4.2.0; extra == "lint"
+Dynamic: license-file
 Dynamic: requires-python
 
 .. figure:: https://zou.cg-wire.com/kitsu.png

{zou-0.20.25 → zou-0.20.27}/zou.egg-info/requires.txt

@@ -30,22 +30,22 @@ meilisearch==0.34.0
 opencv-python==4.11.0.86
 OpenTimelineIO==0.17.0
 OpenTimelineIO-Plugins==0.17.0
-orjson==3.10.15
+orjson==3.10.16
 pillow==11.1.0
 psutil==7.0.0
-psycopg[binary]==3.2.5
+psycopg[binary]==3.2.6
 pyotp==2.9.0
 pysaml2==7.5.2
 python-nomad==2.1.0
 python-slugify==8.0.4
 python-socketio==5.12.1
-pytz==2025.1
+pytz==2025.2
 redis==5.2.1
 requests==2.32.3
-rq==2.1.0
+rq==2.2.0
 slackclient==2.9.4
 sqlalchemy_utils==0.41.2
-sqlalchemy==2.0.38
+sqlalchemy==2.0.39
 ua-parser==1.0.1
 werkzeug==3.1.3
 
@@ -53,7 +53,7 @@ werkzeug==3.1.3
 numpy==2.0.1
 
 [:python_version >= "3.10"]
-numpy==2.2.3
+numpy==2.2.4
 
 [dev]
 wheel
@@ -61,12 +61,12 @@ wheel
 [lint]
 autoflake==2.3.1
 black==25.1.0
-pre-commit==4.1.0
+pre-commit==4.2.0
 
 [monitoring]
-prometheus-flask-exporter==0.23.1
+prometheus-flask-exporter==0.23.2
 pygelf==0.4.2
-sentry-sdk==2.22.0
+sentry-sdk==2.24.1
 
 [prod]
 gunicorn

zou-0.20.25/zou/__init__.py

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