zou 0.19.37__tar.gz → 0.19.39__tar.gz

{zou-0.19.37/zou.egg-info → zou-0.19.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.37
+Version: 0.19.39
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -49,10 +49,10 @@ 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.1
+Requires-Dist: meilisearch==0.31.2
 Requires-Dist: numpy==1.24.4; python_version == "3.8"
 Requires-Dist: numpy==1.26.4; python_version >= "3.9"
-Requires-Dist: opencv-python==4.9.0.80
+Requires-Dist: opencv-python==4.10.0.82
 Requires-Dist: OpenTimelineIO==0.16.0
 Requires-Dist: orjson==3.10.3
 Requires-Dist: pillow==10.3.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.2
 Requires-Dist: pytz==2024.1
-Requires-Dist: redis==5.0.4
+Requires-Dist: redis==5.0.5
 Requires-Dist: requests==2.32.3
 Requires-Dist: rq==1.16.2
 Requires-Dist: slackclient==2.9.4
@@ -80,11 +80,11 @@ Provides-Extra: test
 Requires-Dist: fakeredis==2.23.2; extra == "test"
 Requires-Dist: mixer==7.2.2; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
-Requires-Dist: pytest==8.2.1; extra == "test"
+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.3.1; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.5.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.4.2; extra == "lint"

{zou-0.19.37 → zou-0.19.39}/setup.cfg

@@ -55,10 +55,10 @@ install_requires =
 	Jinja2==3.1.4
 	ldap3==2.9.1
 	matterhook==0.2
-	meilisearch==0.31.1
+	meilisearch==0.31.2
 	numpy==1.24.4; python_version == '3.8'
 	numpy==1.26.4; python_version >= '3.9'
-	opencv-python==4.9.0.80
+	opencv-python==4.10.0.82
 	OpenTimelineIO==0.16.0
 	orjson==3.10.3
 	pillow==10.3.0
@@ -69,7 +69,7 @@ install_requires =
 	python-slugify==8.0.4
 	python-socketio==5.11.2
 	pytz==2024.1
-	redis==5.0.4
+	redis==5.0.5
 	requests==2.32.3
 	rq==1.16.2
 	slackclient==2.9.4
@@ -94,11 +94,11 @@ test =
 	fakeredis==2.23.2
 	mixer==7.2.2
 	pytest-cov==5.0.0
-	pytest==8.2.1
+	pytest==8.2.2
 monitoring = 
 	prometheus-flask-exporter==0.23.0
 	pygelf==0.4.2
-	sentry-sdk==2.3.1
+	sentry-sdk==2.5.0
 lint = 
 	autoflake==2.3.1
 	black==24.4.2

zou-0.19.39/zou/__init__.py

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

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/crud/__init__.py

@@ -128,6 +128,7 @@ from zou.app.blueprints.crud.chat_message import (
     ChatMessageResource,
     ChatMessagesResource,
 )
+from zou.app.blueprints.crud.studio import StudioResource, StudiosResource
 
 routes = [
     ("/data/persons", PersonsResource),
@@ -209,6 +210,8 @@ routes = [
         "/data/preview-background-files/<instance_id>",
         PreviewBackgroundFileResource,
     ),
+    ("/data/studios", StudiosResource),
+    ("/data/studios/<instance_id>", StudioResource),
 ]
 
 blueprint = Blueprint("/data", "data")

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/crud/department.py

@@ -3,9 +3,6 @@ from zou.app.blueprints.crud.base import BaseModelResource, BaseModelsResource
 from zou.app.models.department import Department
 
 from zou.app.services import tasks_service
-from zou.app.services.exception import (
-    ArgumentsException,
-)
 
 
 class DepartmentsResource(BaseModelsResource):
@@ -19,16 +16,6 @@ class DepartmentsResource(BaseModelsResource):
         tasks_service.clear_department_cache(str(instance.id))
         return instance.serialize()
 
-    def update_data(self, data):
-        data = super().update_data(data)
-        name = data.get("name", None)
-        department = Department.get_by(name=name)
-        if department is not None:
-            raise ArgumentsException(
-                "A department type with similar name already exists"
-            )
-        return data
-
 
 class DepartmentResource(BaseModelResource):
     def __init__(self):
@@ -37,17 +24,6 @@ class DepartmentResource(BaseModelResource):
     def check_read_permissions(self, instance):
         return True
 
-    def update_data(self, data, instance_id):
-        data = super().update_data(data, instance_id)
-        name = data.get("name", None)
-        if name is not None:
-            department = Department.get_by(name=name)
-            if department is not None and instance_id != str(department.id):
-                raise ArgumentsException(
-                    "A department with similar name already exists"
-                )
-        return data
-
     def post_update(self, instance_dict, data):
         tasks_service.clear_department_cache(instance_dict["id"])
         return instance_dict

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/crud/person.py

@@ -151,6 +151,7 @@ class PersonResource(BaseModelResource, ArgsMixin):
             data.pop("is_generated_from_ldap", None)
             data.pop("ldap_uid", None)
             data.pop("last_presence", None)
+            data.pop("studio_id", None)
 
         if "role" in data and data["role"] not in [
             role for role, _ in ROLE_TYPES
@@ -204,13 +205,15 @@ class PersonResource(BaseModelResource, ArgsMixin):
             and persons_service.is_user_limit_reached()
         ):
             raise ArgumentsException("User limit reached.")
-        if (
-            data.get("active") is False
-            and instance_dict["email"] in config.PROTECTED_ACCOUNTS
-        ):
-            raise PersonInProtectedAccounts(
-                "Can't set this person as inactive it's a protected account."
-            )
+        if instance_dict["email"] in config.PROTECTED_ACCOUNTS:
+            message = None
+            if data.get("active") is False:
+                message = "Can't set this person as inactive it's a protected account."
+            elif data.get("role") is not None:
+                message = "Can't change the role of this person it's a protected account."
+
+            if message is not None:
+                raise PersonInProtectedAccounts(message)
         return data
 
     def post_update(self, instance_dict, data):

zou-0.19.39/zou/app/blueprints/crud/studio.py

@@ -0,0 +1,33 @@
+from zou.app.models.studio import Studio
+
+from zou.app.blueprints.crud.base import BaseModelsResource, BaseModelResource
+
+from zou.app.services import tasks_service
+
+
+class StudiosResource(BaseModelsResource):
+    def __init__(self):
+        BaseModelsResource.__init__(self, Studio)
+
+    def check_read_permissions(self):
+        return True
+
+    def post_creation(self, instance):
+        tasks_service.clear_studio_cache(str(instance.id))
+        return instance.serialize()
+
+
+class StudioResource(BaseModelResource):
+    def __init__(self):
+        BaseModelResource.__init__(self, Studio)
+
+    def check_read_permissions(self, instance):
+        return True
+
+    def post_update(self, instance_dict, data):
+        tasks_service.clear_studio_cache(instance_dict["id"])
+        return instance_dict
+
+    def post_delete(self, instance_dict):
+        tasks_service.clear_studio_cache(instance_dict["id"])
+        return instance_dict

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/persons/__init__.py

@@ -7,7 +7,6 @@ from zou.app.blueprints.persons.resources import (
     DayOffForMonthResource,
     DesktopLoginsResource,
     InvitePersonResource,
-    NewPersonResource,
     PersonMonthQuotaShotsResource,
     PersonWeekQuotaShotsResource,
     PersonDayQuotaShotsResource,
@@ -34,7 +33,6 @@ from zou.app.blueprints.persons.resources import (
 )
 
 routes = [
-    ("/data/persons/new", NewPersonResource),
     ("/data/persons/<person_id>/desktop-login-logs", DesktopLoginsResource),
     ("/data/persons/presence-logs/<month_date>", PresenceLogsResource),
     ("/data/persons/<person_id>/time-spents", TimeSpentsResource),

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/persons/resources.py

@@ -29,113 +29,14 @@ from zou.app.services.exception import (
     WrongParameterException,
     UnactiveUserException,
     TwoFactorAuthenticationNotEnabledException,
+    PersonInProtectedAccounts,
+    ArgumentsException,
 )
 from zou.app.services.auth_service import (
     disable_two_factor_authentication_for_person,
 )
 
 
-class NewPersonResource(Resource, ArgsMixin):
-    """
-    Create a new user in the database.
-    """
-
-    # TODO: Remove this route in the future.
-    @jwt_required()
-    @permissions.require_admin
-    def post(self):
-        """
-        Create a new user in the database.
-        This route will be removed in the future.
-        Please use POST /data/persons instead.
-        ---
-        tags:
-        - Persons
-        description: Set password to None if not provided.
-                     User role can be set but only admins can create admin users.
-        parameters:
-          - in: formData
-            name: email
-            required: True
-            type: string
-            format: email
-            x-example: admin@example.com
-          - in: formData
-            name: phone
-            required: False
-            type: integer
-            x-example: 06 12 34 56 78
-          - in: formData
-            name: role
-            required: False
-            type: string
-            x-example: user
-          - in: formData
-            name: first_name
-            required: True
-            type: string
-          - in: formData
-            name: last_name
-            required: False
-            type: string
-        responses:
-            201:
-                description: User created
-        """
-        data = self.get_arguments()
-
-        if not data["is_bot"] and persons_service.is_user_limit_reached():
-            return {
-                "error": True,
-                "message": "User limit reached.",
-                "limit": config.USER_LIMIT,
-            }, 400
-        else:
-            if data["password"] is not None:
-                data["password"] = auth.encrypt_password(data["password"])
-            person = persons_service.create_person(
-                data["email"],
-                data["password"],
-                data["first_name"],
-                data["last_name"],
-                data["phone"],
-                role=data["role"],
-                desktop_login=data["desktop_login"],
-                departments=data["departments"],
-                is_bot=data["is_bot"],
-                expiration_date=data["expiration_date"],
-                active=data["active"],
-            )
-        return person, 201
-
-    def get_arguments(self):
-        args = self.get_args(
-            [
-                {
-                    "name": "email",
-                    "help": "The email is required.",
-                    "required": True,
-                },
-                {
-                    "name": "first_name",
-                    "help": "The first name is required.",
-                    "required": True,
-                },
-                ("last_name", ""),
-                ("phone", ""),
-                ("role", "user"),
-                ("desktop_login", ""),
-                {"name": "departments", "action": "append"},
-                "password",
-                {"name": "is_bot", "default": False, "type": bool},
-                {"name": "expiration_date", "default": None, "type": str},
-                {"name": "active", "default": True, "type": bool},
-            ]
-        )
-
-        return args
-
-
 class DesktopLoginsResource(Resource, ArgsMixin):
     """
     Allow to create and retrieve desktop login logs. Desktop login logs can only
@@ -813,7 +714,12 @@ class TimeSpentDurationResource(Resource, ArgsMixin):
     def get_person_project_department_arguments(self):
         project_id = self.get_project_id()
         person_id = None
-        department_ids = None
+        department_id = self.get_text_parameter("department_id")
+        if department_id is not None:
+            department_ids = [department_id]
+        else:
+            department_ids = None
+        studio_id = self.get_text_parameter("studio_id")
         if not permissions.has_admin_permissions():
             if (
                 permissions.has_manager_permissions()
@@ -827,9 +733,16 @@ class TimeSpentDurationResource(Resource, ArgsMixin):
                 elif project_id not in project_ids:
                     raise permissions.PermissionDenied
                 if permissions.has_supervisor_permissions():
-                    department_ids = persons_service.get_current_user(
+                    persons_departments = persons_service.get_current_user(
                         relations=True
                     )["departments"]
+                    if department_id is not None:
+                        if department_id not in persons_departments:
+                            raise ArgumentsException(
+                                "Supervisor not allowed to access this department"
+                            )
+                    else:
+                        department_ids = persons_departments
             else:
                 person_id = persons_service.get_current_user()["id"]
 
@@ -837,6 +750,7 @@ class TimeSpentDurationResource(Resource, ArgsMixin):
             "person_id": person_id,
             "project_id": project_id,
             "department_ids": department_ids,
+            "studio_id": studio_id,
         }
 
 
@@ -1300,6 +1214,8 @@ class ChangePasswordForPersonResource(Resource, ArgsMixin):
         permissions.check_admin_permissions()
         try:
             person = persons_service.get_person(person_id)
+            if person["email"] in config.PROTECTED_ACCOUNTS:
+                raise PersonInProtectedAccounts()
             current_user = persons_service.get_current_user()
             auth.validate_password(password, password_2)
             password = auth.encrypt_password(password)
@@ -1343,6 +1259,14 @@ Thank you and see you soon on Kitsu,
             return {"error": True, "message": "Password is too short."}, 400
         except UnactiveUserException:
             return {"error": True, "message": "User is unactive."}, 400
+        except PersonInProtectedAccounts:
+            return (
+                {
+                    "error": True,
+                    "message": "This user is in protected accounts.",
+                },
+                400,
+            )
 
     def get_arguments(self):
         args = self.get_args(

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/shots/resources.py

@@ -1512,13 +1512,17 @@ class ProjectQuotasResource(Resource, ArgsMixin):
         """
         projects_service.get_project(project_id)
         user_service.check_project_access(project_id)
-        detail_level = self.get_text_parameter("detail")
-        weighted = self.get_bool_parameter("weighted", default="true")
-        if weighted:
+        args = self.get_args(
+            [
+                ("weighted", False, False, bool),
+                ("studio_id", None, False, str),
+            ]
+        )
+        if args["weighted"]:
             return shots_service.get_weighted_quotas(
-                project_id, task_type_id, detail_level
+                project_id, task_type_id, args["studio_id"]
             )
         else:
             return shots_service.get_raw_quotas(
-                project_id, task_type_id, detail_level
+                project_id, task_type_id, args["studio_id"]
             )

{zou-0.19.37 → zou-0.19.39}/zou/app/blueprints/tasks/resources.py

@@ -844,7 +844,7 @@ class ClearAssignationResource(Resource, ArgsMixin):
         tasks = []
         for task_id in task_ids:
             try:
-                user_service.check_task_departement_access_for_unassign(
+                user_service.check_task_department_access_for_unassign(
                     task_id, person_id
                 )
                 tasks_service.clear_assignation(task_id, person_id=person_id)
@@ -925,7 +925,7 @@ class TasksAssignResource(Resource, ArgsMixin):
         for task_id in args["task_ids"]:
             try:
                 user_service.check_person_is_not_bot(person_id)
-                user_service.check_task_departement_access(task_id, person_id)
+                user_service.check_task_department_access(task_id, person_id)
                 task = tasks_service.assign_task(
                     task_id, person_id, current_user["id"]
                 )
@@ -995,7 +995,7 @@ class TaskAssignResource(Resource, ArgsMixin):
         current_user = persons_service.get_current_user()
         try:
             user_service.check_person_is_not_bot(person_id)
-            user_service.check_task_departement_access(task_id, person_id)
+            user_service.check_task_department_access(task_id, person_id)
             task = tasks_service.assign_task(
                 task_id, person_id, current_user["id"]
             )

{zou-0.19.37 → zou-0.19.39}/zou/app/mixin.py

@@ -121,12 +121,12 @@ class ArgsMixin(object):
         """
         return self.get_bool_parameter("no_job")
 
-    def get_text_parameter(self, field_name):
+    def get_text_parameter(self, field_name, default=None):
         """
         Returns text parameter value matching `field_name`.
         """
         options = request.args
-        return options.get(field_name, None)
+        return options.get(field_name, default)
 
     def get_bool_parameter(self, field_name, default="false"):
         """

{zou-0.19.37 → zou-0.19.39}/zou/app/models/person.py

@@ -114,6 +114,9 @@ class Person(db.Model, BaseMixin, SerializerMixin):
     departments = db.relationship(
         "Department", secondary="department_link", lazy="joined"
     )
+    studio_id = db.Column(
+        UUIDType(binary=False), db.ForeignKey("studio.id"), index=True
+    )
 
     is_generated_from_ldap = db.Column(db.Boolean(), default=False)
     ldap_uid = db.Column(db.String(60), unique=True, default=None)
@@ -185,6 +188,7 @@ class Person(db.Model, BaseMixin, SerializerMixin):
             "has_avatar": data["has_avatar"],
             "active": data["active"],
             "departments": data.get("departments", []),
+            "studio_id": data["studio_id"],
             "role": data["role"],
             "desktop_login": data["desktop_login"],
             "is_bot": data["is_bot"],

zou-0.19.39/zou/app/models/studio.py

@@ -0,0 +1,13 @@
+from zou.app import db
+from zou.app.models.serializer import SerializerMixin
+from zou.app.models.base import BaseMixin
+
+
+class Studio(db.Model, BaseMixin, SerializerMixin):
+    """
+    Describe a studio.
+    """
+
+    name = db.Column(db.String(80), unique=True, nullable=False)
+    color = db.Column(db.String(7), nullable=False)
+    archived = db.Column(db.Boolean(), default=False)

{zou-0.19.37 → zou-0.19.39}/zou/app/services/exception.py

@@ -49,6 +49,10 @@ class DepartmentNotFoundException(NotFound):
     pass
 
 
+class StudioNotFoundException(NotFound):
+    pass
+
+
 class TaskStatusNotFoundException(NotFound):
     pass
 

{zou-0.19.37 → zou-0.19.39}/zou/app/services/persons_service.py

@@ -210,6 +210,7 @@ def create_person(
     ldap_uid=None,
     is_bot=False,
     expiration_date=None,
+    studio_id=None,
     active=True,
     serialize=True,
 ):
@@ -245,6 +246,7 @@ def create_person(
         ldap_uid=ldap_uid,
         is_bot=is_bot,
         expiration_date=expiration_date,
+        studio_id=studio_id,
         active=active,
     )
     if is_bot:
@@ -279,13 +281,17 @@ def update_person(person_id, data):
     Update person entry with data given in parameter.
     """
     person = Person.get(person_id)
-    if (
-        data.get("active") is False
-        and person.email in config.PROTECTED_ACCOUNTS
-    ):
-        raise PersonInProtectedAccounts(
-            "Can't set this person as inactive it's a protected account."
-        )
+    if person.email in config.PROTECTED_ACCOUNTS:
+        message = None
+        if data.get("active") is False:
+            message = (
+                "Can't set this person as inactive it's a protected account."
+            )
+        elif data.get("role") is not None:
+            message = "Can't change the role of this person it's a protected account."
+
+        if message is not None:
+            raise PersonInProtectedAccounts(message)
 
     if "email" in data and data["email"] is not None:
         data["email"] = data["email"].strip()

{zou-0.19.37 → zou-0.19.39}/zou/app/services/shots_service.py

@@ -2,7 +2,7 @@ from datetime import timedelta
 from operator import itemgetter
 from sqlalchemy.orm import aliased
 from sqlalchemy.exc import IntegrityError, StatementError
-from sqlalchemy import func
+from sqlalchemy import func, or_
 
 from zou.app.utils import (
     cache,
@@ -1112,7 +1112,7 @@ def get_base_entity_type_name(entity_dict):
     return type_name
 
 
-def get_weighted_quotas(project_id, task_type_id, detail_level):
+def get_weighted_quotas(project_id, task_type_id, studio_id=None):
     """
     Build quota statistics. It counts the number of frames done for each day.
     A shot is considered done at the first feedback request. If time spent is
@@ -1140,6 +1140,14 @@ def get_weighted_quotas(project_id, task_type_id, detail_level):
             TimeSpent.person_id,
         )
     )
+
+    if studio_id is not None:
+        persons_from_studio = Person.query.filter(
+            Person.studio_id == studio_id
+        ).all()
+        query = query.filter(
+            or_(*[Task.assignees.contains(p) for p in persons_from_studio])
+        )
     result = query.all()
 
     for task, nb_frames, date, duration, person_id in result:
@@ -1161,6 +1169,11 @@ def get_weighted_quotas(project_id, task_type_id, detail_level):
         .join(Task.assignees)
         .add_columns(Entity.nb_frames, Person.id)
     )
+
+    if studio_id is not None:
+        query = query.filter(
+            or_(*[Task.assignees.contains(p) for p in persons_from_studio])
+        )
     result = query.all()
 
     for task, nb_frames, person_id in result:
@@ -1182,7 +1195,7 @@ def get_weighted_quotas(project_id, task_type_id, detail_level):
     return quotas
 
 
-def get_raw_quotas(project_id, task_type_id, detail_level):
+def get_raw_quotas(project_id, task_type_id, studio_id=None):
     """
     Build quota statistics in a raw way. It counts the number of frames done
     for each day. A shot is considered done at the first feedback request (end
@@ -1203,6 +1216,15 @@ def get_raw_quotas(project_id, task_type_id, detail_level):
         .join(Task.assignees)
         .add_columns(Entity.nb_frames, Person.id)
     )
+
+    if studio_id is not None:
+        persons_from_studio = Person.query.filter(
+            Person.studio_id == studio_id
+        ).all()
+        query = query.filter(
+            or_(*[Task.assignees.contains(p) for p in persons_from_studio])
+        )
+
     result = query.all()
 
     for task, nb_frames, person_id in result:

{zou-0.19.37 → zou-0.19.39}/zou/app/services/sync_service.py

@@ -42,6 +42,7 @@ from zou.app.models.task import Task
 from zou.app.models.task_status import TaskStatus
 from zou.app.models.task_type import TaskType
 from zou.app.models.time_spent import TimeSpent
+from zou.app.models.studio import Studio
 
 from zou.app.services import deletion_service, tasks_service, projects_service
 from zou.app.stores import file_store
@@ -102,6 +103,7 @@ event_name_model_map = {
     "subscription": Subscription,
     "search-filter": SearchFilter,
     "search-filter-group": SearchFilterGroup,
+    "studio": Studio,
     "task": Task,
     "task-status": TaskStatus,
     "task-type": TaskType,
@@ -140,6 +142,7 @@ event_name_model_path_map = {
     "search-filter": "search-filters",
     "search-filter-group": "search-filter-groups",
     "subscription": "subscriptions",
+    "studio": "studios",
     "task": "tasks",
     "task-status": "task-status",
     "task-type": "task-types",
@@ -173,6 +176,7 @@ main_events = [
     "organisation",
     "project-status",
     "department",
+    "studio",
     "task-type",
     "task-status",
     "custom-action",