zou 0.20.37__tar.gz → 0.20.39__tar.gz

{zou-0.20.37/zou.egg-info → zou-0.20.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.37
+Version: 0.20.39
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -42,7 +42,7 @@ Requires-Dist: flask-socketio==5.5.1
 Requires-Dist: flask==3.1.0
 Requires-Dist: gazu==0.10.31
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==25.4.1
+Requires-Dist: gevent==25.4.2
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -51,7 +51,7 @@ 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.4; python_version >= "3.10"
+Requires-Dist: numpy==2.2.5; 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
@@ -68,9 +68,12 @@ Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: rq==2.3.2
+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: tomlkit==0.13.2
 Requires-Dist: ua-parser==1.0.1
 Requires-Dist: werkzeug==3.1.3
 Provides-Extra: prod
@@ -86,7 +89,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.26.1; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.27.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"

{zou-0.20.37 → zou-0.20.39}/setup.cfg

@@ -48,7 +48,7 @@ install_requires =
 	flask==3.1.0
 	gazu==0.10.31
 	gevent-websocket==0.10.1
-	gevent==25.4.1
+	gevent==25.4.2
 	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
@@ -57,7 +57,7 @@ install_requires =
 	matterhook==0.2
 	meilisearch==0.34.1
 	numpy==2.0.1; python_version == '3.9'
-	numpy==2.2.4; python_version >= '3.10'
+	numpy==2.2.5; python_version >= '3.10'
 	opencv-python==4.11.0.86
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
@@ -74,9 +74,12 @@ install_requires =
 	redis==5.2.1
 	requests==2.32.3
 	rq==2.3.2
+	semver==3.0.4
 	slackclient==2.9.4
+	spdx-license-list==3.26.0
 	sqlalchemy_utils==0.41.2
 	sqlalchemy==2.0.40
+	tomlkit==0.13.2
 	ua-parser==1.0.1
 	werkzeug==3.1.3
 
@@ -100,7 +103,7 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.2
 	pygelf==0.4.2
-	sentry-sdk==2.26.1
+	sentry-sdk==2.27.0
 lint = 
 	autoflake==2.3.1
 	black==25.1.0

zou-0.20.39/zou/__init__.py

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

{zou-0.20.37 → zou-0.20.39}/zou/app/api.py

@@ -1,9 +1,12 @@
 import os
 import sys
+import tomlkit
+import importlib
+import traceback
 
-from zou.app.utils import events, api as api_utils
+from zou.app.utils import events
+from pathlib import Path
 
-from flask import Blueprint
 
 from zou.app.blueprints.assets import blueprint as assets_blueprint
 from zou.app.blueprints.auth import blueprint as auth_blueprint
@@ -93,44 +96,32 @@ def register_event_handlers(app):
 
 def load_plugins(app):
     """
-    Load plugin, (bunch of resources dedicated to a specific usage).
+    Load plugins from the plugin folder.
     """
-    if os.path.exists(app.config["PLUGIN_FOLDER"]):
-        plugins = load_plugin_modules(app.config["PLUGIN_FOLDER"])
-        for plugin in plugins:
-            load_plugin(app, plugin)
-
-
-def load_plugin_modules(plugin_folder):
-    """
-    Run Python import on all plugin listed in plugin folder. It returns the
-    imported module.
-    """
-    sys.path.insert(0, plugin_folder)
-    return [
-        __import__(file_name)
-        for file_name in os.listdir(plugin_folder)
-        if os.path.isdir(os.path.join(plugin_folder, file_name))
-        and file_name != "__pycache__"
-    ]
+    abs_plugin_path = os.path.abspath(app.config["PLUGIN_FOLDER"])
+    if abs_plugin_path not in sys.path:
+        sys.path.insert(0, abs_plugin_path)
 
-
-def load_plugin(app, plugin):
-    """
-    Load a given plugin as an API plugin: add configured routes to the API. It
-    assumes that the plugin is already loaded in memory has a blueprint
-    structure.
-    """
-    routes = [
-        ("/plugins%s" % route_path, resource)
-        for (route_path, resource) in plugin.routes
-        if len(route_path) > 0 and route_path[0] == "/"
-    ]
-    plugin.routes = routes
-    plugin.blueprint = Blueprint(plugin.name, plugin.name)
-    plugin.api = api_utils.configure_api_from_blueprint(
-        plugin.blueprint, plugin.routes
-    )
-    app.register_blueprint(plugin.blueprint)
-    app.logger.info("Plugin %s loaded." % plugin.name)
-    return plugin
+    if os.path.exists(app.config["PLUGIN_FOLDER"]):
+        for plugin_id in os.listdir(app.config["PLUGIN_FOLDER"]):
+            try:
+                load_plugin(app, plugin_id)
+                app.logger.info(f"Plugin {plugin_id} loaded.")
+            except:
+                app.logger.error(f"Plugin {plugin_id} fails to load:")
+                app.logger.error(traceback.format_exc())
+
+    if abs_plugin_path in sys.path:
+        sys.path.remove(abs_plugin_path)
+
+
+def load_plugin(app, plugin_id):
+    with open(
+        Path(app.config["PLUGIN_FOLDER"]).joinpath(plugin_id, "manifest.toml"),
+        "rb",
+    ) as manifest_file:
+        manifest = tomlkit.load(manifest_file)
+    plugin_module = importlib.import_module(plugin_id)
+    if hasattr(plugin_module, "init_plugin"):
+        plugin_module.init_plugin(app, manifest)
+    return plugin_module

{zou-0.20.37 → zou-0.20.39}/zou/app/blueprints/crud/__init__.py

@@ -129,6 +129,10 @@ from zou.app.blueprints.crud.chat_message import (
     ChatMessagesResource,
 )
 from zou.app.blueprints.crud.studio import StudioResource, StudiosResource
+from zou.app.blueprints.crud.salary_scale import (
+    SalaryScalesResource,
+    SalaryScaleResource,
+)
 
 routes = [
     ("/data/persons", PersonsResource),
@@ -212,6 +216,8 @@ routes = [
     ),
     ("/data/studios", StudiosResource),
     ("/data/studios/<instance_id>", StudioResource),
+    ("/data/salary-scales", SalaryScalesResource),
+    ("/data/salary-scales/<instance_id>", SalaryScaleResource),
 ]
 
 blueprint = Blueprint("/data", "data")

zou-0.20.39/zou/app/blueprints/crud/budget.py

@@ -0,0 +1,21 @@
+from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
+
+from zou.app.models.salary_scale import Budget
+
+
+class BudgetsResource(BaseModelsResource):
+    def __init__(self):
+        BaseModelsResource.__init__(self, Budget)
+
+
+class BudgetResource(BaseModelResource):
+    protected_fields = [
+        "id",
+        "created_at",
+        "updated_at",
+        "project_id",
+        "revision",
+    ]
+
+    def __init__(self):
+        BaseModelResource.__init__(self, Budget)

zou-0.20.39/zou/app/blueprints/crud/budget_entry.py

@@ -0,0 +1,15 @@
+from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
+
+from zou.app.models.salary_scale import BudgetEntry
+
+
+class BudgetEntriesResource(BaseModelsResource):
+
+    def __init__(self):
+        BaseModelsResource.__init__(self, BudgetEntry)
+
+
+class BudgetEntryResource(BaseModelResource):
+
+    def __init__(self):
+        BaseModelResource.__init__(self, BudgetEntry)

zou-0.20.39/zou/app/blueprints/crud/plugin.py

@@ -0,0 +1,13 @@
+from zou.app.models.plugin import Plugin
+
+from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
+
+
+class PluginsResource(BaseModelsResource):
+    def __init__(self):
+        BaseModelsResource.__init__(self, Plugin)
+
+
+class PluginResource(BaseModelResource):
+    def __init__(self):
+        BaseModelResource.__init__(self, Plugin)

zou-0.20.39/zou/app/blueprints/crud/salary_scale.py

@@ -0,0 +1,73 @@
+from flask_jwt_extended import jwt_required
+
+from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
+
+from zou.app.services.exception import WrongParameterException
+
+from zou.app.models.department import Department
+from zou.app.models.salary_scale import SalaryScale
+
+
+from zou.app.models.person import POSITION_TYPES, SENIORITY_TYPES
+
+
+class SalaryScalesResource(BaseModelsResource):
+    def __init__(self):
+        BaseModelsResource.__init__(self, SalaryScale)
+
+    def check_creation_integrity(self, data):
+        raise WrongParameterException("Salary scales cannot be created")
+
+    @jwt_required()
+    def get(self):
+        """
+        Retrieve all salary scale entries.
+        ---
+        tags:
+          - Crud
+        description: Retrieve all salary scale entries.
+        responses:
+            200:
+                description: All salary scale entries
+            403:
+                description: Permission denied
+        """
+        self.check_read_permissions()
+        query = self.model.query
+
+        position_types = [position for position, _ in POSITION_TYPES]
+        seniority_types = [seniority for seniority, _ in SENIORITY_TYPES]
+
+        departments = Department.query.all()
+        salary_scales = SalaryScale.query.all()
+        salary_scale_map = {}
+        for salary_scale in salary_scales:
+            key = (
+                f"{salary_scale.department_id}-"
+                + f"{salary_scale.position.value.lower()}-"
+                + f"{salary_scale.seniority.value.lower()}"
+            )
+            salary_scale_map[key] = True
+
+        for department in departments:
+            for position in position_types:
+                for seniority in seniority_types:
+                    key = (
+                        f"{department.id}-"
+                        + f"{position.lower()}-"
+                        + f"{seniority.lower()}"
+                    )
+                    if key not in salary_scale_map:
+                        SalaryScale.create(
+                            department_id=department.id,
+                            position=position,
+                            seniority=seniority,
+                        )
+        return self.all_entries(query)
+
+
+class SalaryScaleResource(BaseModelResource):
+    protected_fields = ["id", "created_at", "updated_at", "department_id"]
+
+    def __init__(self):
+        BaseModelResource.__init__(self, SalaryScale)

{zou-0.20.37 → zou-0.20.39}/zou/app/blueprints/playlists/resources.py

@@ -42,6 +42,21 @@ class ProjectPlaylistsResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: page
+            required: False
+            type: integer
+            x-example: 1
+          - in: query
+            name: sort_by
+            required: False
+            type: string
+            x-example: udpdated_at
+          - in: query
+            name: task_type_id
+            required: False
+            type: string
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: All playlists related to given project

{zou-0.20.37 → zou-0.20.39}/zou/app/blueprints/projects/__init__.py

@@ -26,6 +26,10 @@ from zou.app.blueprints.projects.resources import (
     ProductionEpisodesScheduleItemsResource,
     ProductionSequencesScheduleItemsResource,
     ProductionTimeSpentsResource,
+    ProductionBudgetsResource,
+    ProductionBudgetResource,
+    ProductionBudgetEntriesResource,
+    ProductionBudgetEntryResource,
 )
 
 routes = [
@@ -110,6 +114,19 @@ routes = [
         ProductionSequencesScheduleItemsResource,
     ),
     ("/data/projects/<project_id>/time-spents", ProductionTimeSpentsResource),
+    ("/data/projects/<project_id>/budgets", ProductionBudgetsResource),
+    (
+        "/data/projects/<project_id>/budgets/<budget_id>",
+        ProductionBudgetResource,
+    ),
+    (
+        "/data/projects/<project_id>/budgets/<budget_id>/entries",
+        ProductionBudgetEntriesResource,
+    ),
+    (
+        "/data/projects/<project_id>/budgets/<budget_id>/entries/<entry_id>",
+        ProductionBudgetEntryResource,
+    ),
 ]
 
 blueprint = Blueprint("projects", "projects")