zou 0.20.22__py3-none-any.whl → 0.20.23__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.22"
+__version__ = "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/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/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/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/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/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/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/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:

zou/app/services/stats_service.py

@@ -19,22 +19,25 @@ DEFAULT_RETAKE_STATS = {
     "done": {
         "count": 0,
         "frames": 0,
+        "drawings": 0,
     },
     "retake": {
         "count": 0,
         "frames": 0,
+        "drawings": 0,
     },
     "other": {
         "count": 0,
         "frames": 0,
+        "drawings": 0,
     },
 }
 
 
 DEFAULT_EVOLUTION_STATS = {
-    "done": {"count": 0, "frames": 0},
-    "retake": {"count": 0, "frames": 0},
-    "other": {"count": 0, "frames": 0},
+    "done": {"count": 0, "frames": 0, "drawings": 0},
+    "retake": {"count": 0, "frames": 0, "drawings": 0},
+    "other": {"count": 0, "frames": 0, "drawings": 0},
 }
 
 
@@ -94,6 +97,7 @@ def _get_episode_counts(project_id, only_assigned=False):
             TaskStatus.color,
         )
         .add_columns(func.count(Task.id))
+        .add_columns(func.sum(Task.nb_drawings))
         .add_columns(func.sum(Entity.nb_frames))
     )
 
@@ -112,6 +116,7 @@ def add_entry_to_stats(
     task_status_short_name,
     task_status_color,
     task_count,
+    task_nb_drawings,
     entity_nb_frames,
 ):
     """
@@ -129,6 +134,7 @@ def add_entry_to_stats(
         "color": task_status_color,
         "count": task_count,
         "frames": entity_nb_frames or 0,
+        "drawings": task_nb_drawings or 0,
     }
 
     # Aggregate for episode
@@ -140,12 +146,16 @@ def add_entry_to_stats(
             "color": task_status_color,
             "count": 0,
             "frames": 0,
+            "drawings": 0,
         },
     )
     results[episode_id]["all"][task_status_id]["count"] += task_count or 0
     results[episode_id]["all"][task_status_id]["frames"] += (
         entity_nb_frames or 0
     )
+    results[episode_id]["all"][task_status_id]["drawings"] += (
+        task_nb_drawings or 0
+    )
 
 
 def add_entry_to_all_stats(
@@ -157,6 +167,7 @@ def add_entry_to_all_stats(
     task_status_short_name,
     task_status_color,
     task_count,
+    task_nb_drawings,
     entity_nb_frames,
 ):
     """
@@ -175,9 +186,13 @@ def add_entry_to_all_stats(
             "color": task_status_color,
             "count": 0,
             "frames": 0,
+            "drawings": 0,
         },
     )
     results["all"][task_type_id][task_status_id]["count"] += task_count or 0
+    results["all"][task_type_id][task_status_id]["drawings"] += (
+        task_nb_drawings or 0
+    )
     results["all"][task_type_id][task_status_id]["frames"] += (
         entity_nb_frames or 0
     )
@@ -189,10 +204,12 @@ def add_entry_to_all_stats(
             "color": task_status_color,
             "count": 0,
             "frames": 0,
+            "drawings": 0,
         },
     )
     results["all"]["all"][task_status_id]["count"] += task_count or 0
     results["all"]["all"][task_status_id]["frames"] += entity_nb_frames or 0
+    results["all"]["all"][task_status_id]["drawings"] += task_nb_drawings or 0
 
 
 def get_episode_retake_stats_for_project(project_id, only_assigned=False):
@@ -207,11 +224,13 @@ def get_episode_retake_stats_for_project(project_id, only_assigned=False):
                 "1": {
                     "retake": {
                         "count": 80,
-                        "frames": 7900
+                        "frames": 7900,
+                        "drawings": 8000
                     },
                     "done": {
                         "count": 117,
                         "frames": 3900
+                        "drawings": 8000
                     }
                 },
                 "2": {
@@ -226,15 +245,18 @@ def get_episode_retake_stats_for_project(project_id, only_assigned=False):
             },
             "done": {
                 "count": 197,
-                "frames": 16090
+                "frames": 16090,
+                "drawings": 16090
             },
             "retake": {
                 "count": 0,
-                "frames": 0
+                "frames": 0,
+                "drawings": 0
             },
             "other": {
                 "count": 5,
-                "frames": 185
+                "frames": 185,
+                "drawings": 185
             }
 
         },
@@ -244,6 +266,7 @@ def get_episode_retake_stats_for_project(project_id, only_assigned=False):
     query_results = query.all()
     for (
         episode_id,
+        nb_drawings,
         nb_frames,
         task_type_id,
         retake_count,
@@ -262,12 +285,14 @@ def get_episode_retake_stats_for_project(project_id, only_assigned=False):
             is_done,
             retake_count,
             nb_frames,
+            nb_drawings,
         )
 
     # Another loop is needed because we need to know the max retake count
     # for each entries prior to build evolution stats.
     for (
         episode_id,
+        nb_drawings,
         nb_frames,
         task_type_id,
         retake_count,
@@ -282,6 +307,7 @@ def get_episode_retake_stats_for_project(project_id, only_assigned=False):
             is_done,
             retake_count,
             nb_frames,
+            nb_drawings,
         )
     return results
 
@@ -292,6 +318,7 @@ def _get_retake_stats_query(project_id, only_assigned):
     query = (
         Task.query.with_entities(
             Episode.id,
+            Task.nb_drawings,
             Entity.nb_frames,
             Task.task_type_id,
             Task.retake_count,
@@ -328,6 +355,7 @@ def _add_stats(
     is_done,
     retake_count,
     nb_frames,
+    nb_drawings,
 ):
     for key1, key2 in [
         ("all", "all"),
@@ -345,12 +373,15 @@ def _add_stats(
             # For the "current" stats we prioritize `is_done` over `is_retake`
             results[key1][key2]["done"]["count"] += 1
             results[key1][key2]["done"]["frames"] += nb_frames or 0
+            results[key1][key2]["done"]["drawings"] += nb_drawings or 0
         elif is_retake:
             results[key1][key2]["retake"]["count"] += 1
             results[key1][key2]["retake"]["frames"] += nb_frames or 0
+            results[key1][key2]["retake"]["drawings"] += nb_drawings or 0
         else:
             results[key1][key2]["other"]["count"] += 1
             results[key1][key2]["other"]["frames"] += nb_frames or 0
+            results[key1][key2]["other"]["drawings"] += nb_drawings or 0
     return results
 
 
@@ -362,6 +393,7 @@ def _add_evolution_stats(
     is_done,
     retake_count,
     nb_frames,
+    nb_drawings,
 ):
     for key1, key2 in [(episode_id, "all"), (episode_id, task_type_id)]:
         # In this loop we compute the "evolution" statistics
@@ -382,12 +414,18 @@ def _add_evolution_stats(
                 evolution_data[take_number]["retake"]["frames"] += (
                     nb_frames or 0
                 )
+                evolution_data[take_number]["retake"]["drawings"] += (
+                    nb_drawings or 0
+                )
             elif is_done:
                 evolution_data[take_number]["done"]["count"] += 1
                 evolution_data[take_number]["done"]["frames"] += nb_frames or 0
+                evolution_data[take_number]["done"]["drawings"] += (
+                    nb_drawings or 0
+                )
             else:
                 evolution_data[take_number]["other"]["count"] += 1
-                evolution_data[take_number]["other"]["frames"] += (
-                    nb_frames or 0
+                evolution_data[take_number]["other"]["drawings"] += (
+                    nb_drawings or 0
                 )
     return results

zou/app/services/user_service.py

@@ -504,7 +504,8 @@ def check_task_action_access(task_id):
             is_allowed = True
         else:
             user = persons_service.get_current_user(relations=True)
-            if permissions.has_supervisor_permissions():
+            is_allowed = user["id"] in task["assignees"]
+            if not is_allowed and permissions.has_supervisor_permissions():
                 is_allowed = (
                     user["departments"] == []
                     or tasks_service.get_task_type(task["task_type_id"])[
@@ -512,8 +513,6 @@ def check_task_action_access(task_id):
                     ]
                     in user["departments"]
                 )
-            else:
-                is_allowed = user["id"] in task["assignees"]
     else:
         is_allowed = False
 

zou/app/utils/commands.py

@@ -324,7 +324,7 @@ def sync_with_ldap_server():
                     {
                         "first_name": clean_value(entry.givenName or entry.cn),
                         "last_name": clean_value(entry.sn),
-                        "email": emails[0],
+                        "email": emails[0].lower(),
                         "emails": emails,
                         "desktop_login": desktop_login,
                         "thumbnail": thumbnail,

zou/migrations/versions/addbad59c706_allow_to_manage_drawings_instead_of_.py

@@ -0,0 +1,35 @@
+"""allow to manage drawings instead of frames
+
+Revision ID: addbad59c706
+Revises: 20a8ad264659
+Create Date: 2025-02-24 11:06:34.925091
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "addbad59c706"
+down_revision = "06552e22f9e7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("nb_drawings", sa.Integer(), nullable=True)
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task", schema=None) as batch_op:
+        batch_op.drop_column("nb_drawings")
+
+    # ### end Alembic commands ###

{zou-0.20.22.dist-info → zou-0.20.23.dist-info}/METADATA

@@ -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.dist-info → zou-0.20.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=33kMxw-d1Q1t68-DRbcXnrr-aan70uNLNZcmAgxFLKc,24
+zou/__init__.py,sha256=x4_zHRUIBHYylJp20ojxmrTuyJId9rcESyxmdsUn08Y,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=MMYfJN0wERVXJ1WcsKFS_WXQTw26YmEUwv0-NzIWefk,18830
+zou/app/blueprints/comments/resources.py,sha256=o_izuBb4Z2yNMpRa1rfS8Shf4PTFP5zuSbw51I-wS8g,19110
 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
@@ -91,13 +91,13 @@ zou/app/blueprints/persons/resources.py,sha256=PfK6epzRn_kbqN6g9qYiH9XWStFlccTVC
 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=sZEFwSExmwXbF92ajWcLQGCl3VDCWdLfPhRyiPro9AE,53642
+zou/app/blueprints/previews/resources.py,sha256=i_BwkcPLKh-ktxckwcesXddgXmA9D6JnSTZjkEnL8uE,53551
 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=HfgLneZBYUMa2OGwIgEZTz8zrIEYFRiYmRbreBPYeYw,4076
-zou/app/blueprints/shots/resources.py,sha256=6YUtyDE-auVwm5DTeD84sB9w2R15KnN9wBY4aIKmz2Q,49936
+zou/app/blueprints/shots/__init__.py,sha256=EcG9qmAchlucqg1M6-RqWGfuKpa5Kq6RgyLZNSsjUr4,4225
+zou/app/blueprints/shots/resources.py,sha256=WOWvYOEVxv3mu1PKTFg6lGoTfM_UQ5n-iJTUFuZKMh8,52162
 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
@@ -163,7 +163,7 @@ zou/app/models/person.py,sha256=txHmSzokaS-tET_MIjGHxhNNS8CPt-GzUPIhp5baDmU,7714
 zou/app/models/playlist.py,sha256=YGgAk84u0_fdIEY02Dal4kfk8APVZvWFwWYV74qvrio,1503
 zou/app/models/preview_background_file.py,sha256=j8LgRmY7INnlB07hFwwB-8ssQrRC8vsb8VcpsTbt6tA,559
 zou/app/models/preview_file.py,sha256=eDPXw0QIdJze_E4kAS8SsyabrefWhIIdwuGmjss7iXo,3282
-zou/app/models/project.py,sha256=m9Rhlfa8K21-xuNJUIadaYGuj5hMnC0yzJcxXcqoCsE,9162
+zou/app/models/project.py,sha256=mXoLK7fEwDRGd21AoQadgV9K0AgoxYwTb5Sdf_cezlY,9203
 zou/app/models/project_status.py,sha256=pExaHH7x4Eu8xOqD3_mRRbMzjT2jJZ8rm-9jo7yUGXA,390
 zou/app/models/schedule_item.py,sha256=coY5uDDuBoctaMICnfCzx4zT5om2E1uu4iq5MDWAPlY,1444
 zou/app/models/search_filter.py,sha256=Q699mJa3GGwFEva93Y_nHiIcx3BDht9VsAe2zeQL0FA,1242
@@ -173,13 +173,13 @@ zou/app/models/software.py,sha256=3y9xEOS8BBxqgTaRrCaSYHaB6uOdJ88uU5i-cACoCSk,51
 zou/app/models/status_automation.py,sha256=95c0lmOetujyGWViLd_qsR4GWPhrmlvi9ZfkC0x1NuM,1391
 zou/app/models/studio.py,sha256=cXnYFh-8m5Kw05QawYcCr59eeLp25NDI0VIb77oqUOs,384
 zou/app/models/subscription.py,sha256=kMfPPe8uFJMDWB4B9MpWaXZD86FFZlj7ty0FkVyqE_4,1054
-zou/app/models/task.py,sha256=kC0ufy82n9Vj5f9r_pbx74szSJMM0LPIlrWIlAnTkD8,3615
+zou/app/models/task.py,sha256=luZNdb30rnRPampD-_oxuhi_rZ8ECXC0v2RwChNKAjo,3667
 zou/app/models/task_status.py,sha256=J7mNWIFd9KMWfUOLHjmuxIupjs59iSh8aQ_9LEFXqH4,1227
 zou/app/models/task_type.py,sha256=IsixVAfz3pyMf0eQw8x-uFNM9OHNkZpsPLEz_VNQ0hA,1005
 zou/app/models/time_spent.py,sha256=n7i3FO9g1eE_zATkItoCgrGVqq3iMSfdlKSveEZPloc,795
 zou/app/models/working_file.py,sha256=q0LM3s1ziw_9AmmPDCkwyf1-TJkWTBMgo2LdHyVRwxg,1509
 zou/app/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zou/app/services/assets_service.py,sha256=Hj1dznCFM86HxAIRIRXEcGwI9lCtYpzurhusVqOVrMc,24139
+zou/app/services/assets_service.py,sha256=l4RiMKLmxiiK8hWC10lAXnH-G_7rXcbAZwOTE16pEr8,24185
 zou/app/services/auth_service.py,sha256=hQpNb21xlr5EiTrXnzpFb4W4GDtglubqA2z_-YIBfnk,22897
 zou/app/services/backup_service.py,sha256=_ZtZp6wkcVYnHxBosziwLGdrTvsUttXGphiydq53iy8,4840
 zou/app/services/base_service.py,sha256=OZd0STFh-DyBBdwsmA7DMMnrwv4C8wJUbShvZ1isndU,1383
@@ -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=JEBywQGSKz1R7uXM8wtQQebMhWQZbGrWmTS5nOyn_Js,52191
-zou/app/services/stats_service.py,sha256=cAlc92i9d6eYtsuwe3hYHYwdytg8KEMi1-TADfysJwM,11733
+zou/app/services/shots_service.py,sha256=UW7QcW2Gi_OsbBuR_96FCjNKnsm3SH2R1AcBRnL9pzo,54803
+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=yysijKuLm2WtkCI6WvfLLYiwoM91TB_N0ZazoxEfco4,69825
 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=fEtG-KtwDJTJK5GMCqcFi2b5e1bGF0lznlwc17Ds3CU,51365
+zou/app/services/user_service.py,sha256=SKW6n3eMRDUJljUE893cYUrg00xyUwUkxLHzQHjIZT0,51362
 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
@@ -225,7 +225,7 @@ zou/app/utils/auth.py,sha256=DZfZSr1Ulge0UK3hfvOWsMo3_d7RVP_llV118u9BtUI,870
 zou/app/utils/cache.py,sha256=MRluTvGG67ybOkyzgD70B6PGKMdRyFdTc0AYy3dEQe8,1210
 zou/app/utils/chats.py,sha256=ORngxQ3IQQF0QcVFJLxJ-RaU4ksQ9-0M8cmPa0pc0Ho,4302
 zou/app/utils/colors.py,sha256=LaGV17NL_8xY0XSp8snGWz5UMwGnm0KPWXyE5BTMG6w,200
-zou/app/utils/commands.py,sha256=ztGq2x5GQJWXDFyHrBV9Cm0cBRWxzEH3zFkPeOD3D0U,27943
+zou/app/utils/commands.py,sha256=7PeiQ9YFeta4onlsho4Cabjt34SUkmy1w3KW0v_gphs,27951
 zou/app/utils/csv_utils.py,sha256=GiI8SeUqmIh9o1JwhZGkQXU_0K0EcPrRHYIZ8bMoYzk,1228
 zou/app/utils/date_helpers.py,sha256=jFxDPCbAasg0I1gsC72AKEbGcx5c4pLqXZkSfZ4wLdQ,4724
 zou/app/utils/dbhelpers.py,sha256=RSJuoxLexGJyME16GQCs-euFLBR0u-XAFdJ1KMSv5M8,1143
@@ -369,6 +369,7 @@ zou/migrations/versions/a66508788c53_add_nb_assets_ready.py,sha256=ph1xtl0uBhGXj
 zou/migrations/versions/a6c25eed3ea1_add_login_failed_attemps_and_last_login_.py,sha256=r2vhaMGmG9xMAcmCBpWujtI3sMebc_XXFuX8_6qybpg,908
 zou/migrations/versions/a7c43f3fbc76_add_duration_column_to_the_preview_file.py,sha256=9GgEM7GXZcCrX0TF8MYM7uSCR5sJJTmCP2hCaCqRP6w,825
 zou/migrations/versions/aa0a60033106_feedback_request.py,sha256=okfgw-Rvyfs1RQDolkx3yQHI9K5tMuks8W7mwvzqw_c,1002
+zou/migrations/versions/addbad59c706_allow_to_manage_drawings_instead_of_.py,sha256=ip3RWFUJ5fqJDu99UoCu0Dk8fRrD7x_K5a7qbaYKCNA,844
 zou/migrations/versions/addbbefa7028_add_departments_link_to_metadata_.py,sha256=XV1r9S5ua7xNYI9UgrTKEkBLsBIGDbfQa2-mMYNIgEo,1359
 zou/migrations/versions/ae0127f2fc56_add_previewfile_width_and_previewfile_.py,sha256=DdbGfFcTTESmWrR77GmrJ75c7nHLbGj0-3ZecdINqKU,945
 zou/migrations/versions/af1790868e2c_.py,sha256=BsoY8uQXFcZDyipc69K4yzaeYz3j0Z6KhUCXQz8zn2s,673
@@ -418,9 +419,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.22.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.22.dist-info/METADATA,sha256=1L4ZsZUKzNQi_t8Bl428WZE7vGkR4AF2gsB_GbffgNE,6673
-zou-0.20.22.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-zou-0.20.22.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.22.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.22.dist-info/RECORD,,
+zou-0.20.23.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.23.dist-info/METADATA,sha256=ogjGsLoBuHL-ZAf11x2IJZGr1SYLisEwb3RuVs12vFI,6673
+zou-0.20.23.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+zou-0.20.23.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.23.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.23.dist-info/RECORD,,

{zou-0.20.22.dist-info → zou-0.20.23.dist-info}/WHEEL

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