zou 1.0.3__tar.gz → 1.0.4__tar.gz

{zou-1.0.3/zou.egg-info → zou-1.0.4}/PKG-INFO

@@ -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.4/zou/__init__.py

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

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

@@ -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/zou/__init__.py

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