zou 0.19.49__tar.gz → 0.19.51__tar.gz

{zou-0.19.49/zou.egg-info → zou-0.19.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.49
+Version: 0.19.51
 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.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -19,9 +18,9 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Multimedia :: Graphics
-Requires-Python: >=3.8.1, <3.13
+Requires-Python: >=3.9, <3.13
 License-File: LICENSE
-Requires-Dist: babel==2.15.0
+Requires-Dist: babel==2.16.0
 Requires-Dist: click==8.1.7
 Requires-Dist: discord.py==2.4.0
 Requires-Dist: email-validator==2.2.0
@@ -40,55 +39,56 @@ Requires-Dist: flask-jwt-extended==4.6.0
 Requires-Dist: flask-migrate==4.0.7
 Requires-Dist: flask-socketio==5.3.6
 Requires-Dist: flask==3.0.3
-Requires-Dist: gazu==0.10.11
+Requires-Dist: gazu==0.10.14
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.2.1
-Requires-Dist: gunicorn==22.0.0
+Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: Jinja2==3.1.4
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
-Requires-Dist: meilisearch==0.31.4
-Requires-Dist: numpy==1.24.4; python_version == "3.8"
-Requires-Dist: numpy==2.0.1; python_version >= "3.9"
+Requires-Dist: meilisearch==0.31.5
+Requires-Dist: numpy==2.0.1; python_version == "3.9"
+Requires-Dist: numpy==2.1.0; python_version >= "3.10"
 Requires-Dist: opencv-python==4.10.0.84
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
-Requires-Dist: orjson==3.10.6
+Requires-Dist: orjson==3.10.7
 Requires-Dist: pillow==10.4.0
 Requires-Dist: psutil==6.0.0
 Requires-Dist: psycopg[binary]==3.2.1
 Requires-Dist: pyotp==2.9.0
+Requires-Dist: pysaml2==7.5.0
 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.7
+Requires-Dist: redis==5.0.8
 Requires-Dist: requests==2.32.3
 Requires-Dist: rq==1.16.2
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: sqlalchemy_utils==0.41.2
-Requires-Dist: sqlalchemy==2.0.31
+Requires-Dist: sqlalchemy==2.0.32
 Requires-Dist: ua-parser==0.18.0
-Requires-Dist: werkzeug==3.0.3
+Requires-Dist: werkzeug==3.0.4
 Provides-Extra: prod
 Requires-Dist: gunicorn; extra == "prod"
 Requires-Dist: gevent; extra == "prod"
 Provides-Extra: dev
 Requires-Dist: wheel; extra == "dev"
 Provides-Extra: test
-Requires-Dist: fakeredis==2.23.3; extra == "test"
+Requires-Dist: fakeredis==2.24.1; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
 Requires-Dist: pytest==8.3.2; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.1; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.11.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.13.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
-Requires-Dist: black==24.4.2; extra == "lint"
+Requires-Dist: black==24.8.0; extra == "lint"
 Requires-Dist: pre-commit==3.8.0; python_version >= "3.9" and extra == "lint"
 
 .. figure:: https://zou.cg-wire.com/kitsu.png

{zou-0.19.49 → zou-0.19.51}/setup.cfg

@@ -14,7 +14,6 @@ classifiers =
 	Environment :: Web Environment
 	Framework :: Flask
 	Intended Audience :: Developers
-	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
@@ -27,7 +26,7 @@ classifiers =
 zip_safe = False
 packages = find:
 install_requires = 
-	babel==2.15.0
+	babel==2.16.0
 	click==8.1.7
 	discord.py==2.4.0
 	email-validator==2.2.0
@@ -46,38 +45,39 @@ install_requires =
 	flask-migrate==4.0.7
 	flask-socketio==5.3.6
 	flask==3.0.3
-	gazu==0.10.11
+	gazu==0.10.14
 	gevent-websocket==0.10.1
 	gevent==24.2.1
-	gunicorn==22.0.0
+	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
 	Jinja2==3.1.4
 	ldap3==2.9.1
 	matterhook==0.2
-	meilisearch==0.31.4
-	numpy==1.24.4; python_version == '3.8'
-	numpy==2.0.1; python_version >= '3.9'
+	meilisearch==0.31.5
+	numpy==2.0.1; python_version == '3.9'
+	numpy==2.1.0; python_version >= '3.10'
 	opencv-python==4.10.0.84
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.6
+	orjson==3.10.7
 	pillow==10.4.0
 	psutil==6.0.0
 	psycopg[binary]==3.2.1
 	pyotp==2.9.0
+	pysaml2==7.5.0
 	python-nomad==2.0.1
 	python-slugify==8.0.4
 	python-socketio==5.11.3
 	pytz==2024.1
-	redis==5.0.7
+	redis==5.0.8
 	requests==2.32.3
 	rq==1.16.2
 	slackclient==2.9.4
 	sqlalchemy_utils==0.41.2
-	sqlalchemy==2.0.31
+	sqlalchemy==2.0.32
 	ua-parser==0.18.0
-	werkzeug==3.0.3
+	werkzeug==3.0.4
 
 [options.package_data]
 * = app/file_trees/*.json,migrations/*,migrations/versions/*.py
@@ -92,17 +92,17 @@ prod =
 dev = 
 	wheel
 test = 
-	fakeredis==2.23.3
+	fakeredis==2.24.1
 	mixer==7.2.2
 	pytest-cov==5.0.0
 	pytest==8.3.2
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.11.0
+	sentry-sdk==2.13.0
 lint = 
 	autoflake==2.3.1
-	black==24.4.2
+	black==24.8.0
 	pre-commit==3.8.0; python_version >= '3.9'
 
 [options.entry_points]

{zou-0.19.49 → zou-0.19.51}/setup.py

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

zou-0.19.51/zou/__init__.py

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

{zou-0.19.49 → zou-0.19.51}/zou/app/__init__.py

@@ -41,6 +41,9 @@ from zou.app.utils.flask import (
     wrong_auth_handler,
 )
 
+from zou.app.utils.saml import saml_client_for
+from zou.app.utils.fido import get_fido_server
+
 app = Flask(__name__)
 app.json = ORJSONProvider(app)
 app.request_class.user_agent_class = ParsedUserAgent
@@ -64,6 +67,11 @@ swagger = Swagger(
     app, template=swagger.swagger_template, config=swagger.swagger_config
 )
 
+if config.SAML_ENABLED:
+    app.extensions["saml_client"] = saml_client_for(config.SAML_METADATA_URL)
+
+app.extensions["fido_server"] = get_fido_server()
+
 
 @app.teardown_appcontext
 def shutdown_session(exception=None):

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/auth/__init__.py

@@ -13,6 +13,8 @@ from zou.app.blueprints.auth.resources import (
     RegistrationResource,
     ResetPasswordResource,
     TOTPResource,
+    SAMLSSOResource,
+    SAMLLoginResource,
 )
 
 routes = [
@@ -27,6 +29,8 @@ routes = [
     ("/auth/email-otp", EmailOTPResource),
     ("/auth/recovery-codes", RecoveryCodesResource),
     ("/auth/fido", FIDOResource),
+    ("/auth/saml/sso", SAMLSSOResource),
+    ("/auth/saml/login", SAMLLoginResource),
 ]
 
 blueprint = Blueprint("auth", "auth")

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/auth/resources.py

@@ -1,6 +1,6 @@
 import urllib.parse
 
-from flask import request, jsonify, current_app
+from flask import request, jsonify, current_app, redirect, make_response
 from flask_restful import Resource
 from flask_principal import (
     Identity,
@@ -19,6 +19,7 @@ from flask_jwt_extended import (
 
 from sqlalchemy.exc import OperationalError, TimeoutError
 from babel.dates import format_datetime
+from saml2 import entity
 
 from zou.app import app, config
 from zou.app.mixin import ArgsMixin
@@ -1331,3 +1332,108 @@ class RecoveryCodesResource(Resource, ArgsMixin):
                 },
                 400,
             )
+
+
+class SAMLSSOResource(Resource, ArgsMixin):
+    """
+    Resource to allow a user to login with SAML SSO.
+    """
+
+    def post(self):
+        """
+        Resource to allow a user to login with SAML SSO.
+        ---
+        description: ""
+        tags:
+            - Authentication
+        responses:
+          302:
+            description: Login successful, redirect to the home page.
+          400:
+            description: Wrong parameter
+        """
+        if not config.SAML_ENABLED:
+            return {"error": "SAML is not enabled."}, 400
+        authn_response = current_app.extensions[
+            "saml_client"
+        ].parse_authn_request_response(
+            request.form["SAMLResponse"], entity.BINDING_HTTP_POST
+        )
+        authn_response.get_identity()
+        email = authn_response.get_subject().text
+        person_info = {
+            k: v if not isinstance(v, list) else " ".join(v)
+            for k, v in authn_response.ava.items()
+        }
+        try:
+            user = persons_service.get_person_by_email(email)
+            for k, v in person_info.items():
+                if user.get(k) != v:
+                    persons_service.update_person(user["id"], person_info)
+                    break
+        except PersonNotFoundException:
+            user = persons_service.create_person(
+                email, "default".encode("utf-8"), **person_info
+            )
+
+        access_token = create_access_token(
+            identity=user["id"],
+            additional_claims={
+                "identity_type": "person",
+            },
+        )
+        refresh_token = create_refresh_token(
+            identity=user["id"],
+            additional_claims={
+                "identity_type": "person",
+            },
+        )
+        identity_changed.send(
+            current_app._get_current_object(),
+            identity=Identity(user["id"], "person"),
+        )
+
+        ip_address = request.environ.get("HTTP_X_REAL_IP", request.remote_addr)
+
+        response = make_response(
+            redirect(f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}")
+        )
+        set_access_cookies(response, access_token)
+        set_refresh_cookies(response, refresh_token)
+        events_service.create_login_log(user["id"], ip_address, "web")
+
+        return response
+
+
+class SAMLLoginResource(Resource, ArgsMixin):
+    """
+    Resource to allow a user to login with SAML SSO.
+    """
+
+    def get(self):
+        """
+        Resource to allow a user to login with SAML SSO.
+        ---
+        description: ""
+        tags:
+            - Authentication
+        responses:
+          302:
+            description: Redirect to the SAML IDP.
+          400:
+            description: Wrong parameter.
+        """
+        if not config.SAML_ENABLED:
+            return {"error": "SAML is not enabled."}, 400
+        _, info = current_app.extensions[
+            "saml_client"
+        ].prepare_for_authenticate()
+
+        redirect_url = None
+
+        # Select the IdP URL to send the AuthN request to
+        for key, value in info["headers"]:
+            if key == "Location":
+                redirect_url = value
+
+        return redirect(redirect_url, code=302)

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/crud/entity.py

@@ -10,8 +10,11 @@ from zou.app.models.entity import (
     EntityVersion,
     EntityLink,
     EntityConceptLink,
+    ENTITY_STATUSES,
 )
+from zou.app.models.project import Project
 from zou.app.models.subscription import Subscription
+from zou.app.models.task import Task
 from zou.app.services import (
     assets_service,
     breakdown_service,
@@ -23,7 +26,9 @@ from zou.app.services import (
     user_service,
     concepts_service,
 )
-from zou.app.utils import events, date_helpers
+from zou.app.utils import date_helpers, events, permissions
+
+from zou.app.services.exception import ArgumentsException
 
 from werkzeug.exceptions import NotFound
 
@@ -56,11 +61,36 @@ class EntitiesResource(BaseModelsResource, EntityEventMixin):
     def emit_create_event(self, entity_dict):
         self.emit_event("new", entity_dict)
 
+    def check_read_permissions(self):
+        return True
+
+    def add_project_permission_filter(self, query):
+        if not permissions.has_admin_permissions():
+            query = query.join(Project).filter(
+                user_service.build_related_projects_filter()
+            )
+            if permissions.has_vendor_permissions():
+                query = query.join(Task).filter(
+                    user_service.build_assignee_filter()
+                )
+
+        return query
+
     def update_data(self, data):
         data = super().update_data(data)
         data["created_by"] = persons_service.get_current_user()["id"]
         return data
 
+    def check_creation_integrity(self, data):
+        """
+        Check if entity has a valid status.
+        """
+        if "status" in data:
+            types = [entity_status for entity_status, _ in ENTITY_STATUSES]
+            if data["status"] not in types:
+                raise ArgumentsException("Invalid status")
+        return True
+
     def all_entries(self, query=None, relations=False):
         entities = BaseModelsResource.all_entries(
             self, query=query, relations=relations
@@ -216,3 +246,14 @@ class EntityResource(BaseModelResource, EntityEventMixin):
             index_service.remove_asset_index(entity_dict["id"])
         elif shots_service.is_shot(entity_dict):
             index_service.remove_shot_index(entity_dict["id"])
+
+    def update_data(self, data, instance_id):
+        """
+        Check if the entity has a valid status.
+        """
+        data = super().update_data(data, instance_id)
+        if "status" in data:
+            types = [entity_status for entity_status, _ in ENTITY_STATUSES]
+            if data["status"] not in types:
+                raise ArgumentsException("Invalid status")
+        return data

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/crud/task.py

@@ -1,8 +1,11 @@
 from flask import request, current_app
 from flask_jwt_extended import jwt_required
 
+from sqlalchemy.orm import aliased
 from sqlalchemy.exc import IntegrityError
+
 from zou.app.mixin import ArgsMixin
+from zou.app.models.entity import Entity
 from zou.app.models.person import Person
 from zou.app.models.project import Project
 from zou.app.models.task import Task
@@ -21,7 +24,7 @@ from zou.app.services.exception import WrongTaskTypeForEntityException
 from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
 
 
-class TasksResource(BaseModelsResource):
+class TasksResource(BaseModelsResource, ArgsMixin):
     def __init__(self):
         BaseModelsResource.__init__(self, Task)
 
@@ -37,6 +40,43 @@ class TasksResource(BaseModelsResource):
             )
         return query
 
+    def build_filters(self, options):
+        (
+            many_join_filter,
+            in_filter,
+            name_filter,
+            criterions,
+        ) = super().build_filters(options)
+        if "project_id" in criterions:
+            del criterions["project_id"]
+        if "episode_id" in criterions:
+            del criterions["episode_id"]
+        return (
+            many_join_filter,
+            in_filter,
+            name_filter,
+            criterions,
+        )
+
+    def apply_filters(self, query, options):
+        query = super().apply_filters(query, options)
+
+        project_id = options.get("project_id", None)
+        episode_id = options.get("episode_id", None)
+        if episode_id is not None:
+            Sequence = aliased(Entity)
+            query = (
+                query.join(Entity, Task.entity_id == Entity.id)
+                .join(Sequence, Entity.parent_id == Sequence.id)
+                .filter(Sequence.parent_id == episode_id)
+            )
+        elif project_id is not None:
+            query = query.join(Entity, Task.entity_id == Entity.id).filter(
+                Entity.project_id == project_id
+            )
+
+        return query
+
     def post(self):
         """
         Create a task with data given in the request body. JSON format is

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/index/resources.py

@@ -25,7 +25,7 @@ class IndexResource(Resource):
             200:
                 description: API name and version
         """
-        return {"api": app.config["APP_NAME"], "version": __version__}
+        return {"api": config.APP_NAME, "version": __version__}
 
 
 class BaseStatusResource(Resource):
@@ -86,10 +86,8 @@ class BaseStatusResource(Resource):
 
         version = __version__
 
-        api_name = app.config["APP_NAME"]
-
         return (
-            api_name,
+            config.APP_NAME,
             version,
             is_db_up,
             is_kv_up,
@@ -281,20 +279,22 @@ class ConfigResource(Resource):
             200:
                 description: Crisp token
         """
-        config = {
-            "is_self_hosted": app.config["IS_SELF_HOSTED"],
-            "crisp_token": app.config["CRISP_TOKEN"],
+        conf = {
+            "is_self_hosted": config.IS_SELF_HOSTED,
+            "crisp_token": config.CRISP_TOKEN,
             "indexer_configured": (
-                len(app.config["INDEXER"]["key"]) > 0
-                and app.config["INDEXER"]["key"] != "masterkey"
+                len(config.INDEXER["key"]) > 0
+                and config.INDEXER["key"] != "masterkey"
             ),
+            "saml_enabled": config.SAML_ENABLED,
+            "saml_idp_name": config.SAML_IDP_NAME,
         }
-        if app.config["SENTRY_KITSU_ENABLED"]:
-            config["sentry"] = {
-                "dsn": app.config["SENTRY_KITSU_DSN"],
-                "sampleRate": app.config["SENTRY_KITSU_SR"],
+        if config.SENTRY_KITSU_ENABLED:
+            conf["sentry"] = {
+                "dsn": config.SENTRY_KITSU_DSN,
+                "sampleRate": config.SENTRY_KITSU_SR,
             }
-        return config
+        return conf
 
 
 class TestEventsResource(Resource):

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/previews/resources.py

@@ -76,6 +76,7 @@ ALLOWED_FILE_EXTENSION = [
     "sbbkp",
     "svg",
     "swf",
+    "tvpp",
     "wav",
     "zip",
 ]

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/shots/resources.py

@@ -18,7 +18,10 @@ 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
+from zou.app.services.exception import (
+    WrongParameterException,
+    ArgumentsException,
+)
 
 
 class ShotResource(Resource, ArgsMixin):
@@ -48,6 +51,52 @@ class ShotResource(Resource, ArgsMixin):
         user_service.check_entity_access(shot["id"])
         return shot
 
+    @jwt_required()
+    def put(self, shot_id):
+        """
+        Update given shot.
+        ---
+        tags:
+        - Shots
+        parameters:
+          - in: path
+            name: shot_id
+            required: True
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: body
+            name: data
+            required: True
+            type: object
+        responses:
+            200:
+                description: Update given shot
+        """
+        shot = shots_service.get_shot(shot_id)
+        user_service.check_manager_project_access(shot["project_id"])
+        data = request.json
+        if data is None:
+            raise ArgumentsException(
+                "Data are empty. Please verify that you sent JSON data and"
+                " that you set the right headers."
+            )
+        for field in [
+            "id",
+            "created_at",
+            "updated_at",
+            "instance_casting",
+            "project_id",
+            "entities_in",
+            "entities_out",
+            "type",
+            "shotgun_id",
+            "created_by",
+        ]:
+            data.pop(field, None)
+
+        return shots_service.update_shot(shot_id, data)
+
     @jwt_required()
     def delete(self, shot_id):
         """

{zou-0.19.49 → zou-0.19.51}/zou/app/blueprints/tasks/resources.py

@@ -1463,7 +1463,6 @@ class ProjectTasksResource(Resource, ArgsMixin):
     """
 
     @jwt_required()
-    @permissions.require_admin
     def get(self, project_id):
         """
         Retrieve all tasks related to given project.
@@ -1478,13 +1477,34 @@ class ProjectTasksResource(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: task_type_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: episode_id
+            required: False
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: All tasks related to given project
         """
         projects_service.get_project(project_id)
         page = self.get_page()
-        return tasks_service.get_tasks_for_project(project_id, page)
+        task_type_id = self.get_task_type_id()
+        episode_id = self.get_episode_id()
+        return tasks_service.get_tasks_for_project(
+            project_id, page, task_type_id=task_type_id, episode_id=episode_id
+        )
 
 
 class ProjectCommentsResource(Resource, ArgsMixin):

{zou-0.19.49 → zou-0.19.51}/zou/app/config.py

@@ -132,6 +132,10 @@ LDAP_IS_AD = envtobool("LDAP_IS_AD", False)
 LDAP_IS_AD_SIMPLE = envtobool("LDAP_IS_AD_SIMPLE", False)
 LDAP_SSL = envtobool("LDAP_SSL", False)
 
+SAML_ENABLED = envtobool("SAML_ENABLED", False)
+SAML_IDP_NAME = os.getenv("SAML_IDP_NAME", "")
+SAML_METADATA_URL = os.getenv("SAML_METADATA_URL", "")
+
 LOGS_MODE = os.getenv("LOGS_MODE", "default")
 LOGS_HOST = os.getenv("LOGS_HOST", "localhost")
 LOGS_PORT = os.getenv("LOGS_PORT", 2202)