Skip to content

Commit 4cb3c4b

Browse files
author
gdj0nes
committed
format
1 parent d5a7388 commit 4cb3c4b

File tree

2 files changed

+51
-47
lines changed

2 files changed

+51
-47
lines changed

labelbox/schema/data_row_metadata.py

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def id(self):
5353

5454

5555
class _CamelCaseMixin(BaseModel):
56+
5657
class Config:
5758
allow_population_by_field_name = True
5859
alias_generator = camel_case
@@ -135,14 +136,18 @@ def _build_ontology(self):
135136
f for f in self.fields if f.reserved
136137
]
137138
self.reserved_by_id = self._make_id_index(self.reserved_fields)
138-
self.reserved_by_name: Dict[str, DataRowMetadataSchema] = self._make_name_index(self.reserved_fields)
139+
self.reserved_by_name: Dict[
140+
str,
141+
DataRowMetadataSchema] = self._make_name_index(self.reserved_fields)
139142

140143
# custom fields
141144
self.custom_fields: List[DataRowMetadataSchema] = [
142145
f for f in self.fields if not f.reserved
143146
]
144147
self.custom_by_id = self._make_id_index(self.custom_fields)
145-
self.custom_by_name: Dict[str, DataRowMetadataSchema] = self._make_name_index(self.custom_fields)
148+
self.custom_by_name: Dict[
149+
str,
150+
DataRowMetadataSchema] = self._make_name_index(self.custom_fields)
146151

147152
@staticmethod
148153
def _make_name_index(fields: List[DataRowMetadataSchema]):
@@ -158,7 +163,7 @@ def _make_name_index(fields: List[DataRowMetadataSchema]):
158163

159164
@staticmethod
160165
def _make_id_index(
161-
fields: List[DataRowMetadataSchema]
166+
fields: List[DataRowMetadataSchema]
162167
) -> Dict[SchemaId, DataRowMetadataSchema]:
163168
index = {}
164169
for f in fields:
@@ -209,9 +214,9 @@ def _parse_ontology(raw_ontology) -> List[DataRowMetadataSchema]:
209214
return fields
210215

211216
def parse_metadata(
212-
self, unparsed: List[Dict[str,
213-
List[Union[str,
214-
Dict]]]]) -> List[DataRowMetadata]:
217+
self, unparsed: List[Dict[str,
218+
List[Union[str,
219+
Dict]]]]) -> List[DataRowMetadata]:
215220
""" Parse metadata responses
216221
217222
>>> mdo.parse_metadata([metdata])
@@ -272,7 +277,7 @@ def bulk_upsert(
272277
raise ValueError("Empty list passed")
273278

274279
def _batch_upsert(
275-
upserts: List[_UpsertBatchDataRowMetadata]
280+
upserts: List[_UpsertBatchDataRowMetadata]
276281
) -> List[DataRowMetadataBatchResponse]:
277282
query = """mutation UpsertDataRowMetadataBetaPyApi($metadata: [DataRowCustomMetadataBatchUpsertInput!]!) {
278283
upsertDataRowCustomMetadata(data: $metadata){
@@ -305,13 +310,13 @@ def _batch_upsert(
305310
fields=list(
306311
chain.from_iterable(
307312
self._parse_upsert(m) for m in m.fields))).dict(
308-
by_alias=True))
313+
by_alias=True))
309314

310315
res = _batch_operations(_batch_upsert, items, self._batch_size)
311316
return res
312317

313318
def bulk_delete(
314-
self, deletes: List[DeleteDataRowMetadata]
319+
self, deletes: List[DeleteDataRowMetadata]
315320
) -> List[DataRowMetadataBatchResponse]:
316321
""" Delete metadata from a datarow by specifiying the fields you want to remove
317322
@@ -338,7 +343,7 @@ def bulk_delete(
338343
raise ValueError("Empty list passed")
339344

340345
def _batch_delete(
341-
deletes: List[_DeleteBatchDataRowMetadata]
346+
deletes: List[_DeleteBatchDataRowMetadata]
342347
) -> List[DataRowMetadataBatchResponse]:
343348
query = """mutation DeleteDataRowMetadataBetaPyApi($deletes: [DataRowCustomMetadataBatchDeleteInput!]!) {
344349
deleteDataRowCustomMetadata(data: $deletes) {
@@ -459,9 +464,9 @@ def _batch_items(iterable: List[Any], size: int) -> Generator[Any, None, None]:
459464

460465

461466
def _batch_operations(
462-
batch_function: _BatchFunction,
463-
items: List,
464-
batch_size: int = 100,
467+
batch_function: _BatchFunction,
468+
items: List,
469+
batch_size: int = 100,
465470
):
466471
response = []
467472

tests/integration/test_data_row_metadata.py

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ def mdo(client):
3636
@pytest.fixture
3737
def big_dataset(dataset: Dataset, image_url):
3838
task = dataset.create_data_rows([
39-
{
40-
"row_data": image_url,
41-
"external_id": "my-image"
42-
},
43-
] * 250)
39+
{
40+
"row_data": image_url,
41+
"external_id": "my-image"
42+
},
43+
] * 250)
4444
task.wait_till_done()
4545

4646
yield dataset
@@ -50,11 +50,11 @@ def big_dataset(dataset: Dataset, image_url):
5050
def wait_for_embeddings_svc(data_row_ids, mdo):
5151
for idx in range(5):
5252
if all([
53-
len(metadata.fields)
54-
for metadata in mdo.bulk_export(data_row_ids)
53+
len(metadata.fields)
54+
for metadata in mdo.bulk_export(data_row_ids)
5555
]):
5656
return
57-
time.sleep((idx + 1) ** 2)
57+
time.sleep((idx + 1)**2)
5858
raise Exception("Embedding svc failed to update metadata.")
5959

6060

@@ -90,16 +90,10 @@ def test_get_datarow_metadata_ontology(mdo):
9090
schema_id=mdo.reserved_by_name["captureDateTime"].uid,
9191
value=datetime.utcnow(),
9292
),
93-
DataRowMetadataField(
94-
schema_id=split.parent,
95-
value=split.uid
96-
),
97-
DataRowMetadataField(
98-
schema_id=mdo.reserved_by_name["tag"].uid,
99-
value="hello-world"
100-
),
101-
]
102-
)
93+
DataRowMetadataField(schema_id=split.parent, value=split.uid),
94+
DataRowMetadataField(schema_id=mdo.reserved_by_name["tag"].uid,
95+
value="hello-world"),
96+
])
10397

10498

10599
def test_bulk_upsert_datarow_metadata(datarow, mdo: DataRowMetadataOntology):
@@ -248,22 +242,27 @@ def test_parse_raw_metadata(mdo):
248242
example = {
249243
'dataRowId':
250244
'ckr6kkfx801ui0yrtg9fje8xh',
251-
'fields': [{
252-
'schemaId': 'cko8s9r5v0001h2dk9elqdidh',
253-
'value': 'my-new-message'
254-
}, {
255-
'schemaId': 'cko8sbczn0002h2dkdaxb5kal',
256-
'value': {}
257-
}, {
258-
'schemaId': 'cko8sbscr0003h2dk04w86hof',
259-
'value': {}
260-
}, {
261-
'schemaId': 'cko8sdzv70006h2dk8jg64zvb',
262-
'value': '2021-07-20T21:41:14.606710Z'
263-
}, {
264-
'schemaId': FAKE_SCHEMA_ID,
265-
'value': 0.5
266-
},
245+
'fields': [
246+
{
247+
'schemaId': 'cko8s9r5v0001h2dk9elqdidh',
248+
'value': 'my-new-message'
249+
},
250+
{
251+
'schemaId': 'cko8sbczn0002h2dkdaxb5kal',
252+
'value': {}
253+
},
254+
{
255+
'schemaId': 'cko8sbscr0003h2dk04w86hof',
256+
'value': {}
257+
},
258+
{
259+
'schemaId': 'cko8sdzv70006h2dk8jg64zvb',
260+
'value': '2021-07-20T21:41:14.606710Z'
261+
},
262+
{
263+
'schemaId': FAKE_SCHEMA_ID,
264+
'value': 0.5
265+
},
267266
]
268267
}
269268

0 commit comments

Comments
 (0)