zou 0.20.35__py3-none-any.whl → 0.20.37__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.35"
+__version__ = "0.20.37"

zou/app/services/playlists_service.py

@@ -524,37 +524,38 @@ def build_playlist_movie_file(playlist, job, shots, params, full, remote):
             movie_file_path = get_playlist_movie_file_path(job)
             tmp_file_paths = retrieve_playlist_tmp_files(previews)
 
-            if not remote:
-                success = False
-                if not full:
-                    success = _run_concatenation(
-                        playlist,
-                        job,
-                        tmp_file_paths,
-                        movie_file_path,
-                        params,
-                        movie.concat_demuxer,
-                    )
-
-                # Try again using concat filter
-                if not success:
-                    success = _run_concatenation(
-                        playlist,
-                        job,
-                        tmp_file_paths,
-                        movie_file_path,
-                        params,
-                        movie.concat_filter,
-                    )
-            else:
-                try:
-                    _run_remote_job_build_playlist(
-                        app, job, previews, params, movie_file_path, full
-                    )
-                    success = True
-                except Exception as exc:
-                    app.logger.error(exc)
+            if tmp_file_paths:
+                if not remote:
                     success = False
+                    if not full:
+                        success = _run_concatenation(
+                            playlist,
+                            job,
+                            tmp_file_paths,
+                            movie_file_path,
+                            params,
+                            movie.concat_demuxer,
+                        )
+
+                    # Try again using concat filter
+                    if not success:
+                        success = _run_concatenation(
+                            playlist,
+                            job,
+                            tmp_file_paths,
+                            movie_file_path,
+                            params,
+                            movie.concat_filter,
+                        )
+                else:
+                    try:
+                        _run_remote_job_build_playlist(
+                            app, job, previews, params, movie_file_path, full
+                        )
+                        success = True
+                    except Exception as exc:
+                        app.logger.error(exc)
+                        success = False
 
         except Exception as exc:
             app.logger.error(exc)

zou/event_stream.py

@@ -8,7 +8,7 @@ from flask_jwt_extended import (
     jwt_required,
     verify_jwt_in_request,
 )
-from flask_socketio import SocketIO, disconnect, join_room, emit
+from flask_socketio import SocketIO, disconnect, join_room, leave_room, emit
 
 from zou.app import config, app
 from zou.app.utils.redis import get_redis_url
@@ -25,6 +25,7 @@ socketio.init_app(app, message_queue=redis_url, async_mode="gevent")
 
 def _get_empty_room(current_frame=0):
     return {
+        "playlist_id": None,
         "user_id": None,
         "people": [],
         "is_playing": False,
@@ -60,10 +61,22 @@ def _leave_room(room_id, user_id):
         rooms_data[room_id] = room
     else:
         del rooms_data[room_id]
-    emit("preview-room:room-people-updated", room, room=room_id)
+    _emit_people_updated(room_id, room["people"])
+    return room
+
+
+def _emit_people_updated(room_id, people):
+    event_data = {
+        "people": people,
+        "playlist_id": room_id,
+        "id": room_id,
+    }
+    emit("preview-room:room-people-updated", event_data, room=room_id)
+    return event_data
 
 
 def _update_room_playing_status(data, room):
+    room["playlist_id"] = data.get("playlist_id", False)
     room["user_id"] = data.get("user_id", False)
     room["is_playing"] = data.get("is_playing", False)
     room["is_repeating"] = data.get("is_repeating", False)
@@ -110,10 +123,11 @@ def disconnected(_):
     try:
         verify_jwt_in_request()
         user_id = get_jwt_identity()
-        # needed to be able to clear empty rooms
+        # Needed to be able to clear empty rooms
         tmp_rooms_data = dict(rooms_data)
         for room_id in tmp_rooms_data:
             _leave_room(room_id, user_id)
+            leave_room(room_id, user_id)
         server_stats["nb_connections"] -= 1
         app.logger.info("Websocket client disconnected")
     except Exception:
@@ -141,12 +155,27 @@ def on_open_playlist(data):
     when a person opens the playlist page he immediately enters the
     websocket room. This way he can see in live which people are in the
     review room. The user still has to explicitly enter the review room
-    to actually be in sync with the other users
+    to actually be in sync with the other users.
     """
     room, room_id = _get_room_from_data(data)
     rooms_data[room_id] = room
+    # Connect to the socketio room but dont add the user to the data of
+    # the room.
     join_room(room_id)
-    emit("preview-room:room-people-updated", room, room=room_id)
+    _emit_people_updated(room_id, room["people"])
+
+
+@socketio.on("preview-room:close-playlist", namespace="/events")
+@jwt_required()
+def on_close_playlist(data):
+    """
+    when a person closes the playlist page he immediately leaves the
+    websocket room.
+    """
+    room, room_id = _get_room_from_data(data)
+    # Leave only the socketio room but dont remove the user from the data of
+    # the room. This operation must be done via a leave event.
+    leave_room(room_id)
 
 
 @socketio.on("preview-room:join", namespace="/events")
@@ -161,8 +190,9 @@ def on_join(data):
     if len(room["people"]) == 0:
         _update_room_playing_status(data, room)
     room["people"] = list(set(room["people"] + [user_id]))
+    room["playlist_id"] = room_id
     rooms_data[room_id] = room
-    emit("preview-room:room-people-updated", room, room=room_id)
+    _emit_people_updated(room_id, room["people"])
 
 
 @socketio.on("preview-room:leave", namespace="/events")

{zou-0.20.35.dist-info → zou-0.20.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.35
+Version: 0.20.37
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -42,7 +42,7 @@ Requires-Dist: flask-socketio==5.5.1
 Requires-Dist: flask==3.1.0
 Requires-Dist: gazu==0.10.31
 Requires-Dist: gevent-websocket==0.10.1
-Requires-Dist: gevent==24.11.1
+Requires-Dist: gevent==25.4.1
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: isoweek==1.3.3
 Requires-Dist: itsdangerous==2.2.0
@@ -56,18 +56,18 @@ Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
 Requires-Dist: orjson==3.10.16
-Requires-Dist: pillow==11.1.0
+Requires-Dist: pillow==11.2.1
 Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.6
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: pysaml2==7.5.2
 Requires-Dist: python-nomad==2.1.0
 Requires-Dist: python-slugify==8.0.4
-Requires-Dist: python-socketio==5.12.1
+Requires-Dist: python-socketio==5.13.0
 Requires-Dist: pytz==2025.2
 Requires-Dist: redis==5.2.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: rq==2.3.1
+Requires-Dist: rq==2.3.2
 Requires-Dist: slackclient==2.9.4
 Requires-Dist: sqlalchemy_utils==0.41.2
 Requires-Dist: sqlalchemy==2.0.40
@@ -86,7 +86,7 @@ Requires-Dist: pytest==8.3.5; extra == "test"
 Provides-Extra: monitoring
 Requires-Dist: prometheus-flask-exporter==0.23.2; extra == "monitoring"
 Requires-Dist: pygelf==0.4.2; extra == "monitoring"
-Requires-Dist: sentry-sdk==2.25.1; extra == "monitoring"
+Requires-Dist: sentry-sdk==2.26.1; extra == "monitoring"
 Provides-Extra: lint
 Requires-Dist: autoflake==2.3.1; extra == "lint"
 Requires-Dist: black==25.1.0; extra == "lint"

{zou-0.20.35.dist-info → zou-0.20.37.dist-info}/RECORD

@@ -1,7 +1,7 @@
-zou/__init__.py,sha256=CiKA3TE6R01oyvtNw_rNBH1DEEAmpZITm9M-h70F1PQ,24
+zou/__init__.py,sha256=EBK4BUKGDAx7AyYuIhT53iwcbOHpqHhJXAi0P1PU5MY,24
 zou/cli.py,sha256=HuYi2Ma7SP2SD7C9d9dwpZ49BHpytKIoyJP_su9JwZY,18755
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
-zou/event_stream.py,sha256=_BB_cwEpWOrHEhfxxgwzZgfAauekg0lrI5COume2XR8,6663
+zou/event_stream.py,sha256=KljIebYRa3zyfxf1eO-ITIufv754zDdejKmgXmdekwE,7567
 zou/job_settings.py,sha256=_aqBhujt2Q8sXRWIbgbDf-LUdXRdBimdtTc-fZbiXoY,202
 zou/app/__init__.py,sha256=zGmaBGBHSS_Px34I3_WZmcse62G_AZJArjm4F6TwmRk,7100
 zou/app/api.py,sha256=JTB_IMVO8EOoyqx9KdRkiIix0chOLi0yGDY-verUJXA,5127
@@ -201,7 +201,7 @@ zou/app/services/names_service.py,sha256=TOSrintROmxcAlcFQE0i2E3PBLnw81GAztNselp
 zou/app/services/news_service.py,sha256=eOXkvLhOcgncI2NrgiJEccV28oxZX5CsZVqaE-l4kWQ,9084
 zou/app/services/notifications_service.py,sha256=7GDRio_mGaRYV5BHOAdpxBZjA_LLYUfVpbwZqy1n9pI,15685
 zou/app/services/persons_service.py,sha256=HjV-su80Y2BO9l5zoBKHMNF0mDGtkWqPhEOs3nQ3nlI,16566
-zou/app/services/playlists_service.py,sha256=Gs5K6jDJmnbdWqNvM3J0cOn0Lfxh_JtoPdEmqYXFSWk,32345
+zou/app/services/playlists_service.py,sha256=OCq6CD9XSzH99Eipie8gyEBo8BAGQp2wEMbYKqHS9vw,32496
 zou/app/services/preview_files_service.py,sha256=Yk-vwzHuKTzNkEZfl9DhQRdDuRU006uwZxJ-RKajEkI,35842
 zou/app/services/projects_service.py,sha256=aIbYaFomy7OX2Pxvkf9w5qauDvkjuc9ummSGNYIpQMY,21249
 zou/app/services/scenes_service.py,sha256=iXN19HU4njPF5VtZXuUrVJ-W23ZQuQNPC3ADXltbWtU,992
@@ -420,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.35.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.35.dist-info/METADATA,sha256=2Bq8sfXkRJCkAJELu6sxbCnmQdLCaIo8yNeuM88cLAI,6695
-zou-0.20.35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-zou-0.20.35.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.35.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.35.dist-info/RECORD,,
+zou-0.20.37.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.37.dist-info/METADATA,sha256=qv5YA0qVkyMEJkdtBoYET90oQ8l6DfDoM7P64nfYeuM,6694
+zou-0.20.37.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+zou-0.20.37.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.37.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.37.dist-info/RECORD,,