From 5898b19509032ad27894dbca8c6e92b88924b80a Mon Sep 17 00:00:00 2001 From: kmkkiii Date: Mon, 31 Mar 2025 16:10:45 +0900 Subject: [PATCH 1/2] refactor --- fastlabel/__init__.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fastlabel/__init__.py b/fastlabel/__init__.py index 313a887..a4383a9 100644 --- a/fastlabel/__init__.py +++ b/fastlabel/__init__.py @@ -4254,7 +4254,7 @@ def find_dataset_object( ) encoded_object_name = urllib.parse.quote(object_name, safe="") endpoint = ( - "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name + "dataset-revision-objects/datasets/" + dataset_id + "/objects/" + encoded_object_name ) params = {} if revision_id: @@ -4283,10 +4283,10 @@ def get_dataset_objects( revision_id is dataset rebision (Optional). Only use specify one of revision_id or version. """ - endpoint = "dataset-objects-v2" + endpoint = "dataset-revision-objects" types = [DatasetObjectType.create(type_) for type_ in types or []] params = self._prepare_params( - dataset=dataset, + dataset_name=dataset, version=version, tags=tags, licenses=licenses, @@ -4299,7 +4299,7 @@ def get_dataset_objects( def _prepare_params( self, - dataset: str, + dataset_name: str, offset: int, limit: int, version: str, @@ -4317,7 +4317,7 @@ def _prepare_params( "Limit must be less than or equal to 1000.", 422 ) params: DatasetObjectGetQuery = { - "dataset": dataset, + "datasetName": dataset_name, "offset": offset, "limit": limit, } @@ -4345,10 +4345,10 @@ def download_dataset_objects( offset: int = 0, limit: int = 1000, ): - endpoint = "dataset-objects-v2/signed-urls" + endpoint = "dataset-revision-objects/signed-urls" types = [DatasetObjectType.create(type_) for type_ in types or []] params = self._prepare_params( - dataset=dataset, + dataset_name=dataset, offset=offset, limit=limit, version=version, @@ -4433,14 +4433,14 @@ def create_dataset_object( """ tags = tags or [] annotations = annotations or [] - endpoint = "dataset-objects-v2" + endpoint = "dataset-revision-objects" if not utils.is_object_supported_size(file_path): raise FastLabelInvalidException( "Supported object size is under 250 MB.", 422 ) payload = { - "dataset": dataset, - "name": name, + "datasetName": dataset, + "objectName": name, "filePath": utils.base64_encode(file_path), } if tags: @@ -4462,7 +4462,7 @@ def update_dataset_object( annotations: Optional[List[dict]] = None, custom_metadata: Optional[dict] = None, ) -> dict: - endpoint = "dataset-objects-v2" + endpoint = "dataset-revision-objects" payload = {"datasetId": dataset_id, "objectName": object_name} if tags is not None: payload["tags"] = tags @@ -4480,7 +4480,7 @@ def delete_dataset_object(self, dataset_id: str, object_name: str) -> None: """ encoded_object_name = urllib.parse.quote(object_name, safe="") endpoint = ( - "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name + "dataset-revision-objects/datasets/" + dataset_id + "/objects/" + encoded_object_name ) self.api.delete_request(endpoint) From a41154bb6ccf64f5c8ddb0dab4d3681998571ab3 Mon Sep 17 00:00:00 2001 From: kmkkiii Date: Mon, 31 Mar 2025 16:14:49 +0900 Subject: [PATCH 2/2] fix black --- fastlabel/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fastlabel/__init__.py b/fastlabel/__init__.py index a4383a9..f1b112a 100644 --- a/fastlabel/__init__.py +++ b/fastlabel/__init__.py @@ -4254,7 +4254,10 @@ def find_dataset_object( ) encoded_object_name = urllib.parse.quote(object_name, safe="") endpoint = ( - "dataset-revision-objects/datasets/" + dataset_id + "/objects/" + encoded_object_name + "dataset-revision-objects/datasets/" + + dataset_id + + "/objects/" + + encoded_object_name ) params = {} if revision_id: @@ -4480,7 +4483,10 @@ def delete_dataset_object(self, dataset_id: str, object_name: str) -> None: """ encoded_object_name = urllib.parse.quote(object_name, safe="") endpoint = ( - "dataset-revision-objects/datasets/" + dataset_id + "/objects/" + encoded_object_name + "dataset-revision-objects/datasets/" + + dataset_id + + "/objects/" + + encoded_object_name ) self.api.delete_request(endpoint)