Skip to content

Commit

Permalink
Make edits from code review
Browse files Browse the repository at this point in the history
  • Loading branch information
@sguequierre
sguequierre committed Sep 16, 2024
1 parent bb821a6 commit 20c315b
Showing 1 changed file with 36 additions and 33 deletions.
69 changes: 36 additions & 33 deletions src/viam/app/data_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,16 @@ async def tabular_data_by_filter(
::
from viam.utils import create_filter
left_motor_filter = create_filter(
component_name="motor-1"
)
my_data = []
my_filter = create_filter(component_name="motor-1")
last = None
while True:
tabular_data, count, last = await data_client.tabular_data_by_filter(my_filter, last=last)
if not tabular_data:
break
my_data.extend(tabular_data)
data, count, last = await data_client.tabular_data_by_filter(filter=left_motor_filter)
for tab in data:
print(tab)
print(f"My data: {my_data}")
Args:
filter (viam.proto.app.data.Filter): Optional `Filter` specifying tabular data to retrieve. No `Filter` implies all tabular
Expand Down Expand Up @@ -293,7 +294,7 @@ def mql_to_binary(mql_pipeline):
tabular_data = await data_client.tabular_data_by_mql(
organization_id="<YOUR-ORG-ID>",
mql_binary=binary_pipeline
)
)
print(f"Tabular Data 1: {tabular_data}")
Expand Down Expand Up @@ -343,17 +344,19 @@ async def binary_data_by_filter(
from viam.utils import create_filter
from viam.proto.app.data import Filter, TagsFilter, TagsFilterType
camera_filter = create_filter(
component_name="camera-1"
)
# Get data captured from camera components
my_data = []
last = None
my_filter = create_filter(component_name="camera-1")
data, count, last = await data_client.binary_data_by_filter(
filter=camera_filter,
limit=1,
include_binary_data=True
)
for binary in data:
print(binary)
while True:
data, count, last = await data_client.binary_data_by_filter(
my_filter, limit=1, last=last)
if not data:
break
my_data.extend(data)
print(f"My data: {my_data}")
# Get untagged data from a dataset
Expand Down Expand Up @@ -432,13 +435,13 @@ async def binary_data_by_ids(
from viam.proto.app.data import BinaryID
binary_metadata = await data_client.binary_data_by_filter(
binary_metadata, count, last = await data_client.binary_data_by_filter(
include_binary_data=False
)
my_ids = []
for obj in binary_metadata[0]:
for obj in binary_metadata:
my_ids.append(
BinaryID(
file_id=obj.metadata.id,
Expand Down Expand Up @@ -480,7 +483,7 @@ async def delete_tabular_data(self, organization_id: str, delete_older_than_days
tabular_data = await data_client.delete_tabular_data(
organization_id="<YOUR-ORG-ID>",
delete_older_than_days=150
)
)
Args:
organization_id (str): ID of organization to delete data from.
Expand Down Expand Up @@ -536,15 +539,15 @@ async def delete_binary_data_by_ids(self, binary_ids: List[BinaryID]) -> int:
from viam.utils import create_filter
my_filter = create_filter(component_name="camera-1", organization_ids=["<YOUR-ORG-ID>"])
binary_metadata = await data_client.binary_data_by_filter(
binary_metadata, count, last = await data_client.binary_data_by_filter(
filter=my_filter,
limit=20,
include_binary_data=False
)
)
my_ids = []
for obj in binary_metadata[0]:
for obj in binary_metadata:
my_ids.append(
BinaryID(
file_id=obj.metadata.id,
Expand Down Expand Up @@ -581,15 +584,15 @@ async def add_tags_to_binary_data_by_ids(self, tags: List[str], binary_ids: List
tags = ["tag1", "tag2"]
my_filter = create_filter(component_name="camera-1", organization_ids=["<YOUR-ORG-ID>"])
binary_metadata = await data_client.binary_data_by_filter(
binary_metadata, count, last = await data_client.binary_data_by_filter(
filter=my_filter,
limit=20,
include_binary_data=False
)
my_ids = []
for obj in binary_metadata[0]:
for obj in binary_metadata:
my_ids.append(
BinaryID(
file_id=obj.metadata.id,
Expand Down Expand Up @@ -649,15 +652,15 @@ async def remove_tags_from_binary_data_by_ids(self, tags: List[str], binary_ids:
my_filter = create_filter(component_name="camera-1")
binary_metadata = await data_client.binary_data_by_filter(
binary_metadata, count, last = await data_client.binary_data_by_filter(
filter=my_filter,
limit=50,
include_binary_data=False
)
my_ids = []
for obj in binary_metadata[0]:
for obj in binary_metadata:
my_ids.append(
BinaryID(
file_id=obj.metadata.id,
Expand Down Expand Up @@ -1019,13 +1022,13 @@ async def add_binary_data_to_dataset_by_ids(self, binary_ids: List[BinaryID], da
from viam.proto.app.data import BinaryID
binary_metadata, _, _ = await data_client.binary_data_by_filter(
binary_metadata, count, last = await data_client.binary_data_by_filter(
include_binary_data=False
)
my_binary_ids = []
for obj in binary_metadata[0]:
for obj in binary_metadata:
my_binary_ids.append(
BinaryID(
file_id=obj.metadata.id,
Expand Down Expand Up @@ -1059,13 +1062,13 @@ async def remove_binary_data_from_dataset_by_ids(self, binary_ids: List[BinaryID
from viam.proto.app.data import BinaryID
binary_metadata, _, _ = await data_client.binary_data_by_filter(
binary_metadata, count, last = await data_client.binary_data_by_filter(
include_binary_data=False
)
my_binary_ids = []
for obj in binary_metadata[0]:
for obj in binary_metadata:
my_binary_ids.append(
BinaryID(
file_id=obj.metadata.id,
Expand Down

0 comments on commit 20c315b

Please sign in to comment.