zou 0.19.67__tar.gz → 0.19.69__tar.gz

{zou-0.19.67/zou.egg-info → zou-0.19.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.67
+Version: 0.19.69
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -27,7 +27,7 @@ Requires-Dist: click==8.1.7
 Requires-Dist: discord.py==2.4.0
 Requires-Dist: email-validator==2.2.0
 Requires-Dist: ffmpeg-python==0.2.0
-Requires-Dist: fido2==1.1.3
+Requires-Dist: fido2==1.2.0
 Requires-Dist: flasgger==0.9.7.1
 Requires-Dist: flask_bcrypt==1.0.1
 Requires-Dist: flask_caching==2.3.0
@@ -41,7 +41,7 @@ Requires-Dist: flask-jwt-extended==4.7.1
 Requires-Dist: flask-migrate==4.0.7
 Requires-Dist: flask-socketio==5.4.1
 Requires-Dist: flask==3.1.0
-Requires-Dist: gazu==0.10.19
+Requires-Dist: gazu==0.10.20
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
@@ -50,13 +50,13 @@ Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: Jinja2==3.1.4
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
-Requires-Dist: meilisearch==0.31.6
+Requires-Dist: meilisearch==0.32.0
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
 Requires-Dist: numpy==2.1.3; 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
-Requires-Dist: orjson==3.10.11
+Requires-Dist: orjson==3.10.12
 Requires-Dist: pillow==11.0.0
 Requires-Dist: psutil==6.1.0
 Requires-Dist: psycopg[binary]==3.2.3
@@ -72,7 +72,7 @@ Requires-Dist: rq==2.0.0
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: sqlalchemy_utils==0.41.2
 Requires-Dist: sqlalchemy==2.0.36
-Requires-Dist: ua-parser==0.18.0
+Requires-Dist: ua-parser==1.0.0
 Requires-Dist: werkzeug==3.1.3
 Provides-Extra: prod
 Requires-Dist: gunicorn; extra == "prod"
@@ -87,7 +87,7 @@ 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.18.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.19.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"

{zou-0.19.67 → zou-0.19.69}/setup.cfg

@@ -33,7 +33,7 @@ install_requires =
 	discord.py==2.4.0
 	email-validator==2.2.0
 	ffmpeg-python==0.2.0
-	fido2==1.1.3
+	fido2==1.2.0
 	flasgger==0.9.7.1
 	flask_bcrypt==1.0.1
 	flask_caching==2.3.0
@@ -47,7 +47,7 @@ install_requires =
 	flask-migrate==4.0.7
 	flask-socketio==5.4.1
 	flask==3.1.0
-	gazu==0.10.19
+	gazu==0.10.20
 	gevent-websocket==0.10.1
 	gevent==24.11.1
 	gunicorn==23.0.0
@@ -56,13 +56,13 @@ install_requires =
 	Jinja2==3.1.4
 	ldap3==2.9.1
 	matterhook==0.2
-	meilisearch==0.31.6
+	meilisearch==0.32.0
 	numpy==2.0.1; python_version == '3.9'
 	numpy==2.1.3; python_version >= '3.10'
 	opencv-python==4.10.0.84
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.11
+	orjson==3.10.12
 	pillow==11.0.0
 	psutil==6.1.0
 	psycopg[binary]==3.2.3
@@ -78,7 +78,7 @@ install_requires =
 	slackclient==2.9.4
 	sqlalchemy_utils==0.41.2
 	sqlalchemy==2.0.36
-	ua-parser==0.18.0
+	ua-parser==1.0.0
 	werkzeug==3.1.3
 
 [options.package_data]
@@ -101,7 +101,7 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.18.0
+	sentry-sdk==2.19.0
 lint = 
 	autoflake==2.3.1
 	black==24.10.0

zou-0.19.69/zou/__init__.py

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

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/auth/resources.py

@@ -1362,8 +1362,22 @@ class SAMLSSOResource(Resource, ArgsMixin):
         authn_response.get_identity()
         email = authn_response.get_subject().text
         person_info = {
-            k: v if not isinstance(v, list) else " ".join(v)
+            k: (
+                " ".join(v)
+                if isinstance(v, list) and k in ["first_name", "last_name"]
+                else v
+            )
             for k, v in authn_response.ava.items()
+            if k
+            in [
+                "first_name",
+                "last_name",
+                "phone",
+                "role",
+                "departments",
+                "studio_id",
+                "active",
+            ]
         }
         try:
             user = persons_service.get_person_by_email(email)

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/comments/resources.py

@@ -435,8 +435,8 @@ class CommentManyTasksResource(Resource):
         allowed_comments = []
         for comment in comments:
             try:
-                task = tasks_service.get_task_with_relations(
-                    comment["object_id"],
+                task = tasks_service.get_task(
+                    comment["object_id"], relations=True
                 )
                 if (
                     person["role"] == "supervisor"

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/crud/base.py

@@ -13,7 +13,6 @@ from zou.app.mixin import ArgsMixin
 from zou.app.utils import events, fields, permissions, query
 from zou.app.services.exception import (
     WrongParameterException,
-    WrongParameterException,
 )
 
 
@@ -259,14 +258,6 @@ class BaseModelsResource(Resource, ArgsMixin):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except WrongParameterException as exception:
-            current_app.logger.error(str(exception), exc_info=1)
-            return (
-                exception.dict
-                if exception.dict is not None
-                else {"message": str(exception)}
-            ), 400
-
     def emit_create_event(self, instance_dict):
         return events.emit(
             "%s:new" % self.model.__tablename__.replace("_", "-"),
@@ -290,6 +281,10 @@ class BaseModelResource(Resource, ArgsMixin):
             abort(404)
         return instance
 
+    def get_serialized_instance(self, instance_id, relations=True):
+        instance = self.get_model_or_404(instance_id)
+        return self.serialize_instance(instance, relations=relations)
+
     def check_read_permissions(self, instance_dict):
         return permissions.check_admin_permissions()
 
@@ -338,8 +333,9 @@ class BaseModelResource(Resource, ArgsMixin):
         """
         relations = self.get_bool_parameter("relations", "true")
         try:
-            instance = self.get_model_or_404(instance_id)
-            result = self.serialize_instance(instance, relations=relations)
+            result = self.get_serialized_instance(
+                instance_id, relations=relations
+            )
             self.check_read_permissions(result)
             result = self.clean_get_result(result)
 
@@ -430,14 +426,6 @@ class BaseModelResource(Resource, ArgsMixin):
             current_app.logger.error(str(exception), exc_info=1)
             return {"message": str(exception)}, 400
 
-        except WrongParameterException as exception:
-            current_app.logger.error(str(exception), exc_info=1)
-            return (
-                exception.dict
-                if exception.dict is not None
-                else {"message": str(exception)}
-            ), 400
-
     @jwt_required()
     def delete(self, instance_id):
         """

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/crud/comments.py

@@ -1,7 +1,5 @@
 from flask_jwt_extended import jwt_required
-from flask import current_app
 
-from sqlalchemy.exc import StatementError
 
 from zou.app.models.comment import Comment
 from zou.app.models.attachment_file import AttachmentFile
@@ -19,10 +17,6 @@ from zou.app.utils import events, permissions
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
-from zou.app.services.exception import (
-    CommentNotFoundException,
-)
-
 
 class CommentsResource(BaseModelsResource):
     def __init__(self):
@@ -47,25 +41,8 @@ class CommentResource(BaseModelResource):
         BaseModelResource.__init__(self, Comment)
         self.protected_fields += ["mentions", "department_mentions"]
 
-    @jwt_required()
-    def get(self, instance_id):
-        """
-        Retrieve a model corresponding at given ID and return it as a JSON
-        object.
-        """
-        try:
-            instance = tasks_service.get_comment_with_relations(instance_id)
-            self.check_read_permissions(instance)
-            result = self.clean_get_result(instance)
-
-        except StatementError as exception:
-            current_app.logger.error(str(exception), exc_info=1)
-            return {"message": str(exception)}, 400
-
-        except ValueError:
-            raise CommentNotFoundException
-
-        return result, 200
+    def get_serialized_instance(self, instance_id, relations=True):
+        return tasks_service.get_comment(instance_id, relations=relations)
 
     def clean_get_result(self, result):
         if permissions.has_client_permissions():
@@ -123,8 +100,8 @@ class CommentResource(BaseModelResource):
                 instance["object_id"], relations=True
             )
             task_type = tasks_service.get_task_type(task["task_type_id"])
-            project = projects_service.get_project_with_relations(
-                task["project_id"]
+            project = projects_service.get_project(
+                task["project_id"], relations=True
             )
             current_user = persons_service.get_current_user(relations=True)
             if current_user["id"] not in project["team"]:

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/crud/person.py

@@ -97,6 +97,8 @@ class PersonsResource(BaseModelsResource):
                     raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
+            except WrongParameterException:
+                raise
             except:
                 raise WrongParameterException("Expiration date is not valid.")
         return data
@@ -178,6 +180,8 @@ class PersonResource(BaseModelResource, ArgsMixin):
                     raise WrongParameterException(
                         "Expiration date can't be in the past."
                     )
+            except WrongParameterException:
+                raise
             except:
                 raise WrongParameterException("Expiration date is not valid.")
         return data

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/crud/task.py

@@ -116,7 +116,10 @@ class TasksResource(BaseModelsResource, ArgsMixin):
             instance.save()
             self.emit_create_event(instance.serialize())
 
-            return tasks_service.get_task_with_relations(str(instance.id)), 201
+            return (
+                tasks_service.get_task(str(instance.id), relations=True),
+                201,
+            )
 
         except TypeError as exception:
             current_app.logger.error(str(exception), exc_info=1)

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/persons/resources.py

@@ -30,7 +30,6 @@ from zou.app.services.exception import (
     UnactiveUserException,
     TwoFactorAuthenticationNotEnabledException,
     PersonInProtectedAccounts,
-    WrongParameterException,
 )
 from zou.app.services.auth_service import (
     disable_two_factor_authentication_for_person,

{zou-0.19.67 → zou-0.19.69}/zou/app/blueprints/shots/resources.py

@@ -20,7 +20,6 @@ from zou.app.mixin import ArgsMixin
 from zou.app.utils import fields, query, permissions
 from zou.app.services.exception import (
     WrongParameterException,
-    WrongParameterException,
 )
 
 

{zou-0.19.67 → zou-0.19.69}/zou/app/config.py

@@ -158,6 +158,7 @@ CRISP_TOKEN = os.getenv("CRISP_TOKEN", "")
 IS_SELF_HOSTED = envtobool("IS_SELF_HOSTED", True)
 
 DEFAULT_TIMEZONE = os.getenv("DEFAULT_TIMEZONE", "Europe/Paris")
+DEFAULT_LOCALE = os.getenv("DEFAULT_LOCALE", "en_US")
 
 USER_LIMIT = int(os.getenv("USER_LIMIT", "100"))
 MIN_PASSWORD_LENGTH = int(os.getenv("MIN_PASSWORD_LENGTH", 8))

{zou-0.19.67 → zou-0.19.69}/zou/app/models/person.py

@@ -94,7 +94,7 @@ class Person(db.Model, BaseMixin, SerializerMixin):
         TimezoneType(backend="pytz"),
         default=pytz_timezone(config.DEFAULT_TIMEZONE),
     )
-    locale = db.Column(LocaleType, default=Locale("en", "US"))
+    locale = db.Column(LocaleType, default=Locale(config.DEFAULT_LOCALE))
     data = db.Column(JSONB)
     role = db.Column(ChoiceType(ROLE_TYPES), default="user", nullable=False)
     has_avatar = db.Column(db.Boolean(), default=False)

{zou-0.19.67 → zou-0.19.69}/zou/app/services/assets_service.py

@@ -40,7 +40,7 @@ from zou.app.services.exception import (
 
 def clear_asset_cache(asset_id):
     cache.cache.delete_memoized(get_asset, asset_id)
-    cache.cache.delete_memoized(get_asset_with_relations, asset_id)
+    cache.cache.delete_memoized(get_asset, asset_id, True)
     cache.cache.delete_memoized(get_full_asset, asset_id)
 
 
@@ -416,19 +416,13 @@ def get_asset_raw(entity_id):
 
 
 @cache.memoize_function(120)
-def get_asset(entity_id):
+def get_asset(entity_id, relations=False):
     """
     Return a given asset as a dict.
     """
-    return get_asset_raw(entity_id).serialize(obj_type="Asset")
-
-
-@cache.memoize_function(120)
-def get_asset_with_relations(entity_id):
-    """
-    Return a given asset as a dict.
-    """
-    return get_asset_raw(entity_id).serialize(obj_type="Asset", relations=True)
+    return get_asset_raw(entity_id).serialize(
+        obj_type="Asset", relations=relations
+    )
 
 
 def get_asset_by_shotgun_id(shotgun_id):
@@ -458,7 +452,7 @@ def get_full_asset(asset_id):
     """
     assets = get_assets_and_tasks({"id": asset_id}, with_episode_ids=True)
     if len(assets) > 0:
-        asset = get_asset_with_relations(asset_id)
+        asset = get_asset(asset_id, relations=True)
         asset_type_id = asset["entity_type_id"]
         asset_type = get_asset_type(asset_type_id)
         project = Project.get(asset["project_id"])

{zou-0.19.67 → zou-0.19.69}/zou/app/services/breakdown_service.py

@@ -414,7 +414,7 @@ def _create_episode_casting_link(entity, asset_id, nb_occurences=1, label=""):
                 link = EntityLink.create(
                     entity_in_id=sequence["parent_id"],
                     entity_out_id=asset_id,
-                    nb_occurences=1,
+                    nb_occurences=nb_occurences,
                     label=label,
                 )
                 events.emit(

{zou-0.19.67 → zou-0.19.69}/zou/app/services/comments_service.py

@@ -82,7 +82,7 @@ def create_comment(
     """
     Create a new comment and related: news, notifications and events.
     """
-    task = tasks_service.get_task_with_relations(task_id)
+    task = tasks_service.get_task(task_id, relations=True)
     task_status = tasks_service.get_task_status(task_status_id)
     author = _get_comment_author(person_id)
     _check_retake_capping(task_status, task)

{zou-0.19.67 → zou-0.19.69}/zou/app/services/concepts_service.py

@@ -33,7 +33,7 @@ from zou.app.services.exception import (
 
 def clear_concept_cache(concept_id):
     cache.cache.delete_memoized(get_concept, concept_id)
-    cache.cache.delete_memoized(get_concept_with_relations, concept_id)
+    cache.cache.delete_memoized(get_concept, concept_id, True)
     cache.cache.delete_memoized(get_full_concept, concept_id)
 
 
@@ -61,23 +61,15 @@ def get_concept_raw(concept_id):
 
 
 @cache.memoize_function(120)
-def get_concept_with_relations(concept_id):
+def get_concept(concept_id, relations=False):
     """
     Return given concept as a dictionary.
     """
     return get_concept_raw(concept_id).serialize(
-        obj_type="Concept", relations=True
+        obj_type="Concept", relations=relations
     )
 
 
-@cache.memoize_function(120)
-def get_concept(concept_id):
-    """
-    Return given concept as a dictionary.
-    """
-    return get_concept_raw(concept_id).serialize(obj_type="Concept")
-
-
 @cache.memoize_function(120)
 def get_full_concept(concept_id):
     """
@@ -86,7 +78,7 @@ def get_full_concept(concept_id):
     concepts = get_concepts_and_tasks({"id": concept_id})
     if len(concepts) > 0:
         concept = concepts[0]
-        concept.update(get_concept_with_relations(concept_id))
+        concept.update(get_concept(concept_id, relations=True))
         return concept
     else:
         raise ConceptNotFoundException

{zou-0.19.67 → zou-0.19.69}/zou/app/services/edits_service.py

@@ -33,7 +33,7 @@ from zou.app.services.exception import (
 
 def clear_edit_cache(edit_id):
     cache.cache.delete_memoized(get_edit, edit_id)
-    cache.cache.delete_memoized(get_edit_with_relations, edit_id)
+    cache.cache.delete_memoized(get_edit, edit_id, True)
     cache.cache.delete_memoized(get_full_edit, edit_id)
 
 
@@ -241,19 +241,13 @@ def get_edit_raw(edit_id):
 
 
 @cache.memoize_function(120)
-def get_edit(edit_id):
+def get_edit(edit_id, relations=False):
     """
     Return given edit as a dictionary.
     """
-    return get_edit_raw(edit_id).serialize(obj_type="Edit")
-
-
-@cache.memoize_function(120)
-def get_edit_with_relations(edit_id):
-    """
-    Return given edit as a dictionary.
-    """
-    return get_edit_raw(edit_id).serialize(obj_type="Edit", relations=True)
+    return get_edit_raw(edit_id).serialize(
+        obj_type="Edit", relations=relations
+    )
 
 
 @cache.memoize_function(120)

{zou-0.19.67 → zou-0.19.69}/zou/app/services/persons_service.py

@@ -230,6 +230,8 @@ def create_person(
                 raise WrongParameterException(
                     "Expiration date can't be in the past."
                 )
+        except WrongParameterException:
+            raise
         except:
             raise WrongParameterException("Expiration date is not valid.")
 
@@ -310,6 +312,8 @@ def update_person(person_id, data, bypass_protected_accounts=False):
                 raise WrongParameterException(
                     "Expiration date can't be in the past."
                 )
+        except WrongParameterException:
+            raise
         except:
             raise WrongParameterException("Expiration date is not valid.")
 

{zou-0.19.67 → zou-0.19.69}/zou/app/services/preview_files_service.py

@@ -89,7 +89,7 @@ def _is_valid_partial_resolution(resolution):
     return resolution is not None and bool(re.match(r"x\d{3,4}", resolution))
 
 
-def get_preview_file_fps(project):
+def get_preview_file_fps(project, entity=None):
     """
     Return fps set at project level or default fps if the dimensions are not
     set.
@@ -97,6 +97,12 @@ def get_preview_file_fps(project):
     fps = "25.00"
     if project.get("fps", None) is not None:
         fps = project["fps"].replace(",", ".")
+
+    if entity is not None:
+        entity_data = entity.get("data", {}) or {}
+        if entity_data.get("fps", None) is not None:
+            fps = entity_data["fps"].replace(",", ".")
+
     return "%.3f" % float(fps)
 
 
@@ -193,7 +199,7 @@ def prepare_and_store_movie(
                 preview_file = set_preview_file_as_broken(preview_file_id)
                 return preview_file
 
-        fps = get_preview_file_fps(project)
+        fps = get_preview_file_fps(project, entity)
         (width, height) = get_preview_file_dimensions(project, entity)
 
         if normalize:
@@ -619,7 +625,9 @@ def extract_frame_from_preview_file(preview_file, frame_number):
     else:
         raise PreviewFileNotFoundException
 
-    fps = get_preview_file_fps(project)
+    fps = get_preview_file_fps(
+        project, get_entity_from_preview_file(preview_file["id"])
+    )
     extracted_frame_path = movie.extract_frame_from_movie(
         preview_file_path, frame_number, fps
     )
@@ -650,7 +658,7 @@ def extract_tile_from_preview_file(preview_file):
         extracted_tile_path = movie.generate_tile(preview_file_path)
         return extracted_tile_path
     else:
-        return WrongParameterException("Preview file is not a movie")
+        raise WrongParameterException("Preview file is not a movie")
 
 
 def reset_movie_files_metadata():

{zou-0.19.67 → zou-0.19.69}/zou/app/services/projects_service.py

@@ -38,7 +38,7 @@ from sqlalchemy import or_
 
 def clear_project_cache(project_id):
     cache.cache.delete_memoized(get_project, project_id)
-    cache.cache.delete_memoized(get_project_with_relations, project_id)
+    cache.cache.delete_memoized(get_project, project_id, True)
     cache.cache.delete_memoized(get_project_by_name)
     cache.cache.delete_memoized(open_projects)
 
@@ -259,21 +259,12 @@ def get_project_raw(project_id):
 
 
 @cache.memoize_function(240)
-def get_project(project_id):
+def get_project(project_id, relations=False):
     """
     Get project matching given id, as a dict. Raises an exception if project is
     not found.
     """
-    return get_project_raw(project_id).serialize()
-
-
-@cache.memoize_function(240)
-def get_project_with_relations(project_id):
-    """
-    Get project matching given id, as a dict. Raises an exception if project is
-    not found.
-    """
-    return get_project_raw(project_id).serialize(relations=True)
+    return get_project_raw(project_id).serialize(relations=relations)
 
 
 @cache.memoize_function(120)
@@ -487,7 +478,7 @@ def add_metadata_descriptor(
             field_name=slugify.slugify(name, separator="_"),
         )
     except Exception:
-        raise WrongParameterException
+        raise WrongParameterException("Metadata descriptor already exists.")
     events.emit(
         "metadata-descriptor:new",
         {"metadata_descriptor_id": str(descriptor.id)},

{zou-0.19.67 → zou-0.19.69}/zou/app/services/shots_service.py

@@ -50,7 +50,7 @@ from zou.app.services.exception import (
 
 def clear_shot_cache(shot_id):
     cache.cache.delete_memoized(get_shot, shot_id)
-    cache.cache.delete_memoized(get_shot_with_relations, shot_id)
+    cache.cache.delete_memoized(get_shot, shot_id, True)
     cache.cache.delete_memoized(get_full_shot, shot_id)
 
 
@@ -402,19 +402,13 @@ def get_shot_raw(shot_id):
 
 
 @cache.memoize_function(120)
-def get_shot(shot_id):
+def get_shot(shot_id, relations=False):
     """
     Return given shot as a dictionary.
     """
-    return get_shot_raw(shot_id).serialize(obj_type="Shot")
-
-
-@cache.memoize_function(120)
-def get_shot_with_relations(shot_id):
-    """
-    Return given shot as a dictionary.
-    """
-    return get_shot_raw(shot_id).serialize(obj_type="Shot", relations=True)
+    return get_shot_raw(shot_id).serialize(
+        obj_type="Shot", relations=relations
+    )
 
 
 @cache.memoize_function(120)
@@ -426,7 +420,7 @@ def get_full_shot(shot_id):
     shots = get_shots_and_tasks({"id": shot_id})
     if len(shots) > 0:
         shot = shots[0]
-        shot.update(get_shot_with_relations(shot_id))
+        shot.update(get_shot(shot_id, relations=True))
         return shot
     else:
         raise ShotNotFoundException