diff --git a/marketplace/app/v0/object_storage.py b/marketplace/app/v0/object_storage.py index e86c4ec..54bcbe2 100644 --- a/marketplace/app/v0/object_storage.py +++ b/marketplace/app/v0/object_storage.py @@ -44,12 +44,12 @@ def create_or_update_collection( self, metadata: dict = None, collection_name: object_storage.CollectionName = None, - ) -> str: + ) -> Union[Dict, str]: return self._client.put( self._proxy_path("createOrUpdateCollection"), params={"collection_name": collection_name} if collection_name else {}, headers=_encode_metadata(metadata), - ).text + ).json() @check_capability_availability def delete_collection(self, collection_name: object_storage.CollectionName): @@ -58,7 +58,6 @@ def delete_collection(self, collection_name: object_storage.CollectionName): params={"collection_name": collection_name}, ) - # NOTE: change to GET for the meeting if proxy doesn't support HEAD requests @check_capability_availability def get_collection_metadata( self, collection_name: object_storage.CollectionName @@ -74,12 +73,12 @@ def create_collection( self, collection_name: object_storage.CollectionName = None, metadata: dict = None, - ) -> str: + ) -> Union[Dict, str]: return self._client.put( self._proxy_path("createCollection"), params={"collection_name": collection_name} if collection_name else {}, headers=_encode_metadata(metadata), - ).text + ).json() @check_capability_availability def create_dataset( @@ -107,7 +106,7 @@ def create_dataset_metadata( collection_name: object_storage.CollectionName, dataset_name: object_storage.DatasetName = None, metadata: dict = None, - ) -> str: + ) -> Union[Dict, str]: params = {"collection_name": collection_name} if dataset_name: params.update({"dataset_name": dataset_name}) @@ -115,7 +114,7 @@ def create_dataset_metadata( self._proxy_path("createDatasetMetadata"), params=params, headers=_encode_metadata(metadata), - ).text + ).json() @check_capability_availability def get_dataset( @@ -125,7 +124,10 @@ def get_dataset( ) -> Union[Dict, str]: return self._client.get( self._proxy_path("getDataset"), - params={"collection_name": collection_name, "dataset_name": dataset_name}, + params={ + "collection_name": collection_name, + "dataset_name": dataset_name, + }, ).json() def create_or_replace_dataset( @@ -153,12 +155,15 @@ def create_or_replace_dataset_metadata( collection_name: object_storage.CollectionName, dataset_name: object_storage.DatasetName, metadata: dict = None, - ) -> str: + ) -> Union[Dict, str]: return self._client.put( self._proxy_path("createOrReplaceDatasetMetadata"), - params={"collection_name": collection_name, "dataset_name": dataset_name}, + params={ + "collection_name": collection_name, + "dataset_name": dataset_name, + }, headers=_encode_metadata(metadata), - ).text + ).json() @check_capability_availability def delete_dataset( @@ -171,7 +176,6 @@ def delete_dataset( params={"collection_name": collection_name, "dataset_name": dataset_name}, ) - # NOTE: change to GET for the meeting if proxy doesn't support HEAD requests @check_capability_availability def get_dataset_metadata( self,