zou 0.19.56__tar.gz → 0.19.57__tar.gz

{zou-0.19.56/zou.egg-info → zou-0.19.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.56
+Version: 0.19.57
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -37,11 +37,11 @@ Requires-Dist: flask_sqlalchemy==3.1.1
 Requires-Dist: flask-fs2[s3,swift]==0.7.27
 Requires-Dist: flask-jwt-extended==4.6.0
 Requires-Dist: flask-migrate==4.0.7
-Requires-Dist: flask-socketio==5.4.0
+Requires-Dist: flask-socketio==5.4.1
 Requires-Dist: flask==3.0.3
 Requires-Dist: gazu==0.10.15
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==24.2.1
+Requires-Dist: gevent==24.10.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -50,7 +50,7 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.31.5
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.1.1; python_version >= "3.10"
+Requires-Dist: numpy==2.1.2; python_version >= "3.10"
 Requires-Dist: opencv-python==4.10.0.84
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
@@ -64,7 +64,7 @@ Requires-Dist: python-nomad==2.0.1
 Requires-Dist: python-slugify==8.0.4
 Requires-Dist: python-socketio==5.11.4
 Requires-Dist: pytz==2024.2
-Requires-Dist: redis==5.1.0
+Requires-Dist: redis==5.1.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: rq==1.16.2
 Requires-Dist: slackclient==2.9.4
@@ -85,11 +85,11 @@ Requires-Dist: pytest==8.3.3; 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.14.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.16.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
-Requires-Dist: black==24.8.0; extra == "lint"
-Requires-Dist: pre-commit==3.8.0; python_version >= "3.9" and extra == "lint"
+Requires-Dist: black==24.10.0; extra == "lint"
+Requires-Dist: pre-commit==4.0.1; extra == "lint"
 
 .. figure:: https://zou.cg-wire.com/kitsu.png
    :alt: Kitsu Logo

{zou-0.19.56 → zou-0.19.57}/setup.cfg

@@ -43,11 +43,11 @@ install_requires =
 	flask-fs2[swift, s3]==0.7.27
 	flask-jwt-extended==4.6.0
 	flask-migrate==4.0.7
-	flask-socketio==5.4.0
+	flask-socketio==5.4.1
 	flask==3.0.3
 	gazu==0.10.15
 	gevent-websocket==0.10.1
-	gevent==24.2.1
+	gevent==24.10.1
 	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
@@ -56,7 +56,7 @@ install_requires =
 	matterhook==0.2
 	meilisearch==0.31.5
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.1.1; python_version >= '3.10'
+	numpy==2.1.2; python_version >= '3.10'
 	opencv-python==4.10.0.84
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
@@ -70,7 +70,7 @@ install_requires =
 	python-slugify==8.0.4
 	python-socketio==5.11.4
 	pytz==2024.2
-	redis==5.1.0
+	redis==5.1.1
 	requests==2.32.3
 	rq==1.16.2
 	slackclient==2.9.4
@@ -99,11 +99,11 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.14.0
+	sentry-sdk==2.16.0
 lint = 
 	autoflake==2.3.1
-	black==24.8.0
-	pre-commit==3.8.0; python_version >= '3.9'
+	black==24.10.0
+	pre-commit==4.0.1
 
 [options.entry_points]
 console_scripts = 

zou-0.19.57/zou/__init__.py

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

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/chats/resources.py

@@ -116,7 +116,9 @@ class ChatMessagesResource(Resource):
 
         chat = chats_service.get_chat(entity_id)
         if person["id"] not in chat["participants"]:
-            raise WrongParameterException("You are not a participant of this chat")
+            raise WrongParameterException(
+                "You are not a participant of this chat"
+            )
 
         return (
             chats_service.create_chat_message(

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/crud/day_off.py

@@ -21,7 +21,9 @@ class DayOffsResource(BaseModelsResource):
         if time_spents_service.get_day_offs_between(
             data["date"], data["end_date"], data["person_id"]
         ):
-            raise WrongParameterException("Day off already exists for this period")
+            raise WrongParameterException(
+                "Day off already exists for this period"
+            )
         return data
 
     def post_creation(self, instance):
@@ -67,5 +69,7 @@ class DayOffResource(BaseModelResource):
             data.get("person_id", instance_dict["person_id"]),
             exclude_id=instance_dict["id"],
         ):
-            raise WrongParameterException("Day off already exists for this period")
+            raise WrongParameterException(
+                "Day off already exists for this period"
+            )
         return data

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/crud/entity_type.py

@@ -7,7 +7,6 @@ from zou.app.services import entities_service, assets_service
 from zou.app.services.exception import WrongParameterException
 
 
-
 class EntityTypesResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, EntityType)
@@ -32,11 +31,9 @@ class EntityTypesResource(BaseModelsResource):
         return instance.serialize(relations=True)
 
     def check_creation_integrity(self, data):
-        entity_type = (
-            EntityType.query
-            .filter(EntityType.name.ilike(data.get("name", "")))
-            .first()
-        )
+        entity_type = EntityType.query.filter(
+            EntityType.name.ilike(data.get("name", ""))
+        ).first()
         if entity_type is not None:
             raise WrongParameterException(
                 "Entity type with this name already exists"

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/crud/project.py

@@ -71,7 +71,9 @@ class ProjectsResource(BaseModelsResource):
                 or data["preview_background_file_id"]
                 not in data["preview_background_files_ids"]
             ):
-                raise WrongParameterException("Invalid preview_background_file_id")
+                raise WrongParameterException(
+                    "Invalid preview_background_file_id"
+                )
         return data
 
     def post_creation(self, project):
@@ -131,7 +133,9 @@ class ProjectResource(BaseModelResource, ArgsMixin):
                 data["preview_background_file_id"]
                 not in preview_background_files_ids
             ):
-                raise WrongParameterException("Invalid preview_background_file_id")
+                raise WrongParameterException(
+                    "Invalid preview_background_file_id"
+                )
 
         return data
 

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/crud/schedule_item.py

@@ -17,7 +17,9 @@ class ScheduleItemsResource(BaseModelsResource):
             object_id=data.get("object_id", None),
         )
         if schedule_item is not None:
-            raise WrongParameterException("A similar schedule item already exists")
+            raise WrongParameterException(
+                "A similar schedule item already exists"
+            )
         return schedule_item
 
 

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/export/csv/playlists.py

@@ -100,7 +100,7 @@ class PlaylistCsvExport(Resource):
 
     def build_row(self, shot):
         entity = entities_service.get_entity(shot["entity_id"])
-        name, _ = names_service.get_full_entity_name(shot["entity_id"])
+        name, _, _ = names_service.get_full_entity_name(shot["entity_id"])
         preview_file = files_service.get_preview_file(shot["preview_file_id"])
         task = tasks_service.get_task(preview_file["task_id"])
         task_type = self.task_type_map[task["task_type_id"]]

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/export/csv/time_spents.py

@@ -72,7 +72,7 @@ class TimeSpentsCsvExport(BaseCsvExport):
             person_last_name,
         ) = time_spent_row
         if entity_type_name == "Shot":
-            entity_name, _ = names_service.get_full_entity_name(entity_id)
+            entity_name, _, _ = names_service.get_full_entity_name(entity_id)
 
         date = ""
         if time_spent.date is not None:

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/previews/resources.py

@@ -65,6 +65,7 @@ ALLOWED_FILE_EXTENSION = [
     "glb",
     "gltf",
     "hip",
+    "kra",
     "ma",
     "mb",
     "mp3",
@@ -73,6 +74,8 @@ ALLOWED_FILE_EXTENSION = [
     "psd",
     "psb",
     "rar",
+    "sai",
+    "sai2",
     "sbbkp",
     "svg",
     "swf",

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/user/__init__.py

@@ -33,6 +33,7 @@ from zou.app.blueprints.user.resources import (
     FilterGroupResource,
     FilterGroupsResource,
     DesktopLoginLogsResource,
+    MarkAllNotificationsAsReadResource,
     NotificationsResource,
     NotificationResource,
     HasTaskSubscribedResource,
@@ -108,6 +109,10 @@ routes = [
         "/actions/user/sequences/<sequence_id>/task-types/<task_type_id>/unsubscribe",
         SequenceUnsubscribeResource,
     ),
+    (
+        "/actions/user/notifications/mark-all-as-read",
+        MarkAllNotificationsAsReadResource,
+    ),
 ]
 
 blueprint = Blueprint("user", "user")

{zou-0.19.56 → zou-0.19.57}/zou/app/blueprints/user/resources.py

@@ -1,4 +1,4 @@
-from flask import abort
+from flask import abort, request
 from flask_restful import Resource
 
 from zou.app.mixin import ArgsMixin
@@ -593,7 +593,6 @@ class FilterResource(Resource, ArgsMixin):
                 ("project_id", None, None),
             ]
         )
-
         data = self.clear_empty_fields(
             data, ignored_fields=["search_filter_group_id"]
         )
@@ -848,13 +847,22 @@ class NotificationsResource(Resource, ArgsMixin):
             task_status_id,
             notification_type,
         ) = self.get_arguments()
+
+        read = None
+        if request.args.get("read", None) is not None:
+            read = self.get_bool_parameter("read")
+        watching = None
+        if request.args.get("watching", None) is not None:
+            watching = self.get_bool_parameter("watching")
+        print("watching", watching)
         notifications = user_service.get_last_notifications(
             before=before,
             task_type_id=task_type_id,
             task_status_id=task_status_id,
             notification_type=notification_type,
+            read=read,
+            watching=watching,
         )
-        user_service.mark_notifications_as_read()
         return notifications
 
     def get_arguments(self):
@@ -867,7 +875,7 @@ class NotificationsResource(Resource, ArgsMixin):
         )
 
 
-class NotificationResource(Resource):
+class NotificationResource(Resource, ArgsMixin):
     """
     Return notification matching given id, only if it's a notification that
     belongs to current user.
@@ -894,6 +902,42 @@ class NotificationResource(Resource):
         """
         return user_service.get_notification(notification_id)
 
+    def put(self, notification_id):
+        """
+        Change notification read status.
+        ---
+        tags:
+        - User
+        parameters:
+          - in: path
+            name: notification_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+        responses:
+            200:
+                description: Notification
+        """
+        data = self.get_args([("read", None, False, bool)])
+        return user_service.update_notification(notification_id, data["read"])
+
+
+class MarkAllNotificationsAsReadResource(Resource):
+
+    def post(self):
+        """
+        Mark all notifications as read for the current user.
+        ---
+        tags:
+        - User
+        responses:
+            200:
+                description: All notifications marked as read
+        """
+        user_service.mark_notifications_as_read()
+        return {"success": True}
+
 
 class HasTaskSubscribedResource(Resource):
     """
@@ -905,7 +949,7 @@ class HasTaskSubscribedResource(Resource):
         Return true if current user has subscribed to given task.
         ---
         tags:
-        - User
+          - User
         parameters:
           - in: path
             name: task_id

{zou-0.19.56 → zou-0.19.57}/zou/app/models/organisation.py

@@ -14,10 +14,13 @@ class Organisation(db.Model, BaseMixin, SerializerMixin):
     has_avatar = db.Column(db.Boolean(), default=False)
     use_original_file_name = db.Column(db.Boolean(), default=False)
     timesheets_locked = db.Column(db.Boolean(), default=False)
+    format_duration_in_hours = db.Column(db.Boolean(), default=False)
     hd_by_default = db.Column(db.Boolean(), default=False)
     chat_token_slack = db.Column(db.String(80), default="")
     chat_webhook_mattermost = db.Column(db.String(80), default="")
     chat_token_discord = db.Column(db.String(80), default="")
+    dark_theme_by_default = db.Column(db.Boolean(), default=False)
+    format_duration_in_hours = db.Column(db.Boolean(), default=False)
 
     def present(self):
         return fields.serialize_dict(
@@ -32,6 +35,8 @@ class Organisation(db.Model, BaseMixin, SerializerMixin):
                 "hd_by_default": self.hd_by_default,
                 "use_original_file_name": self.use_original_file_name,
                 "timesheets_locked": self.timesheets_locked,
+                "dark_theme_by_default": self.dark_theme_by_default,
+                "format_duration_in_hours": self.format_duration_in_hours,
                 "updated_at": self.updated_at,
                 "created_at": self.created_at,
             }

{zou-0.19.56 → zou-0.19.57}/zou/app/models/project.py

@@ -142,6 +142,9 @@ class Project(db.Model, BaseMixin, SerializerMixin):
     is_preview_download_allowed = db.Column(db.Boolean(), default=False)
     is_set_preview_automated = db.Column(db.Boolean(), default=False)
     homepage = db.Column(db.String(80), default="assets")
+    is_publish_default_for_artists = db.Column(db.Boolean(), default=False)
+    hd_bitrate_compression = db.Column(db.Integer, default=28)
+    ld_bitrate_compression = db.Column(db.Integer, default=6)
 
     project_status_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("project_status.id"), index=True

{zou-0.19.56 → zou-0.19.57}/zou/app/models/subscription.py

@@ -22,10 +22,10 @@ class Subscription(db.Model, BaseMixin, SerializerMixin):
 
     entity_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("entity.id"), index=True
-    )
+    )  # Deprecated
     task_type_id = db.Column(
         UUIDType(binary=False), db.ForeignKey("task_type.id"), index=True
-    )
+    )  # Deprecated
 
     __table_args__ = (
         db.UniqueConstraint(

{zou-0.19.56 → zou-0.19.57}/zou/app/models/task.py

@@ -33,6 +33,7 @@ class Task(db.Model, BaseMixin, SerializerMixin):
     description = db.Column(db.Text())
 
     priority = db.Column(db.Integer, default=0)
+    difficulty = db.Column(db.Integer, default=3, nullable=False)
     duration = db.Column(db.Float, default=0)
     estimation = db.Column(db.Float, default=0)
     completion_rate = db.Column(db.Integer, default=0)
@@ -70,6 +71,9 @@ class Task(db.Model, BaseMixin, SerializerMixin):
         db.UniqueConstraint(
             "name", "project_id", "task_type_id", "entity_id", name="task_uc"
         ),
+        db.CheckConstraint(
+            "difficulty > 0 AND difficulty < 6", name="check_difficulty"
+        ),
     )
 
     def assignees_as_string(self):

{zou-0.19.56 → zou-0.19.57}/zou/app/services/assets_service.py

@@ -104,8 +104,8 @@ def get_assets(criterions={}, is_admin=False):
 
     if "is_shared" in criterions:
         if not is_admin:
-            query = (
-                query.join(Project).filter(user_service.build_team_filter())
+            query = query.join(Project).filter(
+                user_service.build_team_filter()
             )
 
     if episode_id is not None:
@@ -127,7 +127,7 @@ def get_assets(criterions={}, is_admin=False):
         result += [a for a in query.all() if a.source_id != episode_id]
     else:
         result = query.all()
-    return EntityType.serialize_list(result, obj_type="Asset")
+    return Entity.serialize_list(result, obj_type="Asset")
 
 
 def get_all_raw_assets():
@@ -202,6 +202,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
         Task.due_date,
         Task.done_date,
         Task.last_comment_date,
+        Task.difficulty,
         assignees_table.columns.person,
     ).order_by(EntityType.name, Entity.name)
 
@@ -281,6 +282,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
         task_due_date,
         task_done_date,
         task_last_comment_date,
+        task_difficulty,
         person_id,
     ) in query_result:
         if asset.source_id is None:
@@ -338,6 +340,7 @@ def get_assets_and_tasks(criterions={}, page=1, with_episode_ids=False):
                     ),
                     "retake_count": task_retake_count,
                     "start_date": fields.serialize_value(task_start_date),
+                    "difficulty": task_difficulty,
                     "task_status_id": str(task_status_id),
                     "task_type_id": str(task_type_id),
                     "assignees": [],
@@ -722,7 +725,7 @@ def set_shared_assets(
     project_id=None,
     asset_type_id=None,
     asset_ids=None,
-    with_events=False
+    with_events=False,
 ):
     """
     Set all assets of a project to is_shared=True or False.

{zou-0.19.56 → zou-0.19.57}/zou/app/services/chats_service.py

@@ -213,7 +213,7 @@ def get_chats_for_person(person_id):
     result = []
     for chat_model, project_id, preview_file_id in chats:
         chat = chat_model.present()
-        chat["entity_name"], _ = names_service.get_full_entity_name(
+        chat["entity_name"], _, _ = names_service.get_full_entity_name(
             chat["object_id"]
         )
         chat["project_id"] = project_id

{zou-0.19.56 → zou-0.19.57}/zou/app/services/emails_service.py

@@ -296,7 +296,7 @@ def get_task_descriptors(person_id, task):
     project = projects_service.get_project(task["project_id"])
     task_type = tasks_service.get_task_type(task["task_type_id"])
     entity = entities_service.get_entity(task["entity_id"])
-    (entity_name, episode_id) = names_service.get_full_entity_name(
+    entity_name, episode_id, _ = names_service.get_full_entity_name(
         entity["id"]
     )
 

{zou-0.19.56 → zou-0.19.57}/zou/app/services/entities_service.py

@@ -242,6 +242,7 @@ def get_entities_and_tasks(criterions={}):
             Task.due_date,
             Task.done_date,
             Task.last_comment_date,
+            Task.difficulty,
             assignees_table.columns.person,
         )
     )
@@ -272,6 +273,7 @@ def get_entities_and_tasks(criterions={}):
         task_due_date,
         task_done_date,
         task_last_comment_date,
+        task_difficulty,
         person_id,
     ) in query.all():
         entity_id = str(entity.id)
@@ -315,6 +317,7 @@ def get_entities_and_tasks(criterions={}):
                         "real_start_date": task_real_start_date,
                         "retake_count": task_retake_count,
                         "start_date": task_start_date,
+                        "difficulty": task_difficulty,
                         "task_status_id": str(task_status_id),
                         "task_type_id": str(task_type_id),
                         "assignees": [],

{zou-0.19.56 → zou-0.19.57}/zou/app/services/names_service.py

@@ -52,7 +52,7 @@ def get_full_entity_name(entity_id):
         asset_type = entities_service.get_entity_type(entity["entity_type_id"])
         episode_id = entity["source_id"]
         name = "%s / %s" % (asset_type["name"], entity["name"])
-    return (name, episode_id)
+    return (name, episode_id, entity["preview_file_id"])
 
 
 def get_preview_file_name(preview_file_id):
@@ -66,7 +66,7 @@ def get_preview_file_name(preview_file_id):
     task = tasks_service.get_task(preview_file["task_id"])
     task_type = tasks_service.get_task_type(task["task_type_id"])
     project = projects_service.get_project(task["project_id"])
-    (entity_name, _) = get_full_entity_name(task["entity_id"])
+    (entity_name, _, _) = get_full_entity_name(task["entity_id"])
 
     if (
         organisation["use_original_file_name"]

{zou-0.19.56 → zou-0.19.57}/zou/app/services/news_service.py

@@ -185,7 +185,7 @@ def get_last_news_for_project(
         preview_file_annotations,
         entity_preview_file_id,
     ) in news_list:
-        (full_entity_name, episode_id) = names_service.get_full_entity_name(
+        full_entity_name, episode_id, _ = names_service.get_full_entity_name(
             task_entity_id
         )
 

{zou-0.19.56 → zou-0.19.57}/zou/app/services/preview_files_service.py

@@ -561,7 +561,7 @@ def get_running_preview_files():
         result = preview_file.serialize()
         result["project_id"] = fields.serialize_value(project_id)
         result["task_type_id"] = fields.serialize_value(task_type_id)
-        (result["full_entity_name"], _) = names_service.get_full_entity_name(
+        result["full_entity_name"], _, _ = names_service.get_full_entity_name(
             entity_id
         )
         results.append(result)

{zou-0.19.56 → zou-0.19.57}/zou/app/services/shots_service.py

@@ -254,6 +254,7 @@ def get_shots_and_tasks(criterions={}):
             Task.done_date,
             Task.last_comment_date,
             Task.nb_assets_ready,
+            Task.difficulty,
             assignees_table.columns.person,
             Project.id,
             Project.name,
@@ -304,6 +305,7 @@ def get_shots_and_tasks(criterions={}):
         task_done_date,
         task_last_comment_date,
         task_nb_assets_ready,
+        task_difficulty,
         person_id,
         project_id,
         project_name,
@@ -367,6 +369,7 @@ def get_shots_and_tasks(criterions={}):
                         "real_start_date": task_real_start_date,
                         "retake_count": task_retake_count,
                         "start_date": task_start_date,
+                        "difficulty": task_difficulty,
                         "task_status_id": task_status_id,
                         "task_type_id": task_type_id,
                         "assignees": [],
@@ -1478,7 +1481,7 @@ def get_weighted_quota_shots_between(
     for entity, task_duration, duration in query_shots:
         shot = entity.serialize()
         if shot["id"] not in already_listed:
-            full_name, _ = names_service.get_full_entity_name(shot["id"])
+            full_name, _, _ = names_service.get_full_entity_name(shot["id"])
             shot["full_name"] = full_name
             shot["weight"] = round(duration / task_duration, 2) or 0
             shots.append(shot)
@@ -1525,7 +1528,7 @@ def get_weighted_quota_shots_between(
             business_days = (
                 date_helpers.get_business_days(task_start, task_end) + 1
             )
-            full_name, _ = names_service.get_full_entity_name(shot["id"])
+            full_name, _, _ = names_service.get_full_entity_name(shot["id"])
             shot["full_name"] = full_name
             multiplicator = 1
             if task_start >= start and task_end <= end:
@@ -1583,7 +1586,7 @@ def get_raw_quota_shots_between(
 
     for entity in query_shots:
         shot = entity.serialize()
-        full_name, _ = names_service.get_full_entity_name(shot["id"])
+        full_name, _, _ = names_service.get_full_entity_name(shot["id"])
         shot["full_name"] = full_name
         shot["weight"] = 1
         shots.append(shot)