zou 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.3"
+__version__ = "1.0.4"

zou/app/blueprints/events/resources.py

@@ -38,6 +38,13 @@ class EventsResource(Resource, ArgsMixin):
             default: false
             description: Return only file-related events
             example: false
+          - in: query
+            name: cursor_event_id
+            required: False
+            type: string
+            format: uuid
+            example: a24a6ea4-ce75-4665-a070-57453082c25
+            description: ID of the last event from previous page for cursor-based pagination
           - in: query
             name: limit
             type: integer
@@ -99,7 +106,8 @@ class EventsResource(Resource, ArgsMixin):
                 ("after", None, False),
                 ("before", None, False),
                 ("only_files", False, False),
-                ("limit", 100, False),
+                ("cursor_event_id", None, False),
+                ("limit", 100, False, int),
                 ("project_id", None, False),
                 ("name", None, False),
             ],
@@ -108,6 +116,7 @@ class EventsResource(Resource, ArgsMixin):
         permissions.check_manager_permissions()
         before = self.parse_date_parameter(args["before"])
         after = self.parse_date_parameter(args["after"])
+        cursor_event_id = args["cursor_event_id"]
         limit = args["limit"]
         only_files = args["only_files"] == "true"
         project_id = args.get("project_id", None)
@@ -116,15 +125,21 @@ class EventsResource(Resource, ArgsMixin):
             raise WrongParameterException(
                 "The project_id parameter is not a valid id"
             )
-        else:
-            return events_service.get_last_events(
-                after=after,
-                before=before,
-                limit=limit,
-                only_files=only_files,
-                project_id=project_id,
-                name=name,
+        if cursor_event_id is not None and not fields.is_valid_id(
+            cursor_event_id
+        ):
+            raise WrongParameterException(
+                "The cursor_event_id parameter is not a valid id"
             )
+        return events_service.get_last_events(
+            after=after,
+            before=before,
+            cursor_event_id=cursor_event_id,
+            limit=limit,
+            only_files=only_files,
+            project_id=project_id,
+            name=name,
+        )
 
 
 class LoginLogsResource(Resource, ArgsMixin):

zou/app/blueprints/previews/resources.py

@@ -27,6 +27,7 @@ from zou.app.services import (
 from zou.app.stores import queue_store
 from zou.utils import movie
 from zou.app.utils import (
+    fields,
     fs,
     events,
     permissions,
@@ -1567,6 +1568,20 @@ class RunningPreviewFiles(Resource, ArgsMixin):
           states equal to processing or broken.
         tags:
           - Previews
+        parameters:
+          - in: query
+            name: cursor_preview_file_id
+            required: false
+            type: string
+            format: uuid
+            description: ID of the last preview file from previous page for cursor-based pagination
+            example: a24a6ea4-ce75-4665-a070-57453082c25
+          - in: query
+            name: limit
+            required: false
+            type: integer
+            description: Maximum number of preview files to return
+            example: 100
         responses:
           200:
             description: All preview files from open productions with processing or broken states
@@ -1588,7 +1603,26 @@ class RunningPreviewFiles(Resource, ArgsMixin):
                         example: "processing"
         """
         permissions.check_admin_permissions()
-        return preview_files_service.get_running_preview_files()
+        args = self.get_args(
+            [
+                ("cursor_preview_file_id", None, False),
+                ("limit", None, False, int),
+            ],
+        )
+        cursor_preview_file_id = args["cursor_preview_file_id"]
+        limit = args["limit"]
+
+        if cursor_preview_file_id is not None and not fields.is_valid_id(
+            cursor_preview_file_id
+        ):
+            raise WrongParameterException(
+                "The cursor_preview_file_id parameter is not a valid id"
+            )
+
+        return preview_files_service.get_running_preview_files(
+            cursor_preview_file_id=cursor_preview_file_id,
+            limit=limit,
+        )
 
 
 class ExtractFrameFromPreview(Resource, ArgsMixin):

zou/app/services/events_service.py

@@ -1,20 +1,22 @@
 from zou.app.models.event import ApiEvent
 from zou.app.models.login_log import LoginLog
 from zou.app.utils import fields
+from zou.app.services.exception import WrongParameterException
 from sqlalchemy import func
 
 
 def get_last_events(
     after=None,
     before=None,
+    cursor_event_id=None,
     limit=100,
     only_files=False,
     project_id=None,
     name=None,
 ):
     """
-    Return last 100 events published. If before parameter is set, it returns
-    last 100 events before this date.
+    Return paginated events using cursor-based pagination.
+    If cursor_event_id is set, it returns events older than this event.
     """
     query = ApiEvent.query.order_by(ApiEvent.created_at.desc())
 
@@ -46,6 +48,14 @@ def get_last_events(
     if name is not None:
         query = query.filter(ApiEvent.name == name)
 
+    if cursor_event_id is not None:
+        cursor_event = ApiEvent.query.get(cursor_event_id)
+        if cursor_event is None:
+            raise WrongParameterException(
+                f"No event found with id: {cursor_event_id}"
+            )
+        query = query.filter(ApiEvent.created_at < cursor_event.created_at)
+
     events = query.limit(limit).all()
     return [
         fields.serialize_dict(

zou/app/services/preview_files_service.py

@@ -551,12 +551,12 @@ def _clear_empty_annotations(annotations):
     ]
 
 
-def get_running_preview_files():
+def get_running_preview_files(cursor_preview_file_id=None, limit=None):
     """
     Return preview files for all productions with status equals to broken
-    or processing.
+    or processing using cursor-based pagination.
     """
-    entries = (
+    query = (
         PreviewFile.query.join(Task)
         .join(Project)
         .join(ProjectStatus, ProjectStatus.id == Project.project_status_id)
@@ -566,6 +566,21 @@ def get_running_preview_files():
         .order_by(PreviewFile.created_at.desc())
     )
 
+    if cursor_preview_file_id is not None:
+        cursor_preview_file = PreviewFile.query.get(cursor_preview_file_id)
+        if cursor_preview_file is None:
+            raise WrongParameterException(
+                f"No preview file found with id: {cursor_preview_file_id}"
+            )
+        query = query.filter(
+            PreviewFile.created_at < cursor_preview_file.created_at
+        )
+
+    if limit is not None:
+        query = query.limit(limit)
+
+    entries = query.all()
+
     results = []
     for preview_file, project_id, task_type_id, entity_id in entries:
         result = preview_file.serialize()

{zou-1.0.3.dist-info → zou-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 1.0.3
+Version: 1.0.4
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

{zou-1.0.3.dist-info → zou-1.0.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=2plzdEEb24FLjE2I2XyBBcJEPYWHccNL4SgtLC_6erg,22
+zou/__init__.py,sha256=acuR_XSJzp4OrQ5T8-Ac5gYe48mUwObuwjRmisFmZ7k,22
 zou/cli.py,sha256=N9FyrL4TDgIiCUa-I3xIzOgiVLM14kz8_QLQ48y51oE,22767
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
@@ -74,7 +74,7 @@ zou/app/blueprints/edits/resources.py,sha256=TLdajQm-b9q-QjBo__NeX95VvxUCLUovj34
 zou/app/blueprints/entities/__init__.py,sha256=v-qt2dl3s3tmK_ur-cpDHNPmcL0A6xCybczyuidjUCo,713
 zou/app/blueprints/entities/resources.py,sha256=KDvGz7xtEkG5cE_oe8ivdX_NqmBhQcpV6Em35WX8zIY,11262
 zou/app/blueprints/events/__init__.py,sha256=Vb0gO7Bpj_2Dpx9hhKd2SZW2qqnJrFVoDpJjFOmoMZw,394
-zou/app/blueprints/events/resources.py,sha256=K85om5n0WjBahUp2vE56Mf1VLExrdCLLQXL2C_lE0ic,7119
+zou/app/blueprints/events/resources.py,sha256=N_KFpwo9IJucZhZN67mqIYfAuYVW50c1f_dReGys88Y,7736
 zou/app/blueprints/export/__init__.py,sha256=W3U93VD-dHlozFVSt_RDvP7h7K_FqgHPLA__W5H1DkE,1574
 zou/app/blueprints/export/csv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/blueprints/export/csv/assets.py,sha256=QzRoX00bOX6M1ISPPWqhmNZPDah36avit72mBE1_A28,6282
@@ -99,7 +99,7 @@ zou/app/blueprints/persons/resources.py,sha256=-2FV1rDkMDtEvrUkbHdHFC7lTCoWRkxjI
 zou/app/blueprints/playlists/__init__.py,sha256=gI6dV102RwsztOnUDk53BErYd9zrjA43gfNgGeYwfFU,1700
 zou/app/blueprints/playlists/resources.py,sha256=2NA5UAnl7JQUIB0WbmMmXnFqKB6pEdbgWqhlNqdxyE8,28978
 zou/app/blueprints/previews/__init__.py,sha256=ihC6OQ9AUjnZ2JeMnjRh_tKGO0UmAjOwhZnOivc3BnQ,4460
-zou/app/blueprints/previews/resources.py,sha256=uCSQ1ytpCGHvbg-NcWtY0vEQWznxb2mLKN0V-BR03Ko,61722
+zou/app/blueprints/previews/resources.py,sha256=YdwlPATv3bCB5OrzEE0wfVyPkEUrLES1WNjQ3FUEdf8,62854
 zou/app/blueprints/projects/__init__.py,sha256=mUQI2C_6GfH-JkhPEOpGsGCYBbCr__c5CWPaW7sKH4c,6103
 zou/app/blueprints/projects/resources.py,sha256=q4hEOkA7vOfncrEeoXb6FQJ2TwVo0xKs44M0SAu4ZHc,87747
 zou/app/blueprints/search/__init__.py,sha256=QCjQIY_85l_orhdEiqav_GifjReuwsjZggN3V0GeUVY,356
@@ -208,7 +208,7 @@ zou/app/services/departments_service.py,sha256=7jLKH7ziToc6uHZsZKdBUzN2Ubi2YloHC
 zou/app/services/edits_service.py,sha256=hfg6Fk9J9W41Qyw96UF35cSgbXqCYci6H8OY5rL_cIk,12075
 zou/app/services/emails_service.py,sha256=6Ye4dUB_04XItdH6mynCERYP2Jj5wYTYrJQfir7slDA,14993
 zou/app/services/entities_service.py,sha256=mSVoKt06pF9-7H5eD43UpfwOpSGWKjrE7F7eo0IBjw8,17788
-zou/app/services/events_service.py,sha256=Ew-bY5hqrWLmpbVj1_xd3E2S3JtyAGzdgw2XjudTZjc,2700
+zou/app/services/events_service.py,sha256=lsBzNo4zez9ucYZQLUDJh_hv37KyOO_OoSxZiEHB72E,3128
 zou/app/services/exception.py,sha256=VaQbvvv7yJ-lCFOlvAPKkYPuw7MjCaSAo1F40fS3kZ8,4478
 zou/app/services/file_tree_service.py,sha256=sz2Eq4S5VqEU7AupmKtRzX2W8ouUheTyYWkgiMf2G6o,33857
 zou/app/services/files_service.py,sha256=df1_9v-vwE5HVi9XjtilTPWHuiWunvrwPyQh_IXupNM,28517
@@ -219,7 +219,7 @@ zou/app/services/notifications_service.py,sha256=FsZ7rFv8p_4bVn0IlpW7TIo5rDQoupO
 zou/app/services/persons_service.py,sha256=XtaYofeYgjNIaQ-nvynj15jW2yDWEqdUtJgf7l0SgDg,16450
 zou/app/services/playlists_service.py,sha256=ftEP7LFyPAXogssOYi3TGZstdn2k9eq5o5FveYC25TI,33282
 zou/app/services/plugins_service.py,sha256=dbU-2f7t3eo6VISQBsASM8Or4Y8ha6Vt8ZHgtizdOi0,1917
-zou/app/services/preview_files_service.py,sha256=mxOc1bBjlA3a900QU6fUufBM1JmAzr5D8jvcf_HAkXM,36178
+zou/app/services/preview_files_service.py,sha256=nHjRa_5zwGUZDbrYDwhEBMNzgaGCAwrQCn-HhONfXKI,36734
 zou/app/services/projects_service.py,sha256=OBKFEYna-hi1WfVM3FtcYCpe_AoHVP3C3zSk97VPNKQ,23665
 zou/app/services/scenes_service.py,sha256=iXN19HU4njPF5VtZXuUrVJ-W23ZQuQNPC3ADXltbWtU,992
 zou/app/services/schedule_service.py,sha256=cG8RRjdjMX4_D04cSt-WkqBCNeCQMLyX0O-I99DwCqI,14474
@@ -475,9 +475,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-1.0.3.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-1.0.3.dist-info/METADATA,sha256=rFFzVXfuB7IqirHHztqP8hMLdzfEHVZ8SbhsMFZuVaY,6695
-zou-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-1.0.3.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-1.0.3.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-1.0.3.dist-info/RECORD,,
+zou-1.0.4.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-1.0.4.dist-info/METADATA,sha256=96AdsyHrnhMFfUG2gWlBr-lXNUleEtpxVc1yNSWauDE,6695
+zou-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-1.0.4.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-1.0.4.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-1.0.4.dist-info/RECORD,,