zou 0.19.59__tar.gz → 0.19.61__tar.gz

{zou-0.19.59/zou.egg-info → zou-0.19.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.59
+Version: 0.19.61
 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-socketio==5.4.1
 Requires-Dist: flask==3.0.3
 Requires-Dist: gazu==0.10.16
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==24.10.2
+Requires-Dist: gevent==24.10.3
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -54,9 +54,9 @@ Requires-Dist: numpy==2.1.2; 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.7
+Requires-Dist: orjson==3.10.9
 Requires-Dist: pillow==11.0.0
-Requires-Dist: psutil==6.0.0
+Requires-Dist: psutil==6.1.0
 Requires-Dist: psycopg[binary]==3.2.3
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.0
@@ -85,7 +85,7 @@ Requires-Dist: pytest==8.3.3; 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.16.0; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.17.0; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==24.10.0; extra == "lint"

{zou-0.19.59 → zou-0.19.61}/setup.cfg

@@ -47,7 +47,7 @@ install_requires =
 	flask==3.0.3
 	gazu==0.10.16
 	gevent-websocket==0.10.1
-	gevent==24.10.2
+	gevent==24.10.3
 	gunicorn==23.0.0
 	isoweek==1.3.3
 	itsdangerous==2.2.0
@@ -60,9 +60,9 @@ install_requires =
 	opencv-python==4.10.0.84
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
-	orjson==3.10.7
+	orjson==3.10.9
 	pillow==11.0.0
-	psutil==6.0.0
+	psutil==6.1.0
 	psycopg[binary]==3.2.3
 	pyotp==2.9.0
 	pysaml2==7.5.0
@@ -99,7 +99,7 @@ test =
 monitoring = 
 	prometheus-flask-exporter==0.23.1
 	pygelf==0.4.2
-	sentry-sdk==2.16.0
+	sentry-sdk==2.17.0
 lint = 
 	autoflake==2.3.1
 	black==24.10.0

zou-0.19.61/zou/__init__.py

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

{zou-0.19.59 → zou-0.19.61}/zou/app/blueprints/auth/resources.py

@@ -1369,7 +1369,9 @@ class SAMLSSOResource(Resource, ArgsMixin):
             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)
+                    persons_service.update_person(
+                        user["id"], person_info, bypass_protected_accounts=True
+                    )
                     break
         except PersonNotFoundException:
             user = persons_service.create_person(

{zou-0.19.59 → zou-0.19.61}/zou/app/blueprints/crud/person.py

@@ -203,7 +203,10 @@ class PersonResource(BaseModelResource, ArgsMixin):
             and persons_service.is_user_limit_reached()
         ):
             raise WrongParameterException("User limit reached.")
-        if instance_dict["email"] in config.PROTECTED_ACCOUNTS:
+        if (
+            instance_dict["email"] in config.PROTECTED_ACCOUNTS
+            and instance_dict["id"] != persons_service.get_current_user()["id"]
+        ):
             message = None
             if data.get("active") is False:
                 message = "Can't set this person as inactive it's a protected account."

{zou-0.19.59 → zou-0.19.61}/zou/app/blueprints/index/resources.py

@@ -9,7 +9,7 @@ from zou import __version__
 
 from zou.app import app, config
 from zou.app.utils import permissions, shell, date_helpers
-from zou.app.services import projects_service, stats_service
+from zou.app.services import projects_service, stats_service, persons_service
 
 from flask_jwt_extended import jwt_required
 
@@ -276,17 +276,21 @@ class StatsResource(Resource):
 class ConfigResource(Resource):
     def get(self):
         """
-        Get crisp token.
+        Get basic configuration for the current instance.
         ---
         tags:
           - Index
         responses:
             200:
-                description: Crisp token
+                description: Configuration object including self-hosted status,
+                    Crisp token, indexer configuration, SAML status, and dark
+                    theme status.
         """
+        organisation = persons_service.get_organisation()
         conf = {
             "is_self_hosted": config.IS_SELF_HOSTED,
             "crisp_token": config.CRISP_TOKEN,
+            "dark_theme_by_default": organisation["dark_theme_by_default"],
             "indexer_configured": (
                 len(config.INDEXER["key"]) > 0
                 and config.INDEXER["key"] != "masterkey"

{zou-0.19.59 → zou-0.19.61}/zou/app/blueprints/persons/resources.py

@@ -1255,7 +1255,10 @@ class ChangePasswordForPersonResource(Resource, ArgsMixin):
         permissions.check_admin_permissions()
         try:
             person = persons_service.get_person(person_id)
-            if person["email"] in config.PROTECTED_ACCOUNTS:
+            if (
+                person["email"] in config.PROTECTED_ACCOUNTS
+                and person["id"] != persons_service.get_current_user()["id"]
+            ):
                 raise PersonInProtectedAccounts()
             current_user = persons_service.get_current_user()
             auth.validate_password(password, password_2)

{zou-0.19.59 → zou-0.19.61}/zou/app/blueprints/previews/resources.py

@@ -1023,6 +1023,11 @@ class PersonThumbnailResource(BaseThumbnailResource):
         if not is_current_user and not permissions.has_admin_permissions():
             raise permissions.PermissionDenied
 
+    def prepare_creation(self, instance_id):
+        self.model = self.update_model_func(
+            instance_id, {"has_avatar": True}, bypass_protected_accounts=True
+        )
+
 
 class CreatePersonThumbnailResource(PersonThumbnailResource):
     pass

{zou-0.19.59 → zou-0.19.61}/zou/app/blueprints/user/resources.py

@@ -544,6 +544,7 @@ class FiltersResource(Resource, ArgsMixin):
                 arguments["entity_type"],
                 arguments["is_shared"],
                 arguments["search_filter_group_id"],
+                department_id=arguments["department_id"],
             ),
             201,
         )
@@ -558,6 +559,7 @@ class FiltersResource(Resource, ArgsMixin):
                 ("entity_type", None, False),
                 ("is_shared", False, False, inputs.boolean),
                 ("search_filter_group_id", None, False),
+                ("department_id", None, False),
             ]
         )
 
@@ -591,6 +593,7 @@ class FilterResource(Resource, ArgsMixin):
                 ("search_filter_group_id", None, False),
                 ("is_shared", None, False, inputs.boolean),
                 ("project_id", None, None),
+                ("department_id", None, None),
             ]
         )
         data = self.clear_empty_fields(
@@ -663,19 +666,27 @@ class FilterGroupsResource(Resource, ArgsMixin):
             name: entity_type
             required: False
             type: string
+          - in: formData
+            name: is_shared
+            required: False
+            type: boolean
           - in: formData
             name: project_id
             required: True
             type: string
             format: UUID
             example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: department_id
+            required: False
+            format: UUID
+            example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             201:
                 description: Filter groups for the current user and only for
                              open projects created.
         """
         arguments = self.get_arguments()
-
         return (
             user_service.create_filter_group(
                 arguments["list_type"],
@@ -684,6 +695,7 @@ class FilterGroupsResource(Resource, ArgsMixin):
                 arguments["project_id"],
                 arguments["entity_type"],
                 arguments["is_shared"],
+                arguments["department_id"],
             ),
             201,
         )
@@ -697,6 +709,7 @@ class FilterGroupsResource(Resource, ArgsMixin):
                 ("project_id", None, False),
                 ("is_shared", False, False, inputs.boolean),
                 ("entity_type", None, False),
+                ("department_id", None, False),
             ]
         )
 
@@ -733,6 +746,28 @@ class FilterGroupResource(Resource, ArgsMixin):
             type: string
             format: UUID
             x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: name
+            type: string
+            x-example: Name of the filter group
+          - in: formData
+            name: color
+            type: string
+            x-example: Color of the filter group
+          - in: formData
+            name: is_shared
+            type: boolean
+            x-example: True
+          - in: formData
+            name: project_id
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: formData
+            name: department_id
+            type: string
+            format: UUID
+            x-example: a24a6ea4-ce75-4665-a070-57453082c25
         responses:
             200:
                 description: Given filter group with updated data
@@ -743,6 +778,7 @@ class FilterGroupResource(Resource, ArgsMixin):
                 ("color", None, False),
                 ("is_shared", None, False, inputs.boolean),
                 ("project_id", None, None),
+                ("department_id", None, None),
             ]
         )
 

{zou-0.19.59 → zou-0.19.61}/zou/app/config.py

@@ -82,6 +82,7 @@ MAIL_PORT = os.getenv("MAIL_PORT", 25)
 MAIL_USERNAME = os.getenv("MAIL_USERNAME", "")
 MAIL_PASSWORD = os.getenv("MAIL_PASSWORD", "")
 MAIL_DEBUG = envtobool("MAIL_DEBUG", False)
+MAIL_DEBUG_BODY = envtobool("MAIL_DEBUG_BODY", False)
 MAIL_USE_TLS = envtobool("MAIL_USE_TLS", False)
 MAIL_USE_SSL = envtobool("MAIL_USE_SSL", False)
 MAIL_DEFAULT_SENDER = os.getenv(

{zou-0.19.59 → zou-0.19.61}/zou/app/models/search_filter.py

@@ -23,6 +23,10 @@ class SearchFilter(db.Model, BaseMixin, SerializerMixin):
         nullable=False,
     )
 
+    department_id = db.Column(
+        UUIDType(binary=False),
+        db.ForeignKey("department.id"),
+    )
     search_filter_group_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("search_filter_group.id"),

{zou-0.19.59 → zou-0.19.61}/zou/app/models/search_filter_group.py

@@ -24,3 +24,6 @@ class SearchFilterGroup(db.Model, BaseMixin, SerializerMixin):
 
     person_id = db.Column(UUIDType(binary=False), db.ForeignKey("person.id"))
     project_id = db.Column(UUIDType(binary=False), db.ForeignKey("project.id"))
+    department_id = db.Column(
+        UUIDType(binary=False), db.ForeignKey("department.id")
+    )

{zou-0.19.59 → zou-0.19.61}/zou/app/services/persons_service.py

@@ -381,7 +381,9 @@ def update_person_last_presence(person_id):
         date = log.date
     elif time_spent is not None:
         date = time_spent.date
-    return update_person(person_id, {"last_presence": date})
+    return update_person(
+        person_id, {"last_presence": date}, bypass_protected_accounts=True
+    )
 
 
 def get_presence_logs(year, month):

{zou-0.19.59 → zou-0.19.61}/zou/app/services/user_service.py

@@ -889,20 +889,30 @@ def get_user_filters(current_user_id):
         .all()
     )
 
+    current_user = persons_service.get_current_user(relations=True)
+    is_manager = permissions.has_manager_permissions()
+
     for search_filter in filters:
-        if search_filter.list_type not in result:
-            result[search_filter.list_type] = {}
-        subresult = result[search_filter.list_type]
+        department_id = search_filter.department_id
+        is_in_departments = (
+            department_id is not None
+            and str(department_id) in current_user["departments"]
+        )
 
-        if search_filter.project_id is None:
-            project_id = "all"
-        else:
-            project_id = str(search_filter.project_id)
+        if department_id is None or is_manager or is_in_departments:
+            if search_filter.list_type not in result:
+                result[search_filter.list_type] = {}
+            subresult = result[search_filter.list_type]
+
+            if search_filter.project_id is None:
+                project_id = "all"
+            else:
+                project_id = str(search_filter.project_id)
 
-        if project_id not in subresult:
-            subresult[project_id] = []
+            if project_id not in subresult:
+                subresult[project_id] = []
 
-        subresult[project_id].append(search_filter.serialize())
+            subresult[project_id].append(search_filter.serialize())
 
     return result
 
@@ -915,6 +925,7 @@ def create_filter(
     entity_type=None,
     is_shared=False,
     search_filter_group_id=None,
+    department_id=None,
 ):
     """
     Add a new search filter to the database.
@@ -937,6 +948,13 @@ def create_filter(
                 "A search filter should have the same value for is_shared than its search filter group."
             )
 
+    if department_id is not None:
+        department = tasks_service.get_department(department_id)
+        if department is None:
+            raise WrongParameterException(
+                f"No department found with id: {department_id}"
+            )
+
     search_filter = SearchFilter.create(
         list_type=list_type,
         name=name,
@@ -946,6 +964,7 @@ def create_filter(
         entity_type=entity_type,
         is_shared=is_shared,
         search_filter_group_id=search_filter_group_id,
+        department_id=department_id,
     )
     search_filter.serialize()
     if search_filter.is_shared:
@@ -969,9 +988,24 @@ def update_filter(search_filter_id, data):
     if search_filter is None:
         raise SearchFilterNotFoundException
 
-    if data.get("project_id", None) is None or (
-        data["project_id"] is not None
-        and not has_manager_project_access(data["project_id"])
+    department_id = data.get("department_id", None)
+    if department_id is not None:
+        department = tasks_service.get_department(department_id)
+        if department is None:
+            raise WrongParameterException(
+                f"No department found with id: {department_id}"
+            )
+
+    if (
+        data.get("is_shared", None) is not None
+        and search_filter.is_shared != data["is_shared"]
+        and (
+            data.get("project_id", None) is None
+            or (
+                data["project_id"] is not None
+                and not has_manager_project_access(data["project_id"])
+            )
+        )
     ):
         data["is_shared"] = False
 
@@ -992,6 +1026,15 @@ def update_filter(search_filter_id, data):
             raise WrongParameterException(
                 "A search filter should have the same value for is_shared than its search filter group."
             )
+
+    department_id = data.get("department_id", None)
+    if department_id is not None:
+        department = tasks_service.get_department(department_id)
+        if department is None:
+            raise WrongParameterException(
+                f"No department found with id: {department_id}"
+            )
+
     search_filter.update(data)
     if search_filter.is_shared:
         clear_filter_cache()
@@ -1028,7 +1071,7 @@ def get_filter_groups():
     return get_user_filter_groups(current_user["id"])
 
 
-@cache.memoize_function(120)
+@cache.memoize_function(10)
 def get_user_filter_groups(current_user_id):
     """
     Retrieve search filter groups used for given user. It groups them by
@@ -1055,26 +1098,41 @@ def get_user_filter_groups(current_user_id):
         .all()
     )
 
+    current_user = persons_service.get_current_user(relations=True)
+    is_manager = permissions.has_manager_permissions()
+
     for search_filter_group in filter_groups:
         if search_filter_group.list_type not in result:
             result[search_filter_group.list_type] = {}
-        subresult = result[search_filter_group.list_type]
 
-        if search_filter_group.project_id is None:
-            project_id = "all"
-        else:
-            project_id = str(search_filter_group.project_id)
+        department_id = search_filter_group.department_id
+        is_in_departments = (
+            department_id is not None
+            and str(department_id) in current_user["departments"]
+        )
+        if department_id is None or is_manager or is_in_departments:
+            subresult = result[search_filter_group.list_type]
 
-        if project_id not in subresult:
-            subresult[project_id] = []
+            if search_filter_group.project_id is None:
+                project_id = "all"
+            else:
+                project_id = str(search_filter_group.project_id)
 
-        subresult[project_id].append(search_filter_group.serialize())
+            if project_id not in subresult:
+                subresult[project_id] = []
+            subresult[project_id].append(search_filter_group.serialize())
 
     return result
 
 
 def create_filter_group(
-    list_type, name, color, project_id=None, entity_type=None, is_shared=False
+    list_type,
+    name,
+    color,
+    project_id=None,
+    entity_type=None,
+    is_shared=False,
+    department_id=None,
 ):
     """
     Add a new search filter group to the database.
@@ -1084,6 +1142,14 @@ def create_filter_group(
         project_id is not None and not has_manager_project_access(project_id)
     ):
         is_shared = False
+
+    if department_id is not None:
+        department = tasks_service.get_department(department_id)
+        if department is None:
+            raise WrongParameterException(
+                f"No department found with id: {department_id}"
+            )
+
     search_filter_group = SearchFilterGroup.create(
         list_type=list_type,
         name=name,
@@ -1092,12 +1158,15 @@ def create_filter_group(
         person_id=current_user["id"],
         entity_type=entity_type,
         is_shared=is_shared,
+        department_id=department_id,
     )
     search_filter_group.serialize()
+
     if search_filter_group.is_shared:
         clear_filter_group_cache()
     else:
         clear_filter_group_cache(current_user["id"])
+
     return search_filter_group.serialize()
 
 
@@ -1122,16 +1191,30 @@ def update_filter_group(search_filter_group_id, data):
     search_filter_group = SearchFilterGroup.get_by(
         id=search_filter_group_id, person_id=current_user["id"]
     )
+
     if search_filter_group is None:
         raise SearchFilterGroupNotFoundException
-    if data.get("project_id", None) is None or (
-        data["project_id"] is not None
-        and not has_manager_project_access(data["project_id"])
+
+    if (
+        data.get("is_shared", None) is not None
+        and search_filter_group.is_shared != data["is_shared"]
+        and (
+            data.get("project_id", None) is None
+            or (
+                data["project_id"] is not None
+                and not has_manager_project_access(data["project_id"])
+            )
+        )
     ):
         data["is_shared"] = False
+
     search_filter_group.update(data)
 
-    if data.get("is_shared", None) is not None:
+    if (
+        data.get("is_shared", None) is not None
+        and data.get("project_id", None) is not None
+        and has_manager_project_access(data["project_id"])
+    ):
         if (
             SearchFilter.query.filter_by(
                 search_filter_group_id=search_filter_group_id
@@ -1284,7 +1367,6 @@ def get_last_notifications(
         query = query.filter(Notification.read == read)
 
     if watching is not None:
-        print(watching)
         if watching:
             query = query.filter(Subscription.id != None)
         else:

{zou-0.19.59 → zou-0.19.61}/zou/app/utils/commands.py

@@ -394,7 +394,9 @@ def sync_with_ldap_server():
             )
             .all()
         ):
-            persons_service.update_person(person.id, {"active": False})
+            persons_service.update_person(
+                person.id, {"active": False}, bypass_protected_accounts=True
+            )
             print(
                 "User %s disabled (not found in LDAP)." % person.desktop_login
             )
@@ -418,6 +420,7 @@ def sync_with_ldap_server():
                         "desktop_login": user["desktop_login"],
                         "ldap_uid": user["ldap_uid"],
                     },
+                    bypass_protected_accounts=True,
                 )
                 print(f"User {user['desktop_login']} updated.")
             except IsUserLimitReachedException:
@@ -470,7 +473,9 @@ def sync_with_ldap_server():
         )
         file_store.add_picture("thumbnails", person["id"], thumbnail_png_path)
         os.remove(thumbnail_png_path)
-        persons_service.update_person(person["id"], {"has_avatar": True})
+        persons_service.update_person(
+            person["id"], {"has_avatar": True}, bypass_protected_accounts=True
+        )
 
     ldap_users = get_ldap_users()
     update_person_list_with_ldap_users(ldap_users)

{zou-0.19.59 → zou-0.19.61}/zou/app/utils/emails.py

@@ -12,9 +12,9 @@ def send_email(subject, html, recipient_email, body=None):
     """
     if body is None:
         body = strip_html_tags(html)
-    if app.config["MAIL_DEBUG"]:
+    if app.config["MAIL_DEBUG_BODY"]:
         print(body)
-    elif app.config["MAIL_ENABLED"]:
+    if app.config["MAIL_ENABLED"]:
         with app.app_context():
             try:
                 mail_default_sender = app.config["MAIL_DEFAULT_SENDER"]

{zou-0.19.59 → zou-0.19.61}/zou/app/utils/string.py

@@ -6,6 +6,8 @@ def strtobool(val):
     """
     if isinstance(val, bool):
         return val
+    if isinstance(val, int):
+        return bool(val)
     elif val.lower() in ("y", "yes", "t", "true", "on", "1"):
         return True
     elif val.lower() in ("n", "no", "f", "false", "off", "0"):

zou-0.19.61/zou/migrations/versions/9d3bb33c6fc6_add_department_keys_to_filter_models.py

@@ -0,0 +1,73 @@
+"""add department keys to filter models
+
+Revision ID: 9d3bb33c6fc6
+Revises: 8e67c183bed7
+Create Date: 2024-10-11 15:52:29.740222
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = "9d3bb33c6fc6"
+down_revision = "8e67c183bed7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("search_filter", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "department_id",
+                sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+                default=uuid.uuid4,
+                nullable=True,
+            )
+        )
+        batch_op.create_foreign_key(
+            "search_filter_department_id_fkey",
+            "department",
+            ["department_id"],
+            ["id"],
+        )
+
+    with op.batch_alter_table("search_filter_group", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "department_id",
+                sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+                default=uuid.uuid4,
+                nullable=True,
+            )
+        )
+        batch_op.create_foreign_key(
+            "search_filter_group_department_id_fkey",
+            "department",
+            ["department_id"],
+            ["id"],
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("search_filter_group", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "search_filter_group_department_id_fkey", type_="foreignkey"
+        )
+        batch_op.drop_column("department_id")
+
+    with op.batch_alter_table("search_filter", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "search_filter_department_id_fkey", type_="foreignkey"
+        )
+        batch_op.drop_column("department_id")
+
+    # ### end Alembic commands ###