zou 0.20.48__tar.gz → 0.20.50__tar.gz

{zou-0.20.48/zou.egg-info → zou-0.20.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.48
+Version: 0.20.50
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -11,7 +11,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Flask
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -19,14 +18,14 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >=3.9, <3.14
+Requires-Python: >=3.10, <3.14
 License-File: LICENSE
 Requires-Dist: babel==2.17.0
-Requires-Dist: click==8.1.8
+Requires-Dist: click==8.2.1
 Requires-Dist: discord.py==2.5.2
 Requires-Dist: email-validator==2.2.0
 Requires-Dist: ffmpeg-python==0.2.0
-Requires-Dist: fido2==1.2.0
+Requires-Dist: fido2==2.0.0
 Requires-Dist: flasgger==0.9.7.1
 Requires-Dist: flask_bcrypt==1.0.1
 Requires-Dist: flask_caching==2.3.1
@@ -35,7 +34,7 @@ Requires-Dist: flask_mail==0.10.0
 Requires-Dist: flask_principal==0.4.0
 Requires-Dist: flask_restful==0.3.10
 Requires-Dist: flask_sqlalchemy==3.1.1
-Requires-Dist: flask-fs2[s3,swift]==0.7.29
+Requires-Dist: flask-fs2[s3,swift]==0.7.30
 Requires-Dist: flask-jwt-extended==4.7.1
 Requires-Dist: flask-migrate==4.1.0
 Requires-Dist: flask-socketio==5.5.1
@@ -50,8 +49,7 @@ Requires-Dist: Jinja2==3.1.6
 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.6; python_version >= "3.10"
+Requires-Dist: numpy==2.2.6
 Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0

{zou-0.20.48 → zou-0.20.50}/setup.cfg

@@ -14,7 +14,6 @@ classifiers =
 	Environment :: Web Environment
 	Framework :: Flask
 	Intended Audience :: Developers
-	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
@@ -28,11 +27,11 @@ zip_safe = False
 packages = find:
 install_requires = 
 	babel==2.17.0
-	click==8.1.8
+	click==8.2.1
 	discord.py==2.5.2
 	email-validator==2.2.0
 	ffmpeg-python==0.2.0
-	fido2==1.2.0
+	fido2==2.0.0
 	flasgger==0.9.7.1
 	flask_bcrypt==1.0.1
 	flask_caching==2.3.1
@@ -41,7 +40,7 @@ install_requires =
 	flask_principal==0.4.0
 	flask_restful==0.3.10
 	flask_sqlalchemy==3.1.1
-	flask-fs2[swift, s3]==0.7.29
+	flask-fs2[swift, s3]==0.7.30
 	flask-jwt-extended==4.7.1
 	flask-migrate==4.1.0
 	flask-socketio==5.5.1
@@ -56,8 +55,7 @@ install_requires =
 	ldap3==2.9.1
 	matterhook==0.2
 	meilisearch==0.34.1
-	numpy==2.0.1; python_version == '3.9'
-	numpy==2.2.6; python_version >= '3.10'
+	numpy==2.2.6
 	opencv-python==4.11.0.86
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0

{zou-0.20.48 → zou-0.20.50}/setup.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-setup(python_requires=">=3.9, <3.14")
+setup(python_requires=">=3.10, <3.14")

zou-0.20.50/zou/__init__.py

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

{zou-0.20.48 → zou-0.20.50}/zou/app/blueprints/crud/preview_file.py

@@ -6,6 +6,7 @@ from sqlalchemy.exc import IntegrityError, StatementError
 from zou.app.models.preview_file import PreviewFile
 from zou.app.models.task import Task
 from zou.app.models.project import Project
+from zou.app.models.project_status import ProjectStatus
 from zou.app.services import (
     user_service,
     tasks_service,
@@ -21,19 +22,22 @@ class PreviewFilesResource(BaseModelsResource):
         BaseModelsResource.__init__(self, PreviewFile)
 
     def add_project_permission_filter(self, query):
-        if permissions.has_vendor_permissions():
-            query = (
-                query.join(Task)
-                .filter(user_service.build_assignee_filter())
-                .filter(user_service.build_open_project_filter())
-            )
-        elif not permissions.has_admin_permissions():
+        if not permissions.has_admin_permissions():
             query = (
                 query.join(Task)
                 .join(Project)
-                .filter(user_service.build_related_projects_filter())
+                .join(
+                    ProjectStatus,
+                    Project.project_status_id == ProjectStatus.id,
+                )
                 .filter(user_service.build_open_project_filter())
             )
+            if permissions.has_vendor_permissions():
+                query = query.filter(user_service.build_assignee_filter())
+            else:
+                query = query.filter(
+                    user_service.build_related_projects_filter()
+                )
 
         return query
 

{zou-0.20.48 → zou-0.20.50}/zou/app/services/deletion_service.py

@@ -313,7 +313,7 @@ def remove_tasks(project_id, task_ids):
     filter is there to facilitate right management.
     """
     task_ids = [task_id for task_id in task_ids if fields.is_valid_id(task_id)]
-    tasks = Task.query.filter(Project.id == project_id).filter(
+    tasks = Task.query.filter(Task.project_id == project_id).filter(
         Task.id.in_(task_ids)
     )
     for task in tasks:

{zou-0.20.48 → zou-0.20.50}/zou/app/services/entities_service.py

@@ -140,6 +140,21 @@ def update_entity_preview(entity_id, preview_file_id):
     return entity.serialize()
 
 
+def get_for_entity_from_task(task):
+    """
+    Return the entity type name for given task. All asset types are returned
+    as "Asset".
+    """
+    entity = get_entity(task["entity_id"])
+    entity_type = get_entity_type(entity["entity_type_id"])
+    for_entity = entity_type["name"]
+    if for_entity.lower() not in [
+        "shot", "sequence", "episode", "edit", "concept"
+    ]:
+        for_entity = "Asset"
+    return for_entity
+
+
 def get_entities_for_project(
     project_id,
     entity_type_id,

{zou-0.20.48 → zou-0.20.50}/zou/app/services/playlists_service.py

@@ -820,9 +820,19 @@ def generate_temp_playlist(task_ids, sort=True):
     persist anything. The goal is to build a temporary playlist used to see
     a quick preview of several shots.
     """
+    if len(task_ids) == 0:
+        return []
+
+    task_id = task_ids[0]
+    task = tasks_service.get_task(task_id)
+    for_entity = entities_service.get_for_entity_from_task(task)
+    task_type_links = projects_service.get_task_type_links(
+        task["project_id"], for_entity
+    )
     entities = []
+
     for task_id in task_ids:
-        entity = generate_playlisted_entity_from_task(task_id)
+        entity = generate_playlisted_entity_from_task(task_id, task_type_links)
         entities.append(entity)
     if len(entities) > 0:
         if not sort:
@@ -846,15 +856,13 @@ def generate_temp_playlist(task_ids, sort=True):
         return []
 
 
-def generate_playlisted_entity_from_task(task_id):
+def generate_playlisted_entity_from_task(task_id, task_type_links):
     """
     Generate the data structure of a playlisted shot for a given task. It
     doesn't persist anything.
     """
     task = tasks_service.get_task(task_id)
-    task = tasks_service.get_task(task_id)
     entity = entities_service.get_entity(task["entity_id"])
-    task = tasks_service.get_task(task_id)
     if shots_service.is_shot(entity):
         playlisted_entity = get_base_shot_for_playlist(entity, task_id)
     elif shots_service.is_sequence(entity):
@@ -866,8 +874,22 @@ def generate_playlisted_entity_from_task(task_id):
 
     task_type_id = task["task_type_id"]
     preview_files = get_preview_files_for_entity(entity["id"])
+
+    preview_file = None
     if task_type_id in preview_files and len(preview_files[task_type_id]) > 0:
         preview_file = preview_files[task_type_id][0]
+
+    if preview_file is None and len(preview_files.keys()) > 0:
+        available_task_types = [
+            link["task_type_id"]
+            for link in task_type_links
+            if link["task_type_id"] in preview_files
+        ]
+        if len(available_task_types) > 0:
+            task_type_id = available_task_types[0]
+            preview_file = preview_files[   task_type_id][0]
+
+    if preview_file is not None:
         playlisted_entity.update(
             {
                 "preview_file_id": preview_file["id"],
@@ -877,7 +899,7 @@ def generate_playlisted_entity_from_task(task_id):
                 "preview_file_duration": preview_file["duration"],
                 "preview_file_revision": preview_file["revision"],
                 "preview_file_status": preview_file["status"],
-                "preview_file_annotations": preview_file["annotations"],
+                "preview_file_annotations": preview_file["annotations"] or [],
                 "preview_file_previews": preview_file["previews"],
             }
         )

{zou-0.20.48 → zou-0.20.50}/zou/app/services/preview_files_service.py

@@ -555,7 +555,7 @@ def get_running_preview_files():
     entries = (
         PreviewFile.query.join(Task)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, ProjectStatus.id == Project.project_status_id)
         .filter(ProjectStatus.name.in_(("Active", "open", "Open")))
         .filter(PreviewFile.status.in_(("broken", "processing")))
         .add_columns(Task.project_id, Task.task_type_id, Task.entity_id)
@@ -668,7 +668,7 @@ def reset_movie_files_metadata():
     preview_files = (
         PreviewFile.query.join(Task)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(ProjectStatus.name.in_(("Active", "open", "Open")))
         .filter(PreviewFile.status.not_in(("broken", "processing")))
         .filter(PreviewFile.extension == "mp4")
@@ -711,7 +711,7 @@ def reset_picture_files_metadata():
     preview_files = (
         PreviewFile.query.join(Task)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(ProjectStatus.name.in_(("Active", "open", "Open")))
         .filter(PreviewFile.status.not_in(("broken", "processing")))
         .filter(PreviewFile.extension == "png")
@@ -765,7 +765,7 @@ def generate_preview_extra(
         PreviewFile.query.join(Task)
         .join(Entity)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(ProjectStatus.name.in_(("Active", "open", "Open")))
         .filter(PreviewFile.status.not_in(("broken", "processing")))
         .filter(PreviewFile.extension.in_(("mp4", "png")))

{zou-0.20.48 → zou-0.20.50}/zou/app/services/projects_service.py

@@ -49,7 +49,9 @@ def open_projects(name=None):
     Return all open projects. Allow to filter projects by name.
     """
     query = (
-        Project.query.join(ProjectStatus)
+        Project.query.join(
+            ProjectStatus, Project.project_status_id == ProjectStatus.id
+        )
         .outerjoin(MetadataDescriptor)
         .filter(ProjectStatus.name.in_(("Active", "open", "Open")))
         .order_by(Project.name)
@@ -163,7 +165,9 @@ def get_projects():
     Return all projects. Allow to filter projects by name.
     """
     query = (
-        Project.query.join(ProjectStatus)
+        Project.query.join(
+            ProjectStatus, Project.project_status_id == ProjectStatus.id
+        )
         .add_columns(ProjectStatus.name)
         .order_by(Project.name)
     )
@@ -696,6 +700,20 @@ def get_task_type_priority_map(project_id, for_entity="Asset"):
     }
 
 
+def get_task_type_links(project_id, for_entity="Asset"):
+    """
+    Return a lisk of links for given project and entity type.
+    """
+    task_type_links = (
+        ProjectTaskTypeLink.query
+        .join(TaskType)
+        .filter(ProjectTaskTypeLink.project_id == project_id)
+        .filter(TaskType.for_entity == for_entity)
+        .order_by(ProjectTaskTypeLink.priority.desc())
+    ).all()
+    return ProjectTaskTypeLink.serialize_list(task_type_links)
+
+
 def get_department_team(project_id, department_id):
     persons = (
         Person.query.join(

{zou-0.20.48 → zou-0.20.50}/zou/app/services/user_service.py

@@ -86,7 +86,9 @@ def build_related_projects_filter():
     is part of the team.
     """
     projects = (
-        Project.query.join(ProjectStatus)
+        Project.query.join(
+            ProjectStatus, Project.project_status_id == ProjectStatus.id
+        )
         .filter(build_team_filter())
         .filter(build_open_project_filter())
         .all()
@@ -105,7 +107,7 @@ def related_projects():
     """
     projects = (
         Project.query.join(Task)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(build_team_filter())
         .filter(build_open_project_filter())
         .all()
@@ -158,7 +160,7 @@ def get_tasks_for_entity(entity_id):
     """
     query = (
         Task.query.join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(Task.entity_id == entity_id)
         .filter(build_assignee_filter())
         .filter(build_open_project_filter())
@@ -175,7 +177,7 @@ def get_task_types_for_entity(entity_id):
     query = (
         TaskType.query.join(Task)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(Task.entity_id == entity_id)
         .filter(build_assignee_filter())
         .filter(build_open_project_filter())
@@ -193,7 +195,7 @@ def get_assets_for_asset_type(project_id, asset_type_id):
         Entity.query.join(EntityType)
         .join(Project)
         .join(Task, Task.entity_id == Entity.id)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(EntityType.id == asset_type_id)
         .filter(Project.id == project_id)
         .filter(build_assignee_filter())
@@ -212,7 +214,7 @@ def get_asset_types_for_project(project_id):
         EntityType.query.join(Entity, Entity.entity_type_id == EntityType.id)
         .join(Task, Task.entity_id == Entity.id)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(Project.id == project_id)
         .filter(build_assignee_filter())
         .filter(build_open_project_filter())
@@ -236,7 +238,7 @@ def get_sequences_for_project(project_id):
         .join(Task, Task.entity_id == Shot.id)
         .join(EntityType, EntityType.id == Entity.entity_type_id)
         .join(Project, Project.id == Entity.project_id)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(Shot.entity_type_id == shot_type["id"])
         .filter(Entity.entity_type_id == sequence_type["id"])
         .filter(Project.id == project_id)
@@ -263,7 +265,7 @@ def get_project_episodes(project_id):
         .join(Shot, Shot.parent_id == Sequence.id)
         .join(Task, Task.entity_id == Shot.id)
         .join(Project, Project.id == Entity.project_id)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .filter(Shot.entity_type_id == shot_type["id"])
         .filter(Sequence.entity_type_id == sequence_type["id"])
         .filter(Entity.entity_type_id == episode_type["id"])
@@ -283,7 +285,7 @@ def get_shots_for_sequence(sequence_id):
     query = (
         Entity.query.join(Task)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .join(EntityType)
         .filter(Entity.entity_type_id == shot_type["id"])
         .filter(Entity.parent_id == sequence_id)
@@ -303,7 +305,7 @@ def get_scenes_for_sequence(sequence_id):
     query = (
         Entity.query.join(Task)
         .join(Project)
-        .join(ProjectStatus)
+        .join(ProjectStatus, Project.project_status_id == ProjectStatus.id)
         .join(EntityType)
         .filter(Entity.entity_type_id == scene_type["id"])
         .filter(Entity.parent_id == sequence_id)
@@ -318,9 +320,9 @@ def get_open_projects(name=None):
     """
     Get all open projects for which current user is part of the team.
     """
-    query = Project.query.join(ProjectStatus).filter(
-        build_open_project_filter()
-    )
+    query = Project.query.join(
+        ProjectStatus, Project.project_status_id == ProjectStatus.id
+    ).filter(build_open_project_filter())
 
     if name is not None:
         query = query.filter(Project.name == name)
@@ -353,7 +355,9 @@ def get_projects(name=None):
     """
     Get all projects for which current user has a task assigned.
     """
-    query = Project.query.join(ProjectStatus).filter(build_team_filter())
+    query = Project.query.join(
+        ProjectStatus, Project.project_status_id == ProjectStatus.id
+    ).filter(build_team_filter())
 
     if name is not None:
         query = query.filter(Project.name == name)

{zou-0.20.48 → zou-0.20.50}/zou/app/utils/fido.py

@@ -1,5 +1,3 @@
-import fido2.features
-
 from fido2.webauthn import (
     PublicKeyCredentialRpEntity,
 )
@@ -8,8 +6,6 @@ from urllib.parse import urlparse
 
 from zou.app import config
 
-fido2.features.webauthn_json_mapping.enabled = True
-
 
 def get_fido_server():
     return Fido2Server(

{zou-0.20.48 → zou-0.20.50}/zou/cli.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
+import warnings
+
+warnings.filterwarnings("ignore")
 import os
 import sys
 import flask_migrate

{zou-0.20.48 → zou-0.20.50}/zou/migrations/alembic.ini

@@ -30,7 +30,7 @@ handlers =
 qualname = sqlalchemy.engine
 
 [logger_alembic]
-level = INFO
+level = WARN
 handlers =
 qualname = alembic
 

{zou-0.20.48 → zou-0.20.50}/zou/plugin_template/migrations/alembic.ini

@@ -30,7 +30,7 @@ handlers =
 qualname = sqlalchemy.engine
 
 [logger_alembic]
-level = INFO
+level = WARN
 handlers =
 qualname = alembic
 

{zou-0.20.48 → zou-0.20.50/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.48
+Version: 0.20.50
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -11,7 +11,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Flask
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -19,14 +18,14 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >=3.9, <3.14
+Requires-Python: >=3.10, <3.14
 License-File: LICENSE
 Requires-Dist: babel==2.17.0
-Requires-Dist: click==8.1.8
+Requires-Dist: click==8.2.1
 Requires-Dist: discord.py==2.5.2
 Requires-Dist: email-validator==2.2.0
 Requires-Dist: ffmpeg-python==0.2.0
-Requires-Dist: fido2==1.2.0
+Requires-Dist: fido2==2.0.0
 Requires-Dist: flasgger==0.9.7.1
 Requires-Dist: flask_bcrypt==1.0.1
 Requires-Dist: flask_caching==2.3.1
@@ -35,7 +34,7 @@ Requires-Dist: flask_mail==0.10.0
 Requires-Dist: flask_principal==0.4.0
 Requires-Dist: flask_restful==0.3.10
 Requires-Dist: flask_sqlalchemy==3.1.1
-Requires-Dist: flask-fs2[s3,swift]==0.7.29
+Requires-Dist: flask-fs2[s3,swift]==0.7.30
 Requires-Dist: flask-jwt-extended==4.7.1
 Requires-Dist: flask-migrate==4.1.0
 Requires-Dist: flask-socketio==5.5.1
@@ -50,8 +49,7 @@ Requires-Dist: Jinja2==3.1.6
 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.6; python_version >= "3.10"
+Requires-Dist: numpy==2.2.6
 Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0

{zou-0.20.48 → zou-0.20.50}/zou.egg-info/requires.txt

@@ -1,9 +1,9 @@
 babel==2.17.0
-click==8.1.8
+click==8.2.1
 discord.py==2.5.2
 email-validator==2.2.0
 ffmpeg-python==0.2.0
-fido2==1.2.0
+fido2==2.0.0
 flasgger==0.9.7.1
 flask_bcrypt==1.0.1
 flask_caching==2.3.1
@@ -12,7 +12,7 @@ flask_mail==0.10.0
 flask_principal==0.4.0
 flask_restful==0.3.10
 flask_sqlalchemy==3.1.1
-flask-fs2[s3,swift]==0.7.29
+flask-fs2[s3,swift]==0.7.30
 flask-jwt-extended==4.7.1
 flask-migrate==4.1.0
 flask-socketio==5.5.1
@@ -27,6 +27,7 @@ Jinja2==3.1.6
 ldap3==2.9.1
 matterhook==0.2
 meilisearch==0.34.1
+numpy==2.2.6
 opencv-python==4.11.0.86
 OpenTimelineIO==0.17.0
 OpenTimelineIO-Plugins==0.17.0
@@ -53,12 +54,6 @@ tomlkit==0.13.2
 ua-parser==1.0.1
 werkzeug==3.1.3
 
-[:python_version == "3.9"]
-numpy==2.0.1
-
-[:python_version >= "3.10"]
-numpy==2.2.6
-
 [dev]
 wheel
 

zou-0.20.48/zou/__init__.py

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