modified as per review

Author: NiveditJain

python-sdk/exospherehost/node/BaseNode.py

@@ -50,10 +50,11 @@ class Secrets(BaseModel):
 
     async def _execute(self, inputs: Inputs, secrets: Secrets) -> Outputs | List[Outputs]:
         """
-        Internal method to execute the node with validated inputs.
+        Internal method to execute the node with validated inputs and secrets.
 
         Args:
             inputs (Inputs): The validated input data for this execution.
+            secrets (Secrets): The validated secrets data for this execution.
 
         Returns:
             Outputs | List[Outputs]: The output(s) produced by the node.

python-sdk/exospherehost/runtime.py

@@ -245,6 +245,7 @@ async def _get_secrets(self, state_id: str) -> Dict[str, str]:
 
                 if response.status != 200:
                     logger.error(f"Failed to get secrets for state {state_id}: {res}")
+                    return {}
 
                 return res
 
@@ -280,7 +281,7 @@ def _validate_nodes(self):
                 errors.append(f"{node.__name__} does not have an Secrets class that inherits from pydantic.BaseModel")
 
             for field_name, field_info in node.Secrets.model_fields.items():
-                if field_info.annotation != str:
+                if field_info.annotation is not str:
                     errors.append(f"{node.__name__}.Secrets field '{field_name}' must be of type str, got {field_info.annotation}")
 
         # Find nodes with the same __class__.__name__

state-manager/app/models/db/graph_template_model.py

@@ -8,7 +8,7 @@
 from ..node_template_model import NodeTemplate
 from pymongo import IndexModel
 from typing import Dict
-from app.utils.encrypter import encrypter
+from app.utils.encrypter import get_encrypter
 
 class GraphTemplate(BaseDatabaseModel):
     name: str = Field(..., description="Name of the graph")
@@ -53,11 +53,6 @@ def _validate_secret_value(cls, secret_value: str) -> None:
         if not re.match(url_safe_base64_pattern, secret_value):
             raise ValueError("Value must be URL-safe base64 encoded")
 
-        # Check if the string length is valid for base64 encoding
-        # Base64 encoding increases size by ~33%, and we need at least 12 bytes nonce
-        if len(secret_value) % 4 != 0:
-            raise ValueError("Value length is not valid for base64 encoding")
-        
         # Try to decode as base64 to ensure it's valid
         try:
             decoded = base64.urlsafe_b64decode(secret_value)
@@ -68,15 +63,17 @@ def _validate_secret_value(cls, secret_value: str) -> None:
 
 
     def set_secrets(self, secrets: Dict[str, str]) -> "GraphTemplate":
-        self.secrets = {secret_name: encrypter.encrypt(secret_value) for secret_name, secret_value in secrets.items()}
+        self.secrets = {secret_name: get_encrypter().encrypt(secret_value) for secret_name, secret_value in secrets.items()}
         return self
 
     def get_secrets(self) -> Dict[str, str]:
         if not self.secrets:
             return {}
-        return {secret_name: encrypter.decrypt(secret_value) for secret_name, secret_value in self.secrets.items()}
+        return {secret_name: get_encrypter().decrypt(secret_value) for secret_name, secret_value in self.secrets.items()}
 
-    def get_secret(self, secret_name: str) -> str:
+    def get_secret(self, secret_name: str) -> str | None:
         if not self.secrets:
-            return ""
-        return encrypter.decrypt(self.secrets[secret_name])
+            return None
+        if secret_name not in self.secrets:
+            return None
+        return get_encrypter().decrypt(self.secrets[secret_name])

state-manager/app/utils/encrypter.py

@@ -31,4 +31,19 @@ def decrypt(self, encrypted_secret: str) -> str:
         ciphertext = encrypted_secret_bytes[12:]
         return self._aesgcm.decrypt(nonce, ciphertext, None).decode()
 
-encrypter = Encrypter()
+_encrypter_instance = None
+
+def get_encrypter() -> Encrypter:
+    """
+    Get the Encrypter instance, creating it on first call.
+    
+    Returns:
+        Encrypter: The singleton Encrypter instance.
+        
+    Raises:
+        ValueError: If SECRETS_ENCRYPTION_KEY is not set or invalid.
+    """
+    global _encrypter_instance
+    if _encrypter_instance is None:
+        _encrypter_instance = Encrypter()
+    return _encrypter_instance