From 2ad1240d16eaaf31e3f73a4dc06d5513e9afe54c Mon Sep 17 00:00:00 2001 From: kmkkiii Date: Wed, 26 Mar 2025 15:12:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?objectName=E3=81=AE=E3=82=A8=E3=83=B3?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=97endpoint=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastlabel/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fastlabel/__init__.py b/fastlabel/__init__.py index 0372f09..562a610 100644 --- a/fastlabel/__init__.py +++ b/fastlabel/__init__.py @@ -11,6 +11,7 @@ import numpy as np import requests import xmltodict +import urllib.parse from PIL import Image, ImageColor, ImageDraw from fastlabel import const, converters, utils @@ -4251,7 +4252,8 @@ def find_dataset_object( raise FastLabelInvalidException( "only use specify one of revisionId or version.", 400 ) - endpoint = "datasets-v2/" + dataset_id + "/objects/" + object_name + encoded_object_name = urllib.parse.quote(object_name, safe="") + endpoint = "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name params = {} if revision_id: params["revisionId"] = revision_id @@ -4474,7 +4476,8 @@ def delete_dataset_object(self, dataset_id: str, object_name: str) -> None: """ Delete a dataset object. """ - endpoint = "datasets-v2/" + dataset_id + "/objects/" + object_name + encoded_object_name = urllib.parse.quote(object_name, safe="") + endpoint = "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name self.api.delete_request(endpoint) def update_aws_s3_storage( From 92c7ac8ffc818d9494aee76c5d6ed6c1cb17dfea Mon Sep 17 00:00:00 2001 From: kmkkiii Date: Wed, 26 Mar 2025 15:12:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?example=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/delete_dataset_object.py | 2 +- examples/find_dataset_object.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/delete_dataset_object.py b/examples/delete_dataset_object.py index af52203..bda9892 100644 --- a/examples/delete_dataset_object.py +++ b/examples/delete_dataset_object.py @@ -3,5 +3,5 @@ client = fastlabel.Client() client.delete_dataset_object( - dataset_id="YOUR_DATASET_OBJECT_ID", object_name="YOUR_OBJECT_NAME" + dataset_id="YOUR_DATASET_ID", object_name="YOUR_OBJECT_NAME" ) diff --git a/examples/find_dataset_object.py b/examples/find_dataset_object.py index 9b7502c..e6d417b 100644 --- a/examples/find_dataset_object.py +++ b/examples/find_dataset_object.py @@ -5,6 +5,6 @@ client = fastlabel.Client() dataset_object = client.find_dataset_object( - dataset_id="YOUR_DATASET_OBJECT_ID", object_name="YOUR_OBJECT_NAME" + dataset_id="YOUR_DATASET_ID", object_name="YOUR_OBJECT_NAME" ) pprint(dataset_object) From c1e2c095ed15b931818dc9abfae2715bc641f6ff Mon Sep 17 00:00:00 2001 From: kmkkiii Date: Wed, 26 Mar 2025 15:49:41 +0900 Subject: [PATCH 3/4] fix black --- fastlabel/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fastlabel/__init__.py b/fastlabel/__init__.py index 562a610..5bdd3a8 100644 --- a/fastlabel/__init__.py +++ b/fastlabel/__init__.py @@ -4253,7 +4253,9 @@ def find_dataset_object( "only use specify one of revisionId or version.", 400 ) encoded_object_name = urllib.parse.quote(object_name, safe="") - endpoint = "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name + endpoint = ( + "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name + ) params = {} if revision_id: params["revisionId"] = revision_id @@ -4477,7 +4479,9 @@ def delete_dataset_object(self, dataset_id: str, object_name: str) -> None: Delete a dataset object. """ encoded_object_name = urllib.parse.quote(object_name, safe="") - endpoint = "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name + endpoint = ( + "dataset-objects-v2/" + dataset_id + "/objects/" + encoded_object_name + ) self.api.delete_request(endpoint) def update_aws_s3_storage( From d672b9e145ba319167f76b1e8dacc43a0466faab Mon Sep 17 00:00:00 2001 From: kmkkiii Date: Wed, 26 Mar 2025 15:51:14 +0900 Subject: [PATCH 4/4] fix isort --- fastlabel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlabel/__init__.py b/fastlabel/__init__.py index 5bdd3a8..313a887 100644 --- a/fastlabel/__init__.py +++ b/fastlabel/__init__.py @@ -3,6 +3,7 @@ import logging import os import re +import urllib.parse from concurrent.futures import ThreadPoolExecutor, wait from pathlib import Path from typing import Dict, List, Literal, Optional, Union @@ -11,7 +12,6 @@ import numpy as np import requests import xmltodict -import urllib.parse from PIL import Image, ImageColor, ImageDraw from fastlabel import const, converters, utils