letta-nightly 0.4.1.dev20241007104134__py3-none-any.whl → 0.4.1.dev20241009104130__py3-none-any.whl

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

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends, Header, Query
 
 from letta.schemas.job import Job
 from letta.server.rest_api.utils import get_letta_server
@@ -13,11 +13,12 @@ router = APIRouter(prefix="/jobs", tags=["jobs"])
 def list_jobs(
     server: "SyncServer" = Depends(get_letta_server),
     source_id: Optional[str] = Query(None, description="Only list jobs associated with the source."),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     List all jobs.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     # TODO: add filtering by status
     jobs = server.list_jobs(user_id=actor.id)
@@ -33,11 +34,12 @@ def list_jobs(
 @router.get("/active", response_model=List[Job], operation_id="list_active_jobs")
 def list_active_jobs(
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     List all active jobs.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     return server.list_active_jobs(user_id=actor.id)
 

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

@@ -1,8 +1,8 @@
 import os
 import tempfile
-from typing import List
+from typing import List, Optional
 
-from fastapi import APIRouter, BackgroundTasks, Depends, Query, UploadFile
+from fastapi import APIRouter, BackgroundTasks, Depends, Header, Query, UploadFile
 
 from letta.schemas.document import Document
 from letta.schemas.job import Job
@@ -21,11 +21,12 @@ router = APIRouter(prefix="/sources", tags=["sources"])
 def get_source(
     source_id: str,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Get all sources
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     return server.get_source(source_id=source_id, user_id=actor.id)
 
@@ -34,11 +35,12 @@ def get_source(
 def get_source_id_by_name(
     source_name: str,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Get a source by name
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     source_id = server.get_source_id(source_name=source_name, user_id=actor.id)
     return source_id
@@ -47,11 +49,12 @@ def get_source_id_by_name(
 @router.get("/", response_model=List[Source], operation_id="list_sources")
 def list_sources(
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     List all data sources created by a user.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     return server.list_all_sources(user_id=actor.id)
 
@@ -60,11 +63,12 @@ def list_sources(
 def create_source(
     source: SourceCreate,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Create a new data source.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     return server.create_source(request=source, user_id=actor.id)
 
@@ -74,11 +78,13 @@ def update_source(
     source_id: str,
     source: SourceUpdate,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Update the name or documentation of an existing data source.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
+
     assert source.id == source_id, "Source ID in path must match ID in request body"
 
     return server.update_source(request=source, user_id=actor.id)
@@ -88,11 +94,12 @@ def update_source(
 def delete_source(
     source_id: str,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Delete a data source.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     server.delete_source(source_id=source_id, user_id=actor.id)
 
@@ -102,11 +109,12 @@ def attach_source_to_agent(
     source_id: str,
     agent_id: str = Query(..., description="The unique identifier of the agent to attach the source to."),
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Attach a data source to an existing agent.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     source = server.ms.get_source(source_id=source_id, user_id=actor.id)
     assert source is not None, f"Source with id={source_id} not found."
@@ -119,11 +127,12 @@ def detach_source_from_agent(
     source_id: str,
     agent_id: str = Query(..., description="The unique identifier of the agent to detach the source from."),
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ) -> None:
     """
     Detach a data source from an existing agent.
     """
-    actor = server.get_current_user()
+    actor = server.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)
 
@@ -134,11 +143,12 @@ def upload_file_to_source(
     source_id: str,
     background_tasks: BackgroundTasks,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Upload a file to a data source.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     source = server.ms.get_source(source_id=source_id, user_id=actor.id)
     assert source is not None, f"Source with id={source_id} not found."
@@ -166,11 +176,12 @@ def upload_file_to_source(
 def list_passages(
     source_id: str,
     server: SyncServer = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     List all passages associated with a data source.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
     passages = server.list_data_source_passages(user_id=actor.id, source_id=source_id)
     return passages
 
@@ -179,11 +190,12 @@ def list_passages(
 def list_documents(
     source_id: str,
     server: "SyncServer" = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     List all documents associated with a data source.
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     documents = server.list_data_source_documents(user_id=actor.id, source_id=source_id)
     return documents

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

@@ -1,6 +1,6 @@
-from typing import List
+from typing import List, Optional
 
-from fastapi import APIRouter, Body, Depends, HTTPException
+from fastapi import APIRouter, Body, Depends, Header, HTTPException
 
 from letta.schemas.tool import Tool, ToolCreate, ToolUpdate
 from letta.server.rest_api.utils import get_letta_server
@@ -13,11 +13,12 @@ router = APIRouter(prefix="/tools", tags=["tools"])
 def delete_tool(
     tool_id: str,
     server: SyncServer = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Delete a tool by name
     """
-    # actor = server.get_current_user()
+    # actor = server.get_user_or_default(user_id=user_id)
     server.delete_tool(tool_id=tool_id)
 
 
@@ -42,11 +43,12 @@ def get_tool(
 def get_tool_id(
     tool_name: str,
     server: SyncServer = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Get a tool ID by name
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     tool_id = server.get_tool_id(tool_name, user_id=actor.id)
     if tool_id is None:
@@ -58,11 +60,12 @@ def get_tool_id(
 @router.get("/", response_model=List[Tool], operation_id="list_tools")
 def list_all_tools(
     server: SyncServer = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Get a list of all tools available to agents created by a user
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
     actor.id
 
     # TODO: add back when user-specific
@@ -75,11 +78,12 @@ def create_tool(
     tool: ToolCreate = Body(...),
     update: bool = False,
     server: SyncServer = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Create a new tool
     """
-    actor = server.get_current_user()
+    actor = server.get_user_or_default(user_id=user_id)
 
     return server.create_tool(
         request=tool,
@@ -94,10 +98,11 @@ def update_tool(
     tool_id: str,
     request: ToolUpdate = Body(...),
     server: SyncServer = Depends(get_letta_server),
+    user_id: Optional[str] = Header(None, alias="user_id"),  # Extract user_id from header, default to None if not present
 ):
     """
     Update an existing tool
     """
     assert tool_id == request.id, "Tool ID in path must match tool ID in request body"
-    server.get_current_user()
+    # actor = server.get_user_or_default(user_id=user_id)
     return server.update_tool(request)

letta/server/server.py

@@ -45,12 +45,13 @@ from letta.metadata import MetadataStore
 from letta.prompts import gpt_system
 from letta.providers import (
     AnthropicProvider,
+    AzureProvider,
     GoogleAIProvider,
     OllamaProvider,
     OpenAIProvider,
     VLLMProvider,
 )
-from letta.schemas.agent import AgentState, CreateAgent, UpdateAgentState
+from letta.schemas.agent import AgentState, AgentType, CreateAgent, UpdateAgentState
 from letta.schemas.api_key import APIKey, APIKeyCreate
 from letta.schemas.block import (
     Block,
@@ -270,6 +271,14 @@ class SyncServer(Server):
             self._enabled_providers.append(VLLMProvider(base_url=model_settings.vllm_base_url))
         if model_settings.gemini_api_key:
             self._enabled_providers.append(GoogleAIProvider(api_key=model_settings.gemini_api_key))
+        if model_settings.azure_api_key and model_settings.azure_base_url:
+            self._enabled_providers.append(
+                AzureProvider(
+                    api_key=model_settings.azure_api_key,
+                    base_url=model_settings.azure_base_url,
+                    api_version=model_settings.azure_api_version,
+                )
+            )
 
     def save_agents(self):
         """Saves all the agents that are in the in-memory object store"""
@@ -332,7 +341,10 @@ class SyncServer(Server):
             # Make sure the memory is a memory object
             assert isinstance(agent_state.memory, Memory)
 
-            letta_agent = Agent(agent_state=agent_state, interface=interface, tools=tool_objs)
+            if agent_state.agent_type == AgentType.memgpt_agent:
+                letta_agent = Agent(agent_state=agent_state, interface=interface, tools=tool_objs)
+            else:
+                raise NotImplementedError("Only base agents are supported as of right now!")
 
             # Add the agent to the in-memory store and return its reference
             logger.debug(f"Adding agent to the agent cache: user_id={user_id}, agent_id={agent_id}")
@@ -596,7 +608,7 @@ class SyncServer(Server):
                 )
 
         # Run the agent state forward
-        usage = self._step(user_id=user_id, agent_id=agent_id, input_message=packaged_user_message, timestamp=timestamp)
+        usage = self._step(user_id=user_id, agent_id=agent_id, input_message=message, timestamp=timestamp)
         return usage
 
     def system_message(
@@ -784,6 +796,7 @@ class SyncServer(Server):
                 name=request.name,
                 user_id=user_id,
                 tools=request.tools if request.tools else [],
+                agent_type=request.agent_type or AgentType.memgpt_agent,
                 llm_config=llm_config,
                 embedding_config=embedding_config,
                 system=request.system,
@@ -1064,7 +1077,11 @@ class SyncServer(Server):
 
     def get_user(self, user_id: str) -> User:
         """Get the user"""
-        return self.ms.get_user(user_id=user_id)
+        user = self.ms.get_user(user_id=user_id)
+        if user is None:
+            raise ValueError(f"User with user_id {user_id} does not exist")
+        else:
+            return user
 
     def get_agent_memory(self, agent_id: str) -> Memory:
         """Return the memory of an agent (core memory)"""
@@ -1880,20 +1897,6 @@ class SyncServer(Server):
         letta_agent = self._get_or_load_agent(agent_id=agent_id)
         return letta_agent.retry_message()
 
-    def set_current_user(self, user_id: Optional[str]):
-        """Very hacky way to set the current user for the server, to be replaced once server becomes stateless
-
-        NOTE: clearly not thread-safe, only exists to provide basic user_id support for REST API for now
-        """
-
-        # Make sure the user_id actually exists
-        if user_id is not None:
-            user_obj = self.get_user(user_id)
-            if not user_obj:
-                raise ValueError(f"User with id {user_id} not found")
-
-        self._current_user = user_id
-
     def get_default_user(self) -> User:
 
         from letta.constants import (
@@ -1910,8 +1913,9 @@ class SyncServer(Server):
             self.ms.create_organization(org)
 
         # check if default user exists
-        default_user = self.get_user(DEFAULT_USER_ID)
-        if not default_user:
+        try:
+            self.get_user(DEFAULT_USER_ID)
+        except ValueError:
             user = User(name=DEFAULT_USER_NAME, org_id=DEFAULT_ORG_ID, id=DEFAULT_USER_ID)
             self.ms.create_user(user)
 
@@ -1922,23 +1926,15 @@ class SyncServer(Server):
         # check if default org exists
         return self.get_user(DEFAULT_USER_ID)
 
-    # TODO(ethan) wire back to real method in future ORM PR
-    def get_current_user(self) -> User:
-        """Returns the currently authed user.
-
-        Since server is the core gateway this needs to pass through server as the
-        first touchpoint.
-        """
-
-        # Check if _current_user is set and if it's non-null:
-        if hasattr(self, "_current_user") and self._current_user is not None:
-            current_user = self.get_user(self._current_user)
-            if not current_user:
-                warnings.warn(f"Provided user '{self._current_user}' not found, using default user")
-            else:
-                return current_user
-
-        return self.get_default_user()
+    def get_user_or_default(self, user_id: Optional[str]) -> User:
+        """Get the user object for user_id if it exists, otherwise return the default user object"""
+        if user_id is None:
+            return self.get_default_user()
+        else:
+            try:
+                return self.get_user(user_id=user_id)
+            except ValueError:
+                raise HTTPException(status_code=404, detail=f"User with id {user_id} not found")
 
     def list_llm_models(self) -> List[LLMConfig]:
         """List available models"""

letta/settings.py

@@ -13,8 +13,8 @@ class ModelSettings(BaseSettings):
     openai_api_key: Optional[str] = None
     # TODO: provide overriding BASE_URL?
 
-    # grok
-    grok_api_key: Optional[str] = None
+    # groq
+    groq_api_key: Optional[str] = None
 
     # anthropic
     anthropic_api_key: Optional[str] = None
@@ -23,7 +23,9 @@ class ModelSettings(BaseSettings):
     ollama_base_url: Optional[str] = None
 
     # azure
-    azure_deployment: Optional[str] = None
+    azure_api_key: Optional[str] = None
+    azure_base_url: Optional[str] = None
+    azure_api_version: Optional[str] = None
 
     # google ai
     gemini_api_key: Optional[str] = None
@@ -54,116 +56,6 @@ class Settings(BaseSettings):
     pg_port: Optional[int] = None
     pg_uri: Optional[str] = None  # option to specifiy full uri
 
-    ## llm configuration
-    # llm_endpoint: Optional[str] = None
-    # llm_endpoint_type: Optional[str] = None
-    # llm_model: Optional[str] = None
-    # llm_context_window: Optional[int] = None
-
-    ## embedding configuration
-    # embedding_endpoint: Optional[str] = None
-    # embedding_endpoint_type: Optional[str] = None
-    # embedding_dim: Optional[int] = None
-    # embedding_model: Optional[str] = None
-    # embedding_chunk_size: int = 300
-
-    # @property
-    # def llm_config(self):
-
-    #    # try to get LLM config from settings
-    #    if self.llm_endpoint and self.llm_endpoint_type and self.llm_model and self.llm_context_window:
-    #        return LLMConfig(
-    #            model=self.llm_model,
-    #            model_endpoint_type=self.llm_endpoint_type,
-    #            model_endpoint=self.llm_endpoint,
-    #            model_wrapper=None,
-    #            context_window=self.llm_context_window,
-    #        )
-    #    else:
-    #        if not self.llm_endpoint:
-    #            printd(f"No LETTA_LLM_ENDPOINT provided")
-    #        if not self.llm_endpoint_type:
-    #            printd(f"No LETTA_LLM_ENDPOINT_TYPE provided")
-    #        if not self.llm_model:
-    #            printd(f"No LETTA_LLM_MODEL provided")
-    #        if not self.llm_context_window:
-    #            printd(f"No LETTA_LLM_CONTEX_WINDOW provided")
-
-    #    # quickstart options
-    #    if self.llm_model:
-    #        try:
-    #            return LLMConfig.default_config(self.llm_model)
-    #        except ValueError:
-    #            pass
-
-    #    # try to read from config file (last resort)
-    #    from letta.config import LettaConfig
-
-    #    if LettaConfig.exists():
-    #        config = LettaConfig.load()
-    #        llm_config = LLMConfig(
-    #            model=config.default_llm_config.model,
-    #            model_endpoint_type=config.default_llm_config.model_endpoint_type,
-    #            model_endpoint=config.default_llm_config.model_endpoint,
-    #            model_wrapper=config.default_llm_config.model_wrapper,
-    #            context_window=config.default_llm_config.context_window,
-    #        )
-    #        return llm_config
-
-    #    # check OpenAI API key
-    #    if os.getenv("OPENAI_API_KEY"):
-    #        return LLMConfig.default_config(self.llm_model if self.llm_model else "gpt-4")
-
-    #    return LLMConfig.default_config("letta")
-
-    # @property
-    # def embedding_config(self):
-
-    #    # try to get LLM config from settings
-    #    if self.embedding_endpoint and self.embedding_endpoint_type and self.embedding_model and self.embedding_dim:
-    #        return EmbeddingConfig(
-    #            embedding_model=self.embedding_model,
-    #            embedding_endpoint_type=self.embedding_endpoint_type,
-    #            embedding_endpoint=self.embedding_endpoint,
-    #            embedding_dim=self.embedding_dim,
-    #            embedding_chunk_size=self.embedding_chunk_size,
-    #        )
-    #    else:
-    #        if not self.embedding_endpoint:
-    #            printd(f"No LETTA_EMBEDDING_ENDPOINT provided")
-    #        if not self.embedding_endpoint_type:
-    #            printd(f"No LETTA_EMBEDDING_ENDPOINT_TYPE provided")
-    #        if not self.embedding_model:
-    #            printd(f"No LETTA_EMBEDDING_MODEL provided")
-    #        if not self.embedding_dim:
-    #            printd(f"No LETTA_EMBEDDING_DIM provided")
-
-    #    # TODO
-    #    ## quickstart options
-    #    # if self.embedding_model:
-    #    #    try:
-    #    #        return EmbeddingConfig.default_config(self.embedding_model)
-    #    #    except ValueError as e:
-    #    #        pass
-
-    #    # try to read from config file (last resort)
-    #    from letta.config import LettaConfig
-
-    #    if LettaConfig.exists():
-    #        config = LettaConfig.load()
-    #        return EmbeddingConfig(
-    #            embedding_model=config.default_embedding_config.embedding_model,
-    #            embedding_endpoint_type=config.default_embedding_config.embedding_endpoint_type,
-    #            embedding_endpoint=config.default_embedding_config.embedding_endpoint,
-    #            embedding_dim=config.default_embedding_config.embedding_dim,
-    #            embedding_chunk_size=config.default_embedding_config.embedding_chunk_size,
-    #        )
-
-    #    if os.getenv("OPENAI_API_KEY"):
-    #        return EmbeddingConfig.default_config(self.embedding_model if self.embedding_model else "text-embedding-ada-002")
-
-    #    return EmbeddingConfig.default_config("letta")
-
     @property
     def letta_pg_uri(self) -> str:
         if self.pg_uri:

{letta_nightly-0.4.1.dev20241007104134.dist-info → letta_nightly-0.4.1.dev20241009104130.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.4.1.dev20241007104134
+Version: 0.4.1.dev20241009104130
 Summary: Create LLM agents with long-term memory and custom tools
 License: Apache License
 Author: Letta Team