Merge branch 'dev' of https://github.com/jupyter-naas/naas-python into dev

Dr0p42 · Dr0p42 · commit 39d0ac9a0277 · 2024-06-19T15:45:35.000+02:00
diff --git a/naas_python/domains/storage/adaptors/primary/SDKStorageAdaptor.py b/naas_python/domains/storage/adaptors/primary/SDKStorageAdaptor.py
@@ -82,7 +82,7 @@ def post_workspace_storage_object(self,
             )
             return response            
         else:
-            raise FileNotFoundError(f"File '{src_file}' does not exist.")
+            raise FileNotFoundError(f"File not found: {src_file}")
 
     def get_workspace_storage_object(self, 
         workspace_id: str = "", 
diff --git a/naas_python/domains/storage/adaptors/secondary/NaasStorageAPIAdaptor.py b/naas_python/domains/storage/adaptors/secondary/NaasStorageAPIAdaptor.py
@@ -105,6 +105,7 @@ def delete_workspace_storage_object(self,
         )
         return self.__handle_response(api_response)
 
+    @BaseAPIAdaptor.service_status_decorator
     def generate_credentials(self, workspace_id :str, storage_name: str) -> dict:
 
         _url = f"{self.host}/workspace/{workspace_id}/storage/credentials/"

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ def post_workspace_storage_object(self,`
`82`	`82`	`)`
`83`	`83`	`return response`
`84`	`84`	`else:`
`85`		`- raise FileNotFoundError(f"File '{src_file}' does not exist.")`
	`85`	`+ raise FileNotFoundError(f"File not found: {src_file}")`
`86`	`86`
`87`	`87`	`def get_workspace_storage_object(self,`
`88`	`88`	`workspace_id: str = "",`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ def delete_workspace_storage_object(self,`
`105`	`105`	`)`
`106`	`106`	`return self.__handle_response(api_response)`
`107`	`107`
	`108`	`+ @BaseAPIAdaptor.service_status_decorator`
`108`	`109`	`def generate_credentials(self, workspace_id :str, storage_name: str) -> dict:`
`109`	`110`
`110`	`111`	`_url = f"{self.host}/workspace/{workspace_id}/storage/credentials/"`