zou 0.20.26__py3-none-any.whl → 0.20.28__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.26"
+__version__ = "0.20.28"

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/app/blueprints/persons/resources.py

@@ -532,12 +532,12 @@ class PersonDayTimeSpentsResource(PersonDurationTimeSpentsResource):
             abort(404)
 
 
-class PersonQuotaMixin:
+class PersonQuotaMixin(ArgsMixin):
 
     def get_quota_arguments(self):
         project_id = self.get_project_id()
         task_type_id = self.get_task_type_id()
-        count_mode = self.get_text_parameter("count_mode", default="weigthed")
+        count_mode = self.get_text_parameter("count_mode", default="weighted")
         if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
             raise WrongParameterException(
                 "count_mode must be equal to weighted, weigtheddone, feedback"
@@ -546,14 +546,49 @@ 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, *args, **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,
+                *args,
+                **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 +627,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 +678,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 +736,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 +1001,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 +1043,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 +1078,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 +1108,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/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/app/blueprints/shots/resources.py

@@ -1646,7 +1646,13 @@ class ProjectPersonQuotasResource(Resource, ArgsMixin):
                 description: Quotas statistics for shots
         """
         projects_service.get_project(project_id)
-        user_service.check_project_access(project_id)
+        if (
+            permissions.has_manager_permissions()
+            or permissions.has_supervisor_permissions()
+        ):
+            user_service.check_project_access(project_id)
+        else:
+            user_service.check_person_access(person_id)
         args = self.get_args(
             [
                 ("count_mode", "weighted", False, str),

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/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
@@ -417,7 +419,7 @@ def check_belong_to_project(project_id):
 
 def has_project_access(project_id):
     """
-    Return true if current user is a manager or has a task assigned for this
+    Return true if current user is an admin or has a task assigned for this
     project.
     """
     return permissions.has_admin_permissions() or check_belong_to_project(

{zou-0.20.26.dist-info → zou-0.20.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: zou
-Version: 0.20.26
+Version: 0.20.28
 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.26.dist-info → zou-0.20.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=uhGl1res98kiqEDpx7DwZ_agTcrQGc3X-FE3cNaE4xc,24
+zou/__init__.py,sha256=lS0BgqFlmD2VCQ72vdCp-Kl8zeRZ2cwgpktzorWsby8,24
 zou/cli.py,sha256=HuYi2Ma7SP2SD7C9d9dwpZ49BHpytKIoyJP_su9JwZY,18755
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=EpohqFJwWL0zs-Ic_W5dX5_XSDeCrqHQPL5Re39OnQ0,6382
@@ -18,7 +18,7 @@ zou/app/blueprints/breakdown/resources.py,sha256=pmGlHLiXFsPRbxf403SiVgGiaBbtK8G
 zou/app/blueprints/chats/__init__.py,sha256=YGmwGvddg3MgSYVIh-hmkX8t2em9_LblxBeJzFqFJD4,558
 zou/app/blueprints/chats/resources.py,sha256=4yLFermdwOsnBLs9nx8yxuHWLar24uQWQy0XgsUNDD0,5950
 zou/app/blueprints/comments/__init__.py,sha256=WqpJ7-_dK1cInGTFJAxQ7syZtPCotwq2oO20UEnk1h4,1532
-zou/app/blueprints/comments/resources.py,sha256=o_izuBb4Z2yNMpRa1rfS8Shf4PTFP5zuSbw51I-wS8g,19110
+zou/app/blueprints/comments/resources.py,sha256=To2tyxh1pMkBAnlnj-0u3PGW70n4JTnNsv7BXw-Ng7I,19185
 zou/app/blueprints/concepts/__init__.py,sha256=sP_P4mfYvfMcgeE6MHZYP3eD0Lz0Lwit5-CFuVnA-Jg,894
 zou/app/blueprints/concepts/resources.py,sha256=maJNrBAWX0bKbDKtOZc3YFp4nTVtIdkkAA4H9WA9n1Y,10140
 zou/app/blueprints/crud/__init__.py,sha256=qn7xkEh2EG0mPS_RBmm0GgYr0O1jnmI8ymXZnFWZCz8,8361
@@ -87,17 +87,17 @@ zou/app/blueprints/index/resources.py,sha256=Z2N8fRffv4rkhazUe1_2x6I7-A01rCkCnBy
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
 zou/app/blueprints/news/resources.py,sha256=HdLq2NgfKyN2d3hIATBhH3dlk4c50I4dhhvEhhB_NY4,7334
 zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
-zou/app/blueprints/persons/resources.py,sha256=PfK6epzRn_kbqN6g9qYiH9XWStFlccTVCYyKxs72Hu8,42764
+zou/app/blueprints/persons/resources.py,sha256=HpVKckUYu52qbMv-llVPqwP3dtD2Q43HxJ1zutQ7d3I,42163
 zou/app/blueprints/playlists/__init__.py,sha256=vuEk1F3hFHsmuKWhdepMoLyOzmNKDn1YrjjfcaIz0lQ,1596
 zou/app/blueprints/playlists/resources.py,sha256=alRlMHypUFErXLsEYxpFK84cdjFJ3YWwamZtW0KcwLY,17211
 zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
-zou/app/blueprints/previews/resources.py,sha256=i_BwkcPLKh-ktxckwcesXddgXmA9D6JnSTZjkEnL8uE,53551
+zou/app/blueprints/previews/resources.py,sha256=uyjfW3vyE2a1PPXO8MsHP8-3jhuVKHt3oi2pYsq-ZIw,53376
 zou/app/blueprints/projects/__init__.py,sha256=Pn3fA5bpNFEPBzxTKJ2foV6osZFflXXSM2l2uZh3ktM,3927
 zou/app/blueprints/projects/resources.py,sha256=1WBS2FyaY1RSA_T-BdPnc8X9myjTJ127bMDigyoAklk,31979
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
 zou/app/blueprints/search/resources.py,sha256=_QgRlUuxCPgY-ip5r2lGFtXNcGSE579JsCSrVf8ajVU,3093
 zou/app/blueprints/shots/__init__.py,sha256=EcG9qmAchlucqg1M6-RqWGfuKpa5Kq6RgyLZNSsjUr4,4225
-zou/app/blueprints/shots/resources.py,sha256=WOWvYOEVxv3mu1PKTFg6lGoTfM_UQ5n-iJTUFuZKMh8,52162
+zou/app/blueprints/shots/resources.py,sha256=Uv8zXKK1e23U0Sw11qjnJT7-JrirDPjS8usQKMHzix0,52366
 zou/app/blueprints/source/__init__.py,sha256=H7K-4TDs4pc5EJvcYTYMJBHesxyqsE5-xq7J8ckOS2g,6093
 zou/app/blueprints/source/kitsu.py,sha256=4lWdqxaKDzwx-5POAIHIgZ6ODbDMOOVRxaSb_FOLcCk,5012
 zou/app/blueprints/source/otio.py,sha256=nTXQEauFinPv2QBXziJW83rSrB_qzIbkFQ_qgxbJynA,13419
@@ -206,14 +206,14 @@ zou/app/services/preview_files_service.py,sha256=Yk-vwzHuKTzNkEZfl9DhQRdDuRU006u
 zou/app/services/projects_service.py,sha256=aIbYaFomy7OX2Pxvkf9w5qauDvkjuc9ummSGNYIpQMY,21249
 zou/app/services/scenes_service.py,sha256=iXN19HU4njPF5VtZXuUrVJ-W23ZQuQNPC3ADXltbWtU,992
 zou/app/services/schedule_service.py,sha256=E99HKYsXgnK2sw58fw-NNHXWBgVJiA60upztjkNSCaM,6989
-zou/app/services/shots_service.py,sha256=UW7QcW2Gi_OsbBuR_96FCjNKnsm3SH2R1AcBRnL9pzo,54803
+zou/app/services/shots_service.py,sha256=NxIK_kluFR284jufZt76xvHxsS-BQBOG6IW5tpz4O68,54802
 zou/app/services/stats_service.py,sha256=e9h090eZWADtzXycy1WOup_jlxGwQojrr1y_PDcVatc,13156
 zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_KNP96hT1o0X7XcGF4,715
 zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0OefMo,41811
 zou/app/services/tasks_service.py,sha256=6ZFq4DhJ9HDgWT3CcikUWWImMNuHko1Bz_ARKPfeoEw,69775
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/time_spents_service.py,sha256=H9X-60s6oqtY9rtU-K2jKwUSljfkdGlf_9wMr3iVfIA,15158
-zou/app/services/user_service.py,sha256=SKW6n3eMRDUJljUE893cYUrg00xyUwUkxLHzQHjIZT0,51362
+zou/app/services/user_service.py,sha256=-ST4zUm2rbdXgdw2xzVJaYEA-LAsZvInRjDvpCC8GJA,51353
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
 zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
@@ -420,9 +420,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.26.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.26.dist-info/METADATA,sha256=qSn_1o3aw1Dr5Se1i1Cm00c2lGZ1CupYOh50b5UrCbA,6673
-zou-0.20.26.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-zou-0.20.26.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.26.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.26.dist-info/RECORD,,
+zou-0.20.28.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.28.dist-info/METADATA,sha256=RzMWJ1L0ABIKyXtZmadHniNlpghuRiXnlWI_pgRjjJw,6695
+zou-0.20.28.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+zou-0.20.28.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.28.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.28.dist-info/RECORD,,

{zou-0.20.26.dist-info → zou-0.20.28.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any