vaapi 0.3.0__tar.gz → 0.3.2__tar.gz

{vaapi-0.3.0 → vaapi-0.3.2}/PKG-INFO

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

{vaapi-0.3.0 → vaapi-0.3.2}/requirements.txt

@@ -1,4 +1,5 @@
 requests
 protobuf==3.20.3
 numpy >= 1.23.5, < 2.0.0
-httpx
+httpx
+pydantic

{vaapi-0.3.0 → vaapi-0.3.2}/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.3.0"
+__version__ = "0.3.2"

{vaapi-0.3.0 → vaapi-0.3.2}/vaapi/cognition_representation/client.py

@@ -227,91 +227,6 @@ class CognitionRepresentationClient:
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CognitionRepresentation:
         """
-        Add annotations to a task like an annotator does.
-
-        You will need to supply the task ID. You can find this in Label Studio by opening a task and checking the URL. It is also listed at the top of the labeling interface. Or you can use [Get tasks list](../tasks/list).
-
-        The content of the result field depends on your labeling configuration. For example, send the following data as part of your POST
-        request to send an empty annotation with the ID of the user who completed the task:
-
-        ```json
-        {
-        "result": {},
-        "was_cancelled": true,
-        "ground_truth": true,
-        "lead_time": 0,
-        "task": 0
-        "completed_by": 123
-        }
-        ```
-
-        Parameters
-        ----------
-        id : int
-            Task ID
-
-        result : typing.Optional[typing.Sequence[typing.Dict[str, typing.Any]]]
-            Labeling result in JSON format. Read more about the format in [the Label Studio documentation.](https://labelstud.io/guide/task_format)
-
-        task : typing.Optional[int]
-            Corresponding task for this annotation
-
-        project : typing.Optional[int]
-            Project ID for this annotation
-
-        completed_by : typing.Optional[int]
-            User ID of the person who created this annotation
-
-        updated_by : typing.Optional[int]
-            Last user who updated this annotation
-
-        was_cancelled : typing.Optional[bool]
-            User skipped the task
-
-        ground_truth : typing.Optional[bool]
-            This annotation is a Ground Truth
-
-        lead_time : typing.Optional[float]
-            How much time it took to annotate the task (in seconds)
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        Annotation
-            Created annotation
-
-        Examples
-        --------
-        from label_studio_sdk.client import LabelStudio
-
-        client = LabelStudio(
-            api_key="YOUR_API_KEY",
-        )
-        client.annotations.create(
-            id=1,
-            result=[
-                {
-                    "original_width": 1920,
-                    "original_height": 1080,
-                    "image_rotation": 0,
-                    "from_name": "bboxes",
-                    "to_name": "image",
-                    "type": "rectanglelabels",
-                    "value": {
-                        "x": 20,
-                        "y": 30,
-                        "width": 50,
-                        "height": 60,
-                        "rotation": 0,
-                        "values": {"rectanglelabels": ["Person"]},
-                    },
-                }
-            ],
-            was_cancelled=False,
-            ground_truth=True,
-        )
         """
         _response = self._client_wrapper.httpx_client.request(
             f"api/cognitionrepr/",
@@ -332,3 +247,26 @@ class CognitionRepresentationClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    def bulk_create(
+        self,
+        *,
+        repr_list: typing.List[CognitionRepresentation] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> CognitionRepresentation:
+        """
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"api/cognitionrepr/",
+            method="POST",
+            json=repr_list,
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return pydantic_v1.parse_obj_as(CognitionRepresentation, _response.json())  # type: ignore
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)

{vaapi-0.3.0 → vaapi-0.3.2}/vaapi/events/client.py

@@ -233,91 +233,6 @@ class EventsClient:
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Event:
         """
-        Add annotations to a task like an annotator does.
-
-        You will need to supply the task ID. You can find this in Label Studio by opening a task and checking the URL. It is also listed at the top of the labeling interface. Or you can use [Get tasks list](../tasks/list).
-
-        The content of the result field depends on your labeling configuration. For example, send the following data as part of your POST
-        request to send an empty annotation with the ID of the user who completed the task:
-
-        ```json
-        {
-        "result": {},
-        "was_cancelled": true,
-        "ground_truth": true,
-        "lead_time": 0,
-        "task": 0
-        "completed_by": 123
-        }
-        ```
-
-        Parameters
-        ----------
-        id : int
-            Task ID
-
-        result : typing.Optional[typing.Sequence[typing.Dict[str, typing.Any]]]
-            Labeling result in JSON format. Read more about the format in [the Label Studio documentation.](https://labelstud.io/guide/task_format)
-
-        task : typing.Optional[int]
-            Corresponding task for this annotation
-
-        project : typing.Optional[int]
-            Project ID for this annotation
-
-        completed_by : typing.Optional[int]
-            User ID of the person who created this annotation
-
-        updated_by : typing.Optional[int]
-            Last user who updated this annotation
-
-        was_cancelled : typing.Optional[bool]
-            User skipped the task
-
-        ground_truth : typing.Optional[bool]
-            This annotation is a Ground Truth
-
-        lead_time : typing.Optional[float]
-            How much time it took to annotate the task (in seconds)
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        Annotation
-            Created annotation
-
-        Examples
-        --------
-        from label_studio_sdk.client import LabelStudio
-
-        client = LabelStudio(
-            api_key="YOUR_API_KEY",
-        )
-        client.annotations.create(
-            id=1,
-            result=[
-                {
-                    "original_width": 1920,
-                    "original_height": 1080,
-                    "image_rotation": 0,
-                    "from_name": "bboxes",
-                    "to_name": "image",
-                    "type": "rectanglelabels",
-                    "value": {
-                        "x": 20,
-                        "y": 30,
-                        "width": 50,
-                        "height": 60,
-                        "rotation": 0,
-                        "values": {"rectanglelabels": ["Person"]},
-                    },
-                }
-            ],
-            was_cancelled=False,
-            ground_truth=True,
-        )
         """
         _response = self._client_wrapper.httpx_client.request(
             f"api/events/",
@@ -340,3 +255,26 @@ class EventsClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    def bulk_create(
+        self,
+        *,
+        event_list: typing.List[Event] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> Event:
+        """
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"api/events/",
+            method="POST",
+            json=event_list,
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return pydantic_v1.parse_obj_as(Event, _response.json())  # type: ignore
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)

{vaapi-0.3.0 → vaapi-0.3.2}/vaapi/logs/client.py

@@ -194,7 +194,11 @@ class LogClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list(self, game_id: int, *, request_options: typing.Optional[RequestOptions] = None) -> typing.List[Log]:
+    def list(
+             self, 
+             *, 
+             game_id: typing.Optional[int] = None,
+             request_options: typing.Optional[RequestOptions] = None) -> typing.List[Log]:
         """
         List all logs.
 
@@ -224,9 +228,14 @@ class LogClient:
             id=1,
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/logs/?game={jsonable_encoder(game_id)}", method="GET", request_options=request_options
-        )
+        if game_id:
+            _response = self._client_wrapper.httpx_client.request(
+                f"api/logs/?game={jsonable_encoder(game_id)}", method="GET", request_options=request_options
+            )
+        else:
+            _response = self._client_wrapper.httpx_client.request(
+                f"api/logs/", method="GET", request_options=request_options
+            )
         try:
             if 200 <= _response.status_code < 300:
                 return pydantic_v1.parse_obj_as(typing.List[Log], _response.json())  # type: ignore

{vaapi-0.3.0 → vaapi-0.3.2}/vaapi/run_tests.py

@@ -1,4 +1,5 @@
 from vaapi.client import Vaapi
+import os
 from tests.event_tests import basic_event_tests
 from tests.game_tests import basic_game_tests
 from tests.logs_tests import basic_log_tests
@@ -10,18 +11,18 @@ if __name__ == "__main__":
     client = Vaapi(
         base_url='http://127.0.0.1:8000/',  
         #FIXME use env var here
-        api_key="84c6f4b516cc9d292f1b0eba26ea88e99812fbb9",
+        api_key=os.environ.get("VAT_API_TOKEN"),
     )
-    a = client.annotations.get(id=1)
-    print(a)
+    #a = client.annotations.get(id=1)
+    #print(a)
 
-    #basic_event_tests(client)
-    #print()
-    #basic_game_tests(client)
+    basic_event_tests(client)
     print()
+    #basic_game_tests(client)
+    #print()
     #basic_log_tests(client)
-    print()
+    #print()
     #basic_cognition_repr_tests(client)
 
-    print()
-    basic_motion_repr_tests(client)
+    #print()
+    #basic_motion_repr_tests(client)

vaapi-0.3.2/vaapi/tests/event_tests.py

@@ -0,0 +1,25 @@
+def basic_event_tests(client):
+    #a = client.events.create(name="test_event")
+    #print(a)
+
+    event1 = {
+        "name": "event1",
+    }
+    event2 = {
+        "name": "event2",
+    }
+    event_list = [event1, event2]
+    a = client.events.bulk_create(event_list=event_list)
+    print(a)
+
+    #b = client.events.get(id=a.id)
+    #print(b)
+
+    #c = client.events.list()
+    #print(c) 
+
+    #d = client.events.update(a.id, name="test_event_renamed")
+    #print(d)
+    
+    #e = client.events.delete(a.id)
+    #print(e)

{vaapi-0.3.0 → vaapi-0.3.2}/vaapi/tests/logs_tests.py

@@ -8,7 +8,7 @@ def basic_log_tests(client):
 
     c = client.logs.list(game_id=2)
     print()
-    print(c) 
+    print(len(c))
 
     d = client.logs.update(id=a.id, player_number=13)
     print()

{vaapi-0.3.0 → vaapi-0.3.2}/vaapi.egg-info/PKG-INFO

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

vaapi-0.3.0/vaapi/tests/event_tests.py

@@ -1,15 +0,0 @@
-def basic_event_tests(client):
-    a = client.events.create(name="test_event")
-    print(a)
-
-    b = client.events.get(id=a.id)
-    print(b)
-
-    c = client.events.list()
-    print(c) 
-
-    d = client.events.update(a.id, name="test_event_renamed")
-    print(d)
-    
-    e = client.events.delete(a.id)
-    print(e)