letta-nightly 0.6.3.dev20241213104231__py3-none-any.whl → 0.6.4.dev20241214104034__py3-none-any.whl

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

@@ -25,7 +25,7 @@ def create_sandbox_config(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
 
     return server.sandbox_config_manager.create_or_update_sandbox_config(config_create, actor)
 
@@ -35,7 +35,7 @@ def create_default_e2b_sandbox_config(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.get_or_create_default_sandbox_config(sandbox_type=SandboxType.E2B, actor=actor)
 
 
@@ -44,7 +44,7 @@ def create_default_local_sandbox_config(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.get_or_create_default_sandbox_config(sandbox_type=SandboxType.LOCAL, actor=actor)
 
 
@@ -55,7 +55,7 @@ def update_sandbox_config(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.update_sandbox_config(sandbox_config_id, config_update, actor)
 
 
@@ -65,7 +65,7 @@ def delete_sandbox_config(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     server.sandbox_config_manager.delete_sandbox_config(sandbox_config_id, actor)
 
 
@@ -76,7 +76,7 @@ def list_sandbox_configs(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.list_sandbox_configs(actor, limit=limit, cursor=cursor)
 
 
@@ -90,7 +90,7 @@ def create_sandbox_env_var(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.create_sandbox_env_var(env_var_create, sandbox_config_id, actor)
 
 
@@ -101,7 +101,7 @@ def update_sandbox_env_var(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.update_sandbox_env_var(env_var_id, env_var_update, actor)
 
 
@@ -111,7 +111,7 @@ def delete_sandbox_env_var(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     server.sandbox_config_manager.delete_sandbox_env_var(env_var_id, actor)
 
 
@@ -123,5 +123,5 @@ def list_sandbox_env_vars(
     server: SyncServer = Depends(get_letta_server),
     user_id: str = Depends(get_user_id),
 ):
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.sandbox_config_manager.list_sandbox_env_vars(sandbox_config_id, actor, limit=limit, cursor=cursor)

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

@@ -36,7 +36,7 @@ def get_source(
     """
     Get all sources
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    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)
     if not source:
@@ -53,7 +53,7 @@ def get_source_id_by_name(
     """
     Get a source by name
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
 
     source = server.source_manager.get_source_by_name(source_name=source_name, actor=actor)
     if not source:
@@ -69,7 +69,7 @@ def list_sources(
     """
     List all data sources created by a user.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
 
     return server.list_all_sources(actor=actor)
 
@@ -83,7 +83,7 @@ def create_source(
     """
     Create a new data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     source = Source(**source_create.model_dump())
 
     return server.source_manager.create_source(source=source, actor=actor)
@@ -99,7 +99,7 @@ def update_source(
     """
     Update the name or documentation of an existing data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     if not 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 server.source_manager.update_source(source_id=source_id, source_update=source, actor=actor)
@@ -114,7 +114,7 @@ def delete_source(
     """
     Delete a data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
 
     server.delete_source(source_id=source_id, actor=actor)
 
@@ -129,7 +129,7 @@ def attach_source_to_agent(
     """
     Attach a data source to an existing agent.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    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."
@@ -147,7 +147,7 @@ def detach_source_from_agent(
     """
     Detach a data source from an existing agent.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    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)
 
@@ -163,7 +163,7 @@ def upload_file_to_source(
     """
     Upload a file to a data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    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."
@@ -197,7 +197,7 @@ def list_passages(
     """
     List all passages associated with a data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     passages = server.list_data_source_passages(user_id=actor.id, source_id=source_id)
     return passages
 
@@ -213,7 +213,7 @@ def list_files_from_source(
     """
     List paginated files associated with a data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.source_manager.list_files(source_id=source_id, limit=limit, cursor=cursor, actor=actor)
 
 
@@ -229,7 +229,7 @@ def delete_file_from_source(
     """
     Delete a data source.
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
 
     deleted_file = server.source_manager.delete_file(file_id=file_id, actor=actor)
     if deleted_file is None:

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

@@ -1,6 +1,8 @@
 from typing import List, Optional
 
 from composio.client.collections import ActionModel, AppModel
+from composio.client.enums.base import EnumStringNotFound
+from composio.exceptions import ComposioSDKError
 from fastapi import APIRouter, Body, Depends, Header, HTTPException
 
 from letta.errors import LettaToolCreateError
@@ -23,7 +25,7 @@ def delete_tool(
     """
     Delete a tool by name
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     server.tool_manager.delete_tool_by_id(tool_id=tool_id, actor=actor)
 
 
@@ -36,7 +38,7 @@ def get_tool(
     """
     Get a tool by ID
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     tool = server.tool_manager.get_tool_by_id(tool_id=tool_id, actor=actor)
     if tool is None:
         # return 404 error
@@ -53,7 +55,7 @@ def get_tool_id(
     """
     Get a tool ID by name
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     tool = server.tool_manager.get_tool_by_name(tool_name=tool_name, actor=actor)
     if tool:
         return tool.id
@@ -72,7 +74,7 @@ def list_tools(
     Get a list of all tools available to agents belonging to the org of the user
     """
     try:
-        actor = server.get_user_or_default(user_id=user_id)
+        actor = server.user_manager.get_user_or_default(user_id=user_id)
         return server.tool_manager.list_tools(actor=actor, cursor=cursor, limit=limit)
     except Exception as e:
         # Log or print the full exception here for debugging
@@ -90,7 +92,7 @@ def create_tool(
     Create a new tool
     """
     try:
-        actor = server.get_user_or_default(user_id=user_id)
+        actor = server.user_manager.get_user_or_default(user_id=user_id)
         tool = Tool(**request.model_dump())
         return server.tool_manager.create_tool(pydantic_tool=tool, actor=actor)
     except UniqueConstraintViolationError as e:
@@ -122,7 +124,7 @@ def upsert_tool(
     Create or update a tool
     """
     try:
-        actor = server.get_user_or_default(user_id=user_id)
+        actor = server.user_manager.get_user_or_default(user_id=user_id)
         tool = server.tool_manager.create_or_update_tool(pydantic_tool=Tool(**request.model_dump()), actor=actor)
         return tool
     except UniqueConstraintViolationError as e:
@@ -145,7 +147,7 @@ def update_tool(
     """
     Update an existing tool
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.tool_manager.update_tool_by_id(tool_id=tool_id, tool_update=request, actor=actor)
 
 
@@ -157,7 +159,7 @@ def add_base_tools(
     """
     Add base tools
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     return server.tool_manager.add_base_tools(actor=actor)
 
 
@@ -171,7 +173,7 @@ def add_base_tools(
 #     """
 #     Run an existing tool on provided arguments
 #     """
-#     actor = server.get_user_or_default(user_id=user_id)
+#     actor = server.user_manager.get_user_or_default(user_id=user_id)
 
 #     return server.run_tool(tool_id=request.tool_id, tool_args=request.tool_args, user_id=actor.id)
 
@@ -185,7 +187,7 @@ def run_tool_from_source(
     """
     Attempt to build a tool from source, then run it on the provided arguments
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
 
     try:
         return server.run_tool_from_source(
@@ -218,7 +220,7 @@ def list_composio_apps(server: SyncServer = Depends(get_letta_server), user_id:
     """
     Get a list of all Composio apps
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     composio_api_key = get_composio_key(server, actor=actor)
     return server.get_composio_apps(api_key=composio_api_key)
 
@@ -232,7 +234,7 @@ def list_composio_actions_by_app(
     """
     Get a list of all Composio actions for a specific app
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     composio_api_key = get_composio_key(server, actor=actor)
     return server.get_composio_actions_from_app_name(composio_app_name=composio_app_name, api_key=composio_api_key)
 
@@ -246,10 +248,28 @@ def add_composio_tool(
     """
     Add a new Composio tool by action name (Composio refers to each tool as an `Action`)
     """
-    actor = server.get_user_or_default(user_id=user_id)
+    actor = server.user_manager.get_user_or_default(user_id=user_id)
     composio_api_key = get_composio_key(server, actor=actor)
-    tool_create = ToolCreate.from_composio(action_name=composio_action_name, api_key=composio_api_key)
-    return server.tool_manager.create_or_update_tool(pydantic_tool=Tool(**tool_create.model_dump()), actor=actor)
+
+    try:
+        tool_create = ToolCreate.from_composio(action_name=composio_action_name, api_key=composio_api_key)
+        return server.tool_manager.create_or_update_tool(pydantic_tool=Tool(**tool_create.model_dump()), actor=actor)
+    except EnumStringNotFound:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "message": f"Cannot find composio action with name `{composio_action_name}`.",
+                "composio_action_name": composio_action_name,
+            },
+        )
+    except ComposioSDKError:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "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,
+            },
+        )
 
 
 # TODO: Factor this out to somewhere else

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

@@ -2,21 +2,9 @@ from typing import TYPE_CHECKING, List, Optional
 
 from fastapi import APIRouter, Body, Depends, HTTPException, Query
 
-from letta.schemas.api_key import APIKey, APIKeyCreate
 from letta.schemas.user import User, UserCreate, UserUpdate
 from letta.server.rest_api.utils import get_letta_server
 
-# from letta.server.schemas.users import (
-#     CreateAPIKeyRequest,
-#     CreateAPIKeyResponse,
-#     CreateUserRequest,
-#     CreateUserResponse,
-#     DeleteAPIKeyResponse,
-#     DeleteUserResponse,
-#     GetAllUsersResponse,
-#     GetAPIKeysResponse,
-# )
-
 if TYPE_CHECKING:
     from letta.schemas.user import User
     from letta.server.server import SyncServer
@@ -84,37 +72,3 @@ def delete_user(
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"{e}")
     return user
-
-
-@router.post("/keys", response_model=APIKey, operation_id="create_api_key")
-def create_new_api_key(
-    create_key: APIKeyCreate = Body(...),
-    server: "SyncServer" = Depends(get_letta_server),
-):
-    """
-    Create a new API key for a user
-    """
-    api_key = server.create_api_key(create_key)
-    return api_key
-
-
-@router.get("/keys", response_model=List[APIKey], operation_id="list_api_keys")
-def get_api_keys(
-    user_id: str = Query(..., description="The unique identifier of the user."),
-    server: "SyncServer" = Depends(get_letta_server),
-):
-    """
-    Get a list of all API keys for a user
-    """
-    if server.user_manager.get_user_by_id(user_id=user_id) is None:
-        raise HTTPException(status_code=404, detail=f"User does not exist")
-    api_keys = server.ms.get_all_api_keys_for_user(user_id=user_id)
-    return api_keys
-
-
-@router.delete("/keys", response_model=APIKey, operation_id="delete_api_key")
-def delete_api_key(
-    api_key: str = Query(..., description="The API key to be deleted."),
-    server: "SyncServer" = Depends(get_letta_server),
-):
-    return server.delete_api_key(api_key)