Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.
feat: connect generated letta api key with modal function wrapper (#6329)
jnjpng442b916fa9e8
diff --git a/letta/services/tool_executor/sandbox_tool_executor.py b/letta/services/tool_executor/sandbox_tool_executor.pyindex 366d05423..656d4dc70 100644--- a/letta/services/tool_executor/sandbox_tool_executor.py+++ b/letta/services/tool_executor/sandbox_tool_executor.py@@ -84,7 +84,9 @@ class SandboxToolExecutor(ToolExecutor):organization_id=actor.organization_id,)# TODO: pass through letta api key- tool_execution_result = await sandbox.run(agent_state=agent_state_copy, additional_env_vars=sandbox_env_vars)+ tool_execution_result = await sandbox.run(+ agent_id=agent_state.id, agent_state=agent_state_copy, additional_env_vars=sandbox_env_vars+ )except Exception as e:# Modal execution failed, log and fall back to E2B/LOCALlogger.warning(f"Modal execution failed for tool {tool.name}: {e}. Falling back to {tool_settings.sandbox_type.value}")diff --git a/letta/services/tool_manager.py b/letta/services/tool_manager.pyindex 245f8ea77..aa5764537 100644--- a/letta/services/tool_manager.py+++ b/letta/services/tool_manager.py@@ -61,7 +61,7 @@ def modal_tool_wrapper(tool: PydanticTool, actor: PydanticUser, sandbox_env_varspackages = [str(req) for req in tool.pip_requirements] if tool.pip_requirements else []for package in MODAL_SAFE_IMPORT_MODULES:packages.append(package)- packages.append("letta_client")+ packages.append("letta_client>=1.1.1")packages.append("letta") # Base letta without extraspackages.append("asyncpg>=0.30.0") # Fixes asyncpg import errorpackages.append("psycopg2-binary>=2.9.10") # PostgreSQL adapter (pre-compiled, no build required)@@ -116,22 +116,23 @@ def modal_tool_wrapper(tool: PydanticTool, actor: PydanticUser, sandbox_env_varsprint("Passing agent_state as dict to tool", file=sys.stderr)reconstructed_agent_state = agent_state- # Set environment variablesif env_vars:for key, value in env_vars.items():os.environ[key] = str(value)+ # TODO: directly instantiate the letta client once we upgrade to 1.0.0+ in core# Initialize the Letta client- if letta_api_key:- letta_client = Letta(token=letta_api_key, base_url=os.environ.get("LETTA_API_URL", "https://api.letta.com"))- else:- letta_client = None+ # if letta_api_key:+ # letta_client = Letta(token=letta_api_key, base_url=os.environ.get("LETTA_API_URL", "https://api.letta.com"))+ # else:+ # letta_client = Nonetool_namespace = {"__builtins__": __builtins__, # Include built-in functions- "_letta_client": letta_client, # Make letta_client available+ # "_letta_client": letta_client, # Make letta_client available"os": os, # Include os module for env vars access"agent_id": agent_id,+ "_LETTA_API_KEY": letta_api_key,# Add any other modules/variables the tool might need}diff --git a/letta/services/tool_sandbox/modal_sandbox.py b/letta/services/tool_sandbox/modal_sandbox.pyindex 1c2acd33b..eaa94a779 100644--- a/letta/services/tool_sandbox/modal_sandbox.py+++ b/letta/services/tool_sandbox/modal_sandbox.py@@ -103,7 +103,7 @@ class AsyncToolSandboxModal(AsyncToolSandboxBase):if additional_env_vars is None:letta_api_key = Noneelse:- letta_api_key = additional_env_vars.get("LETTA_API_KEY", None)+ letta_api_key = additional_env_vars.get("LETTA_SECRET_API_KEY", None)# Construct dynamic env vars# Priority order (later overrides earlier):