vaapi 0.7.30__tar.gz → 0.7.32__tar.gz

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

@@ -1,18 +1,17 @@
 Metadata-Version: 2.4
 Name: vaapi
-Version: 0.7.30
+Version: 0.7.32
 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
+License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10.9
 Description-Content-Type: text/markdown
 Requires-Dist: protobuf==3.20.3
 Requires-Dist: httpx==0.28.1
 Requires-Dist: pydantic==2.12.5
-Requires-Dist: requests==2.32.5
+Requires-Dist: requests==2.33.1
 
 # Berlin United - Visual Analytics Tool
 Work in progress for an Analytics tool tailored to the needs of RoboCup SPL.

{vaapi-0.7.30 → vaapi-0.7.32}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2"]
+requires = ["setuptools>=61", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -10,20 +10,18 @@ authors = [
 description = "Python utils for adding logs to our Visual Analytics Tool"
 readme = "README.md"
 requires-python = ">=3.10.9"
-license = { text = "Apache-2.0" }
+license = "Apache-2.0"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
 ]
 dynamic = ["version"]
-#[tool.setuptools_scm]
 
 dependencies = [
     "protobuf==3.20.3",
     "httpx==0.28.1",
     "pydantic==2.12.5",
-    "requests==2.32.5",
+    "requests==2.33.1",
 ]
 
 [tool.setuptools.dynamic]

{vaapi-0.7.30 → vaapi-0.7.32}/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.30"
+__version__ = "0.7.32"

{vaapi-0.7.30 → vaapi-0.7.32}/vaapi/types/video.py

@@ -21,6 +21,8 @@ class Video(pydantic_v1.BaseModel):
 
     type: typing.Optional[str] = pydantic_v1.Field(default=None)
 
+    labelstudio_url: typing.Optional[str] = pydantic_v1.Field(default=None)
+
     comment: typing.Optional[str] = pydantic_v1.Field(default=None)
 
     def json(self, **kwargs: typing.Any) -> str:

{vaapi-0.7.30 → vaapi-0.7.32}/vaapi/videos/client.py

@@ -79,6 +79,7 @@ class VideoClient:
         video_path: typing.Optional[str] = OMIT,
         url: typing.Optional[str] = OMIT,
         type: typing.Optional[str] = OMIT,
+        labelstudio_url: typing.Optional[str] = OMIT,
         comment: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Video:
@@ -101,6 +102,7 @@ class VideoClient:
                 "video_path": video_path,
                 "url": url,
                 "type": type,
+                "labelstudio_url": labelstudio_url,
                 "comment": comment,
             },
             request_options=request_options,
@@ -155,6 +157,7 @@ class VideoClient:
         video_path: typing.Optional[str] = OMIT,
         url: typing.Optional[str] = OMIT,
         type: typing.Optional[str] = OMIT,
+        labelstudio_url: typing.Optional[str] = OMIT,
         comment: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> Video:
@@ -177,6 +180,7 @@ class VideoClient:
                 "video_path": video_path,
                 "url": url,
                 "type": type,
+                "labelstudio_url": labelstudio_url,
                 "comment": comment,
             },
             request_options=request_options,

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

@@ -1,18 +1,17 @@
 Metadata-Version: 2.4
 Name: vaapi
-Version: 0.7.30
+Version: 0.7.32
 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
+License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10.9
 Description-Content-Type: text/markdown
 Requires-Dist: protobuf==3.20.3
 Requires-Dist: httpx==0.28.1
 Requires-Dist: pydantic==2.12.5
-Requires-Dist: requests==2.32.5
+Requires-Dist: requests==2.33.1
 
 # Berlin United - Visual Analytics Tool
 Work in progress for an Analytics tool tailored to the needs of RoboCup SPL.

{vaapi-0.7.30 → vaapi-0.7.32}/vaapi.egg-info/SOURCES.txt

@@ -1,46 +1,5 @@
-.gitignore
 README.md
-package_pypi.sh
 pyproject.toml
-renovate.json
-.github/workflows/deploy_sdk.yml
-examples/README.md
-examples/annotation_demo.py
-examples/ballcanditates.py
-examples/basics.py
-examples/behavior_demo.py
-examples/bulk_image_update.py
-examples/file_upload.py
-examples/filter_behavior_demo.py
-examples/fix_images.py
-examples/get_annotations.py
-examples/get_frame_per_video_timestamp.py
-examples/get_game_model_data.py
-examples/get_image.py
-examples/get_log_model_data.py
-examples/get_teams.py
-examples/get_video_model_data.py
-examples/image_demo.py
-examples/image_pagination.py
-examples/imu_demo.py
-examples/mmap_local_demo.py
-examples/num_kicks_demo.py
-examples/num_kicks_demo_interactive.py
-examples/requirements.txt
-examples/robot.py
-examples/slice.py
-examples/team_demo.py
-examples/broken_demos/annotation_example.py
-examples/broken_demos/find_kicks_near_goal.py
-examples/broken_demos/frame_filter_example.py
-examples/broken_demos/frame_times.py
-examples/broken_demos/heatmap.py
-tests/run_tests.py
-tests/tests/cognition_repr_test.py
-tests/tests/event_tests.py
-tests/tests/game_tests.py
-tests/tests/logs_tests.py
-tests/tests/motion_repr_test.py
 vaapi/__init__.py
 vaapi/base_client.py
 vaapi/client.py

{vaapi-0.7.30 → vaapi-0.7.32}/vaapi.egg-info/requires.txt

@@ -1,4 +1,4 @@
 protobuf==3.20.3
 httpx==0.28.1
 pydantic==2.12.5
-requests==2.32.5
+requests==2.33.1

vaapi-0.7.30/.github/workflows/deploy_sdk.yml

@@ -1,24 +0,0 @@
-name: GitHub Actions Demo
-run-name: ${{ github.actor }} is deploying the sdk 🚀
-on:
-  workflow_dispatch:
-  push:
-    branches: ['main']
-env:
-  PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-
-jobs:
-  Explore-GitHub-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - run: python -m pip install --upgrade pip setuptools wheel twine
-      - name: Deploy sdk to pypi
-        run: |
-          /bin/bash package_pypi.sh
-      - run: echo "🍏 This job's status is ${{ job.status }}."

vaapi-0.7.30/.gitignore

@@ -1,9 +0,0 @@
-# setup.py stuff
-.eggs/
-*.egg-info
-build/
-dist/
-venv/
-.pypirc
-__pycache__/
-.envrc

vaapi-0.7.30/examples/README.md

@@ -1,18 +0,0 @@
-## Demos for the Berlin United Visual Analytics Tool
-
-## Setup
-
-```bash
-python3 -m venv venv
-source venv/bin/activate
-
-python -m pip install -r requirements.txt
-```
-
-You need to the environment variables for the URL and the API token. 
-```
-export VAT_API_URL=<http://127.0.0.1:8000/ or https://vat.berlin-united.com/>
-export VAT_API_TOKEN=<your token>
-```
-
-If you are using vat.berlin-united.com you should have received a token from the admin. If you are using the self hosted version you can get the token by login to the django admin panel. 

vaapi-0.7.30/examples/annotation_demo.py

@@ -1,41 +0,0 @@
-from vaapi.client import Vaapi
-import os
-
-
-def list_annotations_per_log():
-    log = client.logs.list()
-
-    def sort_key_fn(log):
-        return log.id
-
-    for log in sorted(log, key=sort_key_fn):
-        count = client.annotations.count(
-            log=log.id, class_name="ball", validated=False
-        )["count"]
-        if count < 100 and count > 0:
-            print(f"{log.id} - {count} ball annotations")
-
-
-def print_annotation_stats():
-    # FIXME we cant filter for camera yet
-    all_annotations = client.annotations.count(type='bbox',class_name="ball")["count"]
-    validated_annotations = client.annotations.count(type='bbox',class_name="ball", validated=True)[
-        "count"
-    ]
-
-    validation_progress = (validated_annotations / all_annotations) * 100
-
-    print(f"Percent of Ball Annotations validated: {validation_progress}%")
-    print(
-        f"You already validated {validated_annotations} Ball Annotations of of {all_annotations}"
-    )
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-
-    print_annotation_stats()
-    # list_annotations_per_log()

vaapi-0.7.30/examples/ballcanditates.py

@@ -1,22 +0,0 @@
-"""
-Similar to
-response = client.ballcandidates.list(
-        log_id=1,
-    )
-
-you can use any representation name present in the game.log to query it except behavior. Behavior is handled differently.
-"""
-
-from vaapi.client import Vaapi
-import os
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-    response = client.ballcandidates.list(
-        log=1,
-    )
-    print(response)

vaapi-0.7.30/examples/basics.py

@@ -1,33 +0,0 @@
-from vaapi.client import Vaapi
-import os
-
-
-def get_logs():
-    response = client.logs.list()
-    for log in response:
-        print(f"{log.game} - Player: {log.player_number}")
-
-    # you can print all fields of a log with:
-    # response[0].dict()
-
-
-def get_games():
-    response = client.games.list()
-    for game in response:
-        print(game)
-
-
-def get_experiments():
-    response = client.experiment.list()
-    for experiment in response:
-        print(experiment)
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-    get_games()
-    get_logs()
-    get_experiments()

vaapi-0.7.30/examples/behavior_demo.py

@@ -1,14 +0,0 @@
-from vaapi.client import Vaapi
-import os
-
-def get_all_states_for_option():
-    behavior_option = client.behavior_option.list(log=282,option_name="fall_down_and_stand_up")
-    behavior_option_states = client.behavior_option_state.list(log=282,option_id=behavior_option[0].id)
-    print(behavior_option_states)
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-    get_all_states_for_option()

vaapi-0.7.30/examples/broken_demos/annotation_example.py

@@ -1,26 +0,0 @@
-from vaapi.client import Vaapi
-import os
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-
-    resp = client.annotations.create(
-        image_id=2,
-        annotation={
-            "bbox": [
-                {
-                    "x": 170,
-                    "y": 280,
-                    "id": 123,
-                    "label": "ball",
-                    "width": 100,
-                    "height": 100,
-                }
-            ]
-        },
-    )
-    print(resp)

vaapi-0.7.30/examples/broken_demos/find_kicks_near_goal.py

@@ -1,59 +0,0 @@
-""" """
-
-from vaapi.client import Vaapi
-import os
-
-
-def group_consecutive_integers(numbers):
-    if not numbers:
-        return []
-
-    # Sort the list
-    sorted_numbers = sorted(numbers)
-
-    # Initialize the result and the first group
-    result = []
-    current_group = [sorted_numbers[0]]
-
-    # Iterate through the sorted list starting from the second element
-    for num in sorted_numbers[1:]:
-        if num == current_group[-1] + 1:
-            # If the number is consecutive, add it to the current group
-            current_group.append(num)
-        else:
-            # If there's a gap, add the current group to the result and start a new group
-            result.append(current_group)
-            current_group = [num]
-
-    # Add the last group
-    result.append(current_group)
-
-    return result
-
-
-def find_kick_frames(client):
-    response = client.behavior_frame_option.filter(
-        log_id=168,
-        option_name="path_striker2024",
-        state_name="forwardkick",
-    )
-
-    grouped_numbers = group_consecutive_integers(response)
-    print(f"Number of times the robot tried to kick: {len(grouped_numbers)}")
-    for group in grouped_numbers:
-        print(group[0])
-        # TODO find the location in the xabsl symbols
-        symbols = client.xabsl_symbol_sparse.list(log_id=168, frame=group[0])
-
-        print(symbols[0].data["input"]["robot_pose.planned.x"])
-
-        quit()
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-
-    find_kick_frames(client)

vaapi-0.7.30/examples/broken_demos/frame_filter_example.py

@@ -1,26 +0,0 @@
-from vaapi.client import Vaapi
-import os
-
-
-def frame_filter_demo(client):
-    response = client.behavior_frame_option.filter(
-        log_id=168,
-        option_name="path_striker2024",
-        state_name="forwardkick",
-    )
-
-    # publish the frames list
-    resp = client.frame_filter.create(
-        log_id=168,
-        frames={"frame_list": response},
-    )
-    print(resp)
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-
-    frame_filter_demo(client)

vaapi-0.7.30/examples/broken_demos/frame_times.py

@@ -1,26 +0,0 @@
-from vaapi.client import Vaapi
-import os
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-    """
-    Get FrameInfo from Cognition Process
-    """
-    response = client.cognition_repr.list(
-        log_id=168,
-        representation_name="FrameInfo",
-    )
-    print(response[0])
-
-    """
-    Get FrameInfo from Motion Process
-    """
-    response = client.motion_repr.list(
-        log_id=168,
-        representation_name="FrameInfo",
-    )
-    print(response[0])

vaapi-0.7.30/examples/broken_demos/heatmap.py

@@ -1,110 +0,0 @@
-""" """
-
-from vaapi.client import Vaapi
-import os
-import numpy as np
-import matplotlib.pyplot as plt
-
-
-def candidates_distribution(logs):
-    x_list = list()
-    y_list = list()
-    for data in logs:
-        response = client.cognition_repr.list(
-            log_id=data.id,
-            representation_name="BallCandidates",
-        )
-        print(len(response))
-
-        for candidates in response:
-            patch_list = candidates.representation_data["patches"]
-            for patch in patch_list:
-                mid_x = (patch["max"]["x"] + patch["min"]["x"]) / 2
-                mid_y = (patch["max"]["y"] + patch["min"]["y"]) / 2
-                x_list.append(mid_x)
-                y_list.append(mid_y)
-        break
-
-    fig, ax = plt.subplots()
-    plt.title("Frequency of Ball Canditates found in Image")
-    h = ax.hist2d(x_list, y_list, bins=[np.arange(0, 640, 20), np.arange(0, 480, 20)])
-    fig.colorbar(h[3], ax=ax)
-    plt.savefig("candidates_distribution.png")
-
-
-def candidates_top_distribution(logs):
-    x_list = list()
-    y_list = list()
-    for data in logs:
-        response = client.cognition_repr.list(
-            log_id=data.id,
-            representation_name="BallCandidatesTop",
-        )
-        print(len(response))
-
-        for candidates in response:
-            patch_list = candidates.representation_data["patches"]
-            for patch in patch_list:
-                mid_x = (patch["max"]["x"] + patch["min"]["x"]) / 2
-                mid_y = (patch["max"]["y"] + patch["min"]["y"]) / 2
-                x_list.append(mid_x)
-                y_list.append(mid_y)
-        break
-
-    fig, ax = plt.subplots()
-    plt.title("Frequency of Ball Canditates found in Image Top")
-    h = ax.hist2d(x_list, y_list, bins=[np.arange(0, 640, 20), np.arange(0, 480, 20)])
-    fig.colorbar(h[3], ax=ax)
-    plt.savefig("candidates_top_distribution.png")
-
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-    logs = client.logs.list()
-    # candidates_top_distribution(logs)
-    # candidates_distribution(logs)
-
-    x_list_top = list()
-    y_list_top = list()
-    x_list_bottom = list()
-    y_list_bottom = list()
-    for data in logs:
-        print(data.log_path)
-        response = client.cognition_repr.list(
-            log_id=168,
-            representation_name="MultiBallPercept",
-        )
-
-        for multipercept in response:
-            if "percepts" in multipercept.representation_data:
-                for percept in multipercept.representation_data["percepts"]:
-                    cx = percept["centerInImage"]["x"]
-                    cy = percept["centerInImage"]["y"]
-                    cam = percept["cameraId"]
-                    if cam == "top":
-                        x_list_top.append(cx)
-                        y_list_top.append(cy)
-                    else:
-                        x_list_bottom.append(cx)
-                        y_list_bottom.append(cy)
-
-    fig, ax = plt.subplots()
-    plt.title("Frequency of Ball Percepts found in Image Top")
-    h = ax.hist2d(
-        x_list_top, y_list_top, bins=[np.arange(0, 640, 20), np.arange(0, 480, 20)]
-    )
-    fig.colorbar(h[3], ax=ax)
-    plt.savefig("ball_percepts_top_distribution.png")
-
-    fig, ax = plt.subplots()
-    plt.title("Frequency of Ball Percepts found in Image")
-    h = ax.hist2d(
-        x_list_bottom,
-        y_list_bottom,
-        bins=[np.arange(0, 640, 20), np.arange(0, 480, 20)],
-    )
-    fig.colorbar(h[3], ax=ax)
-    plt.savefig("ball_percepts_distribution.png")

vaapi-0.7.30/examples/bulk_image_update.py

@@ -1,22 +0,0 @@
-from vaapi.client import Vaapi
-from vaapi.types.image import Image
-import os
-
-def get_and_update_img():
-    imgs = client.image.list(log=282)
-    imgs_to_update = []
-    for img in imgs:
-        #construct image with id and the fields that you want to update
-        imgs_to_update.append(Image(id=img.id,frame=img.frame.id))
-        if len(imgs_to_update) == 10:
-            break
-    print(imgs_to_update)
-
-    client.image.bulk_update(data=imgs_to_update)
-
-if __name__ == "__main__":
-    client = Vaapi(
-        base_url=os.environ.get("VAT_API_URL"),
-        api_key=os.environ.get("VAT_API_TOKEN"),
-    )
-    get_and_update_img()

vaapi-0.7.30/examples/file_upload.py

@@ -1,21 +0,0 @@
-import requests
-import os
-
-def upload_model(files):
-    response = requests.post(url=f"{base_url[0]}api/upload/model/",files=files,headers=headers)
-    print(response.text)
-
-def upload_dataset(files):
-    response = requests.post(url=f"{base_url[0]}api/upload/dataset/",files=files,headers=headers)
-    print(response.text)
-
-if __name__ == "__main__":
-    base_url=os.environ.get("VAT_API_URL"),
-    api_key=os.environ.get("VAT_API_TOKEN"),
-
-    # specify a file you want to upload
-    files = {'file': open('test-upload.h5', 'rb')} 
-    headers ={"Authorization":f"Token {api_key[0]}"}
-
-    upload_model(files)
-    # upload_dataset(files)