zou 0.19.48__tar.gz → 0.19.49__tar.gz

{zou-0.19.48/zou.egg-info → zou-0.19.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.48
+Version: 0.19.49
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -81,15 +81,15 @@ Provides-Extra: test
 Requires-Dist: fakeredis==2.23.3; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
-Requires-Dist: pytest==8.3.1; extra == "test"
+Requires-Dist: pytest==8.3.2; 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.10.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.11.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.4.2; extra == "lint"
-Requires-Dist: pre-commit==3.7.1; python_version >= "3.9" and extra == "lint"
+Requires-Dist: pre-commit==3.8.0; python_version >= "3.9" and extra == "lint"
 
 .. figure:: https://zou.cg-wire.com/kitsu.png
    :alt: Kitsu Logo

{zou-0.19.48 → zou-0.19.49}/setup.cfg

@@ -95,15 +95,15 @@ test =
 	fakeredis==2.23.3
 	mixer==7.2.2
 	pytest-cov==5.0.0
-	pytest==8.3.1
+	pytest==8.3.2
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.10.0
+	sentry-sdk==2.11.0
 lint = 
 	autoflake==2.3.1
 	black==24.4.2
-	pre-commit==3.7.1; python_version >= '3.9'
+	pre-commit==3.8.0; python_version >= '3.9'
 
 [options.entry_points]
 console_scripts = 

zou-0.19.49/zou/__init__.py

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

{zou-0.19.48 → zou-0.19.49}/zou/app/blueprints/persons/resources.py

@@ -308,7 +308,7 @@ class PersonDurationTimeSpentsResource(Resource, ArgsMixin):
                         raise permissions.PermissionDenied
                     if permissions.has_supervisor_permissions():
                         department_ids = persons_service.get_current_user(
-                            True
+                            relations=True
                         )["departments"]
                 else:
                     raise permissions.PermissionDenied
@@ -533,7 +533,24 @@ class PersonDayTimeSpentsResource(PersonDurationTimeSpentsResource):
             abort(404)
 
 
-class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
+class PersonQuotaMixin:
+
+    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")
+        if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
+            raise WrongParameterException(
+                "count_mode must be equal to weighted, weigtheddone, feedback"
+                ", or done"
+            )
+        feedback = "done" not in count_mode
+        weighted = "weighted" in count_mode
+
+        return (project_id, task_type_id, count_mode, feedback, weighted)
+
+
+class PersonMonthQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this month.
     """
@@ -564,6 +581,12 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
             x-example: 07
             minimum: 1
             maximum: 12
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
         responses:
             200:
                 description: Ended shots used for quota calculation of this month
@@ -571,10 +594,11 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
                 description: Wrong date format
         """
         user_service.check_person_is_not_bot(person_id)
-        project_id = self.get_project_id()
-        task_type_id = self.get_task_type_id()
         user_service.check_person_access(person_id)
-        weighted = self.get_bool_parameter("weighted", default="true")
+        (project_id, task_type_id, count_mode, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+
         try:
             return shots_service.get_month_quota_shots(
                 person_id,
@@ -583,12 +607,13 @@ class PersonMonthQuotaShotsResource(Resource, ArgsMixin):
                 project_id=project_id,
                 task_type_id=task_type_id,
                 weighted=weighted,
+                feedback=feedback,
             )
         except WrongDateFormatException:
             abort(404)
 
 
-class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
+class PersonWeekQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this week.
     """
@@ -619,6 +644,12 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
             x-example: 35
             minimum: 1
             maximum: 52
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
         responses:
             200:
                 description: Ended shots used for quota calculation of this week
@@ -626,10 +657,11 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
                 description: Wrong date format
         """
         user_service.check_person_is_not_bot(person_id)
-        project_id = self.get_project_id()
-        task_type_id = self.get_task_type_id()
         user_service.check_person_access(person_id)
-        weighted = self.get_bool_parameter("weighted", default="true")
+        (project_id, task_type_id, count_mode, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+
         try:
             return shots_service.get_week_quota_shots(
                 person_id,
@@ -638,12 +670,13 @@ class PersonWeekQuotaShotsResource(Resource, ArgsMixin):
                 project_id=project_id,
                 task_type_id=task_type_id,
                 weighted=weighted,
+                feedback=feedback,
             )
         except WrongDateFormatException:
             abort(404)
 
 
-class PersonDayQuotaShotsResource(Resource, ArgsMixin):
+class PersonDayQuotaShotsResource(Resource, ArgsMixin, PersonQuotaMixin):
     """
     Get ended shots used for quota calculation of this day.
     """
@@ -681,6 +714,12 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin):
             x-example: 12
             minimum: 1
             maximum: 31
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
         responses:
             200:
                 description: Ended shots used for quota calculation of this day
@@ -688,10 +727,11 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin):
                 description: Wrong date format
         """
         user_service.check_person_is_not_bot(person_id)
-        project_id = self.get_project_id()
-        task_type_id = self.get_task_type_id()
         user_service.check_person_access(person_id)
-        weighted = self.get_bool_parameter("weighted", default="true")
+        (project_id, task_type_id, count_mode, feedback, weighted) = (
+            self.get_quota_arguments()
+        )
+
         try:
             return shots_service.get_day_quota_shots(
                 person_id,
@@ -701,6 +741,7 @@ class PersonDayQuotaShotsResource(Resource, ArgsMixin):
                 project_id=project_id,
                 task_type_id=task_type_id,
                 weighted=weighted,
+                feedback=feedback,
             )
         except WrongDateFormatException:
             abort(404)

{zou-0.19.48 → zou-0.19.49}/zou/app/blueprints/shots/resources.py

@@ -1507,6 +1507,18 @@ class ProjectQuotasResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: count_mode
+            required: True
+            type: string
+            enum: [weighted, weigtheddone, feedback, done]
+            x-example: weighted
+          - in: query
+            name: studio_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Quotas statistics for shots
@@ -1515,17 +1527,35 @@ class ProjectQuotasResource(Resource, ArgsMixin):
         user_service.check_project_access(project_id)
         args = self.get_args(
             [
-                ("weighted", False, False, bool),
+                ("count_mode", "weighted", False, str),
                 ("studio_id", None, False, str),
             ]
         )
-        if args["weighted"]:
+        count_mode = args["count_mode"]
+        studio_id = args["studio_id"]
+
+        if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
+            raise WrongParameterException(
+                "count_mode must be equal to weighted, weigtheddone, feedback"
+                ", or done"
+            )
+
+        feedback = "done" not in count_mode
+        weighted = "weighted" in count_mode
+
+        if weighted:
             return shots_service.get_weighted_quotas(
-                project_id, task_type_id, args["studio_id"]
+                project_id,
+                task_type_id,
+                feedback=feedback,
+                studio_id=studio_id,
             )
         else:
             return shots_service.get_raw_quotas(
-                project_id, task_type_id, args["studio_id"]
+                project_id,
+                task_type_id,
+                feedback=feedback,
+                studio_id=studio_id,
             )
 
 

{zou-0.19.48 → zou-0.19.49}/zou/app/mixin.py

@@ -14,6 +14,7 @@ class ArgsMixin(object):
         parser = reqparse.RequestParser()
         if location is None:
             location = ["values", "json"] if request.is_json else ["values"]
+
         for descriptor in descriptors:
             action = None
             data_type = str

{zou-0.19.48 → zou-0.19.49}/zou/app/models/task.py

@@ -42,6 +42,7 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     due_date = db.Column(db.DateTime)
     real_start_date = db.Column(db.DateTime)
     end_date = db.Column(db.DateTime)
+    done_date = db.Column(db.DateTime)
     last_comment_date = db.Column(db.DateTime)
     nb_assets_ready = db.Column(db.Integer, default=0)
     data = db.Column(JSONB)

{zou-0.19.48 → zou-0.19.49}/zou/app/services/assets_service.py

@@ -194,6 +194,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
         Task.end_date,
         Task.start_date,
         Task.due_date,
+        Task.done_date,
         Task.last_comment_date,
         assignees_table.columns.person,
     ).order_by(EntityType.name, Entity.name)
@@ -272,6 +273,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
         task_end_date,
         task_start_date,
         task_due_date,
+        task_done_date,
         task_last_comment_date,
         person_id,
     ) in query_result:
@@ -314,6 +316,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
                 task_dict = {
                     "id": task_id,
                     "due_date": fields.serialize_value(task_due_date),
+                    "done_date": fields.serialize_value(task_done_date),
                     "duration": task_duration,
                     "entity_id": asset_id,
                     "estimation": task_estimation,

{zou-0.19.48 → zou-0.19.49}/zou/app/services/entities_service.py

@@ -240,6 +240,7 @@ def get_entities_and_tasks(criterions={}):
             Task.end_date,
             Task.start_date,
             Task.due_date,
+            Task.done_date,
             Task.last_comment_date,
             assignees_table.columns.person,
         )
@@ -269,6 +270,7 @@ def get_entities_and_tasks(criterions={}):
         task_end_date,
         task_start_date,
         task_due_date,
+        task_done_date,
         task_last_comment_date,
         person_id,
     ) in query.all():
@@ -305,6 +307,7 @@ def get_entities_and_tasks(criterions={}):
                         "entity_id": entity_id,
                         "end_date": task_end_date,
                         "due_date": task_due_date,
+                        "done_date": task_done_date,
                         "duration": task_duration,
                         "is_subscribed": subscription_map.get(task_id, False),
                         "last_comment_date": task_last_comment_date,