Skip to content

Commit 76d9c3d

Browse files
authored
Merge pull request #247 from fastlabel/feature/9319_refactor-dataset-object-method
#9319 Dataset Object関連メソッドのリファクタリング
2 parents 1fed2a2 + a41154b commit 76d9c3d

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

fastlabel/__init__.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,7 +4254,10 @@ def find_dataset_object(
42544254
)
42554255
encoded_object_name = urllib.parse.quote(object_name, safe="")
42564256
endpoint = (
4257-
"dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name
4257+
"dataset-revision-objects/datasets/"
4258+
+ dataset_id
4259+
+ "/objects/"
4260+
+ encoded_object_name
42584261
)
42594262
params = {}
42604263
if revision_id:
@@ -4283,10 +4286,10 @@ def get_dataset_objects(
42834286
revision_id is dataset rebision (Optional).
42844287
Only use specify one of revision_id or version.
42854288
"""
4286-
endpoint = "dataset-objects-v2"
4289+
endpoint = "dataset-revision-objects"
42874290
types = [DatasetObjectType.create(type_) for type_ in types or []]
42884291
params = self._prepare_params(
4289-
dataset=dataset,
4292+
dataset_name=dataset,
42904293
version=version,
42914294
tags=tags,
42924295
licenses=licenses,
@@ -4299,7 +4302,7 @@ def get_dataset_objects(
42994302

43004303
def _prepare_params(
43014304
self,
4302-
dataset: str,
4305+
dataset_name: str,
43034306
offset: int,
43044307
limit: int,
43054308
version: str,
@@ -4317,7 +4320,7 @@ def _prepare_params(
43174320
"Limit must be less than or equal to 1000.", 422
43184321
)
43194322
params: DatasetObjectGetQuery = {
4320-
"dataset": dataset,
4323+
"datasetName": dataset_name,
43214324
"offset": offset,
43224325
"limit": limit,
43234326
}
@@ -4345,10 +4348,10 @@ def download_dataset_objects(
43454348
offset: int = 0,
43464349
limit: int = 1000,
43474350
):
4348-
endpoint = "dataset-objects-v2/signed-urls"
4351+
endpoint = "dataset-revision-objects/signed-urls"
43494352
types = [DatasetObjectType.create(type_) for type_ in types or []]
43504353
params = self._prepare_params(
4351-
dataset=dataset,
4354+
dataset_name=dataset,
43524355
offset=offset,
43534356
limit=limit,
43544357
version=version,
@@ -4433,14 +4436,14 @@ def create_dataset_object(
44334436
"""
44344437
tags = tags or []
44354438
annotations = annotations or []
4436-
endpoint = "dataset-objects-v2"
4439+
endpoint = "dataset-revision-objects"
44374440
if not utils.is_object_supported_size(file_path):
44384441
raise FastLabelInvalidException(
44394442
"Supported object size is under 250 MB.", 422
44404443
)
44414444
payload = {
4442-
"dataset": dataset,
4443-
"name": name,
4445+
"datasetName": dataset,
4446+
"objectName": name,
44444447
"filePath": utils.base64_encode(file_path),
44454448
}
44464449
if tags:
@@ -4462,7 +4465,7 @@ def update_dataset_object(
44624465
annotations: Optional[List[dict]] = None,
44634466
custom_metadata: Optional[dict] = None,
44644467
) -> dict:
4465-
endpoint = "dataset-objects-v2"
4468+
endpoint = "dataset-revision-objects"
44664469
payload = {"datasetId": dataset_id, "objectName": object_name}
44674470
if tags is not None:
44684471
payload["tags"] = tags
@@ -4480,7 +4483,10 @@ def delete_dataset_object(self, dataset_id: str, object_name: str) -> None:
44804483
"""
44814484
encoded_object_name = urllib.parse.quote(object_name, safe="")
44824485
endpoint = (
4483-
"dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name
4486+
"dataset-revision-objects/datasets/"
4487+
+ dataset_id
4488+
+ "/objects/"
4489+
+ encoded_object_name
44844490
)
44854491
self.api.delete_request(endpoint)
44864492

0 commit comments

Comments
 (0)