vaapi 0.7.32__tar.gz → 0.7.34__tar.gz

{vaapi-0.7.32 → vaapi-0.7.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vaapi
-Version: 0.7.32
+Version: 0.7.34
 Summary: Python utils for adding logs to our Visual Analytics Tool
 Author-email: NaoTH Berlin United <nao-team@informatik.hu-berlin.de>
 License-Expression: Apache-2.0

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/__init__.py

@@ -2,4 +2,4 @@
 you can perform with the API of the visual analytics tool by Berlin United for the Robocup SPL
 """
 
-__version__ = "0.7.32"
+__version__ = "0.7.34"

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/cognition_frame/client.py

@@ -6,7 +6,8 @@ from ..core.client_wrapper import SyncClientWrapper
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import pydantic_v1
 from ..core.request_options import RequestOptions
-from ..types.cognition_frame import CognitionFrame
+from ..types.cognition_frame import CognitionFrame, CognitionFrameOffsetPagination
+from ..core.pagination import SyncPager
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -117,6 +118,8 @@ class CognitionFrameClient:
 
     def list(
         self,
+        offset: typing.Optional[int] = None,
+        limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
         **filters: typing.Any,
     ) -> typing.List[CognitionFrame]:
@@ -134,6 +137,8 @@ class CognitionFrameClient:
         )
         """
         query_params = {k: v for k, v in filters.items() if v is not None}
+        query_params['limit'] = limit
+        query_params['offset'] = offset
         _response = self._client_wrapper.httpx_client.request(
             "api/cognitionframe/",
             method="GET",
@@ -142,9 +147,17 @@ class CognitionFrameClient:
         )
         try:
             if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(
-                    typing.List[CognitionFrame], _response.json()
-                )  # type: ignore
+                _parsed_response = pydantic_v1.parse_obj_as(CognitionFrameOffsetPagination,_response.json())
+                _has_next = _parsed_response.next != None
+                _get_next = lambda: self.list(
+                    offset=offset + limit,  # Increase offset by limit to get the next page
+                    limit=limit,
+                    request_options=request_options,
+                    **filters
+                ) if _has_next else None
+                
+                _items = _parsed_response.results
+                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next,count=_parsed_response.count)
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/cognition_representation/client.py

@@ -8,6 +8,7 @@ from ..core.pydantic_utilities import pydantic_v1
 from ..core.request_options import RequestOptions
 from ..types.cognition_representation import CognitionRepresentation, CognitionOffsetPagination
 from ..core.pagination import SyncPager
+
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
 

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/motion_frame/client.py

@@ -6,7 +6,8 @@ from ..core.client_wrapper import SyncClientWrapper
 from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import pydantic_v1
 from ..core.request_options import RequestOptions
-from ..types.motion_frame import MotionFrame
+from ..types.motion_frame import MotionFrame, MotionFrameOffsetPagination
+from ..core.pagination import SyncPager
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -114,6 +115,8 @@ class MotionFrameClient:
 
     def list(
         self,
+        offset: typing.Optional[int] = None,
+        limit: typing.Optional[int] = None,
         request_options: typing.Optional[RequestOptions] = None,
         **filters: typing.Any,
     ) -> typing.List[MotionFrame]:
@@ -128,6 +131,8 @@ class MotionFrameClient:
         )
         """
         query_params = {k: v for k, v in filters.items() if v is not None}
+        query_params['limit'] = limit
+        query_params['offset'] = offset
         _response = self._client_wrapper.httpx_client.request(
             "api/motionframe/",
             method="GET",
@@ -136,9 +141,17 @@ class MotionFrameClient:
         )
         try:
             if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(
-                    typing.List[MotionFrame], _response.json()
-                )  # type: ignore
+                _parsed_response = pydantic_v1.parse_obj_as(MotionFrameOffsetPagination,_response.json())
+                _has_next = _parsed_response.next != None
+                _get_next = lambda: self.list(
+                    offset=offset + limit,  # Increase offset by limit to get the next page
+                    limit=limit,
+                    request_options=request_options,
+                    **filters
+                ) if _has_next else None
+                
+                _items = _parsed_response.results
+                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next,count=_parsed_response.count)
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/types/cognition_frame.py

@@ -47,3 +47,17 @@ class CognitionFrame(pydantic_v1.BaseModel):
         smart_union = True
         extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}
+
+class CognitionFrameOffsetPagination(pydantic_v1.BaseModel):
+    """
+    Offset/limit paginated response for tasks
+    """
+    results: typing.List[CognitionFrame]
+    count: int
+    next: typing.Any
+    previous: typing.Any
+    
+    class Config:
+        frozen = True
+        smart_union = True
+        extra = pydantic_v1.Extra.allow

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/types/game.py

@@ -24,7 +24,7 @@ class Game(pydantic_v1.BaseModel):
 
     field: typing.Optional[str] = pydantic_v1.Field(default=None)
 
-    start_time: typing.Optional[dt.datetime] = pydantic_v1.Field(default=None)
+    start_time: typing.Optional[str] = pydantic_v1.Field(default=None)
 
     score: typing.Optional[str] = pydantic_v1.Field(default=None)
 

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi/types/motion_frame.py

@@ -47,3 +47,18 @@ class MotionFrame(pydantic_v1.BaseModel):
         smart_union = True
         extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}
+
+
+class MotionFrameOffsetPagination(pydantic_v1.BaseModel):
+    """
+    Offset/limit paginated response for tasks
+    """
+    results: typing.List[MotionFrame]
+    count: int
+    next: typing.Any
+    previous: typing.Any
+    
+    class Config:
+        frozen = True
+        smart_union = True
+        extra = pydantic_v1.Extra.allow

{vaapi-0.7.32 → vaapi-0.7.34}/vaapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vaapi
-Version: 0.7.32
+Version: 0.7.34
 Summary: Python utils for adding logs to our Visual Analytics Tool
 Author-email: NaoTH Berlin United <nao-team@informatik.hu-berlin.de>
 License-Expression: Apache-2.0