zou 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.3"

zou/app/blueprints/crud/playlist.py

@@ -1,10 +1,11 @@
 from flask_jwt_extended import jwt_required
 
 from zou.app.models.playlist import Playlist
-from zou.app.services import user_service, playlists_service
+from zou.app.models.build_job import BuildJob
+from zou.app.services import user_service, playlists_service, persons_service
 
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
-from zou.app.utils import fields
+from zou.app.utils import fields, permissions
 
 
 class PlaylistsResource(BaseModelsResource):
@@ -169,6 +170,7 @@ class PlaylistsResource(BaseModelsResource):
             data["task_type_id"]
         ):
             data["task_type_id"] = None
+        data["created_by"] = persons_service.get_current_user()["id"]
         return data
 
 
@@ -353,12 +355,23 @@ class PlaylistResource(BaseModelResource):
             400:
               description: Integrity error or cannot delete
         """
-        playlists_service.remove_playlist(instance_id)
-        return "", 204
+        return super().delete(instance_id)
+
+    def pre_delete(self, playlist):
+        query = BuildJob.query.filter_by(playlist_id=playlist["id"])
+        for job in query.all():
+            playlists_service.remove_build_job(playlist, job.id)
 
     def check_update_permissions(self, playlist, data):
-        user_service.check_project_access(playlist["project_id"])
-        user_service.block_access_to_vendor()
+        if user_service.has_manager_project_access(playlist["project_id"]):
+            return True
+        elif permissions.has_supervisor_permissions() and (
+            playlist["created_by"]
+            in [None, persons_service.get_current_user()["id"]]
+        ):
+            return True
+        else:
+            raise permissions.PermissionDenied()
 
     def pre_update(self, instance_dict, data):
         if "shots" in data:
@@ -372,3 +385,14 @@ class PlaylistResource(BaseModelResource):
             ]
             data["shots"] = shots
         return data
+
+    def check_delete_permissions(self, playlist):
+        if user_service.has_manager_project_access(playlist["project_id"]):
+            return True
+        elif permissions.has_supervisor_permissions() and (
+            playlist["created_by"]
+            in [None, persons_service.get_current_user()["id"]]
+        ):
+            return True
+        else:
+            raise permissions.PermissionDenied()

zou/app/blueprints/tasks/resources.py

@@ -2681,6 +2681,7 @@ class SetTaskMainPreviewResource(Resource):
         preview_file = preview_files_service.get_last_preview_file_for_task(
             task_id
         )
+        entity = None
         if preview_file is not None:
             entity = entities_service.update_entity_preview(
                 task["entity_id"], preview_file["id"]

zou/app/models/playlist.py

@@ -30,6 +30,12 @@ class Playlist(db.Model, BaseMixin, SerializerMixin):
 
     build_jobs = relationship("BuildJob")
 
+    created_by = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("person.id"),
+        nullable=True,
+    )
+
     __table_args__ = (
         db.UniqueConstraint(
             "name", "project_id", "episode_id", name="playlist_uc"

zou/migrations/versions/a0f668430352_add_created_by_field_to_playlists.py

@@ -0,0 +1,36 @@
+"""add created_by field to playlists
+
+Revision ID: a0f668430352
+Revises: a1b2c3d4e5f6
+Create Date: 2025-12-03 12:10:52.626583
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = 'a0f668430352'
+down_revision = 'a1b2c3d4e5f6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('playlist', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('created_by', sqlalchemy_utils.types.uuid.UUIDType(binary=False), default=uuid.uuid4, nullable=True))
+        batch_op.create_foreign_key(None, 'person', ['created_by'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('playlist', schema=None) as batch_op:
+        batch_op.drop_constraint(None, type_='foreignkey')
+        batch_op.drop_column('created_by')
+
+    # ### end Alembic commands ###

{zou-1.0.1.dist-info → zou-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 1.0.1
+Version: 1.0.3
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -56,16 +56,16 @@ Requires-Dist: OpenTimelineIO-Plugins==0.18.1
 Requires-Dist: orjson==3.11.4
 Requires-Dist: pillow==12.0.0
 Requires-Dist: psutil==7.1.3
-Requires-Dist: psycopg[binary]==3.2.12
+Requires-Dist: psycopg[binary]==3.2.13
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.4
 Requires-Dist: python-nomad==2.1.0
 Requires-Dist: python-slugify==8.0.4
-Requires-Dist: python-socketio==5.14.3
+Requires-Dist: python-socketio==5.15.0
 Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.5
-Requires-Dist: rq==2.6.0
+Requires-Dist: rq==2.6.1
 Requires-Dist: semver==3.0.4
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: spdx-license-list==3.27.0
@@ -88,11 +88,11 @@ Requires-Dist: pytest==9.0.1; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.3; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.45.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.46.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.11.0; extra == "lint"
-Requires-Dist: pre-commit==4.4.0; extra == "lint"
+Requires-Dist: pre-commit==4.5.0; extra == "lint"
 Dynamic: license-file
 Dynamic: requires-python
 

{zou-1.0.1.dist-info → zou-1.0.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=d4QHYmS_30j0hPN8NmNPnQ_Z0TphDRbu4MtQj9cT9e8,22
+zou/__init__.py,sha256=2plzdEEb24FLjE2I2XyBBcJEPYWHccNL4SgtLC_6erg,22
 zou/cli.py,sha256=N9FyrL4TDgIiCUa-I3xIzOgiVLM14kz8_QLQ48y51oE,22767
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
@@ -47,7 +47,7 @@ zou/app/blueprints/crud/organisation.py,sha256=zrLy9Zr8oIvXKTgxd_DNKtC8FNzfEm6hH
 zou/app/blueprints/crud/output_file.py,sha256=UBlI75wHY94ej2xBeSsECHd7ru4la2KsrIn6S2b5P1E,4939
 zou/app/blueprints/crud/output_type.py,sha256=MijUbT4-hyFiM_VEUj5LwRNLW_6DI8zc7UaPKg1kLyg,2789
 zou/app/blueprints/crud/person.py,sha256=3NHEDZGNSUqNIPLMiAeXSV1Tzny5SIuATa3uaqLA8yc,23771
-zou/app/blueprints/crud/playlist.py,sha256=U0WNX3fLfYEavuPjYYJ4LKZ5sep1JCtrP4g4tKVUlI0,12538
+zou/app/blueprints/crud/playlist.py,sha256=JGVGzcfCDmtp_NDs8C5Agl23Qsny0ATGIP5KVHcx4Rk,13505
 zou/app/blueprints/crud/plugin.py,sha256=dPlII76DQv9ucpz7dLiIdt6arYfACmhHtCRDGRTdTQ0,8752
 zou/app/blueprints/crud/preview_background_file.py,sha256=z1BDSmf1gapaZgOWhGNkcmmNsLJLmh69xsRzDvXGU7g,11346
 zou/app/blueprints/crud/preview_file.py,sha256=yyGe45-8PiBIKHUT564NHnmHndaxVk3YJj-cgwPRgHY,13081
@@ -135,7 +135,7 @@ zou/app/blueprints/source/shotgun/tasks.py,sha256=neAgM5ARMjxWUZc0i8DuMt2kll4qS7
 zou/app/blueprints/source/shotgun/team.py,sha256=rZUgE-P7uUi8SJf2LhNS0ZPnu2RXpnIaBWjG3caCcRY,6334
 zou/app/blueprints/source/shotgun/versions.py,sha256=eYghDZtkGK76z6pL_ZwZFHT1eYE9CPLpMB9SwmyD7tM,7775
 zou/app/blueprints/tasks/__init__.py,sha256=udtTZJVViawRAPu8dO_OoyVzQTheLYWTHeTnrC-2RDA,4331
-zou/app/blueprints/tasks/resources.py,sha256=FQL1k-BBvKwxaKjSLKBGF-BQblFATdyXpV3HE8Dg7c0,101255
+zou/app/blueprints/tasks/resources.py,sha256=y4wXvi3y0UJObvfTN6Zk2n64CAu2tqYymbmXYOxgmns,101277
 zou/app/blueprints/user/__init__.py,sha256=H9zCHcVobC6jq6dTToXKAjnZmDA0a9gChHiIP3BcZsc,4586
 zou/app/blueprints/user/resources.py,sha256=7nNkgVsZOCGLwlKCdtnVdkJGoCBjMGawGCFjFo26i1o,123927
 zou/app/file_trees/default.json,sha256=ryUrEmQYE8B_WkzCoQLgmem3N9yNwMIWx9G8p3HfG9o,2310
@@ -171,7 +171,7 @@ zou/app/models/organisation.py,sha256=R69AR1JDZSs6YeXDalmz3ewmrSMDv9Mr8AZAHn09Iu
 zou/app/models/output_file.py,sha256=hyLGrpsgrk0aisDXppRQrB7ItCwyuyw-X0ZwVAHabsA,2569
 zou/app/models/output_type.py,sha256=us_lCUCEvuP4vi_XmmOcEl1J2MtZhMX5ZheBqEFCgWA,381
 zou/app/models/person.py,sha256=GhjiXxOXMPdeDHArTbbZDQt-9LLtJpq_HFF-7WVRlaM,8047
-zou/app/models/playlist.py,sha256=YGgAk84u0_fdIEY02Dal4kfk8APVZvWFwWYV74qvrio,1503
+zou/app/models/playlist.py,sha256=bae19fczYpdBFbYMVPraQZ3XuqeW2_vQFlMuodrHlbo,1629
 zou/app/models/plugin.py,sha256=zNs9Qi1h_v_6edZs5GHRSKItaAG4Gnlk1FQKumiiv68,766
 zou/app/models/preview_background_file.py,sha256=j8LgRmY7INnlB07hFwwB-8ssQrRC8vsb8VcpsTbt6tA,559
 zou/app/models/preview_file.py,sha256=ofN0aTvjc7eYBMj7OjUs3Yhw9_HZGOYB9ftbH3XAVCM,3587
@@ -400,6 +400,7 @@ zou/migrations/versions/9bd17364fc18_.py,sha256=nruaGMczzkWkya_D11QEU3uiU1UVEUIt
 zou/migrations/versions/9d3bb33c6fc6_add_department_keys_to_filter_models.py,sha256=xUd0OIqp0q9l-pC6wCn2tfgCi6maeud6jf1CYGCHnxA,2084
 zou/migrations/versions/9e5b3a9b0cee_add_new_column_metadatadescriptor_data_type_.py,sha256=HT34AjM9yN1IvLrCzx4-YOiocFDnPQ-FJ05icPCBnNo,5517
 zou/migrations/versions/9f8445f9b42c_add_man_days_fields.py,sha256=muFsM2g_m-L5Zss36roTsjCoSDdhu_e4hVQntiNHyiY,828
+zou/migrations/versions/a0f668430352_add_created_by_field_to_playlists.py,sha256=lrAzEPD57OAji4zZmyN42iCTA1sr8-4y-HbXy4nhobg,1070
 zou/migrations/versions/a1b2c3d4e5f6_add_position_to_metadata_descriptor.py,sha256=6WLafF57oAI80tc0qZUzoHJ86poyMXcOTzzuFsLNgEM,728
 zou/migrations/versions/a23682ccc1f1_.py,sha256=dVOUWldUZyLuLc6_HrgKUI5XH5-6Vjwai6Ew9kygkHw,1663
 zou/migrations/versions/a252a094e977_add_descriptions_for_entities_tasks_and_.py,sha256=T6V1n09fUAsZNiCYh0zwi2B6ZtCBPOdXDixqdunDI54,1012
@@ -474,9 +475,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-1.0.1.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-1.0.1.dist-info/METADATA,sha256=dRTFpihE95yrbS6FCbCvz0KMIyByWRZUze7yDdDuBeg,6695
-zou-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-1.0.1.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-1.0.1.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-1.0.1.dist-info/RECORD,,
+zou-1.0.3.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-1.0.3.dist-info/METADATA,sha256=rFFzVXfuB7IqirHHztqP8hMLdzfEHVZ8SbhsMFZuVaY,6695
+zou-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-1.0.3.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-1.0.3.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-1.0.3.dist-info/RECORD,,