letta-nightly 0.6.5.dev20241220104040__py3-none-any.whl → 0.6.6.dev20241221104005__py3-none-any.whl

letta/chat_only_agent.py

@@ -63,8 +63,8 @@ class ChatOnlyAgent(Agent):
                 conversation_persona_block_new = Block(
                     name="chat_agent_persona_new", label="chat_agent_persona_new", value=conversation_persona_block.value, limit=2000
                 )
-
-                recent_convo = "".join([str(message) for message in self.messages[3:]])[-self.recent_convo_limit :]
+                in_context_messages = self.agent_manager.get_in_context_messages(agent_id=self.agent_state.id, actor=self.user)
+                recent_convo = "".join([str(message) for message in in_context_messages[3:]])[-self.recent_convo_limit :]
                 conversation_messages_block = Block(
                     name="conversation_block", label="conversation_block", value=recent_convo, limit=self.recent_convo_limit
                 )

letta/client/client.py

@@ -2234,7 +2234,7 @@ class LocalClient(AbstractClient):
         """
         # TODO: add the abilitty to reset linked block_ids
         self.interface.clear()
-        agent_state = self.server.update_agent(
+        agent_state = self.server.agent_manager.update_agent(
             agent_id,
             UpdateAgent(
                 name=name,
@@ -2262,7 +2262,7 @@ class LocalClient(AbstractClient):
             List[Tool]: A list of Tool objs
         """
         self.interface.clear()
-        return self.server.get_tools_from_agent(agent_id=agent_id, user_id=self.user_id)
+        return self.server.agent_manager.get_agent_by_id(agent_id=agent_id, actor=self.user).tools
 
     def add_tool_to_agent(self, agent_id: str, tool_id: str):
         """
@@ -2276,7 +2276,7 @@ class LocalClient(AbstractClient):
             agent_state (AgentState): State of the updated agent
         """
         self.interface.clear()
-        agent_state = self.server.add_tool_to_agent(agent_id=agent_id, tool_id=tool_id, user_id=self.user_id)
+        agent_state = self.server.agent_manager.attach_tool(agent_id=agent_id, tool_id=tool_id, actor=self.user)
         return agent_state
 
     def remove_tool_from_agent(self, agent_id: str, tool_id: str):
@@ -2291,7 +2291,7 @@ class LocalClient(AbstractClient):
             agent_state (AgentState): State of the updated agent
         """
         self.interface.clear()
-        agent_state = self.server.remove_tool_from_agent(agent_id=agent_id, tool_id=tool_id, user_id=self.user_id)
+        agent_state = self.server.agent_manager.detach_tool(agent_id=agent_id, tool_id=tool_id, actor=self.user)
         return agent_state
 
     def rename_agent(self, agent_id: str, new_name: str):
@@ -2426,7 +2426,7 @@ class LocalClient(AbstractClient):
         Returns:
             messages (List[Message]): List of in-context messages
         """
-        return self.server.get_in_context_messages(agent_id=agent_id, actor=self.user)
+        return self.server.agent_manager.get_in_context_messages(agent_id=agent_id, actor=self.user)
 
     # agent interactions
 
@@ -2909,7 +2909,7 @@ class LocalClient(AbstractClient):
         job = self.server.job_manager.create_job(pydantic_job=job, actor=self.user)
 
         # TODO: implement blocking vs. non-blocking
-        self.server.load_file_to_source(source_id=source_id, file_path=filename, job_id=job.id)
+        self.server.load_file_to_source(source_id=source_id, file_path=filename, job_id=job.id, actor=self.user)
         return job
 
     def delete_file_from_source(self, source_id: str, file_id: str):
@@ -2987,7 +2987,11 @@ class LocalClient(AbstractClient):
             source_id (str): ID of the source
             source_name (str): Name of the source
         """
-        self.server.attach_source_to_agent(source_id=source_id, source_name=source_name, agent_id=agent_id, user_id=self.user_id)
+        if source_name:
+            source = self.server.source_manager.get_source_by_id(source_id=source_id, actor=self.user)
+            source_id = source.id
+
+        self.server.agent_manager.attach_source(source_id=source_id, agent_id=agent_id, actor=self.user)
 
     def detach_source_from_agent(self, agent_id: str, source_id: Optional[str] = None, source_name: Optional[str] = None):
         """
@@ -2999,7 +3003,10 @@ class LocalClient(AbstractClient):
         Returns:
             source (Source): Detached source
         """
-        return self.server.detach_source_from_agent(source_id=source_id, source_name=source_name, agent_id=agent_id, user_id=self.user_id)
+        if source_name:
+            source = self.server.source_manager.get_source_by_id(source_id=source_id, actor=self.user)
+            source_id = source.id
+        return self.server.agent_manager.detach_source(agent_id=agent_id, source_id=source_id, actor=self.user)
 
     def list_sources(self) -> List[Source]:
         """
@@ -3075,7 +3082,7 @@ class LocalClient(AbstractClient):
             agent_id (str): ID of the agent
             memory_id (str): ID of the memory
         """
-        self.server.delete_archival_memory(agent_id=agent_id, memory_id=memory_id, actor=self.user)
+        self.server.delete_archival_memory(memory_id=memory_id, actor=self.user)
 
     def get_archival_memory(
         self, agent_id: str, before: Optional[str] = None, after: Optional[str] = None, limit: Optional[int] = 1000

letta/client/streaming.py

@@ -59,8 +59,8 @@ def _sse_post(url: str, data: dict, headers: dict) -> Generator[LettaStreamingRe
                             yield ToolCallMessage(**chunk_data)
                         elif "tool_return" in chunk_data:
                             yield ToolReturnMessage(**chunk_data)
-                        elif "usage" in chunk_data:
-                            yield LettaUsageStatistics(**chunk_data["usage"])
+                        elif "step_count" in chunk_data:
+                            yield LettaUsageStatistics(**chunk_data)
                         else:
                             raise ValueError(f"Unknown message type in chunk_data: {chunk_data}")
 

letta/constants.py

@@ -69,6 +69,8 @@ INITIAL_BOOT_MESSAGE_SEND_MESSAGE_FIRST_MSG = STARTUP_QUOTES[2]
 
 CLI_WARNING_PREFIX = "Warning: "
 
+ERROR_MESSAGE_PREFIX = "Error"
+
 NON_USER_MSG_PREFIX = "[This is an automated system message hidden from the user] "
 
 # Constants to do with summarization / conversation length window

letta/main.py

@@ -194,46 +194,6 @@ def run_agent_loop(
                     print(f"Current model: {letta_agent.agent_state.llm_config.model}")
                     continue
 
-                elif user_input.lower() == "/pop" or user_input.lower().startswith("/pop "):
-                    # Check if there's an additional argument that's an integer
-                    command = user_input.strip().split()
-                    pop_amount = int(command[1]) if len(command) > 1 and command[1].isdigit() else 3
-                    try:
-                        popped_messages = letta_agent.pop_message(count=pop_amount)
-                    except ValueError as e:
-                        print(f"Error popping messages: {e}")
-                    continue
-
-                elif user_input.lower() == "/retry":
-                    print(f"Retrying for another answer...")
-                    try:
-                        letta_agent.retry_message()
-                    except Exception as e:
-                        print(f"Error retrying message: {e}")
-                    continue
-
-                elif user_input.lower() == "/rethink" or user_input.lower().startswith("/rethink "):
-                    if len(user_input) < len("/rethink "):
-                        print("Missing text after the command")
-                        continue
-                    try:
-                        letta_agent.rethink_message(new_thought=user_input[len("/rethink ") :].strip())
-                    except Exception as e:
-                        print(f"Error rethinking message: {e}")
-                    continue
-
-                elif user_input.lower() == "/rewrite" or user_input.lower().startswith("/rewrite "):
-                    if len(user_input) < len("/rewrite "):
-                        print("Missing text after the command")
-                        continue
-
-                    text = user_input[len("/rewrite ") :].strip()
-                    try:
-                        letta_agent.rewrite_message(new_text=text)
-                    except Exception as e:
-                        print(f"Error rewriting message: {e}")
-                    continue
-
                 elif user_input.lower() == "/summarize":
                     try:
                         letta_agent.summarize_messages_inplace()
@@ -319,42 +279,6 @@ def run_agent_loop(
                         questionary.print(cmd, "bold")
                         questionary.print(f" {desc}")
                     continue
-
-                elif user_input.lower().startswith("/systemswap"):
-                    if len(user_input) < len("/systemswap "):
-                        print("Missing new system prompt after the command")
-                        continue
-                    old_system_prompt = letta_agent.system
-                    new_system_prompt = user_input[len("/systemswap ") :].strip()
-
-                    # Show warning and prompts to user
-                    typer.secho(
-                        "\nWARNING: You are about to change the system prompt.",
-                        # fg=typer.colors.BRIGHT_YELLOW,
-                        bold=True,
-                    )
-                    typer.secho(
-                        f"\nOld system prompt:\n{old_system_prompt}",
-                        fg=typer.colors.RED,
-                        bold=True,
-                    )
-                    typer.secho(
-                        f"\nNew system prompt:\n{new_system_prompt}",
-                        fg=typer.colors.GREEN,
-                        bold=True,
-                    )
-
-                    # Ask for confirmation
-                    confirm = questionary.confirm("Do you want to proceed with the swap?").ask()
-
-                    if confirm:
-                        letta_agent.update_system_prompt(new_system_prompt=new_system_prompt)
-                        print("System prompt updated successfully.")
-                    else:
-                        print("System prompt swap cancelled.")
-
-                    continue
-
                 else:
                     print(f"Unrecognized command: {user_input}")
                     continue

letta/offline_memory_agent.py

@@ -129,9 +129,8 @@ class OfflineMemoryAgent(Agent):
         # extras
         first_message_verify_mono: bool = False,
         max_memory_rethinks: int = 10,
-        initial_message_sequence: Optional[List[Message]] = None,
     ):
-        super().__init__(interface, agent_state, user, initial_message_sequence=initial_message_sequence)
+        super().__init__(interface, agent_state, user)
         self.first_message_verify_mono = first_message_verify_mono
         self.max_memory_rethinks = max_memory_rethinks
 

letta/orm/source.py

@@ -11,10 +11,10 @@ from letta.schemas.embedding_config import EmbeddingConfig
 from letta.schemas.source import Source as PydanticSource
 
 if TYPE_CHECKING:
-    from letta.orm.organization import Organization
+    from letta.orm.agent import Agent
     from letta.orm.file import FileMetadata
+    from letta.orm.organization import Organization
     from letta.orm.passage import SourcePassage
-    from letta.orm.agent import Agent
 
 
 class Source(SqlalchemyBase, OrganizationMixin):
@@ -32,4 +32,11 @@ class Source(SqlalchemyBase, OrganizationMixin):
     organization: Mapped["Organization"] = relationship("Organization", back_populates="sources")
     files: Mapped[List["FileMetadata"]] = relationship("FileMetadata", back_populates="source", cascade="all, delete-orphan")
     passages: Mapped[List["SourcePassage"]] = relationship("SourcePassage", back_populates="source", cascade="all, delete-orphan")
-    agents: Mapped[List["Agent"]] = relationship("Agent", secondary="sources_agents", back_populates="sources")
+    agents: Mapped[List["Agent"]] = relationship(
+        "Agent",
+        secondary="sources_agents",
+        back_populates="sources",
+        lazy="selectin",
+        cascade="all, delete",  # Ensures rows in sources_agents are deleted when the source is deleted
+        passive_deletes=True,  # Allows the database to handle deletion of orphaned rows
+    )

letta/orm/sources_agents.py

@@ -9,5 +9,5 @@ class SourcesAgents(Base):
 
     __tablename__ = "sources_agents"
 
-    agent_id: Mapped[String] = mapped_column(String, ForeignKey("agents.id"), primary_key=True)
-    source_id: Mapped[String] = mapped_column(String, ForeignKey("sources.id"), primary_key=True)
+    agent_id: Mapped[String] = mapped_column(String, ForeignKey("agents.id", ondelete="CASCADE"), primary_key=True)
+    source_id: Mapped[String] = mapped_column(String, ForeignKey("sources.id", ondelete="CASCADE"), primary_key=True)

letta/providers.py

@@ -27,6 +27,10 @@ class Provider(BaseModel):
     def provider_tag(self) -> str:
         """String representation of the provider for display purposes"""
         raise NotImplementedError
+    
+    def get_handle(self, model_name: str) -> str:
+        return f"{self.name}/{model_name}"
+
 
 
 class LettaProvider(Provider):
@@ -40,6 +44,7 @@ class LettaProvider(Provider):
                 model_endpoint_type="openai",
                 model_endpoint="https://inference.memgpt.ai",
                 context_window=16384,
+                handle=self.get_handle("letta-free")
             )
         ]
 
@@ -51,6 +56,7 @@ class LettaProvider(Provider):
                 embedding_endpoint="https://embeddings.memgpt.ai",
                 embedding_dim=1024,
                 embedding_chunk_size=300,
+                handle=self.get_handle("letta-free")
             )
         ]
 
@@ -115,7 +121,7 @@ class OpenAIProvider(Provider):
                 # continue
 
             configs.append(
-                LLMConfig(model=model_name, model_endpoint_type="openai", model_endpoint=self.base_url, context_window=context_window_size)
+                LLMConfig(model=model_name, model_endpoint_type="openai", model_endpoint=self.base_url, context_window=context_window_size, handle=self.get_handle(model_name))
             )
 
         # for OpenAI, sort in reverse order
@@ -135,6 +141,7 @@ class OpenAIProvider(Provider):
                 embedding_endpoint="https://api.openai.com/v1",
                 embedding_dim=1536,
                 embedding_chunk_size=300,
+                handle=self.get_handle("text-embedding-ada-002")
             )
         ]
 
@@ -163,6 +170,7 @@ class AnthropicProvider(Provider):
                     model_endpoint_type="anthropic",
                     model_endpoint=self.base_url,
                     context_window=model["context_window"],
+                    handle=self.get_handle(model["name"])
                 )
             )
         return configs
@@ -195,6 +203,7 @@ class MistralProvider(Provider):
                         model_endpoint_type="openai",
                         model_endpoint=self.base_url,
                         context_window=model["max_context_length"],
+                        handle=self.get_handle(model["id"])
                     )
                 )
 
@@ -250,6 +259,7 @@ class OllamaProvider(OpenAIProvider):
                     model_endpoint=self.base_url,
                     model_wrapper=self.default_prompt_formatter,
                     context_window=context_window,
+                    handle=self.get_handle(model["name"])
                 )
             )
         return configs
@@ -325,6 +335,7 @@ class OllamaProvider(OpenAIProvider):
                     embedding_endpoint=self.base_url,
                     embedding_dim=embedding_dim,
                     embedding_chunk_size=300,
+                    handle=self.get_handle(model["name"])
                 )
             )
         return configs
@@ -345,7 +356,7 @@ class GroqProvider(OpenAIProvider):
                 continue
             configs.append(
                 LLMConfig(
-                    model=model["id"], model_endpoint_type="groq", model_endpoint=self.base_url, context_window=model["context_window"]
+                    model=model["id"], model_endpoint_type="groq", model_endpoint=self.base_url, context_window=model["context_window"], handle=self.get_handle(model["id"])
                 )
             )
         return configs
@@ -413,6 +424,7 @@ class TogetherProvider(OpenAIProvider):
                     model_endpoint=self.base_url,
                     model_wrapper=self.default_prompt_formatter,
                     context_window=context_window_size,
+                    handle=self.get_handle(model_name)
                 )
             )
 
@@ -493,6 +505,7 @@ class GoogleAIProvider(Provider):
                     model_endpoint_type="google_ai",
                     model_endpoint=self.base_url,
                     context_window=self.get_model_context_window(model),
+                    handle=self.get_handle(model)
                 )
             )
         return configs
@@ -516,6 +529,7 @@ class GoogleAIProvider(Provider):
                     embedding_endpoint=self.base_url,
                     embedding_dim=768,
                     embedding_chunk_size=300,  # NOTE: max is 2048
+                    handle=self.get_handle(model)
                 )
             )
         return configs
@@ -556,7 +570,7 @@ class AzureProvider(Provider):
             context_window_size = self.get_model_context_window(model_name)
             model_endpoint = get_azure_chat_completions_endpoint(self.base_url, model_name, self.api_version)
             configs.append(
-                LLMConfig(model=model_name, model_endpoint_type="azure", model_endpoint=model_endpoint, context_window=context_window_size)
+                LLMConfig(model=model_name, model_endpoint_type="azure", model_endpoint=model_endpoint, context_window=context_window_size), handle=self.get_handle(model_name)
             )
         return configs
 
@@ -577,6 +591,7 @@ class AzureProvider(Provider):
                     embedding_endpoint=model_endpoint,
                     embedding_dim=768,
                     embedding_chunk_size=300,  # NOTE: max is 2048
+                    handle=self.get_handle(model_name)
                 )
             )
         return configs
@@ -610,6 +625,7 @@ class VLLMChatCompletionsProvider(Provider):
                     model_endpoint_type="openai",
                     model_endpoint=self.base_url,
                     context_window=model["max_model_len"],
+                    handle=self.get_handle(model["id"])
                 )
             )
         return configs
@@ -642,6 +658,7 @@ class VLLMCompletionsProvider(Provider):
                     model_endpoint=self.base_url,
                     model_wrapper=self.default_prompt_formatter,
                     context_window=model["max_model_len"],
+                    handle=self.get_handle(model["id"])
                 )
             )
         return configs

letta/schemas/agent.py

@@ -118,6 +118,7 @@ class CreateAgent(BaseModel, validate_assignment=True):  #
     )
     context_window_limit: Optional[int] = Field(None, description="The context window limit used by the agent.")
     embedding_chunk_size: Optional[int] = Field(DEFAULT_EMBEDDING_CHUNK_SIZE, description="The embedding chunk size used by the agent.")
+    from_template: Optional[str] = Field(None, description="The template id used to configure the agent")
 
     @field_validator("name")
     @classmethod

letta/schemas/embedding_config.py

@@ -43,6 +43,7 @@ class EmbeddingConfig(BaseModel):
     embedding_model: str = Field(..., description="The model for the embedding.")
     embedding_dim: int = Field(..., description="The dimension of the embedding.")
     embedding_chunk_size: Optional[int] = Field(300, description="The chunk size of the embedding.")
+    handle: Optional[str] = Field(None, description="The handle for this config, in the format provider/model-name.")
 
     # azure only
     azure_endpoint: Optional[str] = Field(None, description="The Azure endpoint for the model.")

letta/schemas/llm_config.py

@@ -44,6 +44,7 @@ class LLMConfig(BaseModel):
         True,
         description="Puts 'inner_thoughts' as a kwarg in the function call if this is set to True. This helps with function calling performance and also the generation of inner thoughts.",
     )
+    handle: Optional[str] = Field(None, description="The handle for this config, in the format provider/model-name.")
 
     # FIXME hack to silence pydantic protected namespace warning
     model_config = ConfigDict(protected_namespaces=())

letta/schemas/usage.py

@@ -1,3 +1,4 @@
+from typing import Literal
 from pydantic import BaseModel, Field
 
 
@@ -11,7 +12,7 @@ class LettaUsageStatistics(BaseModel):
         total_tokens (int): The total number of tokens processed by the agent.
         step_count (int): The number of steps taken by the agent.
     """
-
+    message_type: Literal["usage_statistics"] = "usage_statistics"
     completion_tokens: int = Field(0, description="The number of tokens generated by the agent.")
     prompt_tokens: int = Field(0, description="The number of tokens in the prompt.")
     total_tokens: int = Field(0, description="The total number of tokens processed by the agent.")

letta/server/rest_api/interface.py

@@ -238,7 +238,7 @@ class QueuingInterface(AgentInterface):
             new_message = {"function_return": msg, "status": "success"}
 
         elif msg.startswith("Error: "):
-            msg = msg.replace("Error: ", "")
+            msg = msg.replace("Error: ", "", 1)
             new_message = {"function_return": msg, "status": "error"}
 
         else:
@@ -951,7 +951,7 @@ class StreamingServerInterface(AgentChunkStreamingInterface):
             )
 
         elif msg.startswith("Error: "):
-            msg = msg.replace("Error: ", "")
+            msg = msg.replace("Error: ", "", 1)
             # new_message = {"function_return": msg, "status": "error"}
             assert msg_obj.tool_call_id is not None
             new_message = ToolReturnMessage(

letta/server/rest_api/routers/v1/agents.py

@@ -104,7 +104,7 @@ def get_agent_context_window(
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
 
-    return server.get_agent_context_window(user_id=actor.id, agent_id=agent_id)
+    return server.get_agent_context_window(agent_id=agent_id, actor=actor)
 
 
 class CreateAgentRequest(CreateAgent):
@@ -138,7 +138,7 @@ def update_agent(
 ):
     """Update an exsiting agent"""
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    return server.update_agent(agent_id, update_agent, actor=actor)
+    return server.agent_manager.update_agent(agent_id=agent_id, agent_update=update_agent, actor=actor)
 
 
 @router.get("/{agent_id}/tools", response_model=List[Tool], operation_id="get_tools_from_agent")
@@ -149,7 +149,7 @@ def get_tools_from_agent(
 ):
     """Get tools from an existing agent"""
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    return server.get_tools_from_agent(agent_id=agent_id, user_id=actor.id)
+    return server.agent_manager.get_agent_by_id(agent_id=agent_id, actor=actor).tools
 
 
 @router.patch("/{agent_id}/add-tool/{tool_id}", response_model=AgentState, operation_id="add_tool_to_agent")
@@ -161,7 +161,7 @@ def add_tool_to_agent(
 ):
     """Add tools to an existing agent"""
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    return server.add_tool_to_agent(agent_id=agent_id, tool_id=tool_id, user_id=actor.id)
+    return server.agent_manager.attach_tool(agent_id=agent_id, tool_id=tool_id, actor=actor)
 
 
 @router.patch("/{agent_id}/remove-tool/{tool_id}", response_model=AgentState, operation_id="remove_tool_from_agent")
@@ -173,7 +173,7 @@ def remove_tool_from_agent(
 ):
     """Add tools to an existing agent"""
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    return server.remove_tool_from_agent(agent_id=agent_id, tool_id=tool_id, user_id=actor.id)
+    return server.agent_manager.detach_tool(agent_id=agent_id, tool_id=tool_id, actor=actor)
 
 
 @router.get("/{agent_id}", response_model=AgentState, operation_id="get_agent")
@@ -232,7 +232,7 @@ def get_agent_in_context_messages(
     Retrieve the messages in the context of a specific agent.
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    return server.get_in_context_messages(agent_id=agent_id, actor=actor)
+    return server.agent_manager.get_in_context_messages(agent_id=agent_id, actor=actor)
 
 
 # TODO: remove? can also get with agent blocks
@@ -429,7 +429,7 @@ def delete_agent_archival_memory(
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
 
-    server.delete_archival_memory(agent_id=agent_id, memory_id=memory_id, actor=actor)
+    server.delete_archival_memory(memory_id=memory_id, actor=actor)
     return JSONResponse(status_code=status.HTTP_200_OK, content={"message": f"Memory id={memory_id} successfully deleted"})
 
 
@@ -479,8 +479,9 @@ def update_message(
     """
     Update the details of a message associated with an agent.
     """
+    # TODO: Get rid of agent_id here, it's not really relevant
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    return server.update_agent_message(agent_id=agent_id, message_id=message_id, request=request, actor=actor)
+    return server.message_manager.update_message_by_id(message_id=message_id, message_update=request, actor=actor)
 
 
 @router.post(

letta/server/rest_api/routers/v1/sources.py

@@ -130,11 +130,8 @@ def attach_source_to_agent(
     Attach a data source to an existing agent.
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-
-    source = server.source_manager.get_source_by_id(source_id=source_id, actor=actor)
-    assert source is not None, f"Source with id={source_id} not found."
-    source = server.attach_source_to_agent(source_id=source.id, agent_id=agent_id, user_id=actor.id)
-    return source
+    server.agent_manager.attach_source(source_id=source_id, agent_id=agent_id, actor=actor)
+    return server.source_manager.get_source_by_id(source_id=source_id, actor=actor)
 
 
 @router.post("/{source_id}/detach", response_model=Source, operation_id="detach_agent_from_source")
@@ -148,8 +145,8 @@ def detach_source_from_agent(
     Detach a data source from an existing agent.
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-
-    return server.detach_source_from_agent(source_id=source_id, agent_id=agent_id, user_id=actor.id)
+    server.agent_manager.detach_source(agent_id=agent_id, source_id=source_id, actor=actor)
+    return server.source_manager.get_source_by_id(source_id=source_id, actor=actor)
 
 
 @router.post("/{source_id}/upload", response_model=Job, operation_id="upload_file_to_source")

letta/server/rest_api/routers/v1/tools.py

@@ -243,6 +243,7 @@ def add_composio_tool(
         raise HTTPException(
             status_code=400,  # Bad Request
             detail={
+                "code": "EnumStringNotFound",
                 "message": f"Cannot find composio action with name `{composio_action_name}`.",
                 "composio_action_name": composio_action_name,
             },
@@ -251,6 +252,7 @@ def add_composio_tool(
         raise HTTPException(
             status_code=400,  # Bad Request
             detail={
+                "code": "ComposioSDKError",
                 "message": f"No connected account found for tool `{composio_action_name}`. You need to connect the relevant app in Composio order to use the tool.",
                 "composio_action_name": composio_action_name,
             },

letta/server/rest_api/utils.py

@@ -61,7 +61,7 @@ async def sse_async_generator(
                 # Double-check the type
                 if not isinstance(usage, LettaUsageStatistics):
                     raise ValueError(f"Expected LettaUsageStatistics, got {type(usage)}")
-                yield sse_formatter({"usage": usage.model_dump()})
+                yield sse_formatter(usage.model_dump())
 
             except ContextWindowExceededError as e:
                 log_error_to_sentry(e)