zou 0.20.42__tar.gz → 0.20.44__tar.gz

{zou-0.20.42/zou.egg-info → zou-0.20.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.42
+Version: 0.20.44
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -39,7 +39,7 @@ Requires-Dist: flask-fs2[s3,swift]==0.7.29
 Requires-Dist: flask-jwt-extended==4.7.1
 Requires-Dist: flask-migrate==4.1.0
 Requires-Dist: flask-socketio==5.5.1
-Requires-Dist: flask==3.1.0
+Requires-Dist: flask==3.1.1
 Requires-Dist: gazu==0.10.31
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==25.5.1
@@ -51,14 +51,14 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.34.1
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.2.5; python_version >= "3.10"
+Requires-Dist: numpy==2.2.6; python_version >= "3.10"
 Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
 Requires-Dist: orjson==3.10.18
 Requires-Dist: pillow==11.2.1
 Requires-Dist: psutil==7.0.0
-Requires-Dist: psycopg[binary]==3.2.8
+Requires-Dist: psycopg[binary]==3.2.9
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.2
 Requires-Dist: python-nomad==2.1.0
@@ -72,7 +72,7 @@ Requires-Dist: semver==3.0.4
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: spdx-license-list==3.26.0
 Requires-Dist: sqlalchemy_utils==0.41.2
-Requires-Dist: sqlalchemy==2.0.40
+Requires-Dist: sqlalchemy==2.0.41
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: tomlkit==0.13.2
 Requires-Dist: ua-parser==1.0.1
@@ -90,7 +90,7 @@ Requires-Dist: pytest==8.3.5; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.28.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.29.1; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"

{zou-0.20.42 → zou-0.20.44}/setup.cfg

@@ -45,7 +45,7 @@ install_requires =
 	flask-jwt-extended==4.7.1
 	flask-migrate==4.1.0
 	flask-socketio==5.5.1
-	flask==3.1.0
+	flask==3.1.1
 	gazu==0.10.31
 	gevent-websocket==0.10.1
 	gevent==25.5.1
@@ -57,14 +57,14 @@ install_requires =
 	matterhook==0.2
 	meilisearch==0.34.1
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.2.5; python_version >= '3.10'
+	numpy==2.2.6; python_version >= '3.10'
 	opencv-python==4.11.0.86
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
 	orjson==3.10.18
 	pillow==11.2.1
 	psutil==7.0.0
-	psycopg[binary]==3.2.8
+	psycopg[binary]==3.2.9
 	pyotp==2.9.0
 	pysaml2==7.5.2
 	python-nomad==2.1.0
@@ -78,7 +78,7 @@ install_requires =
 	slackclient==2.9.4
 	spdx-license-list==3.26.0
 	sqlalchemy_utils==0.41.2
-	sqlalchemy==2.0.40
+	sqlalchemy==2.0.41
 	tabulate==0.9.0
 	tomlkit==0.13.2
 	ua-parser==1.0.1
@@ -104,7 +104,7 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.2
 	pygelf==0.4.2
-	sentry-sdk==2.28.0
+	sentry-sdk==2.29.1
 lint = 
 	autoflake==2.3.1
 	black==25.1.0

zou-0.20.44/zou/__init__.py

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

{zou-0.20.42 → zou-0.20.44}/zou/app/blueprints/assets/resources.py

@@ -29,9 +29,6 @@ def check_criterion_access(criterions):
 
 
 class AssetResource(Resource, ArgsMixin):
-    """
-    Retrieve or delete given asset.
-    """
 
     @jwt_required()
     def get(self, asset_id):
@@ -72,7 +69,7 @@ class AssetResource(Resource, ArgsMixin):
             required: True
         responses:
           204:
-            description: Given asset deleted
+            description: Empty response
         """
         force = self.get_force()
 
@@ -87,15 +84,11 @@ class AssetResource(Resource, ArgsMixin):
 
 
 class AllAssetsResource(Resource):
-    """
-    Retrieve all entities that are not shot or sequence.
-    Adds project name and asset type name.
-    """
 
     @jwt_required()
     def get(self):
         """
-        Retrieve all entities that are not shot or sequence.
+        Retrieve all entities that are not shot, sequence, episode, or edit.
         Adds project name and asset type name.
         ---
         tags:
@@ -121,18 +114,15 @@ class AllAssetsAliasResource(AllAssetsResource):
 
 
 class AssetsAndTasksResource(Resource, ArgsMixin):
-    """
-    Retrieve all entities that are not shot or sequence.
-    """
 
     @jwt_required()
     def get(self):
         """
-        Retrieve all entities that are not shot or sequence.
+        Retrieve all entities that are not shot, sequence, episode, or edit.
+        Adds project name and asset type name and all related tasks.
+        If episode_id is given as parameter, it returns assets not linked
+        to an episode and assets linked to given episode.
         ---
-        description: Adds project name and asset type name and all related tasks.
-                     If episode_id is given as parameter, it returns assets not linked
-                     to an episode and assets linked to given episode.
         tags:
           - Assets
         responses:
@@ -153,9 +143,6 @@ class AssetsAndTasksResource(Resource, ArgsMixin):
 
 
 class AssetTypeResource(Resource):
-    """
-    Retrieve given asset type.
-    """
 
     @jwt_required()
     def get(self, asset_type_id):
@@ -179,9 +166,6 @@ class AssetTypeResource(Resource):
 
 
 class AssetTypesResource(Resource):
-    """
-    Retrieve all asset types (entity types that are not shot, sequence or episode).
-    """
 
     @jwt_required()
     def get(self):
@@ -199,9 +183,6 @@ class AssetTypesResource(Resource):
 
 
 class ProjectAssetTypesResource(Resource):
-    """
-    Retrieve all asset types for given project.
-    """
 
     @jwt_required()
     def get(self, project_id):
@@ -226,14 +207,11 @@ class ProjectAssetTypesResource(Resource):
 
 
 class ShotAssetTypesResource(Resource):
-    """
-    Retrieve all asset shots for given shot.
-    """
 
     @jwt_required()
     def get(self, shot_id):
         """
-        Retrieve all asset shots for given shot.
+        Retrieve all asset types of assets casted in given shot.
         ---
         tags:
           - Assets
@@ -246,7 +224,7 @@ class ShotAssetTypesResource(Resource):
             required: True
         responses:
           200:
-            description: All asset shots for given shot
+            description: All asset types of assets casted in given shot
         """
         shot = shots_service.get_shot(shot_id)
         user_service.check_project_access(shot["project_id"])
@@ -254,9 +232,6 @@ class ShotAssetTypesResource(Resource):
 
 
 class ProjectAssetsResource(Resource):
-    """
-    Retrieve all assets for given project.
-    """
 
     @jwt_required()
     def get(self, project_id):
@@ -287,14 +262,11 @@ class ProjectAssetsResource(Resource):
 
 
 class ProjectAssetTypeAssetsResource(Resource):
-    """
-    Retrieve all assets for given project and entity type.
-    """
 
     @jwt_required()
     def get(self, project_id, asset_type_id):
         """
-        Retrieve all assets for given project and entity type.
+        Retrieve all assets for given project and asset type.
         ---
         tags:
             - Assets
@@ -313,7 +285,7 @@ class ProjectAssetTypeAssetsResource(Resource):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: All assets for given project and entity type
+                description: All assets for given project and asset type
         """
         user_service.check_project_access(project_id)
         criterions = query.get_query_criterions_from_request(request)
@@ -327,14 +299,11 @@ class ProjectAssetTypeAssetsResource(Resource):
 
 
 class AssetAssetsResource(Resource):
-    """
-    Retrieve all assets for a given asset.
-    """
 
     @jwt_required()
     def get(self, asset_id):
         """
-        Retrieve all assets for a given asset.
+        Retrieve all assets linked to given asset.
         ---
         tags:
             - Assets
@@ -347,7 +316,7 @@ class AssetAssetsResource(Resource):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: All assets for a given asset
+                description: All assets linked to given asset
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
@@ -356,10 +325,11 @@ class AssetAssetsResource(Resource):
 
 
 class AssetTasksResource(Resource, ArgsMixin):
+
     @jwt_required()
     def get(self, asset_id):
         """
-        Retrieve all tasks related to a given shot.
+        Retrieve all tasks related to given asset.
         ---
         tags:
             - Assets
@@ -372,7 +342,7 @@ class AssetTasksResource(Resource, ArgsMixin):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: All tasks related to given shot
+                description: All tasks related to given asset
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
@@ -382,10 +352,11 @@ class AssetTasksResource(Resource, ArgsMixin):
 
 
 class AssetTaskTypesResource(Resource):
+
     @jwt_required()
     def get(self, asset_id):
         """
-        Retrieve all task types related to a given asset.
+        Retrieve all task types of tasks related to given asset.
         ---
         tags:
             - Assets
@@ -398,7 +369,7 @@ class AssetTaskTypesResource(Resource):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: All task types related to given asset
+                description: All task types of tasks related to given asset
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
@@ -406,14 +377,11 @@ class AssetTaskTypesResource(Resource):
 
 
 class NewAssetResource(Resource, ArgsMixin):
-    """
-    Create new asset resource.
-    """
 
     @jwt_required()
     def post(self, project_id, asset_type_id):
         """
-        Create new asset resource.
+        Create new asset with given parameters.
         ---
         tags:
             - Assets
@@ -503,10 +471,11 @@ class NewAssetResource(Resource, ArgsMixin):
 
 
 class AssetCastingResource(Resource):
+
     @jwt_required()
     def get(self, asset_id):
         """
-        Resource to retrieve the casting of a given asset.
+        Retrieve the casting of a given asset.
         ---
         tags:
             - Assets
@@ -529,7 +498,7 @@ class AssetCastingResource(Resource):
     @jwt_required()
     def put(self, asset_id):
         """
-        Resource to allow the modification of assets linked to a asset.
+        Modify the casting of given asset.
         ---
         tags:
             - Assets
@@ -551,10 +520,11 @@ class AssetCastingResource(Resource):
 
 
 class AssetCastInResource(Resource):
+
     @jwt_required()
     def get(self, asset_id):
         """
-        Resource to retrieve the casting of a given asset.
+        Retrieve the list of shots that cast given asset.
         ---
         tags:
             - Assets
@@ -567,7 +537,7 @@ class AssetCastInResource(Resource):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: Casting of given asset
+                description: List of shots that cast given asset
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
@@ -576,10 +546,11 @@ class AssetCastInResource(Resource):
 
 
 class AssetShotAssetInstancesResource(Resource):
+
     @jwt_required()
     def get(self, asset_id):
         """
-        Retrieve all shot asset instances linked to asset.
+        Retrieve all shot asset instances linked to given asset.
         ---
         tags:
             - Assets
@@ -592,7 +563,7 @@ class AssetShotAssetInstancesResource(Resource):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: All shot asset instances linked to asset
+                description: All shot asset instances linked to given asset
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
@@ -603,7 +574,7 @@ class AssetSceneAssetInstancesResource(Resource):
     @jwt_required()
     def get(self, asset_id):
         """
-        Retrieve all scene asset instances linked to asset.
+        Retrieve all scene asset instances linked to given asset.
         ---
         tags:
             - Assets
@@ -616,7 +587,7 @@ class AssetSceneAssetInstancesResource(Resource):
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
-                description: All scene asset instances linked to asset
+                description: All scene asset instances linked to given asset
         """
         asset = assets_service.get_asset(asset_id)
         user_service.check_project_access(asset["project_id"])
@@ -627,7 +598,7 @@ class AssetAssetInstancesResource(Resource, ArgsMixin):
     @jwt_required()
     def get(self, asset_id):
         """
-        Retrieve all asset instances instantiated inside this asset.
+        Retrieve all asset instances instantiated inside given asset.
         ---
         tags:
             - Assets
@@ -702,9 +673,6 @@ class BaseSetSharedAssetsResource(Resource, ArgsMixin):
 
 
 class SetSharedProjectAssetsResource(BaseSetSharedAssetsResource):
-    """
-    Share or unshare all assets (or a list of assets) for given project.
-    """
 
     @jwt_required()
     def post(self, project_id):
@@ -754,9 +722,6 @@ class SetSharedProjectAssetsResource(BaseSetSharedAssetsResource):
 
 
 class SetSharedProjectAssetTypeAssetsResource(BaseSetSharedAssetsResource):
-    """
-    Share or unshare all assets for given project and asset type.
-    """
 
     @jwt_required()
     def post(self, project_id, asset_type_id):
@@ -794,9 +759,6 @@ class SetSharedProjectAssetTypeAssetsResource(BaseSetSharedAssetsResource):
 
 
 class SetSharedAssetsResource(BaseSetSharedAssetsResource):
-    """
-    Share or unshare all assets (or a list of assets) for given project.
-    """
 
     @jwt_required()
     def post(self):
@@ -868,6 +830,7 @@ class ProjectAssetsSharedUsedResource(Resource):
 
 
 class ProjectEpisodeAssetsSharedUsedResource(Resource):
+
     @jwt_required()
     def get(self, project_id, episode_id):
         """

{zou-0.20.42 → zou-0.20.44}/zou/app/blueprints/projects/resources.py

@@ -1447,6 +1447,13 @@ class ProductionBudgetEntryResource(Resource, ArgsMixin):
                 ("daily_salary", None, False),
                 ("position", None, False),
                 ("seniority", None, False),
+                {
+                    "name": "exceptions",
+                    "required": False,
+                    "default": {},
+                    "type": dict,
+                    "help": "Map of amount exceptions. Key is the date and value is the amount. Example: {'2025-01-01': 1000, '2025-02-01': 2000}",
+                },
             ]
         )
         return budget_service.update_budget_entry(entry_id, data)

{zou-0.20.42 → zou-0.20.44}/zou/app/blueprints/source/csv/task_type_estimations.py

@@ -109,6 +109,9 @@ class TaskTypeEstimationsCsvImportResource(BaseCsvProjectImportResource):
                 * 60
             )
 
+        if row.get("Drawings") not in [None, ""]:
+            new_data["nb_drawings"] = int(row["Drawings"])
+
         if row.get("Start date") not in [None, ""]:
             new_data["start_date"] = date_helpers.get_date_from_string(
                 row["Start date"]

{zou-0.20.42 → zou-0.20.44}/zou/app/models/budget_entry.py

@@ -2,6 +2,7 @@ from sqlalchemy_utils import (
     UUIDType,
     ChoiceType,
 )
+from sqlalchemy.dialects.postgresql import JSONB
 
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
@@ -40,6 +41,7 @@ class BudgetEntry(db.Model, BaseMixin, SerializerMixin):
     daily_salary = db.Column(db.Float, nullable=False)
     position = db.Column(ChoiceType(POSITION_TYPES), default="artist")
     seniority = db.Column(ChoiceType(SENIORITY_TYPES), default="mid")
+    exceptions = db.Column(JSONB)
 
     def __repr__(self):
         return "<BudgetEntry of %s - %d %s %s>" % (
@@ -61,5 +63,6 @@ class BudgetEntry(db.Model, BaseMixin, SerializerMixin):
                 "daily_salary": self.daily_salary,
                 "position": self.position,
                 "seniority": self.seniority,
+                "exceptions": self.exceptions,
             }
         )

{zou-0.20.42 → zou-0.20.44}/zou/app/services/assets_service.py

@@ -534,10 +534,7 @@ def get_or_create_asset_type(name):
     if asset_type is None:
         asset_type = EntityType.create(name=name)
         clear_asset_type_cache()
-
-        events.emit(
-            "asset-type:new", {"name": asset_type.name, "id": asset_type.id}
-        )
+        events.emit("asset-type:new", {"asset_type_id": asset_type.id})
 
     return asset_type.serialize(obj_type="AssetType")
 

{zou-0.20.42 → zou-0.20.44}/zou/app/services/budget_service.py

@@ -156,6 +156,7 @@ def create_budget_entry(
         daily_salary=daily_salary,
         position=position,
         seniority=seniority,
+        exceptions={},
     )
     events.emit(
         "budget-entry:create",
@@ -171,6 +172,7 @@ def update_budget_entry(budget_entry_id, data):
     """
     budget_entry = get_budget_entry_raw(budget_entry_id)
     budget = get_budget_raw(str(budget_entry.budget_id))
+    data = _clean_exceptions(data)
     budget_entry.update(data)
     events.emit(
         "budget-entry:update",
@@ -180,6 +182,19 @@ def update_budget_entry(budget_entry_id, data):
     return budget_entry.serialize()
 
 
+def _clean_exceptions(data):
+    if "exceptions" in data:
+        if data["exceptions"] is None:
+            data["exceptions"] = {}
+        else:
+            data["exceptions"] = {
+                k: int(v)
+                for k, v in data["exceptions"].items()
+                if v is not None and int(v) > 0
+            }
+    return data
+
+
 def delete_budget_entry(budget_entry_id):
     """
     Delete budget entry corresponding to given budget entry ID.

zou-0.20.44/zou/migrations/versions/e7e633bd6fa2_add_exceptions_to_budget_entries.py

@@ -0,0 +1,39 @@
+"""add exceptions to budget entries
+
+Revision ID: e7e633bd6fa2
+Revises: 4aab1f84ad72
+Create Date: 2025-05-12 18:47:21.506153
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "e7e633bd6fa2"
+down_revision = "4aab1f84ad72"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("budget_entry", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "exceptions",
+                postgresql.JSONB(astext_type=sa.Text()),
+                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.alter_column(
+            "difficulty", existing_type=sa.INTEGER(), nullable=True
+        )
+    # ### end Alembic commands ###

{zou-0.20.42 → zou-0.20.44/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.42
+Version: 0.20.44
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -39,7 +39,7 @@ Requires-Dist: flask-fs2[s3,swift]==0.7.29
 Requires-Dist: flask-jwt-extended==4.7.1
 Requires-Dist: flask-migrate==4.1.0
 Requires-Dist: flask-socketio==5.5.1
-Requires-Dist: flask==3.1.0
+Requires-Dist: flask==3.1.1
 Requires-Dist: gazu==0.10.31
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==25.5.1
@@ -51,14 +51,14 @@ Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.34.1
 Requires-Dist: numpy==2.0.1; python_version == "3.9"
-Requires-Dist: numpy==2.2.5; python_version >= "3.10"
+Requires-Dist: numpy==2.2.6; python_version >= "3.10"
 Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
 Requires-Dist: orjson==3.10.18
 Requires-Dist: pillow==11.2.1
 Requires-Dist: psutil==7.0.0
-Requires-Dist: psycopg[binary]==3.2.8
+Requires-Dist: psycopg[binary]==3.2.9
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.2
 Requires-Dist: python-nomad==2.1.0
@@ -72,7 +72,7 @@ Requires-Dist: semver==3.0.4
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: spdx-license-list==3.26.0
 Requires-Dist: sqlalchemy_utils==0.41.2
-Requires-Dist: sqlalchemy==2.0.40
+Requires-Dist: sqlalchemy==2.0.41
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: tomlkit==0.13.2
 Requires-Dist: ua-parser==1.0.1
@@ -90,7 +90,7 @@ Requires-Dist: pytest==8.3.5; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.28.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.29.1; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"

{zou-0.20.42 → zou-0.20.44}/zou.egg-info/SOURCES.txt

@@ -427,6 +427,7 @@ zou/migrations/versions/df9f8a147e80_change_file_size_to_big_integer.py
 zou/migrations/versions/e1ef93f40d3d_.py
 zou/migrations/versions/e29638428dfd_add_schedule_item_table.py
 zou/migrations/versions/e3f6db74cc1e_.py
+zou/migrations/versions/e7e633bd6fa2_add_exceptions_to_budget_entries.py
 zou/migrations/versions/e839d6603c09_add_person_id_to_shot_history.py
 zou/migrations/versions/ee2373fbe3a4_.py
 zou/migrations/versions/f0567e8d0c62_.py