vaapi 0.7.28__tar.gz → 0.7.30__tar.gz

{vaapi-0.7.28/vaapi.egg-info → vaapi-0.7.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vaapi
-Version: 0.7.28
+Version: 0.7.30
 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.7.28 → vaapi-0.7.30}/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.28"
+__version__ = "0.7.30"

{vaapi-0.7.28 → vaapi-0.7.30}/vaapi/base_client.py

@@ -4,7 +4,6 @@ import httpx
 
 from .core.api_error import ApiError
 from .core.client_wrapper import SyncClientWrapper
-from .annotations.client import AnnotationsClient
 from .events.client import EventsClient
 from .game.client import GameClient
 from .logs.client import LogClient
@@ -17,7 +16,6 @@ from .image.client import ImageClient
 from .xabsl_symbol_complete.client import XabslSymbolClientComplete
 from .xabsl_symbol_sparse.client import XabslSymbolClientSparse
 from .log_status.client import LogStatusClient
-from .frame_filter.client import FrameFilterClient
 from .experiment.client import ExperimentClient
 from .motion_frame.client import MotionFrameClient
 from .cognition_frame.client import CognitionFrameClient
@@ -125,7 +123,6 @@ class VaapiBase:
             ),
             timeout=_defaulted_timeout,
         )
-        self.annotations = AnnotationsClient(client_wrapper=self._client_wrapper)
         self.events = EventsClient(client_wrapper=self._client_wrapper)
         self.games = GameClient(client_wrapper=self._client_wrapper)
         self.logs = LogClient(client_wrapper=self._client_wrapper)
@@ -147,7 +144,6 @@ class VaapiBase:
             client_wrapper=self._client_wrapper
         )
         self.log_status = LogStatusClient(client_wrapper=self._client_wrapper)
-        self.frame_filter = FrameFilterClient(client_wrapper=self._client_wrapper)
         self.experiment = ExperimentClient(client_wrapper=self._client_wrapper)
         self.team = TeamClient(client_wrapper=self._client_wrapper)
         self.robot = RobotClient(client_wrapper=self._client_wrapper)

{vaapi-0.7.28 → vaapi-0.7.30}/vaapi/image/client.py

@@ -264,7 +264,7 @@ class ImageClient:
         if data is not OMIT:
             payload = []
             for item in data:
-                item_d = item.dict()
+                item_d = item.copy()
                 if "frame" in item_d.keys():
                     item_d["frame_id"] = item_d["frame"]
                     del item_d["frame"]

{vaapi-0.7.28 → vaapi-0.7.30/vaapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vaapi
-Version: 0.7.28
+Version: 0.7.30
 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.7.28 → vaapi-0.7.30}/vaapi.egg-info/SOURCES.txt

@@ -49,8 +49,6 @@ vaapi.egg-info/SOURCES.txt
 vaapi.egg-info/dependency_links.txt
 vaapi.egg-info/requires.txt
 vaapi.egg-info/top_level.txt
-vaapi/annotations/__init__.py
-vaapi/annotations/client.py
 vaapi/behavior_frame_option/__init__.py
 vaapi/behavior_frame_option/client.py
 vaapi/behavior_options/__init__.py
@@ -76,8 +74,6 @@ vaapi/events/__init__.py
 vaapi/events/client.py
 vaapi/experiment/__init__.py
 vaapi/experiment/client.py
-vaapi/frame_filter/__init__.py
-vaapi/frame_filter/client.py
 vaapi/game/__init__.py
 vaapi/game/client.py
 vaapi/image/__init__.py

vaapi-0.7.28/vaapi/annotations/client.py

@@ -1,206 +0,0 @@
-import typing
-from json.decoder import JSONDecodeError
-
-from ..core.api_error import ApiError
-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.annotation import Annotation
-
-# this is used as the default value for optional parameters
-OMIT = typing.cast(typing.Any, ...)
-
-
-class AnnotationsClient:
-    def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
-
-    def get(
-        self, id: int, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> Annotation:
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/annotations/{jsonable_encoder(id)}/",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(Annotation, _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)
-
-    def delete(
-        self, id: int, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> None:
-        """
-        Delete an annotation.
-
-        <Warning>This action can't be undone!</Warning>
-
-        You will need to supply the annotation's unique ID. You can find the ID in the Label Studio UI listed at the top of the annotation in its tab. It is also listed in the History panel when viewing the annotation. Or you can use [Get all task annotations](list) to find all annotation IDs.
-
-        Parameters
-        ----------
-        id : int
-            A unique integer value identifying this annotation.
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        None
-
-        Examples
-        --------
-        from label_studio_sdk.client import LabelStudio
-
-        client = LabelStudio(
-            api_key="YOUR_API_KEY",
-        )
-        client.annotations.delete(
-            id=1,
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/annotations/{jsonable_encoder(id)}/",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _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)
-
-    def update(
-        self,
-        id: int,
-        *,
-        class_name: typing.Optional[str] = OMIT,
-        concealed: typing.Optional[bool] = OMIT,
-        is_empty: typing.Optional[bool] = OMIT,
-        validated: typing.Optional[bool] = OMIT,
-        data: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> Annotation:
-        """ """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/annotations/{jsonable_encoder(id)}/",
-            method="PATCH",
-            json={
-                "class_name": class_name,
-                "concealed": concealed,
-                "is_empty": is_empty,
-                "validated": validated,
-                "data": data,
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(Annotation, _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)
-
-    def list(
-        self,
-        *,
-        request_options: typing.Optional[RequestOptions] = None,
-        **filters: typing.Any,
-    ) -> typing.List[Annotation]:
-        """
-        TODO: think about when it makes sense to use list for annotations:
-        - kind of only makes sense for statistics on annotations.
-        """
-        query_params = {k: v for k, v in filters.items()}
-        _response = self._client_wrapper.httpx_client.request(
-            "api/annotations/",
-            method="GET",
-            request_options=request_options,
-            params=query_params,
-        )
-
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(
-                    typing.List[Annotation], _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)
-
-    def create(
-        self,
-        image_id,
-        type,
-        class_name,
-        *,
-        concealed: typing.Optional[bool] = OMIT,
-        is_empty: typing.Optional[bool] = OMIT,
-        data: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> Annotation:
-        """ """
-        _response = self._client_wrapper.httpx_client.request(
-            "api/annotations/",
-            method="POST",
-            json={
-                "image": image_id,
-                "type": type,
-                "class_name": class_name,
-                "concealed": concealed,
-                "is_empty": is_empty,
-                "data": data,
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(Annotation, _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)
-
-    def count(
-        self,
-        request_options: typing.Optional[RequestOptions] = None,
-        **filters: typing.Any,
-    ) -> typing.Optional[int]:
-        """
-        Examples
-        --------
-        from vaapi.client import Vaapi
-
-        client = Vaapi(
-            base_url='https://vat.berlin-united.com/',
-            api_key="YOUR_API_KEY",
-        )
-        """
-        query_params = {k: v for k, v in filters.items() if v is not None}
-        _response = self._client_wrapper.httpx_client.request(
-            "api/annotation-count/",
-            method="GET",
-            request_options=request_options,
-            params=query_params,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(
-                    typing.Dict[str, typing.Any], _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.7.28/vaapi/frame_filter/client.py

@@ -1,181 +0,0 @@
-import typing
-from json.decoder import JSONDecodeError
-
-from ..core.api_error import ApiError
-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.frame_filter import FrameFilter
-
-# this is used as the default value for optional parameters
-OMIT = typing.cast(typing.Any, ...)
-
-
-class FrameFilterClient:
-    def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
-
-    def get(
-        self, id: int, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> FrameFilter:
-        """
-        Examples
-        --------
-        from vaapi.client import Vaapi
-
-        client = Vaapi(
-            base_url='https://vat.berlin-united.com/',
-            api_key="YOUR_API_KEY",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/frame-filter/{jsonable_encoder(id)}/",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(FrameFilter, _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)
-
-    def delete(
-        self, id: int, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> None:
-        """
-        Delete the log status for one log.
-
-        <Warning>This action can't be undone!</Warning>
-
-        You will need to supply the logs's unique ID. You can find the ID in
-        the django admin panel or in the log settings in the UI.
-        Parameters
-        ----------
-        id : int
-            A unique integer value identifying this annotation.
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        None
-
-        Examples
-        --------
-        from vaapi.client import Vaapi
-
-        client = Vaapi(
-            base_url='https://vat.berlin-united.com/',
-            api_key="YOUR_API_KEY",
-        )
-        client.annotations.delete(
-            id=1,
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/frame-filter/{jsonable_encoder(id)}/",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _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)
-
-    def update(
-        self,
-        id: int,
-        *,
-        frames: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> FrameFilter:
-        """ """
-        _response = self._client_wrapper.httpx_client.request(
-            f"api/frame-filter/{jsonable_encoder(id)}/",
-            method="PATCH",
-            json={
-                "frames": frames,
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(FrameFilter, _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)
-
-    def list(
-        self,
-        # log_id: int, *,
-        request_options: typing.Optional[RequestOptions] = None,
-        **filters: typing.Any,
-    ) -> typing.List[FrameFilter]:
-        """ """
-        query_params = {k: v for k, v in filters.items() if v is not None}
-
-        url = "api/frame-filter/"
-        _response = self._client_wrapper.httpx_client.request(
-            url, method="GET", request_options=request_options, params=query_params
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(
-                    typing.List[FrameFilter], _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)
-
-    def create(
-        self,
-        *,
-        log_id: typing.Optional[int] = OMIT,
-        frames: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        name: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> FrameFilter:
-        """
-
-        Parameters
-        ----------
-
-        Returns
-        -------
-
-        Examples
-        --------
-        ```python
-        from vaapi.client import Vaapi
-
-        client = Vaapi(
-            base_url='https://vat.berlin-united.com/',
-            api_key="YOUR_API_KEY",
-        )
-        ```
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "api/frame-filter/",
-            method="POST",
-            json={"log": log_id, "frames": frames, "name": name},
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return pydantic_v1.parse_obj_as(FrameFilter, _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)