zou 0.20.23__py3-none-any.whl → 0.20.25__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.23"
+__version__ = "0.20.25"

zou/app/blueprints/auth/resources.py

@@ -20,7 +20,7 @@ from flask_jwt_extended import (
 
 from sqlalchemy.exc import OperationalError, TimeoutError
 from babel.dates import format_datetime
-from saml2 import entity
+from saml2 import entity, client_base
 
 from zou.app import app, config
 from zou.app.mixin import ArgsMixin
@@ -32,6 +32,7 @@ from zou.app.services import (
 )
 
 from zou.app.utils.flask import is_from_browser
+from zou.app.utils.saml import saml_client_for
 
 from zou.app.stores import auth_tokens_store
 from zou.app.services.exception import (
@@ -1449,9 +1450,19 @@ class SAMLLoginResource(Resource, ArgsMixin):
         """
         if not config.SAML_ENABLED:
             return {"error": "SAML is not enabled."}, 400
-        _, info = current_app.extensions[
-            "saml_client"
-        ].prepare_for_authenticate()
+
+        try:
+            _, info = current_app.extensions[
+                "saml_client"
+            ].prepare_for_authenticate()
+        except client_base.SAMLError:
+            # retry with new client
+            current_app.extensions["saml_client"] = saml_client_for(
+                config.SAML_METADATA_URL
+            )
+            _, info = current_app.extensions[
+                "saml_client"
+            ].prepare_for_authenticate()
 
         redirect_url = None
 

zou/app/blueprints/crud/comments.py

@@ -191,7 +191,7 @@ class CommentResource(BaseModelResource):
 
     def update_data(self, data, instance_id):
         data = super().update_data(data, instance_id)
-        data["updated_by"] = persons_service.get_current_user_raw().id
+        data["editor_id"] = persons_service.get_current_user_raw().id
         return data
 
     @jwt_required()

zou/app/models/comment.py

@@ -101,7 +101,7 @@ class Comment(db.Model, BaseMixin, SerializerMixin):
         nullable=False,
         index=True,
     )
-    updated_by = db.Column(
+    editor_id = db.Column(
         UUIDType(binary=False),
         db.ForeignKey("person.id"),
         default=None,

zou/app/services/tasks_service.py

@@ -587,13 +587,13 @@ def get_comments(task_id, is_client=False, is_manager=False):
 
 
 def _prepare_query(task_id, is_client, is_manager):
-    UpdatedBy = aliased(Person, name="updated_by")
+    Editor = aliased(Person, name="editor_id")
     query = (
         Comment.query.order_by(Comment.created_at.desc())
         .filter_by(object_id=task_id)
         .join(Person, Comment.person_id == Person.id)
         .join(TaskStatus, Comment.task_status_id == TaskStatus.id)
-        .join(UpdatedBy, Comment.updated_by == UpdatedBy.id, isouter=True)
+        .join(Editor, Comment.editor_id == Editor.id, isouter=True)
         .add_columns(
             TaskStatus.name,
             TaskStatus.short_name,
@@ -601,9 +601,9 @@ def _prepare_query(task_id, is_client, is_manager):
             Person.first_name,
             Person.last_name,
             Person.has_avatar,
-            UpdatedBy.first_name,
-            UpdatedBy.last_name,
-            UpdatedBy.has_avatar,
+            Editor.first_name,
+            Editor.last_name,
+            Editor.has_avatar,
         )
     )
     if not is_manager and not is_client:
@@ -623,9 +623,9 @@ def _run_task_comments_query(query):
             person_first_name,
             person_last_name,
             person_has_avatar,
-            updated_by_first_name,
-            updated_by_last_name,
-            updated_by_has_avatar,
+            editor_first_name,
+            editor_last_name,
+            editor_has_avatar,
         ) = result
 
         comment_dict = comment.serialize()
@@ -635,12 +635,12 @@ def _run_task_comments_query(query):
             "has_avatar": person_has_avatar,
             "id": str(comment.person_id),
         }
-        if comment.updated_by is not None:
-            comment_dict["updated_by"] = {
-                "first_name": updated_by_first_name,
-                "last_name": updated_by_last_name,
-                "has_avatar": updated_by_has_avatar,
-                "id": str(comment.updated_by),
+        if comment.editor_id is not None:
+            comment_dict["editor"] = {
+                "first_name": editor_first_name,
+                "last_name": editor_last_name,
+                "has_avatar": editor_has_avatar,
+                "id": str(comment.editor_id),
             }
         comment_dict["task_status"] = {
             "name": task_status_name,

zou/migrations/versions/307edd8c639d_change_comment_updated_by_in_comment_.py

@@ -0,0 +1,62 @@
+"""Change Comment.updated_by in Comment.editor_id
+
+Revision ID: 307edd8c639d
+Revises: addbad59c706
+Create Date: 2025-03-10 12:53:19.482537
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlalchemy_utils
+import uuid
+
+# revision identifiers, used by Alembic.
+revision = "307edd8c639d"
+down_revision = "addbad59c706"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("comment", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "editor_id",
+                sqlalchemy_utils.types.uuid.UUIDType(binary=False),
+                default=uuid.uuid4,
+                nullable=True,
+            )
+        )
+        batch_op.drop_index("ix_comment_updated_by")
+        batch_op.create_index(
+            batch_op.f("ix_comment_editor_id"), ["editor_id"], unique=False
+        )
+        batch_op.drop_constraint("comment_updated_by_fkey", type_="foreignkey")
+        batch_op.create_foreign_key(None, "person", ["editor_id"], ["id"])
+        batch_op.drop_column("updated_by")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("comment", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "updated_by", sa.UUID(), autoincrement=False, nullable=True
+            )
+        )
+        batch_op.drop_constraint("comment_editor_id_fkey", type_="foreignkey")
+        batch_op.create_foreign_key(
+            "comment_updated_by_fkey", "person", ["updated_by"], ["id"]
+        )
+        batch_op.drop_index(batch_op.f("ix_comment_editor_id"))
+        batch_op.create_index(
+            "ix_comment_updated_by", ["updated_by"], unique=False
+        )
+        batch_op.drop_column("editor_id")
+
+    # ### end Alembic commands ###

{zou-0.20.23.dist-info → zou-0.20.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zou
-Version: 0.20.23
+Version: 0.20.25
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -35,12 +35,12 @@ Requires-Dist: flask_mail==0.10.0
 Requires-Dist: flask_principal==0.4.0
 Requires-Dist: flask_restful==0.3.10
 Requires-Dist: flask_sqlalchemy==3.1.1
-Requires-Dist: flask-fs2[s3,swift]==0.7.28
+Requires-Dist: flask-fs2[s3,swift]==0.7.29
 Requires-Dist: flask-jwt-extended==4.7.1
 Requires-Dist: flask-migrate==4.1.0
 Requires-Dist: flask-socketio==5.5.1
 Requires-Dist: flask==3.1.0
-Requires-Dist: gazu==0.10.30
+Requires-Dist: gazu==0.10.31
 Requires-Dist: gevent-websocket==0.10.1
 Requires-Dist: gevent==24.11.1
 Requires-Dist: gunicorn==23.0.0

{zou-0.20.23.dist-info → zou-0.20.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=x4_zHRUIBHYylJp20ojxmrTuyJId9rcESyxmdsUn08Y,24
+zou/__init__.py,sha256=RYOJIDE9K5kVkcGQZowJLblB5szdIfREiFdS5sbxZPQ,24
 zou/cli.py,sha256=HuYi2Ma7SP2SD7C9d9dwpZ49BHpytKIoyJP_su9JwZY,18755
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=EpohqFJwWL0zs-Ic_W5dX5_XSDeCrqHQPL5Re39OnQ0,6382
@@ -12,7 +12,7 @@ zou/app/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 zou/app/blueprints/assets/__init__.py,sha256=T2zhDagHjXF6jRwOQ8vqokZTkBHyY7XtTI0Rlooamjs,2931
 zou/app/blueprints/assets/resources.py,sha256=YIR1n21vsvM-dYPcnXVePU9rlCf1es-Y5HYURDVYKmI,25628
 zou/app/blueprints/auth/__init__.py,sha256=xP874bMWUnLIirOPSEbpe-Q2fBBQrxZGKd0tLZmNJXk,1128
-zou/app/blueprints/auth/resources.py,sha256=YIhdEVK9WQ7fCYtknwh3dR3TdSdURRm7rBpDxpNSGK0,45608
+zou/app/blueprints/auth/resources.py,sha256=MeOMT6E_CxvyDROFWwu9vE1NNhh5UPBdaBuNZ-Ru2GA,46009
 zou/app/blueprints/breakdown/__init__.py,sha256=Dp6GWSGxxWIedpyzTTEKpCRUYEo8oVNVyQhwNvTMmQM,1888
 zou/app/blueprints/breakdown/resources.py,sha256=pmGlHLiXFsPRbxf403SiVgGiaBbtK8G_tfYbXSkJtAU,13593
 zou/app/blueprints/chats/__init__.py,sha256=YGmwGvddg3MgSYVIh-hmkX8t2em9_LblxBeJzFqFJD4,558
@@ -27,7 +27,7 @@ zou/app/blueprints/crud/attachment_file.py,sha256=-yur0V16BOTvpdqtNymDTHEugwRPgG
 zou/app/blueprints/crud/base.py,sha256=HJcZKeNe3RVe_qEC9bSlpz4FRKhqavzrsfFLSZ8OmoY,15907
 zou/app/blueprints/crud/chat.py,sha256=Sq1r0y9ANjS113PUpwgAhnjYsxxLKMCM-a7DJ_icF00,344
 zou/app/blueprints/crud/chat_message.py,sha256=bEEUoV0sNzu5sntNS6fpLh5NC6wWiycWCXtTE-t4yG4,387
-zou/app/blueprints/crud/comments.py,sha256=9YXuRG0T-_LSmZ8CfyI70RYymJW2YTZhyljk_HOcdmA,7903
+zou/app/blueprints/crud/comments.py,sha256=tdEvRCr40gui-O4HRSleIDqa8z-eYvS-82zizCnjUaI,7902
 zou/app/blueprints/crud/custom_action.py,sha256=zz8E1IgtaV44BGC7m9t7YSQ9t_fYTtoxl_qRn20XijI,992
 zou/app/blueprints/crud/day_off.py,sha256=hr_cSBG-r7i_an2AkRmgTPtzbwojaI6el_JDUHgBBx4,2571
 zou/app/blueprints/crud/department.py,sha256=6UVd4OhloboQAHd6vtDjwdTNgx3tf9XyBAcb4IXnmt0,987
@@ -141,7 +141,7 @@ zou/app/models/base.py,sha256=vZoPzdixyRbk0SoDJGEbQ9LFouBaDCA7gVSZ1o_SIhI,8808
 zou/app/models/build_job.py,sha256=aW6KZXkyMP9d3g8fvcOYk9EAoNMw-6IleZdWbaqLLVw,1286
 zou/app/models/chat.py,sha256=u-IZB67IYlMMoPooFSKJX2kpXFdshlmRKf7UuwAcA6c,1273
 zou/app/models/chat_message.py,sha256=8w7xtoqCW_CRoGKrF4ba5w-oyAHIRh-2ms3p5sQQor4,874
-zou/app/models/comment.py,sha256=0HM5aOqZdvGUrqe2m8CETuS0eXl0V4sSUBaS3MFduAM,6041
+zou/app/models/comment.py,sha256=aDi64Yny5RvlSDace5ydUqxI7_hhugBVnO6EvR19tAE,6040
 zou/app/models/custom_action.py,sha256=wx5ASKJ2oG-ivASZbVf1nLiL7zELgQBJ8U1jDdvGkuU,578
 zou/app/models/data_import_error.py,sha256=dCyzaX0KATa0F8h5V3sTPlXz-XNl1VNkflRfJuaCmsg,425
 zou/app/models/day_off.py,sha256=WMZs7oMhUBpMnNyvhgpl1j6egZ5J0drnrF1dH3N5cII,691
@@ -210,7 +210,7 @@ zou/app/services/shots_service.py,sha256=UW7QcW2Gi_OsbBuR_96FCjNKnsm3SH2R1AcBRnL
 zou/app/services/stats_service.py,sha256=e9h090eZWADtzXycy1WOup_jlxGwQojrr1y_PDcVatc,13156
 zou/app/services/status_automations_service.py,sha256=tVio7Sj7inhvKS4UOyRhcdpwr_KNP96hT1o0X7XcGF4,715
 zou/app/services/sync_service.py,sha256=iWxx1kOGEXympHmSBBQWtDZWNtumdxp8kppee0OefMo,41811
-zou/app/services/tasks_service.py,sha256=yysijKuLm2WtkCI6WvfLLYiwoM91TB_N0ZazoxEfco4,69825
+zou/app/services/tasks_service.py,sha256=6ZFq4DhJ9HDgWT3CcikUWWImMNuHko1Bz_ARKPfeoEw,69775
 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=SKW6n3eMRDUJljUE893cYUrg00xyUwUkxLHzQHjIZT0,51362
@@ -280,6 +280,7 @@ zou/migrations/versions/29fe01a6c9eb_add_status_automation_field.py,sha256=bwmzP
 zou/migrations/versions/2adc020885fa_.py,sha256=CZoG30mi3HadEz7aBIM9rY2kAEcgxNHUj_fgWJQ_XfA,1352
 zou/migrations/versions/2baede80b111_add_entity_status_field.py,sha256=-oRMTToOyx5U9wvHgjtFY27y0ile_5K_JngGHrkMTYE,973
 zou/migrations/versions/306266361f4f_.py,sha256=OdQtt_Jw7iMALvErFuToqPRXSVYogSd0wIW-EY0MNxE,1880
+zou/migrations/versions/307edd8c639d_change_comment_updated_by_in_comment_.py,sha256=klyZzuFsNB30ORPPLt6P2wSfaeVuBzA-ihz4_yaYLQk,1935
 zou/migrations/versions/328fd44c6347_add_entity_created_by.py,sha256=-1J-ndc30OSKhjLY_t8kbsa-UREdj7OmZGyQ2bguBjU,1176
 zou/migrations/versions/32f134ff1201_add_is_shared_flag_to_filters.py,sha256=Hm436fq7VYMJ1gTzvG4razVEFzdmq7vbF2pmAIgxqdw,809
 zou/migrations/versions/346250b5304c_add_position_to_preview_files.py,sha256=8s54X-Yj7lUsiBhcXWiKKRbZrqT_3rIX9D1WJnjpMeU,699
@@ -419,9 +420,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=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.23.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.23.dist-info/METADATA,sha256=ogjGsLoBuHL-ZAf11x2IJZGr1SYLisEwb3RuVs12vFI,6673
-zou-0.20.23.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-zou-0.20.23.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.23.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.23.dist-info/RECORD,,
+zou-0.20.25.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.25.dist-info/METADATA,sha256=dQjGXYP1B9mly95Fi_6-J-eTmo-za1RWF-hYbH6dbf8,6673
+zou-0.20.25.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+zou-0.20.25.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.25.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.25.dist-info/RECORD,,