zou 0.19.42__tar.gz → 0.19.44__tar.gz

{zou-0.19.42/zou.egg-info → zou-0.19.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.42
+Version: 0.19.44
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -23,7 +23,7 @@ Requires-Python: >=3.8.1, <3.13
 License-File: LICENSE
 Requires-Dist: babel==2.15.0
 Requires-Dist: click==8.1.7
-Requires-Dist: discord.py==2.3.2
+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
@@ -53,7 +53,7 @@ Requires-Dist: meilisearch==0.31.3
 Requires-Dist: numpy==1.24.4; python_version == "3.8"
 Requires-Dist: numpy==2.0.0; python_version >= "3.9"
 Requires-Dist: opencv-python==4.10.0.84
-Requires-Dist: OpenTimelineIO==0.16.0
+Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: orjson==3.10.5
 Requires-Dist: pillow==10.3.0
 Requires-Dist: psutil==6.0.0
@@ -63,7 +63,7 @@ Requires-Dist: python-nomad==2.0.1
 Requires-Dist: python-slugify==8.0.4
 Requires-Dist: python-socketio==5.11.3
 Requires-Dist: pytz==2024.1
-Requires-Dist: redis==5.0.6
+Requires-Dist: redis==5.0.7
 Requires-Dist: requests==2.32.3
 Requires-Dist: rq==1.16.2
 Requires-Dist: slackclient==2.9.4
@@ -84,7 +84,7 @@ Requires-Dist: pytest==8.2.2; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.0; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.6.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.7.1; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.4.2; extra == "lint"

{zou-0.19.42 → zou-0.19.44}/setup.cfg

@@ -29,7 +29,7 @@ packages = find:
 install_requires = 
 	babel==2.15.0
 	click==8.1.7
-	discord.py==2.3.2
+	discord.py==2.4.0
 	email-validator==2.2.0
 	ffmpeg-python==0.2.0
 	fido2==1.1.3
@@ -59,7 +59,7 @@ install_requires =
 	numpy==1.24.4; python_version == '3.8'
 	numpy==2.0.0; python_version >= '3.9'
 	opencv-python==4.10.0.84
-	OpenTimelineIO==0.16.0
+	OpenTimelineIO==0.17.0
 	orjson==3.10.5
 	pillow==10.3.0
 	psutil==6.0.0
@@ -69,7 +69,7 @@ install_requires =
 	python-slugify==8.0.4
 	python-socketio==5.11.3
 	pytz==2024.1
-	redis==5.0.6
+	redis==5.0.7
 	requests==2.32.3
 	rq==1.16.2
 	slackclient==2.9.4
@@ -98,7 +98,7 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.0
 	pygelf==0.4.2
-	sentry-sdk==2.6.0
+	sentry-sdk==2.7.1
 lint = 
 	autoflake==2.3.1
 	black==24.4.2

zou-0.19.44/zou/__init__.py

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

{zou-0.19.42 → zou-0.19.44}/zou/app/blueprints/crud/organisation.py

@@ -1,5 +1,4 @@
 from zou.app.models.organisation import Organisation
-from zou.app.utils import fields
 from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 
 
@@ -7,9 +6,6 @@ class OrganisationsResource(BaseModelsResource):
     def __init__(self):
         BaseModelsResource.__init__(self, Organisation)
 
-    def get(self):
-        return fields.serialize_list(Organisation.query.all())
-
     def check_read_permissions(self):
         return True
 

{zou-0.19.42 → zou-0.19.44}/zou/app/blueprints/previews/resources.py

@@ -338,8 +338,6 @@ class CreatePreviewFilePictureResource(Resource, ArgsMixin):
             preview_files_service.prepare_and_store_movie(
                 preview_file_id, uploaded_movie_path, normalize=normalize
             )
-            preview_file = files_service.get_preview_file(preview_file_id)
-            tasks_service.update_preview_file_info(preview_file)
         return preview_file_id
 
     def save_file_preview(self, instance_id, uploaded_file, extension):

{zou-0.19.42 → zou-0.19.44}/zou/app/blueprints/shots/__init__.py

@@ -42,6 +42,7 @@ from zou.app.blueprints.shots.resources import (
     EpisodeAssetTasksResource,
     SequenceShotTasksResource,
     ProjectQuotasResource,
+    SetShotsFramesResource,
 )
 
 routes = [
@@ -94,6 +95,10 @@ routes = [
         "/data/projects/<project_id>/quotas/<task_type_id>",
         ProjectQuotasResource,
     ),
+    (
+        "/actions/projects/<project_id>/task-types/<task_type_id>/set-shot-nb-frames",
+        SetShotsFramesResource,
+    )
 ]
 
 

{zou-0.19.42 → zou-0.19.44}/zou/app/blueprints/shots/resources.py

@@ -18,6 +18,7 @@ from zou.app.services import (
 
 from zou.app.mixin import ArgsMixin
 from zou.app.utils import fields, query, permissions
+from zou.app.services.exception import WrongParameterException
 
 
 class ShotResource(Resource, ArgsMixin):
@@ -1526,3 +1527,51 @@ class ProjectQuotasResource(Resource, ArgsMixin):
             return shots_service.get_raw_quotas(
                 project_id, task_type_id, args["studio_id"]
             )
+
+
+
+class SetShotsFramesResource(Resource, ArgsMixin):
+    @jwt_required()
+    def post(self, project_id, task_type_id):
+        """
+        Set frames for given shots.
+        ---
+        tags:
+        - Shots
+        parameters:
+          - in: formData
+            name: shots
+            required: True
+            type: array
+            items:
+              type: object
+              properties:
+                shot_id:
+                  type: string
+                  format: UUID
+                  x-example: a24a6ea4-ce75-4665-a070-57453082c25
+                nb_frames:
+                  type: integer
+                  x-example: 24
+        responses:
+            200:
+                description: Frames set for given shots
+        """
+        user_service.check_manager_project_access(project_id)
+        if not fields.is_valid_id(task_type_id) or \
+           not fields.is_valid_id(project_id):
+            raise WrongParameterException("Invalid project or task type id")
+
+        episode_id = self.get_episode_id()
+        if not episode_id in ["", None] and \
+           not fields.is_valid_id(episode_id):
+            raise WrongParameterException("Invalid episode id")
+
+        if episode_id == "":
+            episode_id = None
+
+        return shots_service.set_frames_from_task_type_preview_files(
+            project_id,
+            task_type_id,
+            episode_id=episode_id,
+        )

{zou-0.19.42 → zou-0.19.44}/zou/app/models/attachment_file.py

@@ -42,6 +42,7 @@ class AttachmentFile(db.Model, BaseMixin, SerializerMixin):
     def create_from_import(cls, data):
         data.pop("type", None)
         data.pop("comment", None)
+        data.pop("chat_message", None)
         previous_data = cls.get(data["id"])
         if previous_data is None:
             return cls.create(**data)

{zou-0.19.42 → zou-0.19.44}/zou/app/models/entity_type.py

@@ -27,6 +27,8 @@ class EntityType(db.Model, BaseMixin, SerializerMixin):
     """
 
     name = db.Column(db.String(30), unique=True, nullable=False, index=True)
+    short_name = db.Column(db.String(20))
+    description = db.Column(db.Text())
     task_types = db.relationship(
         "TaskType", secondary=task_type_link, lazy="joined"
     )

{zou-0.19.42 → zou-0.19.44}/zou/app/models/task_status.py

@@ -15,6 +15,7 @@ class TaskStatus(db.Model, BaseMixin, SerializerMixin):
     short_name = db.Column(
         db.String(10), unique=True, nullable=False, index=True
     )
+    description = db.Column(db.Text())
     color = db.Column(db.String(7), nullable=False)
     priority = db.Column(db.Integer, default=1)
 

{zou-0.19.42 → zou-0.19.44}/zou/app/models/task_type.py

@@ -12,6 +12,7 @@ class TaskType(db.Model, BaseMixin, SerializerMixin):
 
     name = db.Column(db.String(40), nullable=False)
     short_name = db.Column(db.String(20))
+    description = db.Column(db.Text())
     color = db.Column(db.String(7), default="#FFFFFF")
     priority = db.Column(db.Integer, default=1)
     for_entity = db.Column(db.String(30), default="Asset")

{zou-0.19.42 → zou-0.19.44}/zou/app/services/preview_files_service.py

@@ -163,7 +163,10 @@ def set_preview_file_as_ready(preview_file_id):
 
 
 def prepare_and_store_movie(
-    preview_file_id, uploaded_movie_path, normalize=True
+    preview_file_id,
+    uploaded_movie_path,
+    normalize=True,
+    add_source_to_file_store=True,
 ):
     """
     Prepare movie preview, normalize the movie as a .mp4, build the thumbnails
@@ -196,13 +199,14 @@ def prepare_and_store_movie(
         if normalize:
             current_app.logger.info("start normalization")
             try:
+                if add_source_to_file_store:
+                    file_store.add_movie(
+                        "source", preview_file_id, uploaded_movie_path
+                    )
                 if (
                     config.ENABLE_JOB_QUEUE_REMOTE
                     and len(config.JOB_QUEUE_NOMAD_NORMALIZE_JOB) > 0
                 ):
-                    file_store.add_movie(
-                        "source", preview_file_id, uploaded_movie_path
-                    )
                     result = _run_remote_normalize_movie(
                         current_app, preview_file_id, fps, width, height
                     )

{zou-0.19.42 → zou-0.19.44}/zou/app/services/shots_service.py

@@ -20,6 +20,7 @@ from zou.app.models.entity import (
 )
 from zou.app.models.person import Person
 from zou.app.models.project import Project
+from zou.app.models.preview_file import PreviewFile
 from zou.app.models.schedule_item import ScheduleItem
 from zou.app.models.subscription import Subscription
 from zou.app.models.task import Task
@@ -1525,3 +1526,75 @@ def get_all_raw_shots():
     """
     query = Entity.query.filter(Entity.entity_type_id == get_shot_type()["id"])
     return query.all()
+
+
+def set_frames_from_task_type_preview_files(
+    project_id,
+    task_type_id,
+    episode_id=None,
+):
+    from zou.app import db
+
+    shot_type = get_shot_type()
+    Shot = aliased(Entity)
+    Sequence = aliased(Entity)
+
+    if episode_id is not None:
+        subquery = (
+            db.session.query(
+                Shot.id.label("entity_id"),
+                func.max(PreviewFile.created_at).label("max_created_at")
+            )
+            .join(Task, PreviewFile.task_id == Task.id)
+            .join(Shot, Task.entity_id == Shot.id)
+            .join(Sequence, Sequence.id == Shot.parent_id)
+            .filter(Shot.project_id == project_id)
+            .filter(Shot.entity_type_id == shot_type["id"])
+            .filter(Task.task_type_id == task_type_id)
+            .filter(Sequence.parent_id == episode_id)
+            .group_by(Shot.id)
+            .subquery()
+        )
+    else:
+        subquery = (
+            db.session.query(
+                Shot.id.label("entity_id"),
+                func.max(PreviewFile.created_at).label("max_created_at")
+            )
+            .join(Task, PreviewFile.task_id == Task.id)
+            .join(Shot, Task.entity_id == Shot.id)
+            .filter(Shot.project_id == project_id)
+            .filter(Shot.entity_type_id == shot_type["id"])
+            .filter(Task.task_type_id == task_type_id)
+            .group_by(Shot.id)
+            .subquery()
+        )
+
+    query = (
+        db.session.query(
+            Shot,
+            PreviewFile.duration
+        )
+        .join(Task, Task.entity_id == Shot.id)
+        .join(subquery, (Shot.id == subquery.c.entity_id))
+        .join(PreviewFile,
+              (PreviewFile.task_id == Task.id) &
+              (PreviewFile.created_at == subquery.c.max_created_at))
+        .filter(Task.task_type_id == task_type_id)
+        .filter(Shot.project_id == project_id)
+    )
+
+    results = query.all()
+    project = projects_service.get_project(project_id)
+    updates = []
+    for (shot, preview_duration) in results:
+        nb_frames = round(preview_duration * int(project["fps"]))
+        updates.append({
+            "id": shot.id,
+            "nb_frames": nb_frames,
+        })
+        clear_shot_cache(str(shot.id))
+
+    db.session.bulk_update_mappings(Shot, updates)
+    db.session.commit()
+    return updates

{zou-0.19.42 → zou-0.19.44}/zou/app/services/sync_service.py

@@ -172,15 +172,15 @@ project_events = [
 ]
 
 main_events = [
-    "person",
-    "organisation",
-    "project-status",
-    "department",
     "studio",
+    "department",
     "task-type",
     "task-status",
     "custom-action",
+    "organisation",
+    "project-status",
     "asset-type",
+    "person",
     "project",
 ]
 
@@ -408,35 +408,35 @@ def sync_entries(model_name, model, project=None):
     """
     instances = []
 
-    if model_name in ["organisations", "persons"]:
-        path = model_name + "?relations=true"
-        if model_name == "persons":
-            path += "&with_pass_hash=true"
-        instances = gazu.client.fetch_all(path)
-        model.create_from_import_list(instances)
-    elif project:
+    page = 1
+    init = True
+    results = {"nb_pages": 2}
+    params = {
+        "relations": "true",
+    }
+    if model_name == "persons":
+        params["with_pass_hash"] = "true"
+    if project is not None and model_name in [
+        "projects",
+        "search-filters",
+        "search-filter-groups",
+    ]:
         project = gazu.project.get_project_by_name(project)
         if model_name == "projects":
-            instances = [gazu.client.fetch_one(model_name, project.get("id"))]
+            params = {"id": project["id"]}
         elif model_name in ["search-filters", "search-filter-groups"]:
-            instances = gazu.client.fetch_all(
-                model_name, params=dict(project_id=project.get("id"))
-            )
-        else:
-            instances = gazu.client.fetch_all(model_name)
-        model.create_from_import_list(instances)
-    else:
-        page = 1
-        init = True
-        results = {"nb_pages": 2}
-        while init or results["nb_pages"] >= page:
-            results = gazu.client.fetch_all(
-                "%s?relations=true&page=%d" % (model_name, page)
-            )
-            instances += results["data"]
-            page += 1
-            init = False
-            model.create_from_import_list(results["data"])
+            params = {"project_id": project["id"]}
+    while init or results["nb_pages"] >= page:
+        params["page"] = page
+        results = gazu.client.fetch_all(model_name, params=params)
+        if model_name == "task-status" and results["data"]:
+            results["data"] = [
+                r for r in results["data"] if not r["for_concept"]
+            ]
+        instances += results["data"]
+        page += 1
+        init = False
+        model.create_from_import_list(results["data"])
 
     logger.info("%s %s synced." % (len(instances), model_name))
 

{zou-0.19.42 → zou-0.19.44}/zou/app/utils/commands.py

@@ -3,11 +3,13 @@
 import os
 import datetime
 import tempfile
+import sys
+import shutil
 
 
 from ldap3 import Server, Connection, ALL, NTLM, SIMPLE
 from zou.app.utils import thumbnail as thumbnail_utils, auth
-from zou.app.stores import auth_tokens_store, file_store
+from zou.app.stores import auth_tokens_store, file_store, queue_store
 from zou.app.services import (
     assets_service,
     backup_service,
@@ -23,6 +25,8 @@ from zou.app.services import (
     tasks_service,
 )
 from zou.app.models.person import Person
+from zou.app.models.preview_file import PreviewFile
+from zou.app.models.task import Task
 from sqlalchemy.sql.expression import not_
 
 from zou.app.services.exception import (
@@ -717,3 +721,88 @@ def create_bot(
             is_bot=True,
         )
         print(bot["access_token"])
+
+
+def renormalize_movie_preview_files(
+    preview_file_id=None, project_id=None, all_broken=None, all_processing=None
+):
+    with app.app_context():
+        if preview_file_id is None and not all_broken and not all_processing:
+            print("You must specify at least one option.")
+            sys.exit(1)
+        else:
+            query = PreviewFile.query.filter(
+                PreviewFile.extension == "mp4"
+            ).order_by(PreviewFile.created_at.asc())
+
+            if preview_file_id is not None:
+                query = query.filter(PreviewFile.id == preview_file_id)
+
+            if project_id is not None:
+                query = query.join(Task).filter(
+                    PreviewFile.project_id == project_id
+                )
+
+            if all_broken and all_processing:
+                query = query.filter(
+                    PreviewFile.status.in_(("broken", "processing"))
+                )
+            elif all_broken:
+                query = query.filter(PreviewFile.status == "broken")
+            elif all_processing:
+                query = query.filter(PreviewFile.status == "processing")
+
+            preview_files = query.all()
+            len_preview_files = len(preview_files)
+            if len_preview_files == 0:
+                print("No preview files found.")
+                sys.exit(1)
+            else:
+                for i, preview_file in enumerate(preview_files):
+                    try:
+                        preview_file_id = str(preview_file.id)
+                        print(
+                            f"Renormalizing preview file {preview_file_id} ({i+1}/{len_preview_files})."
+                        )
+                        extension = preview_file.extension
+                        uploaded_movie_path = os.path.join(
+                            config.TMP_DIR,
+                            f"{preview_file_id}.{extension}.tmp",
+                        )
+                        if config.FS_BACKEND == "local":
+                            shutil.copyfile(
+                                file_store.get_local_movie_path(
+                                    "source", preview_file_id
+                                ),
+                                uploaded_movie_path,
+                            )
+                        else:
+                            sync_service.download_file(
+                                uploaded_movie_path,
+                                "source",
+                                file_store.open_movie,
+                                str(preview_file_id),
+                            )
+                        if config.ENABLE_JOB_QUEUE:
+                            queue_store.job_queue.enqueue(
+                                preview_files_service.prepare_and_store_movie,
+                                args=(
+                                    preview_file_id,
+                                    uploaded_movie_path,
+                                    True,
+                                    False,
+                                ),
+                                job_timeout=int(config.JOB_QUEUE_TIMEOUT),
+                            )
+                        else:
+                            preview_files_service.prepare_and_store_movie(
+                                preview_file_id,
+                                uploaded_movie_path,
+                                normalize=True,
+                                add_source_to_file_store=False,
+                            )
+                    except Exception as e:
+                        print(
+                            f"Renormalization of preview file {preview_file_id} failed: {e}"
+                        )
+                        continue

{zou-0.19.42 → zou-0.19.44}/zou/cli.py

@@ -456,13 +456,13 @@ def upload_files_to_cloud_storage(days):
 
 
 @cli.command()
-@click.option("--projectid")
-def clean_tasks_data(projectid):
+@click.option("--project-id")
+def clean_tasks_data(project_id):
     """
     Reset task models data (retake count, wip start date and end date)
     """
-    if projectid is not None:
-        commands.reset_tasks_data(projectid)
+    if project_id is not None:
+        commands.reset_tasks_data(project_id)
 
 
 @cli.command()
@@ -569,7 +569,7 @@ def reset_breakdown_data():
 @click.option("--email", required=True)
 @click.option("--name", required=True)
 @click.option(
-    "--expiration_date",
+    "--expiration-date",
     required=False,
     default=None,
     show_default=True,
@@ -593,5 +593,39 @@ def create_bot(
     )
 
 
+@cli.command()
+@click.option(
+    "--preview-file-id",
+    required=False,
+    default=None,
+    show_default=True,
+)
+@click.option(
+    "--project-id",
+    required=False,
+    default=None,
+    show_default=True,
+)
+@click.option("--all-broken", is_flag=True, default=False, show_default=True)
+@click.option(
+    "--all-processing", is_flag=True, default=False, show_default=True
+)
+def renormalize_movie_preview_files(
+    preview_file_id,
+    project_id,
+    all_broken,
+    all_processing,
+):
+    """
+    Renormalize all preview files.
+    """
+    commands.renormalize_movie_preview_files(
+        preview_file_id,
+        project_id,
+        all_broken,
+        all_processing,
+    )
+
+
 if __name__ == "__main__":
     cli()

zou-0.19.44/zou/migrations/versions/971dbf5a0faf_add_short_name_for_asset_type_entity_.py

@@ -0,0 +1,33 @@
+"""Add short_name for Asset Type entity_type
+
+Revision ID: 971dbf5a0faf
+Revises: a252a094e977
+Create Date: 2024-06-20 19:51:15.758780
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "971dbf5a0faf"
+down_revision = "a252a094e977"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "entity_type",
+        sa.Column("short_name", sa.String(length=20), nullable=True),
+    )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("entity_type", "short_name")
+    # ### end Alembic commands ###

zou-0.19.44/zou/migrations/versions/a252a094e977_add_descriptions_for_entities_tasks_and_.py

@@ -0,0 +1,40 @@
+"""Add descriptions for entities tasks and statuses
+
+Revision ID: a252a094e977
+Revises: 1bb55759146f
+Create Date: 2024-06-20 20:37:21.885953
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "a252a094e977"
+down_revision = "1bb55759146f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "task_type", sa.Column("description", sa.Text(), nullable=True)
+    )
+    op.add_column(
+        "task_status", sa.Column("description", sa.Text(), nullable=True)
+    )
+    op.add_column(
+        "entity_type", sa.Column("description", sa.Text(), nullable=True)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("task_type", "description")
+    op.drop_column("task_status", "description")
+    op.drop_column("entity_type", "description")
+
+    # ### end Alembic commands ###