zou 0.20.12__tar.gz → 0.20.13__tar.gz

{zou-0.20.12/zou.egg-info → zou-0.20.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.12
+Version: 0.20.13
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -41,7 +41,7 @@ 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: gazu==0.10.23
+Requires-Dist: gazu==0.10.25
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
@@ -91,7 +91,7 @@ Requires-Dist: sentry-sdk==2.20.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"
-Requires-Dist: pre-commit==4.0.1; extra == "lint"
+Requires-Dist: pre-commit==4.1.0; extra == "lint"
 Dynamic: requires-python
 
 .. figure:: https://zou.cg-wire.com/kitsu.png

{zou-0.20.12 → zou-0.20.13}/setup.cfg

@@ -47,7 +47,7 @@ install_requires =
 	flask-migrate==4.1.0
 	flask-socketio==5.5.1
 	flask==3.1.0
-	gazu==0.10.23
+	gazu==0.10.25
 	gevent-websocket==0.10.1
 	gevent==24.11.1
 	gunicorn==23.0.0
@@ -105,7 +105,7 @@ monitoring =
 lint = 
 	autoflake==2.3.1
 	black==24.10.0
-	pre-commit==4.0.1
+	pre-commit==4.1.0
 
 [options.entry_points]
 console_scripts = 

zou-0.20.13/zou/__init__.py

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

{zou-0.20.12 → zou-0.20.13}/zou/app/__init__.py

@@ -25,6 +25,7 @@ from meilisearch.errors import (
 
 from zou.app import config, swagger
 from zou.app.stores import auth_tokens_store, file_store
+from zou.app.indexer import indexing
 from zou.app.services.exception import (
     ModelWithRelationsDeletionException,
     PersonNotFoundException,
@@ -72,6 +73,9 @@ if config.SAML_ENABLED:
 
 app.extensions["fido_server"] = get_fido_server()
 
+if config.INDEXER.get("key") is not None:
+    app.extensions["indexer_client"] = indexing.init_client()
+
 
 @app.teardown_appcontext
 def shutdown_session(exception=None):

{zou-0.20.12 → zou-0.20.13}/zou/app/blueprints/assets/resources.py

@@ -484,7 +484,7 @@ class NewAssetResource(Resource, ArgsMixin):
                 ("data", {}, False, dict),
                 (
                     "is_shared",
-                    True,
+                    False,
                     False,
                     inputs.boolean,
                 ),

{zou-0.20.12 → zou-0.20.13}/zou/app/blueprints/crud/preview_file.py

@@ -98,7 +98,9 @@ class PreviewFileResource(BaseModelResource):
             instance_dict = instance.serialize()
             self.check_delete_permissions(instance_dict)
             self.pre_delete(instance_dict)
-            deletion_service.remove_preview_file(instance)
+            deletion_service.remove_preview_file(
+                instance, force=self.get_force()
+            )
             self.emit_delete_event(instance_dict)
             self.post_delete(instance_dict)
 

{zou-0.20.12 → zou-0.20.13}/zou/app/blueprints/index/resources.py

@@ -171,7 +171,7 @@ class StatusResourcesResource(BaseStatusResource):
         }
 
         return {
-            "date": datetime.now().isoformat(),
+            "date": datetime.datetime.now().isoformat(),
             "cpu": cpu_stats,
             "memory": memory_stats,
             "jobs": job_stats,

{zou-0.20.12 → zou-0.20.13}/zou/app/blueprints/source/csv/task_type_estimations.py

@@ -123,6 +123,9 @@ class TaskTypeEstimationsCsvImportResource(BaseCsvProjectImportResource):
                 new_data["start_date"], float(row["Estimation"]) - 1
             )
 
+        if row.get("Difficulty") not in [None, ""]:
+            new_data["difficulty"] = int(row["Difficulty"])
+
         tasks_service.update_task(self.tasks_map[entity_id], new_data)
 
 

{zou-0.20.12 → zou-0.20.13}/zou/app/blueprints/tasks/resources.py

@@ -78,7 +78,7 @@ class AddPreviewResource(Resource, ArgsMixin):
         return preview_file, 201
 
 
-class AddExtraPreviewResource(Resource):
+class AddExtraPreviewResource(Resource, ArgsMixin):
     """
     Add a preview to given comment.
     """
@@ -160,7 +160,9 @@ class AddExtraPreviewResource(Resource):
         """
         task = tasks_service.get_task(task_id)
         user_service.check_project_access(task["project_id"])
-        deletion_service.remove_preview_file_by_id(preview_file_id)
+        deletion_service.remove_preview_file_by_id(
+            preview_file_id, force=self.get_force()
+        )
         return "", 204
 
 

{zou-0.20.12 → zou-0.20.13}/zou/app/config.py

@@ -58,7 +58,7 @@ INDEXER = {
     "host": os.getenv("INDEXER_HOST", "localhost"),
     "port": os.getenv("INDEXER_PORT", "7700"),
     "protocol": os.getenv("INDEXER_PROTOCOL", "http"),
-    "key": os.getenv("INDEXER_KEY", "masterkey"),
+    "key": os.getenv("INDEXER_KEY"),
     "timeout": int(os.getenv("INDEXER_TIMEOUT", 5000)),
 }
 

{zou-0.20.12 → zou-0.20.13}/zou/app/indexer/indexing.py

@@ -3,24 +3,35 @@ from meilisearch.errors import MeilisearchApiError
 
 from zou.app import config
 from zou.app.utils import cache
+from flask import current_app
 
-client = None
 
-
-def init():
+def init_client():
     """
     Configure Meilisearch client.
     """
-    global client
-    if client is None:
-        protocol = config.INDEXER["protocol"]
-        host = config.INDEXER["host"]
-        port = config.INDEXER["port"]
-        client = meilisearch.Client(
-            f"{protocol}://{host}:{port}",
-            config.INDEXER["key"],
-            timeout=config.INDEXER["timeout"],
-        )
+    protocol = config.INDEXER["protocol"]
+    host = config.INDEXER["host"]
+    port = config.INDEXER["port"]
+    return meilisearch.Client(
+        f"{protocol}://{host}:{port}",
+        config.INDEXER["key"],
+        timeout=config.INDEXER["timeout"],
+    )
+
+
+class IndexerNotInitializedError(Exception):
+    pass
+
+
+def get_client():
+    """
+    Get Meilisearch client.
+    """
+    try:
+        return current_app.extensions["indexer_client"]
+    except KeyError:
+        raise IndexerNotInitializedError()
 
 
 def create_index(index_name, searchable_fields=[], filterable_fields=[]):
@@ -34,6 +45,7 @@ def create_index(index_name, searchable_fields=[], filterable_fields=[]):
     except MeilisearchApiError:
         pass
     if index is None:
+        client = get_client()
         task = client.create_index(index_name, {"primaryKey": "id"})
         client.wait_for_task(
             task.task_uid, timeout_in_ms=config.INDEXER["timeout"]
@@ -57,8 +69,7 @@ def get_index(index_name):
     """
     Get index matching given name.
     """
-    init()
-    index = client.get_index(index_name)
+    index = get_client().get_index(index_name)
     return index
 
 
@@ -69,7 +80,7 @@ def clear_index(index_name):
     cache.cache.delete_memoized(get_index)
     index = get_index(index_name)
     task = index.delete_all_documents()
-    client.wait_for_task(
+    get_client().wait_for_task(
         task.task_uid, timeout_in_ms=config.INDEXER["timeout"]
     )
     return index
@@ -80,7 +91,7 @@ def index_document(index, document):
     Add given document to given index.
     """
     task = index.add_documents([document])
-    client.wait_for_task(
+    get_client().wait_for_task(
         task.task_uid, timeout_in_ms=config.INDEXER["timeout"]
     )
     return index
@@ -91,7 +102,7 @@ def index_documents(index, documents):
     Add given documents to given index.
     """
     task = index.add_documents(documents)
-    client.wait_for_task(
+    get_client().wait_for_task(
         task.task_uid, timeout_in_ms=config.INDEXER["timeout"]
     )
     return documents

{zou-0.20.12 → zou-0.20.13}/zou/app/models/entity_type.py

@@ -5,19 +5,28 @@ from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
 from zou.app.models.task_type import TaskType
 
-task_type_link = db.Table(
-    "task_type_asset_type_link",
-    db.Column(
-        "asset_type_id",
+
+class TaskTypeAssetTypeLink(db.Model):
+    asset_type_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("entity_type.id"),
-    ),
-    db.Column(
-        "task_type_id",
+        index=True,
+        primary_key=True,
+    )
+    task_type_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("task_type.id"),
-    ),
-)
+        index=True,
+        primary_key=True,
+    )
+
+    __table_args__ = (
+        db.UniqueConstraint(
+            "asset_type_id",
+            "task_type_id",
+            name="task_type_asset_type_link_uc",
+        ),
+    )
 
 
 class EntityType(db.Model, BaseMixin, SerializerMixin):
@@ -30,7 +39,9 @@ class EntityType(db.Model, BaseMixin, SerializerMixin):
     short_name = db.Column(db.String(20))
     description = db.Column(db.Text())
     task_types = db.relationship(
-        "TaskType", secondary=task_type_link, lazy="joined"
+        TaskType,
+        secondary=TaskTypeAssetTypeLink.__table__,
+        lazy="joined",
     )
     archived = db.Column(db.Boolean(), default=False)
 

{zou-0.20.12 → zou-0.20.13}/zou/app/models/metadata_descriptor.py

@@ -4,18 +4,31 @@ from sqlalchemy.dialects.postgresql import JSONB
 from zou.app import db
 from zou.app.models.serializer import SerializerMixin
 from zou.app.models.base import BaseMixin
+from zou.app.models.department import Department
 
-department_metadata_descriptor_link = db.Table(
-    "department_metadata_descriptor_link",
-    db.Column(
-        "metadata_descriptor_id",
+
+class DepartmentMetadataDescriptorLink(db.Model):
+    metadata_descriptor_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("metadata_descriptor.id"),
-    ),
-    db.Column(
-        "department_id", UUIDType(binary=False), db.ForeignKey("department.id")
-    ),
-)
+        index=True,
+        primary_key=True,
+    )
+    department_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("department.id"),
+        index=True,
+        primary_key=True,
+    )
+
+    __table_args__ = (
+        db.UniqueConstraint(
+            "metadata_descriptor_id",
+            "department_id",
+            name="department_metadata_descriptor_link_uc",
+        ),
+    )
+
 
 METADATA_DESCRIPTOR_TYPES = [
     ("string", "String"),
@@ -46,7 +59,8 @@ class MetadataDescriptor(db.Model, BaseMixin, SerializerMixin):
     choices = db.Column(JSONB)
     for_client = db.Column(db.Boolean(), default=False, index=True)
     departments = db.relationship(
-        "Department", secondary=department_metadata_descriptor_link
+        Department,
+        secondary=DepartmentMetadataDescriptorLink.__table__,
     )
 
     __table_args__ = (

{zou-0.20.12 → zou-0.20.13}/zou/app/services/comments_service.py

@@ -252,24 +252,25 @@ def _run_status_automation(automation, task, person_id):
                         task["id"]
                     )
                 )
-                preview_files = (
-                    preview_files_service.get_preview_files_for_revision(
-                        preview_file["task_id"], preview_file["revision"]
+                if preview_file is not None:
+                    preview_files = (
+                        preview_files_service.get_preview_files_for_revision(
+                            preview_file["task_id"], preview_file["revision"]
+                        )
                     )
-                )
 
-                for preview_file in preview_files:
-                    new_preview_file = (
-                        tasks_service.add_preview_file_to_comment(
-                            new_comment["id"],
-                            new_comment["person_id"],
-                            task_to_update["id"],
+                    for preview_file in preview_files:
+                        new_preview_file = (
+                            tasks_service.add_preview_file_to_comment(
+                                new_comment["id"],
+                                new_comment["person_id"],
+                                task_to_update["id"],
+                            )
                         )
-                    )
 
-                    preview_files_service.copy_preview_file_in_another_one(
-                        preview_file["id"], new_preview_file["id"]
-                    )
+                        preview_files_service.copy_preview_file_in_another_one(
+                            preview_file["id"], new_preview_file["id"]
+                        )
 
     elif automation["out_field_type"] == "ready_for":
         try:

{zou-0.20.12 → zou-0.20.13}/zou/app/services/index_service.py

@@ -12,9 +12,8 @@ from zou.app.services import (
 
 def get_index(index_name):
     """
-    Retrieve whoosh index from disk. It is required to perform any operations.
+    Retrieve meilisearch index from disk. It is required to perform any operations.
     """
-    indexing.init()
     return indexing.get_index(index_name)
 
 
@@ -193,9 +192,11 @@ def index_asset(asset):
         document = prepare_asset(asset)
         indexing.index_document(index, document)
         return document
+    except indexing.IndexerNotInitializedError:
+        pass
     except:
         app.logger.error("Indexer is not reachable, indexation failed.")
-        return {}
+    return {}
 
 
 def index_person(person):
@@ -207,9 +208,11 @@ def index_person(person):
         document = prepare_person(person)
         indexing.index_document(index, document)
         return document
+    except indexing.IndexerNotInitializedError:
+        pass
     except:
         app.logger.error("Indexer is not reachable, indexation failed.")
-        return {}
+    return {}
 
 
 def index_shot(shot):
@@ -221,9 +224,11 @@ def index_shot(shot):
         document = prepare_shot(shot)
         indexing.index_document(index, document)
         return document
+    except indexing.IndexerNotInitializedError:
+        pass
     except:
         app.logger.error("Indexer is not reachable, indexation failed.")
-        return {}
+    return {}
 
 
 def prepare_asset(asset):
@@ -320,9 +325,11 @@ def remove_asset_index(asset_id):
     """
     try:
         return indexing.remove_document(get_asset_index(), asset_id)
+    except indexing.IndexerNotInitializedError:
+        pass
     except:
         app.logger.error("Indexer is not reachable, indexation failed.")
-        return {}
+    return {}
 
 
 def remove_person_index(person_id):
@@ -331,9 +338,11 @@ def remove_person_index(person_id):
     """
     try:
         return indexing.remove_document(get_person_index(), person_id)
+    except indexing.IndexerNotInitializedError:
+        pass
     except:
         app.logger.error("Indexer is not reachable, indexation failed.")
-        return {}
+    return {}
 
 
 def remove_shot_index(shot_id):
@@ -342,6 +351,8 @@ def remove_shot_index(shot_id):
     """
     try:
         return indexing.remove_document(get_shot_index(), shot_id)
+    except indexing.IndexerNotInitializedError:
+        pass
     except:
         app.logger.error("Indexer is not reachable, indexation failed.")
-        return {}
+    return {}

{zou-0.20.12 → zou-0.20.13}/zou/app/services/tasks_service.py

@@ -376,25 +376,17 @@ def _get_entity_task_query():
 
 
 def _convert_rows_to_detailed_tasks(rows, relations=False):
-    results = []
-    for entry in rows:
-        (
-            task_object,
-            project_name,
-            task_type_name,
-            task_status_name,
-            entity_type_name,
-            entity_name,
-        ) = entry
-
-        task = get_task(str(task_object.id), relations=relations)
-        task["project_name"] = project_name
-        task["task_type_name"] = task_type_name
-        task["task_status_name"] = task_status_name
-        task["entity_type_name"] = entity_type_name
-        task["entity_name"] = entity_name
-        results.append(task)
-    return results
+    return [
+        {
+            **task_object.serialize(relations=relations),
+            "project_name": project_name,
+            "task_type_name": task_type_name,
+            "task_status_name": task_status_name,
+            "entity_type_name": entity_type_name,
+            "entity_name": entity_name,
+        }
+        for task_object, project_name, task_type_name, task_status_name, entity_type_name, entity_name in rows
+    ]
 
 
 def get_task_types_for_shot(shot_id):

{zou-0.20.12 → zou-0.20.13}/zou/cli.py

@@ -507,14 +507,6 @@ def reset_search_index():
     commands.reset_search_index()
 
 
-@cli.command()
-def init_search_index():
-    """
-    Init search index.
-    """
-    commands.init_search_index()
-
-
 @cli.command()
 @click.option("--query", default="")
 def search_asset(query):

zou-0.20.13/zou/migrations/versions/20a8ad264659_tasktypeassettypelink_.py

@@ -0,0 +1,132 @@
+"""TaskTypeAssetTypeLink/DepartmentMetadataDescriptorLink add index, pkey and constraint
+
+Revision ID: 20a8ad264659
+Revises: 539a3a00c417
+Create Date: 2025-01-26 23:15:27.665887
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "20a8ad264659"
+down_revision = "539a3a00c417"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "department_metadata_descriptor_link", schema=None
+    ) as batch_op:
+        batch_op.alter_column(
+            "metadata_descriptor_id", existing_type=sa.UUID(), nullable=False
+        )
+        batch_op.alter_column(
+            "department_id", existing_type=sa.UUID(), nullable=False
+        )
+        batch_op.create_unique_constraint(
+            "department_metadata_descriptor_link_uc",
+            ["metadata_descriptor_id", "department_id"],
+        )
+        batch_op.create_index(
+            batch_op.f("ix_department_metadata_descriptor_link_department_id"),
+            ["department_id"],
+            unique=False,
+        )
+        batch_op.create_index(
+            batch_op.f(
+                "ix_department_metadata_descriptor_link_metadata_descriptor_id"
+            ),
+            ["metadata_descriptor_id"],
+            unique=False,
+        )
+
+        batch_op.create_primary_key(
+            "department_metadata_descriptor_link_pkey",
+            ["metadata_descriptor_id", "department_id"],
+        )
+
+    with op.batch_alter_table(
+        "task_type_asset_type_link", schema=None
+    ) as batch_op:
+        batch_op.alter_column(
+            "asset_type_id", existing_type=sa.UUID(), nullable=False
+        )
+        batch_op.alter_column(
+            "task_type_id", existing_type=sa.UUID(), nullable=False
+        )
+        batch_op.create_index(
+            batch_op.f("ix_task_type_asset_type_link_asset_type_id"),
+            ["asset_type_id"],
+            unique=False,
+        )
+        batch_op.create_index(
+            batch_op.f("ix_task_type_asset_type_link_task_type_id"),
+            ["task_type_id"],
+            unique=False,
+        )
+        batch_op.create_unique_constraint(
+            "task_type_asset_type_link_uc", ["asset_type_id", "task_type_id"]
+        )
+
+        batch_op.create_primary_key(
+            "task_type_asset_type_link_pkey", ["asset_type_id", "task_type_id"]
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table(
+        "task_type_asset_type_link", schema=None
+    ) as batch_op:
+        batch_op.drop_constraint(
+            "task_type_asset_type_link_pkey", type_="primary"
+        )
+        batch_op.drop_constraint(
+            "task_type_asset_type_link_uc", type_="unique"
+        )
+        batch_op.drop_index(
+            batch_op.f("ix_task_type_asset_type_link_task_type_id")
+        )
+        batch_op.drop_index(
+            batch_op.f("ix_task_type_asset_type_link_asset_type_id")
+        )
+
+        batch_op.alter_column(
+            "task_type_id", existing_type=sa.UUID(), nullable=True
+        )
+        batch_op.alter_column(
+            "asset_type_id", existing_type=sa.UUID(), nullable=True
+        )
+
+    with op.batch_alter_table(
+        "department_metadata_descriptor_link", schema=None
+    ) as batch_op:
+        batch_op.drop_index(
+            batch_op.f(
+                "ix_department_metadata_descriptor_link_metadata_descriptor_id"
+            )
+        )
+        batch_op.drop_index(
+            batch_op.f("ix_department_metadata_descriptor_link_department_id")
+        )
+        batch_op.drop_constraint(
+            "department_metadata_descriptor_link_pkey", type_="primary"
+        )
+        batch_op.drop_constraint(
+            "department_metadata_descriptor_link_uc", type_="unique"
+        )
+        batch_op.alter_column(
+            "department_id", existing_type=sa.UUID(), nullable=True
+        )
+        batch_op.alter_column(
+            "metadata_descriptor_id", existing_type=sa.UUID(), nullable=True
+        )
+
+    # ### end Alembic commands ###

{zou-0.20.12 → zou-0.20.13/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.12
+Version: 0.20.13
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -41,7 +41,7 @@ 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: gazu==0.10.23
+Requires-Dist: gazu==0.10.25
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0
@@ -91,7 +91,7 @@ Requires-Dist: sentry-sdk==2.20.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"
-Requires-Dist: pre-commit==4.0.1; extra == "lint"
+Requires-Dist: pre-commit==4.1.0; extra == "lint"
 Dynamic: requires-python
 
 .. figure:: https://zou.cg-wire.com/kitsu.png