zou 0.20.22__tar.gz → 0.20.23__tar.gz

{zou-0.20.22/zou.egg-info → zou-0.20.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.22
+Version: 0.20.23
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -46,7 +46,7 @@ Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
-Requires-Dist: Jinja2==3.1.5
+Requires-Dist: Jinja2==3.1.6
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.34.0

{zou-0.20.22 → zou-0.20.23}/setup.cfg

@@ -52,7 +52,7 @@ install_requires =
 	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
-	Jinja2==3.1.5
+	Jinja2==3.1.6
 	ldap3==2.9.1
 	matterhook==0.2
 	meilisearch==0.34.0

zou-0.20.23/zou/__init__.py

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

{zou-0.20.22 → zou-0.20.23}/zou/app/blueprints/comments/resources.py

@@ -491,7 +491,13 @@ class ReplyCommentResource(Resource, ArgsMixin):
             ]
         )
 
-        user_service.check_task_action_access(task_id)
+        comment = tasks_service.get_comment(comment_id)
+        current_user = persons_service.get_current_user()
+        if comment["person_id"] != current_user["id"]:
+            if permissions.has_client_permissions():
+                raise permissions.PermissionDenied()
+            user_service.check_task_action_access(task_id)
+
         return comments_service.reply_comment(comment_id, args["text"])
 
 

{zou-0.20.22 → zou-0.20.23}/zou/app/blueprints/previews/resources.py

@@ -418,11 +418,8 @@ class CreatePreviewFilePictureResource(
             )
             raise PreviewFileReuploadNotAllowedException
 
-        try:
-            user_service.check_task_action_access(preview_file["task_id"])
-            return True
-        except permissions.PermissionDenied:
-            return False
+        user_service.check_task_action_access(preview_file["task_id"])
+        return True
 
     def is_exist(self, preview_file_id):
         """

{zou-0.20.22 → zou-0.20.23}/zou/app/blueprints/shots/__init__.py

@@ -42,6 +42,7 @@ from zou.app.blueprints.shots.resources import (
     EpisodeAssetTasksResource,
     SequenceShotTasksResource,
     ProjectQuotasResource,
+    ProjectPersonQuotasResource,
     SetShotsFramesResource,
 )
 
@@ -95,6 +96,10 @@ routes = [
         "/data/projects/<project_id>/quotas/<task_type_id>",
         ProjectQuotasResource,
     ),
+    (
+        "/data/projects/<project_id>/quotas/persons/<person_id>",
+        ProjectPersonQuotasResource,
+    ),
     (
         "/actions/projects/<project_id>/task-types/<task_type_id>/set-shot-nb-frames",
         SetShotsFramesResource,

{zou-0.20.22 → zou-0.20.23}/zou/app/blueprints/shots/resources.py

@@ -1607,6 +1607,80 @@ class ProjectQuotasResource(Resource, ArgsMixin):
             )
 
 
+class ProjectPersonQuotasResource(Resource, ArgsMixin):
+
+    @jwt_required()
+    def get(self, project_id, person_id):
+        """
+        Retrieve quotas statistics for shots.
+        ---
+        tags:
+        - Shots
+        parameters:
+          - in: path
+            name: project_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: path
+            name: person_id
+            required: True
+            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
+        """
+        projects_service.get_project(project_id)
+        user_service.check_project_access(project_id)
+        args = self.get_args(
+            [
+                ("count_mode", "weighted", False, str),
+                ("studio_id", None, False, str),
+            ]
+        )
+        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,
+                person_id=person_id,
+                feedback=feedback,
+                studio_id=studio_id,
+            )
+        else:
+            return shots_service.get_raw_quotas(
+                project_id,
+                person_id=person_id,
+                feedback=feedback,
+                studio_id=studio_id,
+            )
+
+
 class SetShotsFramesResource(Resource, ArgsMixin):
     @jwt_required()
     def post(self, project_id, task_type_id):

{zou-0.20.22 → zou-0.20.23}/zou/app/models/project.py

@@ -10,6 +10,7 @@ from zou.app.models.person import ROLE_TYPES
 
 PROJECT_STYLES = [
     ("2d", "2D Animation"),
+    ("2dpaper", "2D Animation (Paper)"),
     ("3d", "3D Animation"),
     ("2d3d", "2D/3D Animation"),
     ("ar", "Augmented Reality"),

{zou-0.20.22 → zou-0.20.23}/zou/app/models/task.py

@@ -47,6 +47,8 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     last_comment_date = db.Column(db.DateTime)
     nb_assets_ready = db.Column(db.Integer, default=0)
     data = db.Column(JSONB)
+    nb_drawings = db.Column(db.Integer, default=0)
+
     shotgun_id = db.Column(db.Integer)
     last_preview_file_id = db.Column(UUIDType(binary=False))
 

{zou-0.20.22 → zou-0.20.23}/zou/app/services/assets_service.py

@@ -348,7 +348,9 @@ 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 ""),
+                    "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.22 → zou-0.20.23}/zou/app/services/shots_service.py

@@ -256,6 +256,7 @@ def get_shots_and_tasks(criterions={}):
             Task.last_preview_file_id,
             Task.nb_assets_ready,
             Task.difficulty,
+            Task.nb_drawings,
             assignees_table.columns.person,
             Project.id,
             Project.name,
@@ -308,6 +309,7 @@ def get_shots_and_tasks(criterions={}):
         task_last_preview_file_id,
         task_nb_assets_ready,
         task_difficulty,
+        task_nb_drawings,
         person_id,
         project_id,
         project_name,
@@ -373,6 +375,7 @@ def get_shots_and_tasks(criterions={}):
                         "retake_count": task_retake_count,
                         "start_date": task_start_date,
                         "difficulty": task_difficulty,
+                        "nb_drawings": task_nb_drawings,
                         "task_status_id": task_status_id,
                         "task_type_id": task_type_id,
                         "assignees": [],
@@ -1117,7 +1120,11 @@ def get_base_entity_type_name(entity_dict):
 
 
 def get_weighted_quotas(
-    project_id, task_type_id, studio_id=None, feedback=True
+    project_id,
+    task_type_id=None,
+    person_id=None,
+    studio_id=None,
+    feedback=True,
 ):
     """
     Build quota statistics. It counts the number of frames done for each day.
@@ -1140,7 +1147,6 @@ def get_weighted_quotas(
     query = (
         Task.query.filter(Entity.entity_type_id == shot_type["id"])
         .filter(Task.project_id == project_id)
-        .filter(Task.task_type_id == task_type_id)
         .join(Entity, Entity.id == Task.entity_id)
         .join(Project, Project.id == Task.project_id)
         .join(TimeSpent, Task.id == TimeSpent.task_id)
@@ -1152,6 +1158,12 @@ def get_weighted_quotas(
         )
     )
 
+    if task_type_id is not None:
+        query = query.filter(Task.task_type_id == task_type_id)
+
+    if person_id is not None:
+        query = query.filter(TimeSpent.person_id == person_id)
+
     if feedback:
         query = query.filter(Task.end_date != None)
     else:
@@ -1166,11 +1178,21 @@ def get_weighted_quotas(
         )
     result = query.all()
 
-    for task, nb_frames, date, duration, person_id in result:
-        person_id = str(person_id)
-        if task.duration > 0 and nb_frames is not None:
+    for task, nb_frames, date, duration, task_person_id in result:
+        task_person_id = str(task_person_id)
+        nb_drawings = task.nb_drawings or 0
+        nb_frames = nb_frames or 0
+        if task.duration > 0:
             nb_frames = round(nb_frames * (duration / task.duration))
-            _add_quota_entry(quotas, person_id, date, timezone, nb_frames, fps)
+            nb_drawings = round(nb_drawings * (duration / task.duration))
+            entry_id = str(task_person_id)
+            # We get quotas for a specific person split by task types
+            if person_id is not None:
+                entry_id = str(task.task_type_id)
+            for entry in [entry_id, "total"]:
+                _add_quota_entry(
+                    quotas, entry, date, timezone, nb_frames, nb_drawings, fps
+                )
 
     query = (
         Task.query.filter(Task.project_id == project_id)
@@ -1185,6 +1207,13 @@ def get_weighted_quotas(
         .add_columns(Entity.nb_frames, Person.id)
     )
 
+    if task_type_id is not None:
+        query = query.filter(Task.task_type_id == task_type_id)
+
+    if person_id is not None:
+        person = persons_service.get_person_raw(person_id)
+        query = query.filter(Task.assignees.contains(person))
+
     if feedback:
         query = query.filter(Task.end_date != None)
     else:
@@ -1196,7 +1225,7 @@ def get_weighted_quotas(
         )
     result = query.all()
 
-    for task, nb_frames, person_id in result:
+    for task, nb_frames, task_person_id in result:
         date = task.done_date
         if feedback:
             date = task.end_date
@@ -1209,16 +1238,36 @@ def get_weighted_quotas(
         else:
             nb_frames = 0
 
+        nb_drawings = task.nb_drawings or 0
+
         for x in range((date - task.real_start_date).days + 1):
             if date.weekday() < 5:
-                _add_quota_entry(
-                    quotas, str(person_id), date, timezone, nb_frames, fps
-                )
+                entry_id = str(task_person_id)
+                # We get quotas for a specific person split by task types
+                if person_id is not None:
+                    entry_id = str(task.task_type_id)
+
+                for entry in [entry_id, "total"]:
+                    _add_quota_entry(
+                        quotas,
+                        entry,
+                        date,
+                        timezone,
+                        nb_frames,
+                        nb_drawings,
+                        fps,
+                    )
             date = date + timedelta(1)
     return quotas
 
 
-def get_raw_quotas(project_id, task_type_id, studio_id=None, feedback=True):
+def get_raw_quotas(
+    project_id,
+    task_type_id=None,
+    person_id=None,
+    studio_id=None,
+    feedback=True,
+):
     """
     Build quota statistics in a raw way. It counts the number of frames done
     for each day. A shot is considered done at the first feedback request (end
@@ -1234,13 +1283,19 @@ def get_raw_quotas(project_id, task_type_id, studio_id=None, feedback=True):
     query = (
         Task.query.filter(Task.project_id == project_id)
         .filter(Entity.entity_type_id == shot_type["id"])
-        .filter(Task.task_type_id == task_type_id)
         .join(Entity, Entity.id == Task.entity_id)
         .join(Project, Project.id == Task.project_id)
         .join(Task.assignees)
         .add_columns(Entity.nb_frames, Person.id)
     )
 
+    if task_type_id is not None:
+        query = query.filter(Task.task_type_id == task_type_id)
+
+    if person_id is not None:
+        person = persons_service.get_person_raw(person_id)
+        query = query.filter(Task.assignees.contains(person))
+
     if feedback:
         query = query.filter(Task.end_date != None)
     else:
@@ -1256,20 +1311,30 @@ def get_raw_quotas(project_id, task_type_id, studio_id=None, feedback=True):
 
     result = query.all()
 
-    for task, nb_frames, person_id in result:
+    for task, nb_frames, task_person_id in result:
         date = task.done_date
         if feedback:
             date = task.end_date
 
         if nb_frames is None:
             nb_frames = 0
-        _add_quota_entry(
-            quotas, str(person_id), date, timezone, nb_frames, fps
-        )
+
+        nb_drawings = task.nb_drawings or 0
+
+        entry_id = str(task_person_id)
+        if person_id is not None:
+            entry_id = str(task.task_type_id)
+
+        for entry in [entry_id, "total"]:
+            _add_quota_entry(
+                quotas, entry, date, timezone, nb_frames, nb_drawings, fps
+            )
     return quotas
 
 
-def _add_quota_entry(quotas, person_id, date, timezone, nb_frames, fps):
+def _add_quota_entry(
+    quotas, entry_id, date, timezone, nb_frames, nb_drawings, fps
+):
     nb_seconds = nb_frames / fps
     date_str = date_helpers.get_simple_string_with_timezone_from_date(
         date, timezone
@@ -1277,59 +1342,84 @@ def _add_quota_entry(quotas, person_id, date, timezone, nb_frames, fps):
     year = date_str[:4]
     week = year + "-" + str(date.isocalendar()[1])
     month = date_str[:7]
-    if person_id not in quotas:
-        _init_quota_person(quotas, person_id)
-    _init_quota_date(quotas, person_id, date_str, week, month)
-    quotas[person_id]["day"]["frames"][date_str] += nb_frames
-    quotas[person_id]["day"]["seconds"][date_str] += nb_seconds
-    quotas[person_id]["day"]["count"][date_str] += 1
-    quotas[person_id]["week"]["frames"][week] += nb_frames
-    quotas[person_id]["week"]["seconds"][week] += nb_seconds
-    quotas[person_id]["week"]["count"][week] += 1
-    quotas[person_id]["month"]["frames"][month] += nb_frames
-    quotas[person_id]["month"]["seconds"][month] += nb_seconds
-    quotas[person_id]["month"]["count"][month] += 1
-    quotas[person_id]["year"]["frames"][year] += nb_frames
-    quotas[person_id]["year"]["seconds"][year] += nb_seconds
-    quotas[person_id]["year"]["count"][year] += 1
-
-
-def _init_quota_date(quotas, person_id, date_str, week, month):
+    if entry_id not in quotas:
+        _init_quota_entry(quotas, entry_id)
+    _init_quota_date(quotas, entry_id, date_str, week, month)
+    quotas[entry_id]["day"]["frames"][date_str] += nb_frames
+    quotas[entry_id]["day"]["seconds"][date_str] += nb_seconds
+    quotas[entry_id]["day"]["drawings"][date_str] += nb_drawings
+    quotas[entry_id]["day"]["count"][date_str] += 1
+    quotas[entry_id]["week"]["frames"][week] += nb_frames
+    quotas[entry_id]["week"]["seconds"][week] += nb_seconds
+    quotas[entry_id]["week"]["drawings"][week] += nb_drawings
+    quotas[entry_id]["week"]["count"][week] += 1
+    quotas[entry_id]["month"]["frames"][month] += nb_frames
+    quotas[entry_id]["month"]["seconds"][month] += nb_seconds
+    quotas[entry_id]["month"]["drawings"][month] += nb_drawings
+    quotas[entry_id]["month"]["count"][month] += 1
+    quotas[entry_id]["year"]["frames"][year] += nb_frames
+    quotas[entry_id]["year"]["drawings"][year] += nb_drawings
+    quotas[entry_id]["year"]["seconds"][year] += nb_seconds
+    quotas[entry_id]["year"]["count"][year] += 1
+
+
+def _init_quota_date(quotas, entry_id, date_str, week, month):
     year = week[:4]
-    if date_str not in quotas[person_id]["day"]["frames"]:
-        quotas[person_id]["day"]["frames"][date_str] = 0
-        quotas[person_id]["day"]["seconds"][date_str] = 0
-        quotas[person_id]["day"]["count"][date_str] = 0
-        if month not in quotas[person_id]["day"]["entries"]:
-            quotas[person_id]["day"]["entries"][month] = 0
-        quotas[person_id]["day"]["entries"][month] += 1
-    if week not in quotas[person_id]["week"]["frames"]:
-        quotas[person_id]["week"]["frames"][week] = 0
-        quotas[person_id]["week"]["seconds"][week] = 0
-        quotas[person_id]["week"]["count"][week] = 0
-        if year not in quotas[person_id]["week"]["entries"]:
-            quotas[person_id]["week"]["entries"][year] = 0
-        quotas[person_id]["week"]["entries"][year] += 1
-    if month not in quotas[person_id]["month"]["frames"]:
-        quotas[person_id]["month"]["frames"][month] = 0
-        quotas[person_id]["month"]["seconds"][month] = 0
-        quotas[person_id]["month"]["count"][month] = 0
-        if year not in quotas[person_id]["month"]["entries"]:
-            quotas[person_id]["month"]["entries"][year] = 0
-        quotas[person_id]["month"]["entries"][year] += 1
-    if year not in quotas[person_id]["year"]["frames"]:
-        quotas[person_id]["year"]["frames"][year] = 0
-        quotas[person_id]["year"]["seconds"][year] = 0
-        quotas[person_id]["year"]["count"][year] = 0
-
-
-def _init_quota_person(quotas, person_id):
-    quotas[person_id] = {}
-    quotas[person_id] = {
-        "day": {"frames": {}, "seconds": {}, "count": {}, "entries": {}},
-        "week": {"frames": {}, "seconds": {}, "count": {}, "entries": {}},
-        "month": {"frames": {}, "seconds": {}, "count": {}, "entries": {}},
-        "year": {"frames": {}, "seconds": {}, "count": {}},
+    if date_str not in quotas[entry_id]["day"]["frames"]:
+        quotas[entry_id]["day"]["frames"][date_str] = 0
+        quotas[entry_id]["day"]["seconds"][date_str] = 0
+        quotas[entry_id]["day"]["count"][date_str] = 0
+        quotas[entry_id]["day"]["drawings"][date_str] = 0
+        if month not in quotas[entry_id]["day"]["entries"]:
+            quotas[entry_id]["day"]["entries"][month] = 0
+        quotas[entry_id]["day"]["entries"][month] += 1
+    if week not in quotas[entry_id]["week"]["frames"]:
+        quotas[entry_id]["week"]["frames"][week] = 0
+        quotas[entry_id]["week"]["seconds"][week] = 0
+        quotas[entry_id]["week"]["count"][week] = 0
+        quotas[entry_id]["week"]["drawings"][week] = 0
+        if year not in quotas[entry_id]["week"]["entries"]:
+            quotas[entry_id]["week"]["entries"][year] = 0
+        quotas[entry_id]["week"]["entries"][year] += 1
+    if month not in quotas[entry_id]["month"]["frames"]:
+        quotas[entry_id]["month"]["frames"][month] = 0
+        quotas[entry_id]["month"]["seconds"][month] = 0
+        quotas[entry_id]["month"]["count"][month] = 0
+        quotas[entry_id]["month"]["drawings"][month] = 0
+        if year not in quotas[entry_id]["month"]["entries"]:
+            quotas[entry_id]["month"]["entries"][year] = 0
+        quotas[entry_id]["month"]["entries"][year] += 1
+    if year not in quotas[entry_id]["year"]["frames"]:
+        quotas[entry_id]["year"]["frames"][year] = 0
+        quotas[entry_id]["year"]["seconds"][year] = 0
+        quotas[entry_id]["year"]["count"][year] = 0
+        quotas[entry_id]["year"]["drawings"][year] = 0
+
+
+def _init_quota_entry(quotas, entry_id):
+    quotas[entry_id] = {
+        "day": {
+            "frames": {},
+            "seconds": {},
+            "count": {},
+            "entries": {},
+            "drawings": {},
+        },
+        "week": {
+            "frames": {},
+            "seconds": {},
+            "count": {},
+            "entries": {},
+            "drawings": {},
+        },
+        "month": {
+            "frames": {},
+            "seconds": {},
+            "count": {},
+            "entries": {},
+            "drawings": {},
+        },
+        "year": {"frames": {}, "seconds": {}, "count": {}, "drawings": {}},
     }
 
 
@@ -1487,7 +1577,6 @@ def get_weighted_quota_shots_between(
             shot = already_listed[shot["id"]]
             shot["weight"] += round(duration / task_duration, 2)
 
-    print(start, end)
     if type(start) is str:
         start = date_helpers.get_datetime_from_string(start)
     if type(end) is str: