zou 0.19.60__py3-none-any.whl → 0.19.61__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.19.60"
+__version__ = "0.19.61"

zou/app/blueprints/index/resources.py

@@ -283,8 +283,8 @@ class ConfigResource(Resource):
         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 @@ class FilterGroupResource(Resource, ArgsMixin):
         )
 
         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_SERVER = os.getenv("MAIL_SERVER", "localhost")
 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,6 +5,7 @@ Revises: 8e67c183bed7
 Create Date: 2024-10-11 15:52:29.740222
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 import sqlalchemy_utils
@@ -12,33 +13,61 @@ 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 ###

{zou-0.19.60.dist-info → zou-0.19.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zou
-Version: 0.19.60
+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
@@ -52,9 +52,9 @@ Requires-Dist: meilisearch ==0.31.5
 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
@@ -81,7 +81,7 @@ Requires-Dist: pre-commit ==4.0.1 ; extra == 'lint'
 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: prod
 Requires-Dist: gunicorn ; extra == 'prod'
 Requires-Dist: gevent ; extra == 'prod'

{zou-0.19.60.dist-info → zou-0.19.61.dist-info}/RECORD

@@ -1,11 +1,11 @@
-zou/__init__.py,sha256=Q-R4YnG0E1Dy8riIkq9R2p9ONeBkY4iPua_nw1RTmDA,24
+zou/__init__.py,sha256=0ipQS0LM1jmY4x1OqN5dNC2NcN78T34DBnoO5MxyUvw,24
 zou/cli.py,sha256=DHHf4mz33Bi0gGFJ0GdRUpjrMrMSQYyVubJFppHPZlU,18914
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=_tue9Ry3aqCniZpKGhWJaY1Eo_fd6zOAfnzPvh_mJzU,8489
 zou/job_settings.py,sha256=_aqBhujt2Q8sXRWIbgbDf-LUdXRdBimdtTc-fZbiXoY,202
 zou/app/__init__.py,sha256=AJEGrLTirr5zZmA8DVSjZedtTuDg6eg9rG4kXMimPnQ,6966
 zou/app/api.py,sha256=JTB_IMVO8EOoyqx9KdRkiIix0chOLi0yGDY-verUJXA,5127
-zou/app/config.py,sha256=V6kV3JzaR2yGz8F3vcsb-v4EB9VvvirEPtGeQMot9bI,6649
+zou/app/config.py,sha256=CR0wvWVF_T0Sfh-AGTphyXnMr0dm_ZVdXUOH3WUTz2s,6646
 zou/app/mixin.py,sha256=eYwfS_CUFvNmldaQXrjsN5mK_gX0wYrBFykfx60uUM8,4897
 zou/app/swagger.py,sha256=Jr7zsMqJi0V4FledODOdu-aqqVE02jMFzhqVxHK0_2c,54158
 zou/app/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -83,7 +83,7 @@ zou/app/blueprints/export/csv/time_spents.py,sha256=yYPtilOxfQD5mBwyh9h-PbTQBpab
 zou/app/blueprints/files/__init__.py,sha256=7Wty30JW2OXIn-tBFXOWWmPuHnsnxPpH3jNtHvvr9tY,3987
 zou/app/blueprints/files/resources.py,sha256=8SIV8kaqv3dxyL8nyqG3QiZmk5ZYIvUxw6k1ic-jhBs,69786
 zou/app/blueprints/index/__init__.py,sha256=Dh3oQiirpg8RCkfVOuk3irIjSvUvuRf0jPxE6oGubz0,828
-zou/app/blueprints/index/resources.py,sha256=UUBHWGDIyx6xgk2Jt_uwvpSETB0xeIjQ3quYVN0uOlc,8734
+zou/app/blueprints/index/resources.py,sha256=_JiNodmq3-XCIz4vF0MYkkkg1Wdzh7Fl19KU0TTia1M,8742
 zou/app/blueprints/news/__init__.py,sha256=HxBXjC15dVbotNAZ0CLf02iwUjxJr20kgf8_kT_9nwM,505
 zou/app/blueprints/news/resources.py,sha256=SL0RYo-fs23GjQU1IW4kuEBg2SHdaXaonrOoOnWafdw,7183
 zou/app/blueprints/persons/__init__.py,sha256=0cnHHw3K_8OEMm0qOi3wKVomSAg9IJSnVjAXabMeHks,3893
@@ -129,7 +129,7 @@ zou/app/blueprints/source/shotgun/versions.py,sha256=8Mb35e5p3FLbbiu6AZb9tJErDKz
 zou/app/blueprints/tasks/__init__.py,sha256=pNUqVEVX1KVu1IzRRJNsziPkhWKXqgyvQsNp7LbmIxo,4342
 zou/app/blueprints/tasks/resources.py,sha256=b5z4OolidyKdKTP5kuZLk7tDLhgDs5W3rkH4ZWlwB0Y,56020
 zou/app/blueprints/user/__init__.py,sha256=H9zCHcVobC6jq6dTToXKAjnZmDA0a9gChHiIP3BcZsc,4586
-zou/app/blueprints/user/resources.py,sha256=07TXMEJG__aBRotgKnduoDf2Y59J-9VcMzUDXVUHzCI,39919
+zou/app/blueprints/user/resources.py,sha256=loCigQvPCoRw6nVu_9TIY7pjUByJgk6vutFPSo0MwzI,39891
 zou/app/file_trees/default.json,sha256=ryUrEmQYE8B_WkzCoQLgmem3N9yNwMIWx9G8p3HfG9o,2310
 zou/app/file_trees/simple.json,sha256=VBI43Z3rjQxtTpVCq3ktUgS0UB8x-aTowKL9LXuXCFI,3149
 zou/app/indexer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -213,7 +213,7 @@ zou/app/services/sync_service.py,sha256=EunfXlma_IIb7011A_xLQLVQGAi-MteKgm2Y2NAx
 zou/app/services/tasks_service.py,sha256=IoogHBoZhbJegnl5SYGgOaBp2YVqrL22Gccjfp8dPn8,69335
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/time_spents_service.py,sha256=H9X-60s6oqtY9rtU-K2jKwUSljfkdGlf_9wMr3iVfIA,15158
-zou/app/services/user_service.py,sha256=O6KdOVqJBGHCzRqykqnrqWgH1ijRZLtxqA6QFaNaZ5g,50471
+zou/app/services/user_service.py,sha256=Ih7-I0t_hzoRx_1Ya6zlvlWSLK0AabVtcXNPm7eYZNo,50514
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
 zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
@@ -244,7 +244,7 @@ zou/app/utils/query.py,sha256=q8ETGPAqnz0Pt9xWoQt5o7FFAVYUKVCJiWpwefIr-iU,4592
 zou/app/utils/remote_job.py,sha256=QPxcCWEv-NM1Q4IQawAyJAiSORwkMeOlByQb9OCShEw,2522
 zou/app/utils/saml.py,sha256=m8wt_2RnMEHSrFvqCRGF91U5mwkqC6W-iBcx8N0LAqs,1679
 zou/app/utils/shell.py,sha256=D30NuOzr1D6jsa9OF69JYXyqYNhtIdnfKSVYW4irbz8,405
-zou/app/utils/string.py,sha256=ZIJuQRe7ml669-T1o9keQtk_lV2D1DkS9ARQdexlQ6Y,404
+zou/app/utils/string.py,sha256=MX-zsf55ecyhedu4mk55FhByx_hOc_dSe7B1aVjJzO0,458
 zou/app/utils/thumbnail.py,sha256=eUb25So1fbjxZKYRpTOxLcZ0vww5zXNVkfVIa_tu5Dk,6625
 zou/migrations/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 zou/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -354,7 +354,7 @@ zou/migrations/versions/99825b9cc778_.py,sha256=vleoLh_fCLwNnCmgZkW5x1-lJ09CgjPd
 zou/migrations/versions/9a09467f9b2c_.py,sha256=cjSO3cXzHHhlcaQhShF9WlxmBWIfwLYSyIb9C6B5Dwc,1246
 zou/migrations/versions/9b85c14fa8a7_add_day_off_new_columns.py,sha256=u6n5X_hwoeH9XnkWHB4PvVvGVrkddgDamweMrlPFQ9I,2106
 zou/migrations/versions/9bd17364fc18_.py,sha256=nruaGMczzkWkya_D11QEU3uiU1UVEUItM6svSBjOw2c,1890
-zou/migrations/versions/9d3bb33c6fc6_add_department_keys_to_filter_models.py,sha256=iWcJUdkPThoWONEHQ64hpQYSVcax0lO7rHJ3DVZYRDs,1587
+zou/migrations/versions/9d3bb33c6fc6_add_department_keys_to_filter_models.py,sha256=xUd0OIqp0q9l-pC6wCn2tfgCi6maeud6jf1CYGCHnxA,2084
 zou/migrations/versions/9e5b3a9b0cee_add_new_column_metadatadescriptor_data_type_.py,sha256=HT34AjM9yN1IvLrCzx4-YOiocFDnPQ-FJ05icPCBnNo,5517
 zou/migrations/versions/9f8445f9b42c_add_man_days_fields.py,sha256=muFsM2g_m-L5Zss36roTsjCoSDdhu_e4hVQntiNHyiY,828
 zou/migrations/versions/a23682ccc1f1_.py,sha256=dVOUWldUZyLuLc6_HrgKUI5XH5-6Vjwai6Ew9kygkHw,1663
@@ -413,9 +413,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=u9LCEOvmkxwm-KiZ6jKNdB9LSC6XXUDwJpVx8LkDwJg,16416
-zou-0.19.60.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.19.60.dist-info/METADATA,sha256=EqDZA8e8KYpG4COrPyaVuxsMAeFLd9pHuzKCtAY605Q,6676
-zou-0.19.60.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-zou-0.19.60.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.19.60.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.19.60.dist-info/RECORD,,
+zou-0.19.61.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.19.61.dist-info/METADATA,sha256=hSLIfr761zcENVUpwc4JbG4SPICbF9J3gyAkbmIvgFc,6676
+zou-0.19.61.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+zou-0.19.61.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.19.61.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.19.61.dist-info/RECORD,,