Merge pull request #38 from jupyter-naas/dev

fix: Merge dev on main

Author: Dr0p42

naas_python/domains/secret/SecretDomain.py

@@ -23,9 +23,13 @@ def create(self, name: str, value: str) -> None:
         response = self.adaptor.create_secret(
             name=name, value=value,
         )
-
         return response
 
+    def bulk_create(self, secrets_list: List[Secret]) -> None:
+        response = self.adaptor.bulk_create(
+            secrets_list=secrets_list
+        )
+
     def get(self, name: str) -> Secret:
         response = self.adaptor.get_secret(name=name)
         return response

naas_python/domains/secret/SecretSchema.py

@@ -4,6 +4,7 @@
 from typing import List
 
 from naas_models.pydantic.secret_p2p import *
+from .models.Secret import Secret
 
 from naas_python.utils.exceptions import NaasException
 
@@ -40,6 +41,10 @@ class ISecretDomain(metaclass=ABCMeta):
     @abstractmethod
     def create(self, name: str, value: str) -> None:
         raise NotImplementedError
+    
+    @abstractmethod
+    def bulk_create(self, secrets_list: List[Secret]) -> None:
+        raise NotImplementedError
 
     @abstractmethod
     def get(self, name: str) -> Secret:
@@ -61,6 +66,10 @@ class ISecretInvoker(metaclass=ABCMeta):
     @abstractmethod
     def create(self, **kwargs):
         raise NotImplementedError
+    
+    @abstractmethod
+    def bulk_create(self, secrets_list: List[Secret]) -> None:
+        raise NotImplementedError
 
     @abstractmethod
     def get(self, **kwargs):

naas_python/domains/secret/adaptors/primary/SDKSecretAdaptor.py

@@ -24,7 +24,12 @@ def create(self, name: str = "", value: str ="") -> None:
         """Create a secret with the given name"""
         secret = self.domain.create(name=name, value=value)
         return secret
-
+    
+    def bulk_create(self, secrets_list: List[Secret] = "[]") -> None:
+        """Create a list of secrets"""
+        secret = self.domain.bulk_create(secrets_list=secrets_list)
+        return secret
+    
     def list(self, page_size: int = 0, page_number: int = 0) -> List[Secret]:
         """List all secrets for the current user"""
         secret_list = self.domain.list(page_size=page_size, page_number=page_number)

naas_python/domains/secret/adaptors/primary/TyperSecretAdaptor.py

@@ -20,6 +20,7 @@
     ISecretDomain,
     ISecretInvoker,
     SecretConflictError,
+    Secret
 )
 # from naas_python.domains.secret.SecretSchema import SecrettryConflictError
 from naas_python.utils.cicd import Pipeline
@@ -53,6 +54,7 @@ def __init__(self, domain: ISecretDomain):
         # Include all commands
         self.app.command()(self.list)
         self.app.command()(self.create)
+        self.app.command()(self.bulk_create)
         self.app.command()(self.get)
         self.app.command()(self.delete)
 
@@ -96,6 +98,20 @@ def create(
 
         if secret is None:
             print('Secret Successfully created')
+            
+    def bulk_create(
+        self,
+        secrets: str = typer.Option(..., "--secrets", help="List of secrets"),
+
+    ):
+        print("\ntyper_list:",json.dumps(secrets))
+        """Create Secrets with the given specifications"""
+        secrets = self.domain.bulk_create(
+            secrets_list=secrets,
+        )
+
+        if secrets is None:
+            print('Secret Successfully created')
 
     def get(
         self,

naas_python/domains/secret/adaptors/secondary/NaasSecretAPIAdaptor.py

@@ -79,6 +79,25 @@ def create_secret(self, name: str, value: str) -> None:
         self._handle_response(api_response)
         return None
 
+    @BaseAPIAdaptor.service_status_decorator
+    def bulk_create(self, secrets_list: List[Secret]) -> None:
+        _url = f"{self.host}/secret/bulk"
+        
+        logging.debug(f"create request url: {_url}")
+
+        api_response = self.make_api_request(
+            requests.post,
+            _url,
+            payload=json.dumps(
+                secrets_list
+            ),
+        )
+        logging.debug(
+            f"Request URL: {api_response.url} :: status_code: {api_response.status_code}"
+        )
+        self._handle_response(api_response)
+        return None
+
     @BaseAPIAdaptor.service_status_decorator
     def get_secret(self, name:str) -> Secret:
         _url = f"{self.host}/secret/{name}"

naas_python/utils/domains_base/secondary/BaseAPIAdaptor.py

@@ -22,7 +22,7 @@ class ServiceStatusError(NaasException):
 
 class BaseAPIAdaptor(NaasSpaceAuthenticatorAdapter):
     host = os.environ.get("NAAS_PYTHON_API_BASE_URL", "https://api.naas.ai")
-    # host = os.environ.get("NAAS_PYTHON_API_BASE_URL", "http://localhost:8000")
+    #host = os.environ.get("NAAS_PYTHON_API_BASE_URL", "http://localhost:8000")
     # Cache name is the name of the calling module
     cache_name = __name__
     cache_expire_after = 60  # Cache expires after 60 seconds
@@ -89,8 +89,8 @@ def make_api_request(
             return api_response
 
         except requests.exceptions.HTTPError as e:
+            _response = api_response.json()
             if api_response.status_code == 401:
-                _response = api_response.json()
                 _message = ""
                 if "error_message" in _response:
                     _message = _response["error_message"]
@@ -103,7 +103,13 @@ def make_api_request(
                     e,
                 )
             elif api_response.status_code == 500:
-                _message = "Internal Server Error"
+                _message = ""
+                if "error_message" in _response:
+                    _message = _response["error_message"]
+                elif "detail" in _response:
+                    _message = _response["detail"]
+                else:
+                    _message = "Internal Server Error"
                 raise ServiceStatusError(_message, e)
             else:
                 # Other status codes will be handled by the calling method