feat: folders fixes (#2730)

Author: sarahwooders

letta/schemas/folder.py

@@ -12,7 +12,7 @@ class BaseFolder(LettaBase):
     Shared attributes across all folder schemas.
     """
 
-    __id_prefix__ = "folder"
+    __id_prefix__ = "source"  # TODO: change to "folder"
 
     # Core folder fields
     name: str = Field(..., description="The name of the folder.")

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

@@ -343,6 +343,35 @@ async def attach_source(
     return agent_state
 
 
+@router.patch("/{agent_id}/folders/attach/{folder_id}", response_model=AgentState, operation_id="attach_folder_to_agent")
+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"),
+):
+    """
+    Attach a folder to an agent.
+    """
+    actor = await server.user_manager.get_actor_or_default_async(actor_id=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
+    agent_state = await server.agent_manager.attach_missing_files_tools_async(agent_state=agent_state, actor=actor)
+
+    files = await server.file_manager.list_files(folder_id, actor, include_content=True)
+    if files:
+        await server.agent_manager.insert_files_into_context_window(agent_state=agent_state, file_metadata_with_content=files, actor=actor)
+
+    if agent_state.enable_sleeptime:
+        source = await server.source_manager.get_source_by_id(source_id=folder_id)
+        safe_create_task(
+            server.sleeptime_document_ingest_async(agent_state, source, actor), logger=logger, label="sleeptime_document_ingest_async"
+        )
+
+    return agent_state
+
+
 @router.patch("/{agent_id}/sources/detach/{source_id}", response_model=AgentState, operation_id="detach_source_from_agent")
 async def detach_source(
     agent_id: str,
@@ -373,6 +402,36 @@ async def detach_source(
     return agent_state
 
 
+@router.patch("/{agent_id}/folders/detach/{folder_id}", response_model=AgentState, operation_id="detach_folder_from_agent")
+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"),
+):
+    """
+    Detach a folder from an agent.
+    """
+    actor = await server.user_manager.get_actor_or_default_async(actor_id=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:
+        agent_state = await server.agent_manager.detach_all_files_tools_async(agent_state=agent_state, actor=actor)
+
+    files = await server.file_manager.list_files(folder_id, actor)
+    file_ids = [f.id for f in files]
+    await server.remove_files_from_context_window(agent_state=agent_state, file_ids=file_ids, actor=actor)
+
+    if agent_state.enable_sleeptime:
+        try:
+            source = await server.source_manager.get_source_by_id(source_id=folder_id)
+            block = await server.agent_manager.get_block_with_label_async(agent_id=agent_state.id, block_label=source.name, actor=actor)
+            await server.block_manager.delete_block_async(block.id, actor)
+        except:
+            pass
+    return agent_state
+
+
 @router.patch("/{agent_id}/files/close-all", response_model=List[str], operation_id="close_all_open_files")
 async def close_all_open_files(
     agent_id: str,
@@ -516,6 +575,19 @@ async def list_agent_sources(
     return await server.agent_manager.list_attached_sources_async(agent_id=agent_id, actor=actor)
 
 
+@router.get("/{agent_id}/folders", response_model=list[Source], operation_id="list_agent_folders")
+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
+):
+    """
+    Get the folders associated with an agent.
+    """
+    actor = await server.user_manager.get_actor_or_default_async(actor_id=actor_id)
+    return await server.agent_manager.list_attached_sources_async(agent_id=agent_id, actor=actor)
+
+
 # TODO: remove? can also get with agent blocks
 @router.get("/{agent_id}/core-memory", response_model=Memory, operation_id="retrieve_agent_memory")
 async def retrieve_agent_memory(

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

@@ -20,8 +20,9 @@
 from letta.schemas.embedding_config import EmbeddingConfig
 from letta.schemas.enums import DuplicateFileHandling, FileProcessingStatus
 from letta.schemas.file import FileMetadata
-from letta.schemas.folder import Folder, FolderCreate, FolderUpdate
+from letta.schemas.folder import Folder
 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
@@ -125,7 +126,7 @@ async def list_folders(
 
 @router.post("/", response_model=Folder, operation_id="create_folder")
 async def create_folder(
-    folder_create: FolderCreate,
+    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
 ):
@@ -144,7 +145,7 @@ async def create_folder(
             embedding_chunk_size=folder_create.embedding_chunk_size or constants.DEFAULT_EMBEDDING_CHUNK_SIZE,
             actor=actor,
         )
-    folder = Folder(
+    folder = Source(
         name=folder_create.name,
         embedding_config=folder_create.embedding_config,
         description=folder_create.description,
@@ -157,7 +158,7 @@ async def create_folder(
 @router.patch("/{folder_id}", response_model=Folder, operation_id="modify_folder")
 async def modify_folder(
     folder_id: str,
-    folder: FolderUpdate,
+    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
 ):

poetry.lock

@@ -72,7 +72,7 @@ llama-index = "^0.12.2"
 llama-index-embeddings-openai = "^0.3.1"
 e2b-code-interpreter = {version = "^1.0.3", optional = true}
 anthropic = "^0.49.0"
-letta_client = "^0.1.213"
+letta_client = "^0.1.219"
 openai = "^1.60.0"
 opentelemetry-api = "1.30.0"
 opentelemetry-sdk = "1.30.0"