zou 0.20.23__tar.gz → 0.20.25__tar.gz

{zou-0.20.23/zou.egg-info → zou-0.20.25}/PKG-INFO

@@ -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 → zou-0.20.25}/setup.cfg

@@ -41,12 +41,12 @@ install_requires =
 	flask_principal==0.4.0
 	flask_restful==0.3.10
 	flask_sqlalchemy==3.1.1
-	flask-fs2[swift, s3]==0.7.28
+	flask-fs2[swift, s3]==0.7.29
 	flask-jwt-extended==4.7.1
 	flask-migrate==4.1.0
 	flask-socketio==5.5.1
 	flask==3.1.0
-	gazu==0.10.30
+	gazu==0.10.31
 	gevent-websocket==0.10.1
 	gevent==24.11.1
 	gunicorn==23.0.0

zou-0.20.25/zou/__init__.py

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

{zou-0.20.23 → zou-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-0.20.23 → zou-0.20.25}/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-0.20.23 → zou-0.20.25}/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-0.20.23 → zou-0.20.25}/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-0.20.25/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 → zou-0.20.25/zou.egg-info}/PKG-INFO

@@ -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 → zou-0.20.25}/zou.egg-info/SOURCES.txt

@@ -292,6 +292,7 @@ zou/migrations/versions/29fe01a6c9eb_add_status_automation_field.py
 zou/migrations/versions/2adc020885fa_.py
 zou/migrations/versions/2baede80b111_add_entity_status_field.py
 zou/migrations/versions/306266361f4f_.py
+zou/migrations/versions/307edd8c639d_change_comment_updated_by_in_comment_.py
 zou/migrations/versions/328fd44c6347_add_entity_created_by.py
 zou/migrations/versions/32f134ff1201_add_is_shared_flag_to_filters.py
 zou/migrations/versions/346250b5304c_add_position_to_preview_files.py

{zou-0.20.23 → zou-0.20.25}/zou.egg-info/requires.txt

@@ -12,12 +12,12 @@ flask_mail==0.10.0
 flask_principal==0.4.0
 flask_restful==0.3.10
 flask_sqlalchemy==3.1.1
-flask-fs2[s3,swift]==0.7.28
+flask-fs2[s3,swift]==0.7.29
 flask-jwt-extended==4.7.1
 flask-migrate==4.1.0
 flask-socketio==5.5.1
 flask==3.1.0
-gazu==0.10.30
+gazu==0.10.31
 gevent-websocket==0.10.1
 gevent==24.11.1
 gunicorn==23.0.0

zou-0.20.23/zou/__init__.py

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