Skip to content

armgit / letta

Public Imported from GitHub
0

Platform for stateful agents: AI with advanced memory that can learn and self-improve over time.

feat: add new header dependency in all routes (#2905)

cthomas0776a236c8b3
diff --git a/letta/functions/function_sets/multi_agent.py b/letta/functions/function_sets/multi_agent.py
index 17bd55860..fced08329 100644
--- a/letta/functions/function_sets/multi_agent.py
+++ b/letta/functions/function_sets/multi_agent.py
@@ -11,7 +11,7 @@ from letta.functions.helpers import (
)
from letta.schemas.enums import MessageRole
from letta.schemas.message import MessageCreate
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import get_letta_server
from letta.settings import settings
if TYPE_CHECKING:
diff --git a/letta/functions/helpers.py b/letta/functions/helpers.py
index 76a012357..0e11e4b85 100644
--- a/letta/functions/helpers.py
+++ b/letta/functions/helpers.py
@@ -17,7 +17,7 @@ from letta.schemas.letta_response import LettaResponse
from letta.schemas.letta_stop_reason import LettaStopReason, StopReasonType
from letta.schemas.message import Message, MessageCreate
from letta.schemas.user import User
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import get_letta_server
from letta.settings import settings
from letta.utils import safe_create_task
diff --git a/letta/server/rest_api/dependencies/headers.py b/letta/server/rest_api/dependencies.py
similarity index 65%
rename from letta/server/rest_api/dependencies/headers.py
rename to letta/server/rest_api/dependencies.py
index 3350f23f7..45a7e8a66 100644
--- a/letta/server/rest_api/dependencies/headers.py
+++ b/letta/server/rest_api/dependencies.py
@@ -1,8 +1,11 @@
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
from fastapi import Header
from pydantic import BaseModel
+if TYPE_CHECKING:
+ from letta.server.server import SyncServer
+
class HeaderParams(BaseModel):
"""Common header parameters used across REST API endpoints."""
@@ -23,3 +26,12 @@ def get_headers(
user_agent=user_agent,
project_id=project_id,
)
+
+
+# TODO: why does this double up the interface?
+async def get_letta_server() -> "SyncServer":
+ # Check if a global server is already instantiated
+ from letta.server.rest_api.app import server
+
+ # assert isinstance(server, SyncServer)
+ return server
diff --git a/letta/server/rest_api/routers/openai/chat_completions/chat_completions.py b/letta/server/rest_api/routers/openai/chat_completions/chat_completions.py
index 793e96ca8..92cbf04e2 100644
--- a/letta/server/rest_api/routers/openai/chat_completions/chat_completions.py
+++ b/letta/server/rest_api/routers/openai/chat_completions/chat_completions.py
@@ -11,9 +11,10 @@ from letta.log import get_logger
from letta.schemas.message import Message, MessageCreate
from letta.schemas.user import User
from letta.server.rest_api.chat_completions_interface import ChatCompletionsStreamingInterface
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
# TODO this belongs in a controller!
-from letta.server.rest_api.utils import get_letta_server, get_user_message_from_chat_completions_request, sse_async_generator
+from letta.server.rest_api.utils import get_user_message_from_chat_completions_request, sse_async_generator
from letta.utils import safe_create_task
if TYPE_CHECKING:
@@ -39,13 +40,13 @@ async def create_chat_completions(
agent_id: str,
completion_request: CompletionCreateParams = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- user_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
# Validate and process fields
if not completion_request["stream"]:
raise HTTPException(status_code=400, detail="Must be streaming request: `stream` was set to `False` in the request.")
- actor = server.user_manager.get_user_or_default(user_id=user_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
letta_agent = server.load_agent(agent_id=agent_id, actor=actor)
llm_config = letta_agent.agent_state.llm_config
diff --git a/letta/server/rest_api/routers/v1/agents.py b/letta/server/rest_api/routers/v1/agents.py
index 523458525..e16fe9b52 100644
--- a/letta/server/rest_api/routers/v1/agents.py
+++ b/letta/server/rest_api/routers/v1/agents.py
@@ -13,7 +13,6 @@ from sqlalchemy.exc import IntegrityError, OperationalError
from starlette.responses import Response, StreamingResponse
from letta.agents.agent_loop import AgentLoop
-from letta.agents.letta_agent import LettaAgent
from letta.agents.letta_agent_v2 import LettaAgentV2
from letta.constants import AGENT_ID_PATTERN, DEFAULT_MAX_STEPS, DEFAULT_MESSAGE_TOOL, DEFAULT_MESSAGE_TOOL_KWARG, REDIS_RUN_ID_PREFIX
from letta.data_sources.redis_client import NoopAsyncRedisClient, get_redis_client
@@ -24,13 +23,12 @@ from letta.errors import (
AgentNotFoundForExportError,
PendingApprovalError,
)
-from letta.groups.sleeptime_multi_agent_v2 import SleeptimeMultiAgentV2
from letta.helpers.datetime_helpers import get_utc_timestamp_ns
from letta.log import get_logger
from letta.orm.errors import NoResultFound
from letta.otel.context import get_ctx_attributes
from letta.otel.metric_registry import MetricRegistry
-from letta.schemas.agent import AgentState, AgentType, CreateAgent, UpdateAgent
+from letta.schemas.agent import AgentState, CreateAgent, UpdateAgent
from letta.schemas.agent_file import AgentFileSchema
from letta.schemas.block import Block, BlockUpdate
from letta.schemas.enums import JobType
@@ -54,11 +52,9 @@ from letta.schemas.source import Source
from letta.schemas.tool import Tool
from letta.schemas.user import User
from letta.serialize_schemas.pydantic_agent_schema import AgentSchema
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.rest_api.redis_stream_manager import create_background_stream_processor, redis_sse_stream_generator
-from letta.server.rest_api.utils import get_letta_server
from letta.server.server import SyncServer
-from letta.services.summarizer.enums import SummarizationMode
-from letta.services.telemetry_manager import NoopTelemetryManager
from letta.settings import settings
from letta.utils import safe_create_shielded_task, safe_create_task, truncate_file_visible_content
@@ -79,7 +75,7 @@ async def list_agents(
description="If True, only returns agents that match ALL given tags. Otherwise, return agents that have ANY of the passed-in tags.",
),
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
before: str | None = Query(None, description="Cursor for pagination"),
after: str | None = Query(None, description="Cursor for pagination"),
limit: int | None = Query(50, description="Limit for pagination"),
@@ -125,7 +121,7 @@ async def list_agents(
"""
# Retrieve the actor (user) details
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Handle backwards compatibility - prefer new parameters over legacy ones
final_ascending = (order == "asc") if order else ascending
@@ -156,12 +152,12 @@ async def list_agents(
@router.get("/count", response_model=int, operation_id="count_agents")
async def count_agents(
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the count of all agents associated with a given user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.size_async(actor=actor)
@@ -177,7 +173,7 @@ async def export_agent(
agent_id: str,
max_steps: int = 100,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
use_legacy_format: bool = Query(
False,
description="If true, exports using the legacy single-agent format (v1). If false, exports using the new multi-entity format (v2).",
@@ -194,7 +190,7 @@ async def export_agent(
- Legacy format (use_legacy_format=true): Single agent with inline tools/blocks
- New format (default): Multi-entity format with separate agents, tools, blocks, files, etc.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
if use_legacy_format:
# Use the legacy serialization method
@@ -327,7 +323,7 @@ async def _import_agent(
async def import_agent(
file: UploadFile = File(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
x_override_embedding_model: str | None = Header(None, alias="x-override-embedding-model"),
append_copy_suffix: bool = Form(True, description='If set to True, appends "_copy" to the end of the agent name.'),
override_existing_tools: bool = Form(
@@ -351,7 +347,7 @@ async def import_agent(
Import a serialized agent file and recreate the agent(s) in the system.
Returns the IDs of all imported agents.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
try:
serialized_data = file.file.read()
@@ -408,12 +404,12 @@ async def import_agent(
async def retrieve_agent_context_window(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve the context window of a specific agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
return await server.agent_manager.get_context_window(agent_id=agent_id, actor=actor)
except Exception as e:
@@ -434,7 +430,7 @@ class CreateAgentRequest(CreateAgent):
async def create_agent(
agent: CreateAgentRequest = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
x_project: str | None = Header(
None, alias="X-Project", description="The project slug to associate with the agent (cloud only)."
), # Only handled by next js middleware
@@ -443,7 +439,7 @@ async def create_agent(
Create a new agent with the specified configuration.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.create_agent_async(agent, actor=actor)
except Exception as e:
traceback.print_exc()
@@ -455,10 +451,10 @@ async def modify_agent(
agent_id: str,
update_agent: UpdateAgent = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""Update an existing agent"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.update_agent_async(agent_id=agent_id, request=update_agent, actor=actor)
@@ -466,10 +462,10 @@ async def modify_agent(
async def list_agent_tools(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""Get tools from an existing agent"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.list_attached_tools_async(agent_id=agent_id, actor=actor)
@@ -478,12 +474,12 @@ async def attach_tool(
agent_id: str,
tool_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Attach a tool to an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.agent_manager.attach_tool_async(agent_id=agent_id, tool_id=tool_id, actor=actor)
# TODO: Unfortunately we need this to preserve our current API behavior
return await server.agent_manager.get_agent_by_id_async(agent_id=agent_id, actor=actor)
@@ -494,12 +490,12 @@ async def detach_tool(
agent_id: str,
tool_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Detach a tool from an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.agent_manager.detach_tool_async(agent_id=agent_id, tool_id=tool_id, actor=actor)
# TODO: Unfortunately we need this to preserve our current API behavior
return await server.agent_manager.get_agent_by_id_async(agent_id=agent_id, actor=actor)
@@ -511,12 +507,12 @@ async def modify_approval(
tool_name: str,
requires_approval: bool,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Attach a tool to an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.agent_manager.modify_approvals_async(
agent_id=agent_id, tool_name=tool_name, requires_approval=requires_approval, actor=actor
)
@@ -529,12 +525,12 @@ async def attach_source(
agent_id: str,
source_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Attach a source to an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
agent_state = await server.agent_manager.attach_source_async(agent_id=agent_id, source_id=source_id, actor=actor)
# Check if the agent is missing any files tools
@@ -556,12 +552,12 @@ async def attach_folder_to_agent(
agent_id: str,
folder_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Attach a folder to an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
agent_state = await server.agent_manager.attach_source_async(agent_id=agent_id, source_id=folder_id, actor=actor)
# Check if the agent is missing any files tools
@@ -583,12 +579,12 @@ async def detach_source(
agent_id: str,
source_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Detach a source from an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
agent_state = await server.agent_manager.detach_source_async(agent_id=agent_id, source_id=source_id, actor=actor)
if not agent_state.sources:
@@ -613,12 +609,12 @@ async def detach_folder_from_agent(
agent_id: str,
folder_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Detach a folder from an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
agent_state = await server.agent_manager.detach_source_async(agent_id=agent_id, source_id=folder_id, actor=actor)
if not agent_state.sources:
@@ -642,7 +638,7 @@ async def detach_folder_from_agent(
async def close_all_open_files(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Closes all currently open files for a given agent.
@@ -650,7 +646,7 @@ async def close_all_open_files(
This endpoint updates the file state for the agent so that no files are marked as open.
Typically used to reset the working memory view for the agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.file_agent_manager.close_all_other_files(agent_id=agent_id, keep_file_names=[], actor=actor)
@@ -660,7 +656,7 @@ async def open_file(
agent_id: str,
file_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Opens a specific file for a given agent.
@@ -669,7 +665,7 @@ async def open_file(
The file will be included in the agent's working memory view.
Returns a list of file names that were closed due to LRU eviction.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Get the agent to access files configuration
try:
@@ -712,7 +708,7 @@ async def close_file(
agent_id: str,
file_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Closes a specific file for a given agent.
@@ -720,7 +716,7 @@ async def close_file(
This endpoint marks a specific file as closed in the agent's file state.
The file will be removed from the agent's working memory view.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Use update_file_agent_by_id to close the file
try:
@@ -747,7 +743,7 @@ async def retrieve_agent(
),
),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the state of the agent.
@@ -756,7 +752,7 @@ async def retrieve_agent(
if not AGENT_ID_PATTERN.match(agent_id):
raise HTTPException(status_code=400, detail=f"agent_id {agent_id} is not in the valid format 'agent-<uuid4>'")
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
return await server.agent_manager.get_agent_by_id_async(agent_id=agent_id, include_relationships=include_relationships, actor=actor)
@@ -768,12 +764,12 @@ async def retrieve_agent(
async def delete_agent(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
await server.agent_manager.delete_agent_async(agent_id=agent_id, actor=actor)
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": f"Agent id={agent_id} successfully deleted"})
@@ -785,12 +781,12 @@ async def delete_agent(
async def list_agent_sources(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the sources associated with an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.list_attached_sources_async(agent_id=agent_id, actor=actor)
@@ -798,12 +794,12 @@ async def list_agent_sources(
async def list_agent_folders(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the folders associated with an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.list_attached_sources_async(agent_id=agent_id, actor=actor)
@@ -814,12 +810,12 @@ async def list_agent_files(
limit: int = Query(20, ge=1, le=100, description="Number of items to return (1-100)"),
is_open: Optional[bool] = Query(None, description="Filter by open status (true for open files, false for closed files)"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the files attached to an agent with their open/closed status (paginated).
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# get paginated file-agent relationships for this agent
file_agents, next_cursor, has_more = await server.file_agent_manager.list_files_for_agent_paginated(
@@ -855,13 +851,13 @@ async def list_agent_files(
async def retrieve_agent_memory(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve the memory state of a specific agent.
This endpoint fetches the current memory state of the agent identified by the user ID and agent ID.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.get_agent_memory_async(agent_id=agent_id, actor=actor)
@@ -871,12 +867,12 @@ async def retrieve_block(
agent_id: str,
block_label: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve a core memory block from an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
return await server.agent_manager.get_block_with_label_async(agent_id=agent_id, block_label=block_label, actor=actor)
@@ -888,12 +884,12 @@ async def retrieve_block(
async def list_blocks(
agent_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve the core memory blocks of a specific agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
agent = await server.agent_manager.get_agent_by_id_async(agent_id=agent_id, include_relationships=["memory"], actor=actor)
return agent.memory.blocks
@@ -907,12 +903,12 @@ async def modify_block(
block_label: str,
block_update: BlockUpdate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Updates a core memory block of an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
block = await server.agent_manager.modify_block_by_label_async(
agent_id=agent_id, block_label=block_label, block_update=block_update, actor=actor
@@ -929,12 +925,12 @@ async def attach_block(
agent_id: str,
block_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Attach a core memory block to an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.attach_block_async(agent_id=agent_id, block_id=block_id, actor=actor)
@@ -943,12 +939,12 @@ async def detach_block(
agent_id: str,
block_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Detach a core memory block from an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.detach_block_async(agent_id=agent_id, block_id=block_id, actor=actor)
@@ -963,12 +959,12 @@ async def list_passages(
ascending: bool | None = Query(
True, description="Whether to sort passages oldest to newest (True, default) or newest to oldest (False)"
),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve the memories in an agent's archival memory store (paginated query).
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.get_agent_archival_async(
agent_id=agent_id,
@@ -986,12 +982,12 @@ async def create_passage(
agent_id: str,
request: CreateArchivalMemory = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Insert a memory into an agent's archival memory store.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.insert_archival_memory_async(
agent_id=agent_id, memory_contents=request.text, actor=actor, tags=request.tags, created_at=request.created_at
@@ -1010,7 +1006,7 @@ async def search_archival_memory(
start_datetime: Optional[datetime] = Query(None, description="Filter results to passages created after this datetime"),
end_datetime: Optional[datetime] = Query(None, description="Filter results to passages created before this datetime"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Search archival memory using semantic (embedding-based) search with optional temporal filtering.
@@ -1019,7 +1015,7 @@ async def search_archival_memory(
an agent's archival memory store directly via the API. The search uses the same functionality
as the agent's archival_memory_search tool but is accessible for external API usage.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
# convert datetime to string in ISO 8601 format
@@ -1059,12 +1055,12 @@ async def delete_passage(
memory_id: str,
# memory_id: str = Query(..., description="Unique ID of the memory to be deleted."),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a memory from an agent's archival memory store.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.delete_archival_memory_async(memory_id=memory_id, actor=actor)
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": f"Memory id={memory_id} successfully deleted"})
@@ -1089,12 +1085,12 @@ async def list_messages(
include_err: bool | None = Query(
None, description="Whether to include error messages and error statuses. For debugging purposes only."
),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve message history for an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.get_agent_recall_async(
agent_id=agent_id,
@@ -1118,13 +1114,13 @@ def modify_message(
message_id: str,
request: LettaMessageUpdateUnion = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Update the details of a message associated with an agent.
"""
# TODO: support modifying tool calls/returns
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
return server.message_manager.update_message_by_letta_message(message_id=message_id, letta_message_update=request, actor=actor)
@@ -1139,7 +1135,7 @@ async def send_message(
request_obj: Request, # FastAPI Request
server: SyncServer = Depends(get_letta_server),
request: LettaRequest = Body(...),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Process a user message and return the agent's response.
@@ -1150,7 +1146,7 @@ async def send_message(
request_start_timestamp_ns = get_utc_timestamp_ns()
MetricRegistry().user_message_counter.add(1, get_ctx_attributes())
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# TODO: This is redundant, remove soon
agent = await server.agent_manager.get_agent_by_id_async(
agent_id, actor, include_relationships=["memory", "multi_agent_group", "sources", "tool_exec_environment_variables", "tools"]
@@ -1263,7 +1259,7 @@ async def send_message_streaming(
request_obj: Request, # FastAPI Request
server: SyncServer = Depends(get_letta_server),
request: LettaStreamingRequest = Body(...),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
) -> StreamingResponse | LettaResponse:
"""
Process a user message and return the agent's response.
@@ -1276,7 +1272,7 @@ async def send_message_streaming(
# TODO (cliandy): clean this up
redis_client = await get_redis_client()
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# TODO: This is redundant, remove soon
agent = await server.agent_manager.get_agent_by_id_async(
agent_id, actor, include_relationships=["memory", "multi_agent_group", "sources", "tool_exec_environment_variables", "tools"]
@@ -1463,14 +1459,14 @@ async def cancel_agent_run(
agent_id: str,
request: CancelAgentRunRequest = Body(None),
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
) -> dict:
"""
Cancel runs associated with an agent. If run_ids are passed in, cancel those in particular.
Note to cancel active runs associated with an agent, redis is required.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
if not settings.track_agent_run:
raise HTTPException(status_code=400, detail="Agent run tracking is disabled")
run_ids = request.run_ids if request else None
@@ -1504,14 +1500,14 @@ async def cancel_agent_run(
async def search_messages(
request: MessageSearchRequest = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Search messages across the entire organization with optional project and template filtering. Returns messages with FTS/vector ranks and total RRF score.
This is a cloud-only feature.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# get embedding config from the default agent if needed
# check if any agents exist in the org
@@ -1627,7 +1623,7 @@ async def send_message_async(
agent_id: str,
server: SyncServer = Depends(get_letta_server),
request: LettaAsyncRequest = Body(...),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Asynchronously process a user message and return a run object.
@@ -1637,7 +1633,7 @@ async def send_message_async(
This is more like `send_message_job`
"""
MetricRegistry().user_message_counter.add(1, get_ctx_attributes())
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Create a new job
run = Run(
@@ -1706,10 +1702,10 @@ async def reset_messages(
agent_id: str,
add_default_initial_messages: bool = Query(default=False, description="If true, adds the default initial messages after resetting."),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""Resets the messages for an agent"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.reset_messages_async(
agent_id=agent_id, actor=actor, add_default_initial_messages=add_default_initial_messages
)
@@ -1720,10 +1716,10 @@ async def list_agent_groups(
agent_id: str,
manager_type: str | None = Query(None, description="Manager type to filter groups by"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""Lists the groups for an agent"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
logger.info("in list agents with manager_type", manager_type)
return server.agent_manager.list_groups(agent_id=agent_id, manager_type=manager_type, actor=actor)
@@ -1737,7 +1733,7 @@ async def preview_raw_payload(
agent_id: str,
request: Union[LettaRequest, LettaStreamingRequest] = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Inspect the raw LLM request payload without sending it.
@@ -1746,7 +1742,7 @@ async def preview_raw_payload(
the LLM request, then returns the raw request payload that would
be sent to the LLM provider. Useful for debugging and inspection.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
agent = await server.agent_manager.get_agent_by_id_async(agent_id, actor, include_relationships=["multi_agent_group"])
agent_eligible = agent.multi_agent_group is None or agent.multi_agent_group.manager_type in ["sleeptime", "voice_sleeptime"]
model_compatible = agent.llm_config.model_endpoint_type in [
@@ -1781,7 +1777,7 @@ async def summarize_agent_conversation(
request_obj: Request, # FastAPI Request
max_message_length: int = Query(..., description="Maximum number of messages to retain after summarization."),
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Summarize an agent's conversation history to a target message length.
@@ -1790,7 +1786,7 @@ async def summarize_agent_conversation(
truncating and compressing it down to the specified `max_message_length`.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
agent = await server.agent_manager.get_agent_by_id_async(agent_id, actor, include_relationships=["multi_agent_group"])
agent_eligible = agent.multi_agent_group is None or agent.multi_agent_group.manager_type in ["sleeptime", "voice_sleeptime"]
model_compatible = agent.llm_config.model_endpoint_type in [
diff --git a/letta/server/rest_api/routers/v1/blocks.py b/letta/server/rest_api/routers/v1/blocks.py
index 941bd950c..2e9ea944d 100644
--- a/letta/server/rest_api/routers/v1/blocks.py
+++ b/letta/server/rest_api/routers/v1/blocks.py
@@ -1,11 +1,11 @@
from typing import TYPE_CHECKING, List, Literal, Optional
-from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query
+from fastapi import APIRouter, Body, Depends, HTTPException, Query
from letta.orm.errors import NoResultFound
from letta.schemas.agent import AgentState
from letta.schemas.block import Block, BlockUpdate, CreateBlock
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
if TYPE_CHECKING:
@@ -78,9 +78,9 @@ async def list_blocks(
description="If set to True, include blocks marked as hidden in the results.",
),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.block_manager.get_blocks_async(
actor=actor,
label=label,
@@ -106,12 +106,12 @@ async def list_blocks(
@router.get("/count", response_model=int, operation_id="count_blocks")
async def count_blocks(
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Count all blocks created by a user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.block_manager.size_async(actor=actor)
@@ -119,9 +119,9 @@ async def count_blocks(
async def create_block(
create_block: CreateBlock = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
block = Block(**create_block.model_dump())
return await server.block_manager.create_or_update_block_async(actor=actor, block=block)
@@ -131,9 +131,9 @@ async def modify_block(
block_id: str,
block_update: BlockUpdate = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.block_manager.update_block_async(block_id=block_id, block_update=block_update, actor=actor)
@@ -141,9 +141,9 @@ async def modify_block(
async def delete_block(
block_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.block_manager.delete_block_async(block_id=block_id, actor=actor)
@@ -151,9 +151,9 @@ async def delete_block(
async def retrieve_block(
block_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
block = await server.block_manager.get_block_by_id_async(block_id=block_id, actor=actor)
if block is None:
@@ -175,13 +175,13 @@ async def list_agents_for_block(
),
),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieves all agents associated with the specified block.
Raises a 404 if the block does not exist.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
agents = await server.block_manager.get_agents_for_block_async(
block_id=block_id, include_relationships=include_relationships, actor=actor
diff --git a/letta/server/rest_api/routers/v1/embeddings.py b/letta/server/rest_api/routers/v1/embeddings.py
index c0add6dcc..a932b355c 100644
--- a/letta/server/rest_api/routers/v1/embeddings.py
+++ b/letta/server/rest_api/routers/v1/embeddings.py
@@ -2,7 +2,7 @@ from typing import Optional
from fastapi import APIRouter, Depends, Header
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
router = APIRouter(prefix="/embeddings", tags=["embeddings"])
@@ -11,11 +11,11 @@ router = APIRouter(prefix="/embeddings", tags=["embeddings"])
@router.get("/total_storage_size", response_model=float, operation_id="get_total_storage_size")
async def get_embeddings_total_storage_size(
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
storage_unit: Optional[str] = Header("GB", alias="storage_unit"), # Extract storage unit from header, default to GB
):
"""
Get the total size of all embeddings in the database for a user in the storage unit given.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.passage_manager.estimate_embeddings_size_async(actor=actor, storage_unit=storage_unit)
diff --git a/letta/server/rest_api/routers/v1/folders.py b/letta/server/rest_api/routers/v1/folders.py
index 9dc7dc13c..9f93e7b5b 100644
--- a/letta/server/rest_api/routers/v1/folders.py
+++ b/letta/server/rest_api/routers/v1/folders.py
@@ -1,11 +1,10 @@
-import asyncio
import mimetypes
import os
import tempfile
from pathlib import Path
from typing import List, Literal, Optional
-from fastapi import APIRouter, Depends, Header, HTTPException, Query, UploadFile
+from fastapi import APIRouter, Depends, HTTPException, Query, UploadFile
from starlette import status
from starlette.responses import Response
@@ -27,7 +26,7 @@ from letta.schemas.passage import Passage
from letta.schemas.source import Source, SourceCreate, SourceUpdate
from letta.schemas.source_metadata import OrganizationSourcesStats
from letta.schemas.user import User
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.services.file_processor.embedder.openai_embedder import OpenAIEmbedder
from letta.services.file_processor.embedder.pinecone_embedder import PineconeEmbedder
@@ -50,12 +49,12 @@ router = APIRouter(prefix="/folders", tags=["folders"])
@router.get("/count", response_model=int, operation_id="count_folders")
async def count_folders(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Count all data folders created by a user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.source_manager.size_async(actor=actor)
@@ -63,12 +62,12 @@ async def count_folders(
async def retrieve_folder(
folder_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a folder by ID
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
folder = await server.source_manager.get_source_by_id(source_id=folder_id, actor=actor)
if not folder:
@@ -80,12 +79,12 @@ async def retrieve_folder(
async def get_folder_id_by_name(
folder_name: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a folder by name
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
folder = await server.source_manager.get_source_by_name(source_name=folder_name, actor=actor)
if not folder:
@@ -96,7 +95,7 @@ async def get_folder_id_by_name(
@router.get("/metadata", response_model=OrganizationSourcesStats, operation_id="get_folders_metadata")
async def get_folders_metadata(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
include_detailed_per_source_metadata: bool = False,
):
"""
@@ -108,7 +107,7 @@ async def get_folders_metadata(
- Total size of all files
- Per-source breakdown with file details (file_name, file_size per file) if include_detailed_per_source_metadata is True
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.file_manager.get_organization_sources_metadata(
actor=actor, include_detailed_per_source_metadata=include_detailed_per_source_metadata
)
@@ -128,12 +127,12 @@ async def list_folders(
),
order_by: Literal["created_at"] = Query("created_at", description="Field to sort by"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all data folders created by a user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.source_manager.list_sources(actor=actor, before=before, after=after, limit=limit, ascending=(order == "asc"))
@@ -141,12 +140,12 @@ async def list_folders(
async def create_folder(
folder_create: SourceCreate,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create a new data folder.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# TODO: need to asyncify this
if not folder_create.embedding_config:
@@ -176,13 +175,13 @@ async def modify_folder(
folder_id: str,
folder: SourceUpdate,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Update the name or documentation of an existing data folder.
"""
# TODO: allow updating the handle/embedding config
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
if not await server.source_manager.get_source_by_id(source_id=folder_id, actor=actor):
raise HTTPException(status_code=404, detail=f"Folder with id={folder_id} does not exist.")
return await server.source_manager.update_source(source_id=folder_id, source_update=folder, actor=actor)
@@ -192,12 +191,12 @@ async def modify_folder(
async def delete_folder(
folder_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a data folder.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
folder = await server.source_manager.get_source_by_id(source_id=folder_id, actor=actor)
agent_states = await server.source_manager.list_attached_agents(source_id=folder_id, actor=actor)
files = await server.file_manager.list_files(folder_id, actor)
@@ -232,7 +231,7 @@ async def upload_file_to_folder(
duplicate_handling: DuplicateFileHandling = Query(DuplicateFileHandling.SUFFIX, description="How to handle duplicate filenames"),
name: Optional[str] = Query(None, description="Optional custom name to override the uploaded file's name"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Upload a file to a data folder.
@@ -269,7 +268,7 @@ async def upload_file_to_folder(
),
)
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
folder = await server.source_manager.get_source_by_id(source_id=folder_id, actor=actor)
if folder is None:
@@ -347,12 +346,12 @@ async def upload_file_to_folder(
async def get_agents_for_folder(
folder_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get all agent IDs that have the specified folder attached.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.source_manager.get_agents_for_source_id(source_id=folder_id, actor=actor)
@@ -363,12 +362,12 @@ async def list_folder_passages(
before: Optional[str] = Query(None, description="Message before which to retrieve the returned messages."),
limit: int = Query(100, description="Maximum number of messages to retrieve."),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all passages associated with a data folder.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.query_source_passages_async(
actor=actor,
source_id=folder_id,
@@ -385,12 +384,12 @@ async def list_folder_files(
after: Optional[str] = Query(None, description="Pagination cursor to fetch the next set of results"),
include_content: bool = Query(False, description="Whether to include full file content"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
List paginated files associated with a data folder.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.file_manager.list_files(
source_id=folder_id,
limit=limit,
@@ -407,12 +406,12 @@ async def list_folder_files(
# file_id: str,
# include_content: bool = Query(False, description="Whether to include full file content"),
# server: "SyncServer" = Depends(get_letta_server),
-# actor_id: Optional[str] = Header(None, alias="user_id"),
+# headers: HeaderParams = Depends(get_headers),
# ):
# """
# Retrieve metadata for a specific file by its ID.
# """
-# actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+# actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
#
# # Get file metadata using the file manager
# file_metadata = await server.file_manager.get_file_by_id(
@@ -457,12 +456,12 @@ async def delete_file_from_folder(
folder_id: str,
file_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a file from a folder.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
deleted_file = await server.file_manager.delete_file(file_id=file_id, actor=actor)
diff --git a/letta/server/rest_api/routers/v1/groups.py b/letta/server/rest_api/routers/v1/groups.py
index 00aeb355a..b6d335920 100644
--- a/letta/server/rest_api/routers/v1/groups.py
+++ b/letta/server/rest_api/routers/v1/groups.py
@@ -10,7 +10,7 @@ from letta.schemas.group import Group, GroupCreate, GroupUpdate, ManagerType
from letta.schemas.letta_message import LettaMessageUnion, LettaMessageUpdateUnion
from letta.schemas.letta_request import LettaRequest, LettaStreamingRequest
from letta.schemas.letta_response import LettaResponse
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
router = APIRouter(prefix="/groups", tags=["groups"])
@@ -19,7 +19,7 @@ router = APIRouter(prefix="/groups", tags=["groups"])
@router.get("/", response_model=List[Group], operation_id="list_groups")
async def list_groups(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
manager_type: Optional[ManagerType] = Query(None, description="Search groups by manager type"),
before: Optional[str] = Query(
None, description="Group ID cursor for pagination. Returns groups that come before this group ID in the specified sort order"
@@ -42,7 +42,7 @@ async def list_groups(
"""
Fetch all multi-agent groups matching query.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.group_manager.list_groups_async(
actor=actor,
project_id=project_id,
@@ -58,12 +58,12 @@ async def list_groups(
@router.get("/count", response_model=int, operation_id="count_groups")
async def count_groups(
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the count of all groups associated with a given user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.group_manager.size(actor=actor)
@@ -71,12 +71,12 @@ async def count_groups(
async def retrieve_group(
group_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve the group by id.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
return await server.group_manager.retrieve_group_async(group_id=group_id, actor=actor)
@@ -88,7 +88,7 @@ async def retrieve_group(
async def create_group(
group: GroupCreate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
x_project: Optional[str] = Header(
None, alias="X-Project", description="The project slug to associate with the group (cloud only)."
), # Only handled by next js middleware
@@ -97,7 +97,7 @@ async def create_group(
Create a new multi-agent group with the specified configuration.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.group_manager.create_group_async(group, actor=actor)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
@@ -108,7 +108,7 @@ async def modify_group(
group_id: str,
group: GroupUpdate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
x_project: Optional[str] = Header(
None, alias="X-Project", description="The project slug to associate with the group (cloud only)."
), # Only handled by next js middleware
@@ -117,7 +117,7 @@ async def modify_group(
Create a new multi-agent group with the specified configuration.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.group_manager.modify_group_async(group_id=group_id, group_update=group, actor=actor)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
@@ -127,12 +127,12 @@ async def modify_group(
async def delete_group(
group_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a multi-agent group.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
await server.group_manager.delete_group_async(group_id=group_id, actor=actor)
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": f"Group id={group_id} successfully deleted"})
@@ -149,13 +149,13 @@ async def send_group_message(
group_id: str,
server: SyncServer = Depends(get_letta_server),
request: LettaRequest = Body(...),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Process a user message and return the group's response.
This endpoint accepts a message from a user and processes it through through agents in the group based on the specified pattern
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
result = await server.send_group_message_to_agent(
group_id=group_id,
actor=actor,
@@ -187,14 +187,14 @@ async def send_group_message_streaming(
group_id: str,
server: SyncServer = Depends(get_letta_server),
request: LettaStreamingRequest = Body(...),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Process a user message and return the group's responses.
This endpoint accepts a message from a user and processes it through agents in the group based on the specified pattern.
It will stream the steps of the response always, and stream the tokens if 'stream_tokens' is set to True.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
result = await server.send_group_message_to_agent(
group_id=group_id,
actor=actor,
@@ -220,13 +220,13 @@ async def modify_group_message(
message_id: str,
request: LettaMessageUpdateUnion = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Update the details of a message associated with an agent.
"""
# TODO: support modifying tool calls/returns
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.message_manager.update_message_by_letta_message(message_id=message_id, letta_message_update=request, actor=actor)
@@ -240,12 +240,12 @@ async def list_group_messages(
use_assistant_message: bool = Query(True, description="Whether to use assistant messages"),
assistant_message_tool_name: str = Query(DEFAULT_MESSAGE_TOOL, description="The name of the designated message tool."),
assistant_message_tool_kwarg: str = Query(DEFAULT_MESSAGE_TOOL_KWARG, description="The name of the message argument."),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve message history for an agent.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
group = await server.group_manager.retrieve_group_async(group_id=group_id, actor=actor)
if group.manager_agent_id:
return await server.get_agent_recall_async(
@@ -278,10 +278,10 @@ async def list_group_messages(
async def reset_group_messages(
group_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete the group messages for all agents that are part of the multi-agent group.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.group_manager.reset_messages_async(group_id=group_id, actor=actor)
diff --git a/letta/server/rest_api/routers/v1/identities.py b/letta/server/rest_api/routers/v1/identities.py
index e900d8f2a..842645221 100644
--- a/letta/server/rest_api/routers/v1/identities.py
+++ b/letta/server/rest_api/routers/v1/identities.py
@@ -4,7 +4,7 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query
from letta.orm.errors import NoResultFound, UniqueConstraintViolationError
from letta.schemas.identity import Identity, IdentityCreate, IdentityProperty, IdentityType, IdentityUpdate, IdentityUpsert
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
if TYPE_CHECKING:
from letta.server.server import SyncServer
@@ -32,13 +32,13 @@ async def list_identities(
),
order_by: Literal["created_at"] = Query("created_at", description="Field to sort by"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a list of all identities in the database
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
identities = await server.identity_manager.list_identities_async(
name=name,
@@ -63,13 +63,13 @@ async def list_identities(
@router.get("/count", tags=["identities"], response_model=int, operation_id="count_identities")
async def count_identities(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get count of all identities for a user
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.identity_manager.size_async(actor=actor)
except NoResultFound:
return 0
@@ -83,10 +83,10 @@ async def count_identities(
async def retrieve_identity(
identity_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.identity_manager.get_identity_async(identity_id=identity_id, actor=actor)
except NoResultFound as e:
raise HTTPException(status_code=404, detail=str(e))
@@ -96,13 +96,13 @@ async def retrieve_identity(
async def create_identity(
identity: IdentityCreate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
x_project: Optional[str] = Header(
None, alias="X-Project", description="The project slug to associate with the identity (cloud only)."
), # Only handled by next js middleware
):
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.identity_manager.create_identity_async(identity=identity, actor=actor)
except HTTPException:
raise
@@ -122,13 +122,13 @@ async def create_identity(
async def upsert_identity(
identity: IdentityUpsert = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
x_project: Optional[str] = Header(
None, alias="X-Project", description="The project slug to associate with the identity (cloud only)."
), # Only handled by next js middleware
):
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.identity_manager.upsert_identity_async(identity=identity, actor=actor)
except HTTPException:
raise
@@ -143,10 +143,10 @@ async def modify_identity(
identity_id: str,
identity: IdentityUpdate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.identity_manager.update_identity_async(identity_id=identity_id, identity=identity, actor=actor)
except HTTPException:
raise
@@ -161,10 +161,10 @@ async def upsert_identity_properties(
identity_id: str,
properties: List[IdentityProperty] = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.identity_manager.upsert_identity_properties_async(identity_id=identity_id, properties=properties, actor=actor)
except HTTPException:
raise
@@ -178,13 +178,13 @@ async def upsert_identity_properties(
async def delete_identity(
identity_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete an identity by its identifier key
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.identity_manager.delete_identity_async(identity_id=identity_id, actor=actor)
except HTTPException:
raise
diff --git a/letta/server/rest_api/routers/v1/internal_templates.py b/letta/server/rest_api/routers/v1/internal_templates.py
index 4cdde3e93..b4310acc3 100644
--- a/letta/server/rest_api/routers/v1/internal_templates.py
+++ b/letta/server/rest_api/routers/v1/internal_templates.py
@@ -1,12 +1,12 @@
from typing import List, Optional
-from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query
+from fastapi import APIRouter, Body, Depends, HTTPException, Query
from pydantic import BaseModel
from letta.schemas.agent import AgentState, InternalTemplateAgentCreate
from letta.schemas.block import Block, InternalTemplateBlockCreate
from letta.schemas.group import Group, InternalTemplateGroupCreate
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
router = APIRouter(prefix="/_internal_templates", tags=["_internal_templates"])
@@ -16,13 +16,13 @@ router = APIRouter(prefix="/_internal_templates", tags=["_internal_templates"])
async def create_group(
group: InternalTemplateGroupCreate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create a new multi-agent group with the specified configuration.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.group_manager.create_group_async(group, actor=actor)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
@@ -32,13 +32,13 @@ async def create_group(
async def create_agent(
agent: InternalTemplateAgentCreate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create a new agent with template-related fields.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.create_agent_async(agent, actor=actor)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
@@ -48,13 +48,13 @@ async def create_agent(
async def create_block(
block: InternalTemplateBlockCreate = Body(...),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create a new block with template-related fields.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
block_obj = Block(**block.model_dump())
return await server.block_manager.create_or_update_block_async(block_obj, actor=actor)
except Exception as e:
@@ -94,7 +94,7 @@ class DeleteDeploymentResponse(BaseModel):
async def list_deployment_entities(
deployment_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
entity_types: Optional[List[str]] = Query(None, description="Filter by entity types (block, agent, group)"),
):
"""
@@ -102,7 +102,7 @@ async def list_deployment_entities(
Optionally filter by entity types.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
entities = []
@@ -206,14 +206,14 @@ async def list_deployment_entities(
async def delete_deployment(
deployment_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete all entities (blocks, agents, groups) with the specified deployment_id.
Deletion order: blocks -> agents -> groups to maintain referential integrity.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
deleted_blocks = []
deleted_agents = []
diff --git a/letta/server/rest_api/routers/v1/jobs.py b/letta/server/rest_api/routers/v1/jobs.py
index 2a3ec4648..cf11e3c24 100644
--- a/letta/server/rest_api/routers/v1/jobs.py
+++ b/letta/server/rest_api/routers/v1/jobs.py
@@ -1,11 +1,11 @@
from typing import List, Optional
-from fastapi import APIRouter, Depends, Header, HTTPException, Query
+from fastapi import APIRouter, Depends, HTTPException, Query
from letta.orm.errors import NoResultFound
from letta.schemas.enums import JobStatus
from letta.schemas.job import Job
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.settings import settings
@@ -20,13 +20,13 @@ async def list_jobs(
after: Optional[str] = Query(None, description="Cursor for pagination"),
limit: Optional[int] = Query(50, description="Limit for pagination"),
ascending: bool = Query(True, description="Whether to sort jobs oldest to newest (True, default) or newest to oldest (False)"),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all jobs.
TODO (cliandy): implementation for pagination
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# TODO: add filtering by status
return await server.job_manager.list_jobs_async(
@@ -42,7 +42,7 @@ async def list_jobs(
@router.get("/active", response_model=List[Job], operation_id="list_active_jobs")
async def list_active_jobs(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
source_id: Optional[str] = Query(None, description="Only list jobs associated with the source."),
before: Optional[str] = Query(None, description="Cursor for pagination"),
after: Optional[str] = Query(None, description="Cursor for pagination"),
@@ -52,7 +52,7 @@ async def list_active_jobs(
"""
List all active jobs.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.job_manager.list_jobs_async(
actor=actor,
statuses=[JobStatus.created, JobStatus.running],
@@ -67,13 +67,13 @@ async def list_active_jobs(
@router.get("/{job_id}", response_model=Job, operation_id="retrieve_job")
async def retrieve_job(
job_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Get the status of a job.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
return await server.job_manager.get_job_by_id_async(job_id=job_id, actor=actor)
@@ -84,7 +84,7 @@ async def retrieve_job(
@router.patch("/{job_id}/cancel", response_model=Job, operation_id="cancel_job")
async def cancel_job(
job_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
@@ -93,7 +93,7 @@ async def cancel_job(
This endpoint marks a job as cancelled, which will cause any associated
agent execution to terminate as soon as possible.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
if not settings.track_agent_run:
raise HTTPException(status_code=400, detail="Agent run tracking is disabled")
@@ -113,13 +113,13 @@ async def cancel_job(
@router.delete("/{job_id}", response_model=Job, operation_id="delete_job")
async def delete_job(
job_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Delete a job by its job_id.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
job = await server.job_manager.delete_job_by_id_async(job_id=job_id, actor=actor)
diff --git a/letta/server/rest_api/routers/v1/llms.py b/letta/server/rest_api/routers/v1/llms.py
index c98c2a118..dead3c6ba 100644
--- a/letta/server/rest_api/routers/v1/llms.py
+++ b/letta/server/rest_api/routers/v1/llms.py
@@ -1,11 +1,11 @@
from typing import TYPE_CHECKING, List, Optional
-from fastapi import APIRouter, Depends, Header, Query
+from fastapi import APIRouter, Depends, Query
from letta.schemas.embedding_config import EmbeddingConfig
from letta.schemas.enums import ProviderCategory, ProviderType
from letta.schemas.llm_config import LLMConfig
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
if TYPE_CHECKING:
from letta.server.server import SyncServer
@@ -19,11 +19,10 @@ async def list_llm_models(
provider_name: Optional[str] = Query(None),
provider_type: Optional[ProviderType] = Query(None),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
- # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""List available LLM models using the asynchronous implementation for improved performance"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
models = await server.list_llm_models_async(
provider_category=provider_category,
@@ -38,11 +37,10 @@ async def list_llm_models(
@router.get("/embedding", response_model=List[EmbeddingConfig], operation_id="list_embedding_models")
async def list_embedding_models(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
- # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""List available embedding models using the asynchronous implementation for improved performance"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
models = await server.list_embedding_models_async(actor=actor)
return models
diff --git a/letta/server/rest_api/routers/v1/messages.py b/letta/server/rest_api/routers/v1/messages.py
index 262f03c6d..12d2c2840 100644
--- a/letta/server/rest_api/routers/v1/messages.py
+++ b/letta/server/rest_api/routers/v1/messages.py
@@ -1,6 +1,6 @@
from typing import List, Literal, Optional
-from fastapi import APIRouter, Body, Depends, Header, Query
+from fastapi import APIRouter, Body, Depends, Query
from fastapi.exceptions import HTTPException
from starlette.requests import Request
@@ -10,7 +10,7 @@ from letta.orm.errors import NoResultFound
from letta.schemas.job import BatchJob, JobStatus, JobType, JobUpdate
from letta.schemas.letta_request import CreateBatch
from letta.schemas.letta_response import LettaBatchMessages
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.settings import settings
@@ -28,7 +28,7 @@ async def create_batch(
request: Request,
payload: CreateBatch = Body(..., description="Messages and config for all agents"),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Submit a batch of agent runs for asynchronous processing.
@@ -47,7 +47,7 @@ async def create_batch(
if not settings.enable_batch_job_polling:
logger.warning("Batch job polling is disabled. Enable batch processing by setting LETTA_ENABLE_BATCH_JOB_POLLING to True.")
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
batch_job = BatchJob(
user_id=actor.id,
status=JobStatus.running,
@@ -86,13 +86,13 @@ async def create_batch(
@router.get("/batches/{batch_id}", response_model=BatchJob, operation_id="retrieve_batch")
async def retrieve_batch(
batch_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Retrieve the status and details of a batch run.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
job = await server.job_manager.get_job_by_id_async(job_id=batch_id, actor=actor)
@@ -114,13 +114,13 @@ async def list_batches(
"desc", description="Sort order for jobs by creation time. 'asc' for oldest first, 'desc' for newest first"
),
order_by: Literal["created_at"] = Query("created_at", description="Field to sort by"),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
List all batch runs.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
jobs = server.job_manager.list_jobs(
actor=actor,
@@ -153,13 +153,13 @@ async def list_batch_messages(
),
order_by: Literal["created_at"] = Query("created_at", description="Field to sort by"),
agent_id: Optional[str] = Query(None, description="Filter messages by agent ID"),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: SyncServer = Depends(get_letta_server),
):
"""
Get response messages for a specific batch job.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Verify the batch job exists and the user has access to it
try:
@@ -180,12 +180,12 @@ async def list_batch_messages(
async def cancel_batch(
batch_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Cancel a batch run.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
job = await server.job_manager.get_job_by_id_async(job_id=batch_id, actor=actor)
diff --git a/letta/server/rest_api/routers/v1/organizations.py b/letta/server/rest_api/routers/v1/organizations.py
index 7f52a79df..e57188a92 100644
--- a/letta/server/rest_api/routers/v1/organizations.py
+++ b/letta/server/rest_api/routers/v1/organizations.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, List, Optional
from fastapi import APIRouter, Body, Depends, HTTPException, Query
from letta.schemas.organization import Organization, OrganizationCreate, OrganizationUpdate
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import get_letta_server
if TYPE_CHECKING:
from letta.server.server import SyncServer
diff --git a/letta/server/rest_api/routers/v1/providers.py b/letta/server/rest_api/routers/v1/providers.py
index f5d39da37..bffa70f78 100644
--- a/letta/server/rest_api/routers/v1/providers.py
+++ b/letta/server/rest_api/routers/v1/providers.py
@@ -1,13 +1,13 @@
from typing import TYPE_CHECKING, List, Literal, Optional
-from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, status
+from fastapi import APIRouter, Body, Depends, HTTPException, Query, status
from fastapi.responses import JSONResponse
from letta.errors import LLMAuthenticationError
from letta.orm.errors import NoResultFound
from letta.schemas.enums import ProviderType
from letta.schemas.providers import Provider, ProviderCheck, ProviderCreate, ProviderUpdate
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
if TYPE_CHECKING:
from letta.server.server import SyncServer
@@ -32,14 +32,14 @@ async def list_providers(
order_by: Literal["created_at"] = Query("created_at", description="Field to sort by"),
name: Optional[str] = Query(None, description="Filter providers by name"),
provider_type: Optional[ProviderType] = Query(None, description="Filter providers by type"),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Get a list of all custom providers.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
providers = await server.provider_manager.list_providers_async(
before=before, after=after, limit=limit, actor=actor, name=name, provider_type=provider_type, ascending=(order == "asc")
)
@@ -53,13 +53,13 @@ async def list_providers(
@router.post("/", response_model=Provider, operation_id="create_provider")
async def create_provider(
request: ProviderCreate = Body(...),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Create a new custom provider.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
for field_name in request.model_fields:
value = getattr(request, field_name, None)
if isinstance(value, str) and value == "":
@@ -75,13 +75,13 @@ async def create_provider(
async def modify_provider(
provider_id: str,
request: ProviderUpdate = Body(...),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Update an existing custom provider.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.provider_manager.update_provider_async(provider_id=provider_id, provider_update=request, actor=actor)
@@ -110,14 +110,14 @@ async def check_provider(
@router.delete("/{provider_id}", response_model=None, operation_id="delete_provider")
async def delete_provider(
provider_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Delete an existing custom provider.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.provider_manager.delete_provider_by_id_async(provider_id=provider_id, actor=actor)
return JSONResponse(status_code=status.HTTP_200_OK, content={"message": f"Provider id={provider_id} successfully deleted"})
except NoResultFound:
diff --git a/letta/server/rest_api/routers/v1/runs.py b/letta/server/rest_api/routers/v1/runs.py
index 05a7b09be..86d305ea2 100644
--- a/letta/server/rest_api/routers/v1/runs.py
+++ b/letta/server/rest_api/routers/v1/runs.py
@@ -1,25 +1,25 @@
from datetime import timedelta
from typing import Annotated, List, Literal, Optional
-from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query
+from fastapi import APIRouter, Body, Depends, HTTPException, Query
from pydantic import Field
from letta.data_sources.redis_client import NoopAsyncRedisClient, get_redis_client
from letta.helpers.datetime_helpers import get_utc_time
from letta.orm.errors import NoResultFound
-from letta.schemas.enums import JobStatus, JobType, MessageRole
+from letta.schemas.enums import JobStatus, JobType
from letta.schemas.letta_message import LettaMessageUnion
from letta.schemas.letta_request import RetrieveStreamRequest
from letta.schemas.openai.chat_completion_response import UsageStatistics
from letta.schemas.run import Run
from letta.schemas.step import Step
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.rest_api.redis_stream_manager import redis_sse_stream_generator
from letta.server.rest_api.streaming_response import (
StreamingResponseWithStatusCode,
add_keepalive_to_stream,
cancellation_aware_stream_wrapper,
)
-from letta.server.rest_api.utils import get_letta_server
from letta.server.server import SyncServer
from letta.settings import settings
@@ -38,12 +38,12 @@ def list_runs(
False,
description="Whether to sort agents oldest to newest (True) or newest to oldest (False, default)",
),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all runs.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
runs = [
Run.from_job(job)
@@ -68,12 +68,12 @@ def list_active_runs(
server: "SyncServer" = Depends(get_letta_server),
agent_ids: Optional[List[str]] = Query(None, description="The unique identifier of the agent associated with the run."),
background: Optional[bool] = Query(None, description="If True, filters for runs that were created in background mode."),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all active runs.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
active_runs = server.job_manager.list_jobs(actor=actor, statuses=[JobStatus.created, JobStatus.running], job_type=JobType.RUN)
active_runs = [Run.from_job(job) for job in active_runs]
@@ -90,13 +90,13 @@ def list_active_runs(
@router.get("/{run_id}", response_model=Run, operation_id="retrieve_run")
def retrieve_run(
run_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Get the status of a run.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
try:
job = server.job_manager.get_job_by_id(job_id=run_id, actor=actor)
@@ -118,7 +118,7 @@ RunMessagesResponse = Annotated[
async def list_run_messages(
run_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
before: Optional[str] = Query(
None, description="Message ID cursor for pagination. Returns messages that come before this message ID in the specified sort order"
),
@@ -131,7 +131,7 @@ async def list_run_messages(
),
):
"""Get response messages associated with a run."""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
messages = server.job_manager.get_run_messages(
@@ -150,13 +150,13 @@ async def list_run_messages(
@router.get("/{run_id}/usage", response_model=UsageStatistics, operation_id="retrieve_run_usage")
def retrieve_run_usage(
run_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Get usage statistics for a run.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
try:
usage = server.job_manager.get_job_usage(job_id=run_id, actor=actor)
@@ -173,7 +173,7 @@ def retrieve_run_usage(
async def list_run_steps(
run_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
before: Optional[str] = Query(None, description="Cursor for pagination"),
after: Optional[str] = Query(None, description="Cursor for pagination"),
limit: Optional[int] = Query(100, description="Maximum number of messages to return"),
@@ -197,7 +197,7 @@ async def list_run_steps(
if order not in ["asc", "desc"]:
raise HTTPException(status_code=400, detail="Order must be 'asc' or 'desc'")
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
steps = server.job_manager.get_job_steps(
@@ -216,13 +216,13 @@ async def list_run_steps(
@router.delete("/{run_id}", response_model=Run, operation_id="delete_run")
async def delete_run(
run_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
"""
Delete a run by its run_id.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
job = await server.job_manager.delete_job_by_id_async(job_id=run_id, actor=actor)
@@ -266,10 +266,10 @@ async def delete_run(
async def retrieve_stream(
run_id: str,
request: RetrieveStreamRequest = Body(None),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: "SyncServer" = Depends(get_letta_server),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
job = server.job_manager.get_job_by_id(job_id=run_id, actor=actor)
except NoResultFound:
diff --git a/letta/server/rest_api/routers/v1/sandbox_configs.py b/letta/server/rest_api/routers/v1/sandbox_configs.py
index f1529ec03..86b723691 100644
--- a/letta/server/rest_api/routers/v1/sandbox_configs.py
+++ b/letta/server/rest_api/routers/v1/sandbox_configs.py
@@ -17,7 +17,7 @@ from letta.schemas.sandbox_config import (
SandboxConfigCreate,
SandboxConfigUpdate,
)
-from letta.server.rest_api.utils import get_letta_server, get_user_id
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.services.helpers.tool_execution_helper import create_venv_for_local_sandbox, install_pip_requirements_for_sandbox
@@ -32,9 +32,9 @@ logger = get_logger(__name__)
async def create_sandbox_config(
config_create: SandboxConfigCreate,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.create_or_update_sandbox_config_async(config_create, actor)
@@ -42,18 +42,18 @@ async def create_sandbox_config(
@router.post("/e2b/default", response_model=PydanticSandboxConfig)
async def create_default_e2b_sandbox_config(
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.get_or_create_default_sandbox_config_async(sandbox_type=SandboxType.E2B, actor=actor)
@router.post("/local/default", response_model=PydanticSandboxConfig)
async def create_default_local_sandbox_config(
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.get_or_create_default_sandbox_config_async(sandbox_type=SandboxType.LOCAL, actor=actor)
@@ -61,7 +61,7 @@ async def create_default_local_sandbox_config(
async def create_custom_local_sandbox_config(
local_sandbox_config: LocalSandboxConfig,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create or update a custom LocalSandboxConfig, including pip_requirements.
@@ -74,7 +74,7 @@ async def create_custom_local_sandbox_config(
)
# Retrieve the user (actor)
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Wrap the LocalSandboxConfig into a SandboxConfigCreate
sandbox_config_create = SandboxConfigCreate(config=local_sandbox_config)
@@ -90,9 +90,9 @@ async def update_sandbox_config(
sandbox_config_id: str,
config_update: SandboxConfigUpdate,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.update_sandbox_config_async(sandbox_config_id, config_update, actor)
@@ -100,9 +100,9 @@ async def update_sandbox_config(
async def delete_sandbox_config(
sandbox_config_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.sandbox_config_manager.delete_sandbox_config_async(sandbox_config_id, actor)
@@ -112,22 +112,22 @@ async def list_sandbox_configs(
after: Optional[str] = Query(None, description="Pagination cursor to fetch the next set of results"),
sandbox_type: Optional[SandboxType] = Query(None, description="Filter for this specific sandbox type"),
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.list_sandbox_configs_async(actor, limit=limit, after=after, sandbox_type=sandbox_type)
@router.post("/local/recreate-venv", response_model=PydanticSandboxConfig)
async def force_recreate_local_sandbox_venv(
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Forcefully recreate the virtual environment for the local sandbox.
Deletes and recreates the venv, then reinstalls required dependencies.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Retrieve the local sandbox config
sbx_config = await server.sandbox_config_manager.get_or_create_default_sandbox_config_async(sandbox_type=SandboxType.LOCAL, actor=actor)
@@ -169,9 +169,9 @@ async def create_sandbox_env_var(
sandbox_config_id: str,
env_var_create: SandboxEnvironmentVariableCreate,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.create_sandbox_env_var_async(env_var_create, sandbox_config_id, actor)
@@ -180,9 +180,9 @@ async def update_sandbox_env_var(
env_var_id: str,
env_var_update: SandboxEnvironmentVariableUpdate,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.update_sandbox_env_var_async(env_var_id, env_var_update, actor)
@@ -190,9 +190,9 @@ async def update_sandbox_env_var(
async def delete_sandbox_env_var(
env_var_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.sandbox_config_manager.delete_sandbox_env_var_async(env_var_id, actor)
@@ -202,7 +202,7 @@ async def list_sandbox_env_vars(
limit: int = Query(1000, description="Number of results to return"),
after: Optional[str] = Query(None, description="Pagination cursor to fetch the next set of results"),
server: SyncServer = Depends(get_letta_server),
- actor_id: str = Depends(get_user_id),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.sandbox_config_manager.list_sandbox_env_vars_async(sandbox_config_id, actor, limit=limit, after=after)
diff --git a/letta/server/rest_api/routers/v1/sources.py b/letta/server/rest_api/routers/v1/sources.py
index 7496be322..69e09eb06 100644
--- a/letta/server/rest_api/routers/v1/sources.py
+++ b/letta/server/rest_api/routers/v1/sources.py
@@ -1,11 +1,10 @@
-import asyncio
import mimetypes
import os
import tempfile
from pathlib import Path
from typing import List, Optional
-from fastapi import APIRouter, Depends, Header, HTTPException, Query, UploadFile
+from fastapi import APIRouter, Depends, HTTPException, Query, UploadFile
from starlette import status
from starlette.responses import Response
@@ -26,7 +25,7 @@ from letta.schemas.passage import Passage
from letta.schemas.source import Source, SourceCreate, SourceUpdate
from letta.schemas.source_metadata import OrganizationSourcesStats
from letta.schemas.user import User
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.services.file_processor.embedder.openai_embedder import OpenAIEmbedder
from letta.services.file_processor.embedder.pinecone_embedder import PineconeEmbedder
@@ -48,12 +47,12 @@ router = APIRouter(prefix="/sources", tags=["sources"])
@router.get("/count", response_model=int, operation_id="count_sources")
async def count_sources(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Count all data sources created by a user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.source_manager.size_async(actor=actor)
@@ -61,12 +60,12 @@ async def count_sources(
async def retrieve_source(
source_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get all sources
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
source = await server.source_manager.get_source_by_id(source_id=source_id, actor=actor)
if not source:
@@ -78,12 +77,12 @@ async def retrieve_source(
async def get_source_id_by_name(
source_name: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a source by name
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
source = await server.source_manager.get_source_by_name(source_name=source_name, actor=actor)
if not source:
@@ -94,7 +93,7 @@ async def get_source_id_by_name(
@router.get("/metadata", response_model=OrganizationSourcesStats, operation_id="get_sources_metadata")
async def get_sources_metadata(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
include_detailed_per_source_metadata: bool = False,
):
"""
@@ -106,7 +105,7 @@ async def get_sources_metadata(
- Total size of all files
- Per-source breakdown with file details (file_name, file_size per file) if include_detailed_per_source_metadata is True
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.file_manager.get_organization_sources_metadata(
actor=actor, include_detailed_per_source_metadata=include_detailed_per_source_metadata
)
@@ -115,12 +114,12 @@ async def get_sources_metadata(
@router.get("/", response_model=List[Source], operation_id="list_sources")
async def list_sources(
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all data sources created by a user.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.source_manager.list_sources(actor=actor)
@@ -128,12 +127,12 @@ async def list_sources(
async def create_source(
source_create: SourceCreate,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create a new data source.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# TODO: need to asyncify this
if not source_create.embedding_config:
@@ -163,13 +162,13 @@ async def modify_source(
source_id: str,
source: SourceUpdate,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Update the name or documentation of an existing data source.
"""
# TODO: allow updating the handle/embedding config
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
if not await server.source_manager.get_source_by_id(source_id=source_id, actor=actor):
raise HTTPException(status_code=404, detail=f"Source with id={source_id} does not exist.")
return await server.source_manager.update_source(source_id=source_id, source_update=source, actor=actor)
@@ -179,12 +178,12 @@ async def modify_source(
async def delete_source(
source_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a data source.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
source = await server.source_manager.get_source_by_id(source_id=source_id, actor=actor)
agent_states = await server.source_manager.list_attached_agents(source_id=source_id, actor=actor)
files = await server.file_manager.list_files(source_id, actor)
@@ -219,7 +218,7 @@ async def upload_file_to_source(
duplicate_handling: DuplicateFileHandling = Query(DuplicateFileHandling.SUFFIX, description="How to handle duplicate filenames"),
name: Optional[str] = Query(None, description="Optional custom name to override the uploaded file's name"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Upload a file to a data source.
@@ -256,7 +255,7 @@ async def upload_file_to_source(
),
)
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
source = await server.source_manager.get_source_by_id(source_id=source_id, actor=actor)
if source is None:
@@ -334,12 +333,12 @@ async def upload_file_to_source(
async def get_agents_for_source(
source_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get all agent IDs that have the specified source attached.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.source_manager.get_agents_for_source_id(source_id=source_id, actor=actor)
@@ -350,12 +349,12 @@ async def list_source_passages(
before: Optional[str] = Query(None, description="Message before which to retrieve the returned messages."),
limit: int = Query(100, description="Maximum number of messages to retrieve."),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
List all passages associated with a data source.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.agent_manager.query_source_passages_async(
actor=actor,
source_id=source_id,
@@ -376,12 +375,12 @@ async def list_source_files(
description="Whether to check and update file processing status (from the vector db service). If False, will not fetch and update the status, which may lead to performance gains.",
),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
List paginated files associated with a data source.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.file_manager.list_files(
source_id=source_id,
limit=limit,
@@ -399,12 +398,12 @@ async def get_file_metadata(
file_id: str,
include_content: bool = Query(False, description="Whether to include full file content"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Retrieve metadata for a specific file by its ID.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Get file metadata using the file manager
file_metadata = await server.file_manager.get_file_by_id(
@@ -431,12 +430,12 @@ async def delete_file_from_source(
source_id: str,
file_id: str,
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a data source.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
deleted_file = await server.file_manager.delete_file(file_id=file_id, actor=actor)
diff --git a/letta/server/rest_api/routers/v1/steps.py b/letta/server/rest_api/routers/v1/steps.py
index 2850e9806..5b957e50b 100644
--- a/letta/server/rest_api/routers/v1/steps.py
+++ b/letta/server/rest_api/routers/v1/steps.py
@@ -8,7 +8,7 @@ from letta.orm.errors import NoResultFound
from letta.schemas.provider_trace import ProviderTrace
from letta.schemas.step import Step
from letta.schemas.step_metrics import StepMetrics
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.services.step_manager import FeedbackType
from letta.settings import settings
@@ -35,7 +35,7 @@ async def list_steps(
tags: Optional[list[str]] = Query(None, description="Filter by tags"),
project_id: Optional[str] = Query(None, description="Filter by the project ID that is associated with the step (cloud only)."),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
x_project: Optional[str] = Header(
None, alias="X-Project", description="Filter by project slug to associate with the group (cloud only)."
), # Only handled by next js middleware
@@ -43,7 +43,7 @@ async def list_steps(
"""
List steps with optional pagination and date filters.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Convert ISO strings to datetime objects if provided
start_dt = datetime.fromisoformat(start_date) if start_date else None
@@ -69,14 +69,14 @@ async def list_steps(
@router.get("/{step_id}", response_model=Step, operation_id="retrieve_step")
async def retrieve_step(
step_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: SyncServer = Depends(get_letta_server),
):
"""
Get a step by ID.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.step_manager.get_step_async(step_id=step_id, actor=actor)
except NoResultFound:
raise HTTPException(status_code=404, detail="Step not found")
@@ -85,14 +85,14 @@ async def retrieve_step(
@router.get("/{step_id}/metrics", response_model=StepMetrics, operation_id="retrieve_step_metrics")
async def retrieve_step_metrics(
step_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: SyncServer = Depends(get_letta_server),
):
"""
Get step metrics by step ID.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.step_manager.get_step_metrics_async(step_id=step_id, actor=actor)
except NoResultFound:
raise HTTPException(status_code=404, detail="Step metrics not found")
@@ -102,13 +102,13 @@ async def retrieve_step_metrics(
async def retrieve_step_trace(
step_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
provider_trace = None
if settings.track_provider_trace:
try:
provider_trace = await server.telemetry_manager.get_provider_trace_by_step_id_async(
- step_id=step_id, actor=await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ step_id=step_id, actor=await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
)
except:
pass
@@ -125,14 +125,14 @@ class AddFeedbackRequest(BaseModel):
async def add_feedback(
step_id: str,
request: AddFeedbackRequest = Body(...),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: SyncServer = Depends(get_letta_server),
):
"""
Add feedback to a step.
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.step_manager.add_feedback_async(step_id=step_id, feedback=request.feedback, tags=request.tags, actor=actor)
except NoResultFound:
raise HTTPException(status_code=404, detail="Step not found")
@@ -142,13 +142,13 @@ async def add_feedback(
async def update_step_transaction_id(
step_id: str,
transaction_id: str,
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
server: SyncServer = Depends(get_letta_server),
):
"""
Update the transaction ID for a step.
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
try:
return await server.step_manager.update_step_transaction_id(actor=actor, step_id=step_id, transaction_id=transaction_id)
diff --git a/letta/server/rest_api/routers/v1/tags.py b/letta/server/rest_api/routers/v1/tags.py
index 7e0063609..5411b251b 100644
--- a/letta/server/rest_api/routers/v1/tags.py
+++ b/letta/server/rest_api/routers/v1/tags.py
@@ -1,8 +1,8 @@
from typing import TYPE_CHECKING, List, Literal, Optional
-from fastapi import APIRouter, Depends, Header, Query
+from fastapi import APIRouter, Depends, Query
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
if TYPE_CHECKING:
from letta.server.server import SyncServer
@@ -26,12 +26,12 @@ async def list_tags(
order_by: Literal["name"] = Query("name", description="Field to sort by"),
query_text: Optional[str] = Query(None, description="Filter tags by text search"),
server: "SyncServer" = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get the list of all agent tags that have been created.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
tags = await server.agent_manager.list_tags_async(
actor=actor, before=before, after=after, limit=limit, query_text=query_text, ascending=(order == "asc")
)
diff --git a/letta/server/rest_api/routers/v1/telemetry.py b/letta/server/rest_api/routers/v1/telemetry.py
index d17a378be..864212218 100644
--- a/letta/server/rest_api/routers/v1/telemetry.py
+++ b/letta/server/rest_api/routers/v1/telemetry.py
@@ -1,9 +1,9 @@
from typing import Optional
-from fastapi import APIRouter, Depends, Header
+from fastapi import APIRouter, Depends
from letta.schemas.provider_trace import ProviderTrace
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.server import SyncServer
from letta.settings import settings
@@ -14,13 +14,13 @@ router = APIRouter(prefix="/telemetry", tags=["telemetry"])
async def retrieve_provider_trace_by_step_id(
step_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: str | None = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
provider_trace = None
if settings.track_provider_trace:
try:
provider_trace = await server.telemetry_manager.get_provider_trace_by_step_id_async(
- step_id=step_id, actor=await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ step_id=step_id, actor=await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
)
except:
pass
diff --git a/letta/server/rest_api/routers/v1/tools.py b/letta/server/rest_api/routers/v1/tools.py
index 42c89e44e..0db5df9cc 100644
--- a/letta/server/rest_api/routers/v1/tools.py
+++ b/letta/server/rest_api/routers/v1/tools.py
@@ -11,7 +11,7 @@ from composio.exceptions import (
EnumMetadataNotFound,
EnumStringNotFound,
)
-from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Request
+from fastapi import APIRouter, Body, Depends, HTTPException, Query, Request
from httpx import ConnectError, HTTPStatusError
from pydantic import BaseModel, Field
from starlette.responses import StreamingResponse
@@ -34,8 +34,8 @@ from letta.schemas.mcp import UpdateSSEMCPServer, UpdateStdioMCPServer, UpdateSt
from letta.schemas.message import Message
from letta.schemas.pip_requirement import PipRequirement
from letta.schemas.tool import Tool, ToolCreate, ToolRunFromSource, ToolUpdate
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
from letta.server.rest_api.streaming_response import StreamingResponseWithStatusCode
-from letta.server.rest_api.utils import get_letta_server
from letta.server.server import SyncServer
from letta.services.mcp.oauth_utils import MCPOAuthSession, drill_down_exception, oauth_stream_event
from letta.services.mcp.stdio_client import AsyncStdioMCPClient
@@ -51,12 +51,12 @@ logger = get_logger(__name__)
async def delete_tool(
tool_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a tool by name
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
await server.tool_manager.delete_tool_by_id_async(tool_id=tool_id, actor=actor)
@@ -75,7 +75,7 @@ async def count_tools(
return_only_letta_tools: Optional[bool] = Query(False, description="Count only tools with tool_type starting with 'letta_'"),
exclude_letta_tools: Optional[bool] = Query(False, description="Exclude built-in Letta tools from the count"),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a count of all tools available to agents belonging to the org of the user.
@@ -110,7 +110,7 @@ async def count_tools(
tool_types_str = parse_tool_types(tool_types)
exclude_tool_types_str = parse_tool_types(exclude_tool_types)
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Combine single name with names list for unified processing (same logic as list_tools)
combined_names = []
@@ -158,12 +158,12 @@ async def count_tools(
async def retrieve_tool(
tool_id: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a tool by ID
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
tool = await server.tool_manager.get_tool_by_id_async(tool_id=tool_id, actor=actor)
if tool is None:
# return 404 error
@@ -196,7 +196,7 @@ async def list_tools(
),
return_only_letta_tools: Optional[bool] = Query(False, description="Return only tools with tool_type starting with 'letta_'"),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a list of all tools available to agents.
@@ -231,7 +231,7 @@ async def list_tools(
tool_types_str = parse_tool_types(tool_types)
exclude_tool_types_str = parse_tool_types(exclude_tool_types)
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Combine single name with names list for unified processing
combined_names = []
@@ -282,13 +282,13 @@ async def list_tools(
async def create_tool(
request: ToolCreate = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create a new tool
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
tool = Tool(**request.model_dump(exclude_unset=True))
return await server.tool_manager.create_tool_async(pydantic_tool=tool, actor=actor)
except UniqueConstraintViolationError as e:
@@ -306,13 +306,13 @@ async def create_tool(
async def upsert_tool(
request: ToolCreate = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Create or update a tool
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
tool = await server.tool_manager.create_or_update_tool_async(
pydantic_tool=Tool(**request.model_dump(exclude_unset=True)), actor=actor
)
@@ -333,13 +333,13 @@ async def modify_tool(
tool_id: str,
request: ToolUpdate = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Update an existing tool
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
tool = await server.tool_manager.update_tool_by_id_async(tool_id=tool_id, tool_update=request, actor=actor)
return tool
except LettaToolNameConflictError as e:
@@ -356,12 +356,12 @@ async def modify_tool(
@router.post("/add-base-tools", response_model=List[Tool], operation_id="add_base_tools")
async def upsert_base_tools(
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Upsert base tools
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
return await server.tool_manager.upsert_base_tools_async(actor=actor)
@@ -369,12 +369,12 @@ async def upsert_base_tools(
async def run_tool_from_source(
server: SyncServer = Depends(get_letta_server),
request: ToolRunFromSource = Body(...),
- actor_id: Optional[str] = Header(None, alias="user_id"), # Extract user_id from header, default to None if not present
+ headers: HeaderParams = Depends(get_headers),
):
"""
Attempt to build a tool from source, then run it on the provided arguments
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
return await server.run_tool_from_source(
@@ -399,11 +399,14 @@ async def run_tool_from_source(
# Specific routes for Composio
@router.get("/composio/apps", response_model=List[AppModel], operation_id="list_composio_apps")
-def list_composio_apps(server: SyncServer = Depends(get_letta_server), user_id: Optional[str] = Header(None, alias="user_id")):
+def list_composio_apps(
+ server: SyncServer = Depends(get_letta_server),
+ headers: HeaderParams = Depends(get_headers),
+):
"""
Get a list of all Composio apps
"""
- actor = server.user_manager.get_user_or_default(user_id=user_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
composio_api_key = get_composio_api_key(actor=actor, logger=logger)
if not composio_api_key:
raise HTTPException(
@@ -417,12 +420,12 @@ def list_composio_apps(server: SyncServer = Depends(get_letta_server), user_id:
def list_composio_actions_by_app(
composio_app_name: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a list of all Composio actions for a specific app
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
composio_api_key = get_composio_api_key(actor=actor, logger=logger)
if not composio_api_key:
raise HTTPException(
@@ -436,12 +439,12 @@ def list_composio_actions_by_app(
async def add_composio_tool(
composio_action_name: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Add a new Composio tool by action name (Composio refers to each tool as an `Action`)
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
tool_create = ToolCreate.from_composio(action_name=composio_action_name)
@@ -526,14 +529,17 @@ async def add_composio_tool(
response_model=dict[str, Union[SSEServerConfig, StdioServerConfig, StreamableHTTPServerConfig]],
operation_id="list_mcp_servers",
)
-async def list_mcp_servers(server: SyncServer = Depends(get_letta_server), user_id: Optional[str] = Header(None, alias="user_id")):
+async def list_mcp_servers(
+ server: SyncServer = Depends(get_letta_server),
+ headers: HeaderParams = Depends(get_headers),
+):
"""
Get a list of all configured MCP servers
"""
if tool_settings.mcp_read_from_config:
return server.get_mcp_servers()
else:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=user_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
mcp_servers = await server.mcp_manager.list_mcp_servers(actor=actor)
return {server.server_name: server.to_config(resolve_variables=False) for server in mcp_servers}
@@ -544,13 +550,13 @@ async def list_mcp_servers(server: SyncServer = Depends(get_letta_server), user_
async def list_mcp_tools_by_server(
mcp_server_name: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Get a list of all tools for a specific MCP server
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
mcp_tools = await server.mcp_manager.list_mcp_server_tools(mcp_server_name=mcp_server_name, actor=actor)
return mcp_tools
except Exception as e:
@@ -587,7 +593,7 @@ async def list_mcp_tools_by_server(
async def resync_mcp_server_tools(
mcp_server_name: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
agent_id: Optional[str] = None,
):
"""
@@ -599,7 +605,7 @@ async def resync_mcp_server_tools(
Returns a summary of changes made.
"""
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
try:
result = await server.mcp_manager.resync_mcp_server_tools(mcp_server_name=mcp_server_name, actor=actor, agent_id=agent_id)
@@ -630,12 +636,12 @@ async def add_mcp_tool(
mcp_server_name: str,
mcp_tool_name: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Register a new MCP tool as a Letta server by MCP server + tool name
"""
- actor = server.user_manager.get_user_or_default(user_id=actor_id)
+ actor = server.user_manager.get_user_or_default(user_id=headers.actor_id)
if tool_settings.mcp_read_from_config:
try:
@@ -709,13 +715,13 @@ async def add_mcp_tool(
async def add_mcp_server_to_config(
request: Union[StdioServerConfig, SSEServerConfig, StreamableHTTPServerConfig] = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Add a new MCP server to the Letta MCP server config
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
if tool_settings.mcp_read_from_config:
# write to config file
@@ -778,13 +784,13 @@ async def update_mcp_server(
mcp_server_name: str,
request: Union[UpdateStdioMCPServer, UpdateSSEMCPServer, UpdateStreamableHTTPMCPServer] = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Update an existing MCP server configuration
"""
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
if tool_settings.mcp_read_from_config:
raise HTTPException(status_code=501, detail="Update not implemented for config file mode, config files to be deprecated.")
@@ -808,7 +814,7 @@ async def update_mcp_server(
async def delete_mcp_server_from_config(
mcp_server_name: str,
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Delete a MCP server configuration
@@ -818,7 +824,7 @@ async def delete_mcp_server_from_config(
return server.delete_mcp_server_from_config(server_name=mcp_server_name)
else:
# log to DB
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
mcp_server_id = await server.mcp_manager.get_mcp_server_id_by_name(mcp_server_name, actor)
await server.mcp_manager.delete_mcp_server_by_id(mcp_server_id, actor=actor)
@@ -832,7 +838,7 @@ async def delete_mcp_server_from_config(
async def test_mcp_server(
request: Union[StdioServerConfig, SSEServerConfig, StreamableHTTPServerConfig] = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Test connection to an MCP server without adding it.
@@ -840,7 +846,7 @@ async def test_mcp_server(
"""
client = None
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
request.resolve_environment_variables()
client = await server.mcp_manager.get_mcp_client(request, actor)
@@ -899,7 +905,7 @@ async def test_mcp_server(
async def connect_mcp_server(
request: Union[StdioServerConfig, SSEServerConfig, StreamableHTTPServerConfig] = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
http_request: Request = None,
) -> StreamingResponse:
"""
@@ -918,7 +924,7 @@ async def connect_mcp_server(
# Acknolwedge connection attempt
yield oauth_stream_event(OauthStreamEvent.CONNECTION_ATTEMPT, server_name=request.server_name)
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Create MCP client with respective transport type
try:
@@ -985,7 +991,7 @@ class CodeInput(BaseModel):
async def generate_json_schema(
request: CodeInput = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Generate a JSON schema from the given source code defining a function or class.
@@ -1016,7 +1022,7 @@ async def execute_mcp_tool(
tool_name: str,
request: MCPToolExecuteRequest = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Execute a specific MCP tool from a configured server.
@@ -1024,7 +1030,7 @@ async def execute_mcp_tool(
"""
client = None
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Get the MCP server by name
mcp_server = await server.mcp_manager.get_mcp_server(mcp_server_name, actor)
@@ -1128,7 +1134,7 @@ class GenerateToolOutput(BaseModel):
async def generate_tool_from_prompt(
request: GenerateToolInput = Body(...),
server: SyncServer = Depends(get_letta_server),
- actor_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
"""
Generate a tool from the given user prompt.
@@ -1136,7 +1142,7 @@ async def generate_tool_from_prompt(
response_data = None
try:
- actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
llm_config = await server.get_cached_llm_config_async(actor=actor, handle=request.handle or "anthropic/claude-3-5-sonnet-20240620")
formatted_prompt = (
f"Generate a python function named {request.tool_name} using the instructions below "
diff --git a/letta/server/rest_api/routers/v1/users.py b/letta/server/rest_api/routers/v1/users.py
index d12315cdb..cce47a659 100644
--- a/letta/server/rest_api/routers/v1/users.py
+++ b/letta/server/rest_api/routers/v1/users.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, List, Optional
from fastapi import APIRouter, Body, Depends, HTTPException, Query
from letta.schemas.user import User, UserCreate, UserUpdate
-from letta.server.rest_api.utils import get_letta_server
+from letta.server.rest_api.dependencies import get_letta_server
if TYPE_CHECKING:
from letta.schemas.user import User
diff --git a/letta/server/rest_api/routers/v1/voice.py b/letta/server/rest_api/routers/v1/voice.py
index a8b172de2..4356e2304 100644
--- a/letta/server/rest_api/routers/v1/voice.py
+++ b/letta/server/rest_api/routers/v1/voice.py
@@ -1,12 +1,13 @@
-from typing import TYPE_CHECKING, Any, Dict, Optional
+from typing import TYPE_CHECKING, Any, Dict
import openai
-from fastapi import APIRouter, Body, Depends, Header
+from fastapi import APIRouter, Body, Depends
from fastapi.responses import StreamingResponse
from letta.agents.voice_agent import VoiceAgent
from letta.log import get_logger
-from letta.server.rest_api.utils import get_letta_server, get_user_message_from_chat_completions_request
+from letta.server.rest_api.dependencies import HeaderParams, get_headers, get_letta_server
+from letta.server.rest_api.utils import get_user_message_from_chat_completions_request
from letta.settings import model_settings
if TYPE_CHECKING:
@@ -33,9 +34,9 @@ async def create_voice_chat_completions(
agent_id: str,
completion_request: Dict[str, Any] = Body(...), # The validation is soft in case providers like VAPI send extra params
server: "SyncServer" = Depends(get_letta_server),
- user_id: Optional[str] = Header(None, alias="user_id"),
+ headers: HeaderParams = Depends(get_headers),
):
- actor = await server.user_manager.get_actor_or_default_async(actor_id=user_id)
+ actor = await server.user_manager.get_actor_or_default_async(actor_id=headers.actor_id)
# Create OpenAI async client
client = openai.AsyncClient(
diff --git a/letta/server/rest_api/utils.py b/letta/server/rest_api/utils.py
index 5dbdc0de3..bf6647286 100644
--- a/letta/server/rest_api/utils.py
+++ b/letta/server/rest_api/utils.py
@@ -3,7 +3,7 @@ import json
import os
import uuid
from enum import Enum
-from typing import TYPE_CHECKING, AsyncGenerator, Dict, Iterable, List, Optional, Union, cast
+from typing import AsyncGenerator, Dict, Iterable, List, Optional, Union, cast
from fastapi import Header, HTTPException
from openai.types.chat import ChatCompletionMessageParam
@@ -35,9 +35,6 @@ from letta.schemas.usage import LettaUsageStatistics
from letta.schemas.user import User
from letta.system import get_heartbeat, package_function_response
-if TYPE_CHECKING:
- from letta.server.server import SyncServer
-
SENTRY_ENABLED = bool(os.getenv("SENTRY_DSN"))
if SENTRY_ENABLED:
@@ -145,20 +142,6 @@ async def sse_async_generator(
yield sse_formatter(SSE_FINISH_MSG)
-# TODO: why does this double up the interface?
-def get_letta_server() -> "SyncServer":
- # Check if a global server is already instantiated
- from letta.server.rest_api.app import server
-
- # assert isinstance(server, SyncServer)
- return server
-
-
-# Dependency to get user_id from headers
-def get_user_id(user_id: Optional[str] = Header(None, alias="user_id")) -> Optional[str]:
- return user_id
-
-
def capture_sentry_exception(e: BaseException):
"""This will capture the exception in sentry, since the exception handler upstack (in FastAPI) won't catch it, because this may be a 200 response"""
if SENTRY_ENABLED: