Skip to content

Commit f0ee482

Browse files
author
Val Brodsky
committed
Fixing more tests
1 parent 2f1079a commit f0ee482

File tree

4 files changed

+48
-25
lines changed

4 files changed

+48
-25
lines changed

libs/labelbox/tests/data/annotation_import/conftest.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -622,12 +622,15 @@ def configured_project(client, initial_dataset, ontology, rand_gen, image_url):
622622
data_row_ids = []
623623

624624
ontologies = ontology["tools"] + ontology["classifications"]
625+
data_row_data = []
625626
for ind in range(len(ontologies)):
626-
data_row_ids.append(
627-
dataset.create_data_row(
628-
row_data=image_url,
629-
global_key=f"gk_{ontologies[ind]['name']}_{rand_gen(str)}",
630-
).uid)
627+
data_row_data.append({
628+
"row_data": image_url,
629+
"global_key": f"gk_{ontologies[ind]['name']}_{rand_gen(str)}"
630+
})
631+
task = dataset.create_data_rows(data_row_data)
632+
task.wait_till_done()
633+
data_row_ids = [row['id'] for row in task.result]
631634
project._wait_until_data_rows_are_processed(data_row_ids=data_row_ids,
632635
sleep_interval=3)
633636

libs/labelbox/tests/integration/test_data_rows.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,6 @@ def test_create_data_row_with_invalid_input(dataset, image_url):
362362
with pytest.raises(ResourceCreationError) as exc:
363363
dataset.create_data_row("asdf")
364364

365-
dr = {"row_data": image_url}
366-
with pytest.raises(ResourceCreationError) as exc:
367-
dataset.create_data_row(dr, row_data=image_url)
368-
369365

370366
def test_create_data_row_with_metadata(mdo, dataset, image_url):
371367
client = dataset.client

libs/labelbox/tests/integration/test_dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import requests
33
from unittest.mock import MagicMock
44
from labelbox import Dataset
5-
from labelbox.exceptions import ResourceNotFoundError, InvalidQueryError
5+
from labelbox.exceptions import ResourceNotFoundError, ResourceCreationError
66

77
from labelbox.schema.internal.descriptor_file_creator import DescriptorFileCreator
88

@@ -128,7 +128,7 @@ def test_create_pdf(dataset):
128128
},
129129
media_type="PDF")
130130

131-
with pytest.raises(InvalidQueryError):
131+
with pytest.raises(ResourceCreationError):
132132
# Wrong media type
133133
dataset.create_data_row(row_data={
134134
"pdfUrl":
Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,54 @@
1+
from _pytest import config
12
import pytest
23
from labelbox.exceptions import ResourceNotFoundError
34

4-
def test_add_single_model_config(configured_project, model_config):
5-
project_model_config_id = configured_project.add_model_config(model_config.uid)
65

7-
assert set(config.uid for config in configured_project.project_model_configs()) == set([project_model_config_id])
6+
def test_add_single_model_config(chat_evaluation_project_create_dataset,
7+
model_config):
8+
configured_project = chat_evaluation_project_create_dataset
9+
project_model_config_id = configured_project.add_model_config(
10+
model_config.uid)
811

9-
assert configured_project.delete_project_model_config(project_model_config_id)
12+
assert set(config.uid
13+
for config in configured_project.project_model_configs()) == set(
14+
[project_model_config_id])
1015

16+
assert configured_project.delete_project_model_config(
17+
project_model_config_id)
1118

12-
def test_add_multiple_model_config(client, rand_gen, configured_project, model_config, valid_model_id):
13-
second_model_config = client.create_model_config(rand_gen(str), valid_model_id, {"param": "value"})
14-
first_project_model_config_id = configured_project.add_model_config(model_config.uid)
15-
second_project_model_config_id = configured_project.add_model_config(second_model_config.uid)
16-
expected_model_configs = set([first_project_model_config_id, second_project_model_config_id])
1719

18-
assert set(config.uid for config in configured_project.project_model_configs()) == expected_model_configs
20+
def test_add_multiple_model_config(client, rand_gen,
21+
chat_evaluation_project_create_dataset,
22+
model_config, valid_model_id):
23+
configured_project = chat_evaluation_project_create_dataset
24+
second_model_config = client.create_model_config(rand_gen(str),
25+
valid_model_id,
26+
{"param": "value"})
27+
first_project_model_config_id = configured_project.add_model_config(
28+
model_config.uid)
29+
second_project_model_config_id = configured_project.add_model_config(
30+
second_model_config.uid)
31+
expected_model_configs = set(
32+
[first_project_model_config_id, second_project_model_config_id])
33+
34+
assert set(
35+
config.uid for config in configured_project.project_model_configs()
36+
) == expected_model_configs
1937

2038
for project_model_config_id in expected_model_configs:
21-
assert configured_project.delete_project_model_config(project_model_config_id)
39+
assert configured_project.delete_project_model_config(
40+
project_model_config_id)
2241

2342

24-
def test_delete_project_model_config(configured_project, model_config):
25-
assert configured_project.delete_project_model_config(configured_project.add_model_config(model_config.uid))
43+
def test_delete_project_model_config(chat_evaluation_project_create_dataset,
44+
model_config):
45+
configured_project = chat_evaluation_project_create_dataset
46+
assert configured_project.delete_project_model_config(
47+
configured_project.add_model_config(model_config.uid))
2648
assert not len(configured_project.project_model_configs())
2749

50+
2851
def test_delete_nonexistant_project_model_config(configured_project):
2952
with pytest.raises(ResourceNotFoundError):
30-
configured_project.delete_project_model_config("nonexistant_project_model_config")
53+
configured_project.delete_project_model_config(
54+
"nonexistant_project_model_config")

0 commit comments

Comments
 (0)