Merge pull request #878 from EvanBldy/master

various fixes

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
@@ -103,7 +103,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

tests/user/test_route_context.py

@@ -602,7 +602,7 @@ def test_shared_filters(self):
         }
         filter_2 = self.post(path, filter_2)
 
-         # Artist can see their filters and the shared filters
+        # Artist can see their filters and the shared filters
         self.log_in_cg_artist()
         result = self.get(path)
         self.assertEqual(len(result["asset"][project_id]), 2)
@@ -616,22 +616,23 @@ def test_shared_filters(self):
         )
         self.log_in_cg_artist()
 
-         # Admin can update filter
+        # Admin can update filter
         self.log_in_admin()
         self.put(
             "data/user/filters/%s" % filter_2["id"],
             {"name": "team updated"},
         )
         result = self.get(path)
         user_service.clear_filter_cache()
-        self.assertEqual(result["asset"][project_id][0]["name"], "team updated")
+        self.assertEqual(
+            result["asset"][project_id][0]["name"], "team updated"
+        )
         self.assertEqual(result["asset"][project_id][0]["is_shared"], True)
 
         # Artist cannot update admin's filter
         self.log_in_cg_artist()
         self.put(
-            "data/user/filters/%s"
-            % result["asset"][project_id][0]["id"],
+            "data/user/filters/%s" % result["asset"][project_id][0]["id"],
             {"name": "updated", "is_shared": True},
             404,
         )
@@ -658,7 +659,9 @@ def test_shared_filters(self):
         user_service.clear_filter_cache()
         self.assertEqual(len(result["asset"][project_id]), 2)
         self.assertEqual(result["asset"][project_id][0]["name"], "my filter")
-        self.assertEqual(result["asset"][project_id][1]["name"], "team updated")
+        self.assertEqual(
+            result["asset"][project_id][1]["name"], "team updated"
+        )
 
         # Filter is shared with the artist's department
         self.log_in_admin()
@@ -667,26 +670,31 @@ def test_shared_filters(self):
             {
                 "name": "department updated",
                 "is_shared": True,
-                "department_id": self.department.id
+                "department_id": self.department.id,
             },
         )
         result = self.get(path)
         user_service.clear_filter_cache()
         self.assertEqual(len(result["asset"][project_id]), 2)
-        self.assertEqual(result["asset"][project_id][0]["name"], "team updated")
-        self.assertEqual(result["asset"][project_id][1]["name"], "department updated")
+        self.assertEqual(
+            result["asset"][project_id][0]["name"], "team updated"
+        )
+        self.assertEqual(
+            result["asset"][project_id][1]["name"], "department updated"
+        )
 
         # Now artist can see the department filter
         self.log_in_cg_artist()
         user_service.clear_filter_cache()
         result = self.get(path)
         self.assertEqual(len(result["asset"][project_id]), 3)
         self.assertEqual(
-            result["asset"][project_id][2]["name"], "department updated")
-        self.assertEqual(
-            result["asset"][project_id][1]["name"], "team updated")
+            result["asset"][project_id][2]["name"], "department updated"
+        )
         self.assertEqual(
-            result["asset"][project_id][0]["name"], "my filter")
+            result["asset"][project_id][1]["name"], "team updated"
+        )
+        self.assertEqual(result["asset"][project_id][0]["name"], "my filter")
 
     def test_shared_group_filters(self):
         project_id = str(self.project.id)
@@ -704,12 +712,12 @@ def test_shared_group_filters(self):
         }
         self.post(path, filter_group_1)
 
-         # Admin cannot see artist's filter group
+        # Admin cannot see artist's filter group
         self.log_in_admin()
         result = self.get(path)
         self.assertEqual(result, {})
 
-         # Artist can see their filter groups
+        # Artist can see their filter groups
         self.log_in_cg_artist()
         result = self.get(path)
         self.assertEqual(len(result["asset"][project_id]), 1)
@@ -735,7 +743,7 @@ def test_shared_group_filters(self):
         }
         self.post(path, filter_group_2)
 
-         # Artist can see their groups and the shared groups
+        # Artist can see their groups and the shared groups
         self.log_in_cg_artist()
         result = self.get(path)
         self.assertEqual(len(result["asset"][project_id]), 2)
@@ -744,7 +752,7 @@ def test_shared_group_filters(self):
         self.assertEqual(result["asset"][project_id][1]["name"], "my group")
         self.assertEqual(result["asset"][project_id][1]["is_shared"], False)
 
-         # Admin can update filter group
+        # Admin can update filter group
         self.log_in_admin()
         self.put(
             "data/user/filter-groups/%s"
@@ -796,13 +804,15 @@ def test_shared_group_filters(self):
             {
                 "name": "department updated",
                 "is_shared": True,
-                "department_id": self.department.id
+                "department_id": self.department.id,
             },
         )
         user_service.clear_filter_group_cache()
         result = self.get(path)
         self.assertEqual(len(result["asset"][project_id]), 2)
-        self.assertEqual(result["asset"][project_id][0]["name"], "department updated")
+        self.assertEqual(
+            result["asset"][project_id][0]["name"], "department updated"
+        )
         self.assertEqual(result["asset"][project_id][1]["name"], "updated")
 
         # Now artist can see the department filter group
@@ -811,11 +821,10 @@ def test_shared_group_filters(self):
         result = self.get(path)
         self.assertEqual(len(result["asset"][project_id]), 3)
         self.assertEqual(
-            result["asset"][project_id][0]["name"], "department updated")
-        self.assertEqual(
-            result["asset"][project_id][1]["name"], "updated")
-        self.assertEqual(
-            result["asset"][project_id][2]["name"], "my group")
+            result["asset"][project_id][0]["name"], "department updated"
+        )
+        self.assertEqual(result["asset"][project_id][1]["name"], "updated")
+        self.assertEqual(result["asset"][project_id][2]["name"], "my group")
 
     def create_test_folder(self):
         return super().create_test_folder()

zou/app/blueprints/index/resources.py

@@ -283,8 +283,8 @@ def get(self):
         responses:
             200:
                 description: Configuration object including self-hosted status,
-                Crisp token, indexer configuration, SAML status, and dark theme 
-                status
+                    Crisp token, indexer configuration, SAML status, and dark
+                    theme status.
         """
         organisation = persons_service.get_organisation()
         conf = {

zou/app/blueprints/user/resources.py

@@ -783,7 +783,6 @@ def put(self, filter_group_id):
         )
 
         data = self.clear_empty_fields(data)
-        print("data", data)
         user_filter = user_service.update_filter_group(filter_group_id, data)
         return user_filter, 200
 

zou/app/config.py

@@ -81,7 +81,7 @@
 MAIL_PORT = os.getenv("MAIL_PORT", 25)
 MAIL_USERNAME = os.getenv("MAIL_USERNAME", "")
 MAIL_PASSWORD = os.getenv("MAIL_PASSWORD", "")
-MAIL_DEBUG = int(os.getenv("MAIL_DEBUG", "0"))
+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)

zou/app/services/user_service.py

@@ -895,8 +895,8 @@ def get_user_filters(current_user_id):
     for search_filter in filters:
         department_id = search_filter.department_id
         is_in_departments = (
-            department_id is not None and \
-            str(department_id) in current_user["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:
@@ -996,15 +996,17 @@ def update_filter(search_filter_id, data):
                 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
-          (
+    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
 
     if (
@@ -1105,8 +1107,8 @@ def get_user_filter_groups(current_user_id):
 
         department_id = search_filter_group.department_id
         is_in_departments = (
-            department_id is not None and \
-            str(department_id) in current_user["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]
@@ -1130,7 +1132,7 @@ def create_filter_group(
     project_id=None,
     entity_type=None,
     is_shared=False,
-    department_id=None
+    department_id=None,
 ):
     """
     Add a new search filter group to the database.
@@ -1193,22 +1195,26 @@ def update_filter_group(search_filter_group_id, data):
     if search_filter_group is None:
         raise SearchFilterGroupNotFoundException
 
-    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
-          (
+    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
+            )
+        )
+    ):
+        data["is_shared"] = False
 
     search_filter_group.update(data)
 
-    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 (
+        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

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/migrations/versions/9d3bb33c6fc6_add_department_keys_to_filter_models.py

@@ -5,40 +5,69 @@
 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'
+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(None, 'department', ['department_id'], ['id'])
+    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(None, '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(None, type_='foreignkey')
-        batch_op.drop_column('department_id')
+    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(None, 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 ###