Skip to content

Commit 7b1e370

Browse files
Jiei-SJiei-S
committed
feat: dataset version - ut
1 parent c15d38a commit 7b1e370

File tree

2 files changed

+48
-41
lines changed

2 files changed

+48
-41
lines changed

‎fastlabel/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3922,7 +3922,6 @@ def create_image_dataset_object(
39223922
"""
39233923
endpoint = "dataset-objects"
39243924
# TODO: add jfif, pjpeg, pjp?
3925-
print(file_path)
39263925
if not utils.is_image_supported_ext(file_path):
39273926
raise FastLabelInvalidException(
39283927
"Supported extensions are png, jpg, jpeg.", 422

‎tests/test_client_dataset.py‎

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def test_get_dataset(self, client: Client, testing_image_dataset: dict):
6767
def test_update_dataset(self, client: Client, testing_image_dataset: dict):
6868
# Act
6969
dataset = client.update_dataset(
70-
dataset_id=testing_image_dataset["id"], name="update name"
70+
dataset_id=testing_image_dataset["id"],
71+
name="update name",
7172
)
7273
# Assert
7374
assert dataset["name"] == "update name"
@@ -77,7 +78,7 @@ def test_create_dataset_object(self, client: Client, testing_image_dataset: dict
7778
target_file = Path(sys.path[0]) / "files/test_image.jpg"
7879
# Act
7980
dataset_object = client.create_image_dataset_object(
80-
dataset_id=testing_image_dataset["id"],
81+
dataset_version_id=testing_image_dataset["version"]["id"],
8182
name="test_image.jpg",
8283
file_path=str(target_file),
8384
)
@@ -102,7 +103,7 @@ def test_create_dataset_object_file_type_violation(
102103
),
103104
) as _:
104105
client.create_image_dataset_object(
105-
dataset_id=testing_image_dataset["id"],
106+
dataset_version_id=testing_image_dataset["version"]["id"],
106107
name="test_video.mp4",
107108
file_path=str(target_file),
108109
)
@@ -111,32 +112,32 @@ def test_find_dataset_object(self, client: Client, testing_image_dataset: dict):
111112
# Arrange
112113
target_file = Path(sys.path[0]) / "files/test_image.jpg"
113114
dataset_object = client.create_image_dataset_object(
114-
dataset_id=testing_image_dataset["id"],
115+
dataset_version_id=testing_image_dataset["version"]["id"],
115116
name="test_image.jpg",
116117
file_path=str(target_file),
117118
)
118119
# Act
119120
result = client.find_dataset_object(dataset_object_id=dataset_object["id"])
120121
# Assert
121-
assert remove_object_signed_url(result) == remove_object_signed_url(
122-
dataset_object
123-
)
122+
assert result["name"] == dataset_object["name"]
124123

125124
def test_get_dataset_object(self, client: Client, testing_image_dataset: dict):
126125
# Arrange
127126
target_file = Path(sys.path[0]) / "files/test_image.jpg"
128127
dataset_object1 = client.create_image_dataset_object(
129-
dataset_id=testing_image_dataset["id"],
128+
dataset_version_id=testing_image_dataset["version"]["id"],
130129
name="test_image1.jpg",
131130
file_path=str(target_file),
132131
)
133132
dataset_object2 = client.create_image_dataset_object(
134-
dataset_id=testing_image_dataset["id"],
133+
dataset_version_id=testing_image_dataset["version"]["id"],
135134
name="test_image2.jpg",
136135
file_path=str(target_file),
137136
)
138137
# Act
139-
results = client.get_dataset_objects(dataset_id=testing_image_dataset["id"])
138+
results = client.get_dataset_objects(
139+
dataset_version_id=testing_image_dataset["version"]["id"]
140+
)
140141
# Assert
141142
assert results is not None
142143
assert len(results) == 2
@@ -153,14 +154,14 @@ def test_delete_dataset_object(self, client: Client, testing_image_dataset: dict
153154
dataset_object_names = ["test_image1.jpg", "test_image2.jpg", "test_image3.jpg"]
154155
created = [
155156
client.create_image_dataset_object(
156-
dataset_id=testing_image_dataset["id"],
157+
dataset_version_id=testing_image_dataset["version"]["id"],
157158
name=name,
158159
file_path=str(target_file),
159160
)
160161
for name in dataset_object_names
161162
]
162163
dataset_objects = client.get_dataset_objects(
163-
dataset_id=testing_image_dataset["id"]
164+
dataset_version_id=testing_image_dataset["version"]["id"]
164165
)
165166
assert dataset_objects is not None
166167
assert len(dataset_objects) == 3
@@ -177,7 +178,9 @@ def test_delete_dataset_object(self, client: Client, testing_image_dataset: dict
177178
dataset_object_ids=[created[0]["id"], created[2]["id"]],
178179
)
179180
# Assert
180-
results = client.get_dataset_objects(dataset_id=testing_image_dataset["id"])
181+
results = client.get_dataset_objects(
182+
dataset_version_id=testing_image_dataset["version"]["id"]
183+
)
181184
assert results is not None
182185
assert len(results) == 1
183186
assert remove_object_signed_url(results[0]) == remove_object_signed_url(
@@ -213,7 +216,7 @@ def test_create_dataset_object(self, client: Client, testing_video_dataset: dict
213216
target_file = Path(sys.path[0]) / "files/test_video.mp4"
214217
# Act
215218
dataset_object = client.create_video_dataset_object(
216-
dataset_id=testing_video_dataset["id"],
219+
dataset_version_id=testing_video_dataset["version"]["id"],
217220
name="test_video.mp4",
218221
file_path=str(target_file),
219222
)
@@ -236,7 +239,7 @@ def test_create_dataset_object_file_type_violation(
236239
match=re.escape("<Response [422]> Supported extensions are mp4."),
237240
) as _:
238241
client.create_video_dataset_object(
239-
dataset_id=testing_video_dataset["id"],
242+
dataset_version_id=testing_video_dataset["version"]["id"],
240243
name="test_image.jpg",
241244
file_path=str(target_file),
242245
)
@@ -245,32 +248,32 @@ def test_find_dataset_object(self, client: Client, testing_video_dataset: dict):
245248
# Arrange
246249
target_file = Path(sys.path[0]) / "files/test_video.mp4"
247250
dataset_object = client.create_video_dataset_object(
248-
dataset_id=testing_video_dataset["id"],
251+
dataset_version_id=testing_video_dataset["version"]["id"],
249252
name="test_video.mp4",
250253
file_path=str(target_file),
251254
)
252255
# Act
253256
result = client.find_dataset_object(dataset_object_id=dataset_object["id"])
254257
# Assert
255-
assert remove_object_signed_url(result) == remove_object_signed_url(
256-
dataset_object
257-
)
258+
assert result["name"] == dataset_object["name"]
258259

259260
def test_get_dataset_object(self, client: Client, testing_video_dataset: dict):
260261
# Arrange
261262
target_file = Path(sys.path[0]) / "files/test_video.mp4"
262263
dataset_object1 = client.create_video_dataset_object(
263-
dataset_id=testing_video_dataset["id"],
264+
dataset_version_id=testing_video_dataset["version"]["id"],
264265
name="test_video1.mp4",
265266
file_path=str(target_file),
266267
)
267268
dataset_object2 = client.create_video_dataset_object(
268-
dataset_id=testing_video_dataset["id"],
269+
dataset_version_id=testing_video_dataset["version"]["id"],
269270
name="test_video2.mp4",
270271
file_path=str(target_file),
271272
)
272273
# Act
273-
results = client.get_dataset_objects(dataset_id=testing_video_dataset["id"])
274+
results = client.get_dataset_objects(
275+
dataset_version_id=testing_video_dataset["version"]["id"]
276+
)
274277
# Assert
275278
assert results is not None
276279
assert len(results) == 2
@@ -287,15 +290,15 @@ def test_delete_dataset_object(self, client: Client, testing_video_dataset: dict
287290
dataset_object_names = ["test_video1.mp4", "test_video2.mp4", "test_video3.mp4"]
288291
created = [
289292
client.create_video_dataset_object(
290-
dataset_id=testing_video_dataset["id"],
293+
dataset_version_id=testing_video_dataset["version"]["id"],
291294
name=name,
292295
file_path=str(target_file),
293296
)
294297
for name in dataset_object_names
295298
]
296299

297300
dataset_objects = client.get_dataset_objects(
298-
dataset_id=testing_video_dataset["id"]
301+
dataset_version_id=testing_video_dataset["version"]["id"]
299302
)
300303
assert dataset_objects is not None
301304
assert len(dataset_objects) == 3
@@ -312,7 +315,9 @@ def test_delete_dataset_object(self, client: Client, testing_video_dataset: dict
312315
dataset_object_ids=[created[0]["id"], created[2]["id"]],
313316
)
314317
# Assert
315-
results = client.get_dataset_objects(dataset_id=testing_video_dataset["id"])
318+
results = client.get_dataset_objects(
319+
dataset_version_id=testing_video_dataset["version"]["id"]
320+
)
316321
assert results is not None
317322
assert len(results) == 1
318323
assert remove_object_signed_url(results[0]) == remove_object_signed_url(
@@ -338,7 +343,8 @@ def test_get_dataset(self, client: Client, testing_audio_dataset: dict):
338343
def test_update_dataset(self, client: Client, testing_audio_dataset: dict):
339344
# Act
340345
dataset = client.update_dataset(
341-
dataset_id=testing_audio_dataset["id"], name="update name"
346+
dataset_id=testing_audio_dataset["id"],
347+
name="update name",
342348
)
343349
# Assert
344350
assert dataset["name"] == "update name"
@@ -348,7 +354,7 @@ def test_create_dataset_object(self, client: Client, testing_audio_dataset: dict
348354
target_file = Path(sys.path[0]) / "files/test_audio.mp3"
349355
# Act
350356
dataset_object = client.create_audio_dataset_object(
351-
dataset_id=testing_audio_dataset["id"],
357+
dataset_version_id=testing_audio_dataset["version"]["id"],
352358
name="test_audio.mp3",
353359
file_path=str(target_file),
354360
)
@@ -373,7 +379,7 @@ def test_create_dataset_object_file_type_violation(
373379
),
374380
) as _:
375381
client.create_audio_dataset_object(
376-
dataset_id=testing_audio_dataset["id"],
382+
dataset_version_id=testing_audio_dataset["version"]["id"],
377383
name="test_image.jpg",
378384
file_path=str(target_file),
379385
)
@@ -382,32 +388,32 @@ def test_find_dataset_object(self, client: Client, testing_audio_dataset: dict):
382388
# Arrange
383389
target_file = Path(sys.path[0]) / "files/test_audio.mp3"
384390
dataset_object = client.create_audio_dataset_object(
385-
dataset_id=testing_audio_dataset["id"],
391+
dataset_version_id=testing_audio_dataset["version"]["id"],
386392
name="test_audio.mp3",
387393
file_path=str(target_file),
388394
)
389395
# Act
390396
result = client.find_dataset_object(dataset_object_id=dataset_object["id"])
391397
# Assert
392-
assert remove_object_signed_url(result) == remove_object_signed_url(
393-
dataset_object
394-
)
398+
assert result["name"] == dataset_object["name"]
395399

396400
def test_get_dataset_object(self, client: Client, testing_audio_dataset: dict):
397401
# Arrange
398402
target_file = Path(sys.path[0]) / "files/test_audio.mp3"
399403
dataset_object1 = client.create_audio_dataset_object(
400-
dataset_id=testing_audio_dataset["id"],
404+
dataset_version_id=testing_audio_dataset["version"]["id"],
401405
name="test_audio1.mp3",
402406
file_path=str(target_file),
403407
)
404408
dataset_object2 = client.create_audio_dataset_object(
405-
dataset_id=testing_audio_dataset["id"],
409+
dataset_version_id=testing_audio_dataset["version"]["id"],
406410
name="test_audio2.mp3",
407411
file_path=str(target_file),
408412
)
409413
# Act
410-
results = client.get_dataset_objects(dataset_id=testing_audio_dataset["id"])
414+
results = client.get_dataset_objects(
415+
dataset_version_id=testing_audio_dataset["version"]["id"]
416+
)
411417
# Assert
412418
assert results is not None
413419
assert len(results) == 2
@@ -424,14 +430,14 @@ def test_delete_dataset_object(self, client: Client, testing_audio_dataset: dict
424430
dataset_object_names = ["test_audio1.mp3", "test_audio2.mp3", "test_audio3.mp3"]
425431
created = [
426432
client.create_audio_dataset_object(
427-
dataset_id=testing_audio_dataset["id"],
433+
dataset_version_id=testing_audio_dataset["version"]["id"],
428434
name=name,
429435
file_path=str(target_file),
430436
)
431437
for name in dataset_object_names
432438
]
433439
dataset_objects = client.get_dataset_objects(
434-
dataset_id=testing_audio_dataset["id"]
440+
dataset_version_id=testing_audio_dataset["version"]["id"]
435441
)
436442
for i, dataset_object in enumerate(dataset_objects):
437443
assert OBJECT_SIGNED_URL_KEY in dataset_object
@@ -446,7 +452,9 @@ def test_delete_dataset_object(self, client: Client, testing_audio_dataset: dict
446452
dataset_object_ids=[created[0]["id"], created[2]["id"]],
447453
)
448454
# Assert
449-
results = client.get_dataset_objects(dataset_id=testing_audio_dataset["id"])
455+
results = client.get_dataset_objects(
456+
dataset_version_id=testing_audio_dataset["version"]["id"]
457+
)
450458
assert results is not None
451459
assert len(results) == 1
452460
assert remove_object_signed_url(results[0]) == remove_object_signed_url(
@@ -459,12 +467,12 @@ def test_get(self, client: Client, testing_image_dataset: dict):
459467
# Arrange
460468
target_file = Path(sys.path[0]) / "files/test_image.jpg"
461469
client.create_image_dataset_object(
462-
dataset_id=testing_image_dataset["id"],
470+
dataset_version_id=testing_image_dataset["version"]["id"],
463471
name="test_image1.jpg",
464472
file_path=str(target_file),
465473
)
466474
client.create_image_dataset_object(
467-
dataset_id=testing_image_dataset["id"],
475+
dataset_version_id=testing_image_dataset["version"]["id"],
468476
name="test_image2.jpg",
469477
file_path=str(target_file),
470478
)

0 commit comments

Comments
 (0)