letta-nightly 0.6.4.dev20241213193437__tar.gz → 0.6.4.dev20241215104129__tar.gz

{letta_nightly-0.6.4.dev20241213193437 → letta_nightly-0.6.4.dev20241215104129}/PKG-INFO

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

{letta_nightly-0.6.4.dev20241213193437 → letta_nightly-0.6.4.dev20241215104129}/letta/__init__.py

@@ -4,7 +4,7 @@ __version__ = "0.6.4"
 from letta.client.client import LocalClient, RESTClient, create_client
 
 # imports for easier access
-from letta.schemas.agent import AgentState, PersistedAgentState
+from letta.schemas.agent import AgentState
 from letta.schemas.block import Block
 from letta.schemas.embedding_config import EmbeddingConfig
 from letta.schemas.enums import JobStatus

{letta_nightly-0.6.4.dev20241213193437 → letta_nightly-0.6.4.dev20241215104129}/letta/agent.py

@@ -6,8 +6,6 @@ import warnings
 from abc import ABC, abstractmethod
 from typing import List, Literal, Optional, Tuple, Union
 
-from tqdm import tqdm
-
 from letta.constants import (
     BASE_TOOLS,
     CLI_WARNING_PREFIX,
@@ -28,9 +26,8 @@ from letta.llm_api.helpers import is_context_overflow_error
 from letta.llm_api.llm_api_tools import create
 from letta.local_llm.utils import num_tokens_from_functions, num_tokens_from_messages
 from letta.memory import summarize_messages
-from letta.metadata import MetadataStore
 from letta.orm import User
-from letta.schemas.agent import AgentState, AgentStepResponse
+from letta.schemas.agent import AgentState, AgentStepResponse, UpdateAgent
 from letta.schemas.block import BlockUpdate
 from letta.schemas.embedding_config import EmbeddingConfig
 from letta.schemas.enums import MessageRole
@@ -49,12 +46,12 @@ from letta.schemas.tool import Tool
 from letta.schemas.tool_rule import TerminalToolRule
 from letta.schemas.usage import LettaUsageStatistics
 from letta.schemas.user import User as PydanticUser
+from letta.services.agent_manager import AgentManager
 from letta.services.block_manager import BlockManager
 from letta.services.message_manager import MessageManager
 from letta.services.passage_manager import PassageManager
 from letta.services.source_manager import SourceManager
 from letta.services.tool_execution_sandbox import ToolExecutionSandbox
-from letta.services.user_manager import UserManager
 from letta.streaming_interface import StreamingRefreshCLIInterface
 from letta.system import (
     get_heartbeat,
@@ -316,7 +313,7 @@ class Agent(BaseAgent):
 
         else:
             printd(f"Agent.__init__ :: creating, state={agent_state.message_ids}")
-            assert self.agent_state.id is not None and self.agent_state.user_id is not None
+            assert self.agent_state.id is not None and self.agent_state.created_by_id is not None
 
             # Generate a sequence of initial messages to put in the buffer
             init_messages = initialize_message_sequence(
@@ -335,7 +332,7 @@ class Agent(BaseAgent):
                 # We always need the system prompt up front
                 system_message_obj = Message.dict_to_message(
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict=init_messages[0],
                 )
@@ -358,7 +355,7 @@ class Agent(BaseAgent):
                 # Cast to Message objects
                 init_messages = [
                     Message.dict_to_message(
-                        agent_id=self.agent_state.id, user_id=self.agent_state.user_id, model=self.model, openai_message_dict=msg
+                        agent_id=self.agent_state.id, user_id=self.agent_state.created_by_id, model=self.model, openai_message_dict=msg
                     )
                     for msg in init_messages
                 ]
@@ -439,11 +436,12 @@ class Agent(BaseAgent):
             else:
                 # execute tool in a sandbox
                 # TODO: allow agent_state to specify which sandbox to execute tools in
-                sandbox_run_result = ToolExecutionSandbox(function_name, function_args, self.agent_state.user_id).run(
+                sandbox_run_result = ToolExecutionSandbox(function_name, function_args, self.agent_state.created_by_id).run(
                     agent_state=self.agent_state.__deepcopy__()
                 )
                 function_response, updated_agent_state = sandbox_run_result.func_return, sandbox_run_result.agent_state
                 assert orig_memory_str == self.agent_state.memory.compile(), "Memory should not be modified in a sandbox tool"
+
                 self.update_memory_if_change(updated_agent_state.memory)
         except Exception as e:
             # Need to catch error here, or else trunction wont happen
@@ -573,7 +571,7 @@ class Agent(BaseAgent):
         added_messages_objs = [
             Message.dict_to_message(
                 agent_id=self.agent_state.id,
-                user_id=self.agent_state.user_id,
+                user_id=self.agent_state.created_by_id,
                 model=self.model,
                 openai_message_dict=msg,
             )
@@ -603,7 +601,7 @@ class Agent(BaseAgent):
                 response = create(
                     llm_config=self.agent_state.llm_config,
                     messages=message_sequence,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     functions=allowed_functions,
                     functions_python=self.functions_python,
                     function_call=function_call,
@@ -689,7 +687,7 @@ class Agent(BaseAgent):
                 Message.dict_to_message(
                     id=response_message_id,
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict=response_message.model_dump(),
                 )
@@ -722,7 +720,7 @@ class Agent(BaseAgent):
                 messages.append(
                     Message.dict_to_message(
                         agent_id=self.agent_state.id,
-                        user_id=self.agent_state.user_id,
+                        user_id=self.agent_state.created_by_id,
                         model=self.model,
                         openai_message_dict={
                             "role": "tool",
@@ -745,7 +743,7 @@ class Agent(BaseAgent):
                 messages.append(
                     Message.dict_to_message(
                         agent_id=self.agent_state.id,
-                        user_id=self.agent_state.user_id,
+                        user_id=self.agent_state.created_by_id,
                         model=self.model,
                         openai_message_dict={
                             "role": "tool",
@@ -823,7 +821,7 @@ class Agent(BaseAgent):
                 messages.append(
                     Message.dict_to_message(
                         agent_id=self.agent_state.id,
-                        user_id=self.agent_state.user_id,
+                        user_id=self.agent_state.created_by_id,
                         model=self.model,
                         openai_message_dict={
                             "role": "tool",
@@ -842,7 +840,7 @@ class Agent(BaseAgent):
             messages.append(
                 Message.dict_to_message(
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict={
                         "role": "tool",
@@ -861,7 +859,7 @@ class Agent(BaseAgent):
                 Message.dict_to_message(
                     id=response_message_id,
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict=response_message.model_dump(),
                 )
@@ -890,18 +888,14 @@ class Agent(BaseAgent):
         # additional args
         chaining: bool = True,
         max_chaining_steps: Optional[int] = None,
-        ms: Optional[MetadataStore] = None,
         **kwargs,
     ) -> LettaUsageStatistics:
         """Run Agent.step in a loop, handling chaining via heartbeat requests and function failures"""
-        # assert ms is not None, "MetadataStore is required"
-
         next_input_message = messages if isinstance(messages, list) else [messages]
         counter = 0
         total_usage = UsageStatistics()
         step_count = 0
         while True:
-            kwargs["ms"] = ms
             kwargs["first_message"] = False
             step_response = self.inner_step(
                 messages=next_input_message,
@@ -919,8 +913,7 @@ class Agent(BaseAgent):
 
             # logger.debug("Saving agent state")
             # save updated state
-            if ms:
-                save_agent(self, ms)
+            save_agent(self)
 
             # Chain stops
             if not chaining:
@@ -931,10 +924,10 @@ class Agent(BaseAgent):
                 break
             # Chain handlers
             elif token_warning:
-                assert self.agent_state.user_id is not None
+                assert self.agent_state.created_by_id is not None
                 next_input_message = Message.dict_to_message(
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict={
                         "role": "user",  # TODO: change to system?
@@ -943,10 +936,10 @@ class Agent(BaseAgent):
                 )
                 continue  # always chain
             elif function_failed:
-                assert self.agent_state.user_id is not None
+                assert self.agent_state.created_by_id is not None
                 next_input_message = Message.dict_to_message(
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict={
                         "role": "user",  # TODO: change to system?
@@ -955,10 +948,10 @@ class Agent(BaseAgent):
                 )
                 continue  # always chain
             elif heartbeat_request:
-                assert self.agent_state.user_id is not None
+                assert self.agent_state.created_by_id is not None
                 next_input_message = Message.dict_to_message(
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict={
                         "role": "user",  # TODO: change to system?
@@ -979,7 +972,6 @@ class Agent(BaseAgent):
         first_message_retry_limit: int = FIRST_MESSAGE_ATTEMPTS,
         skip_verify: bool = False,
         stream: bool = False,  # TODO move to config?
-        ms: Optional[MetadataStore] = None,
     ) -> AgentStepResponse:
         """Runs a single step in the agent loop (generates at most one LLM call)"""
 
@@ -1099,7 +1091,6 @@ class Agent(BaseAgent):
                     first_message_retry_limit=first_message_retry_limit,
                     skip_verify=skip_verify,
                     stream=stream,
-                    ms=ms,
                 )
 
             else:
@@ -1129,10 +1120,10 @@ class Agent(BaseAgent):
         openai_message_dict = {"role": "user", "content": cleaned_user_message_text, "name": name}
 
         # Create the associated Message object (in the database)
-        assert self.agent_state.user_id is not None, "User ID is not set"
+        assert self.agent_state.created_by_id is not None, "User ID is not set"
         user_message = Message.dict_to_message(
             agent_id=self.agent_state.id,
-            user_id=self.agent_state.user_id,
+            user_id=self.agent_state.created_by_id,
             model=self.model,
             openai_message_dict=openai_message_dict,
             # created_at=timestamp,
@@ -1232,7 +1223,7 @@ class Agent(BaseAgent):
             [
                 Message.dict_to_message(
                     agent_id=self.agent_state.id,
-                    user_id=self.agent_state.user_id,
+                    user_id=self.agent_state.created_by_id,
                     model=self.model,
                     openai_message_dict=packed_summary_message,
                 )
@@ -1260,7 +1251,7 @@ class Agent(BaseAgent):
         assert isinstance(new_system_message, str)
         new_system_message_obj = Message.dict_to_message(
             agent_id=self.agent_state.id,
-            user_id=self.agent_state.user_id,
+            user_id=self.agent_state.created_by_id,
             model=self.model,
             openai_message_dict={"role": "system", "content": new_system_message},
         )
@@ -1371,7 +1362,14 @@ class Agent(BaseAgent):
         # TODO: recall memory
         raise NotImplementedError()
 
-    def attach_source(self, user: PydanticUser, source_id: str, source_manager: SourceManager, ms: MetadataStore, page_size: Optional[int] = None):
+    def attach_source(
+        self,
+        user: PydanticUser,
+        source_id: str,
+        source_manager: SourceManager,
+        agent_manager: AgentManager,
+        page_size: Optional[int] = None,
+    ):
         """Attach data with name `source_name` to the agent from source_connector."""
         # TODO: eventually, adding a data source should just give access to the retriever the source table, rather than modifying archival memory
         passages = self.passage_manager.list_passages(actor=user, source_id=source_id, limit=page_size)
@@ -1384,7 +1382,7 @@ class Agent(BaseAgent):
         agents_passages = self.passage_manager.list_passages(actor=user, agent_id=self.agent_state.id, source_id=source_id, limit=page_size)
         passage_size = self.passage_manager.size(actor=user, agent_id=self.agent_state.id, source_id=source_id)
         assert all([p.agent_id == self.agent_state.id for p in agents_passages])
-        assert len(agents_passages) == passage_size # sanity check
+        assert len(agents_passages) == passage_size  # sanity check
         assert passage_size == len(passages), f"Expected {len(passages)} passages, got {passage_size}"
 
         # attach to agent
@@ -1393,7 +1391,7 @@ class Agent(BaseAgent):
 
         # NOTE: need this redundant line here because we haven't migrated agent to ORM yet
         # TODO: delete @matt and remove
-        ms.attach_source(agent_id=self.agent_state.id, source_id=source_id, user_id=self.agent_state.user_id)
+        agent_manager.attach_source(agent_id=self.agent_state.id, source_id=source_id, actor=user)
 
         printd(
             f"Attached data source {source.name} to agent {self.agent_state.name}, consisting of {len(passages)}. Agent now has {passage_size} embeddings in archival memory.",
@@ -1610,20 +1608,31 @@ class Agent(BaseAgent):
         return context_window_breakdown.context_window_size_current
 
 
-def save_agent(agent: Agent, ms: MetadataStore):
+def save_agent(agent: Agent):
     """Save agent to metadata store"""
-
     agent.update_state()
     agent_state = agent.agent_state
     assert isinstance(agent_state.memory, Memory), f"Memory is not a Memory object: {type(agent_state.memory)}"
 
     # TODO: move this to agent manager
+    # TODO: Completely strip out metadata
     # convert to persisted model
-    persisted_agent_state = agent.agent_state.to_persisted_agent_state()
-    if ms.get_agent(agent_id=persisted_agent_state.id):
-        ms.update_agent(persisted_agent_state)
-    else:
-        ms.create_agent(persisted_agent_state)
+    agent_manager = AgentManager()
+    update_agent = UpdateAgent(
+        name=agent_state.name,
+        tool_ids=[t.id for t in agent_state.tools],
+        source_ids=[s.id for s in agent_state.sources],
+        block_ids=[b.id for b in agent_state.memory.blocks],
+        tags=agent_state.tags,
+        system=agent_state.system,
+        tool_rules=agent_state.tool_rules,
+        llm_config=agent_state.llm_config,
+        embedding_config=agent_state.embedding_config,
+        message_ids=agent_state.message_ids,
+        description=agent_state.description,
+        metadata_=agent_state.metadata_,
+    )
+    agent_manager.update_agent(agent_id=agent_state.id, agent_update=update_agent, actor=agent.user)
 
 
 def strip_name_field_from_user_message(user_message_text: str) -> Tuple[str, Optional[str]]:

{letta_nightly-0.6.4.dev20241213193437 → letta_nightly-0.6.4.dev20241215104129}/letta/chat_only_agent.py

@@ -2,9 +2,7 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import List, Optional, Union
 
 from letta.agent import Agent
-
 from letta.interface import AgentInterface
-from letta.metadata import MetadataStore
 from letta.prompts import gpt_system
 from letta.schemas.agent import AgentState, AgentType
 from letta.schemas.embedding_config import EmbeddingConfig
@@ -37,11 +35,9 @@ class ChatOnlyAgent(Agent):
         messages: Union[Message, List[Message]],
         chaining: bool = True,
         max_chaining_steps: Optional[int] = None,
-        ms: Optional[MetadataStore] = None,
         **kwargs,
     ) -> LettaUsageStatistics:
-        # assert ms is not None, "MetadataStore is required"
-        letta_statistics = super().step(messages=messages, chaining=chaining, max_chaining_steps=max_chaining_steps, ms=ms, **kwargs)
+        letta_statistics = super().step(messages=messages, chaining=chaining, max_chaining_steps=max_chaining_steps, **kwargs)
 
         if self.always_rethink_memory:
 
@@ -68,8 +64,10 @@ class ChatOnlyAgent(Agent):
                     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:]
-                conversation_messages_block = Block(name="conversation_block", label="conversation_block", value=recent_convo, limit=self.recent_convo_limit)
+                recent_convo = "".join([str(message) for message in self.messages[3:]])[-self.recent_convo_limit :]
+                conversation_messages_block = Block(
+                    name="conversation_block", label="conversation_block", value=recent_convo, limit=self.recent_convo_limit
+                )
 
                 offline_memory = BasicBlockMemory(
                     blocks=[
@@ -89,7 +87,7 @@ class ChatOnlyAgent(Agent):
                     memory=offline_memory,
                     llm_config=LLMConfig.default_config("gpt-4"),
                     embedding_config=EmbeddingConfig.default_config("text-embedding-ada-002"),
-                    tools=self.agent_state.metadata_.get("offline_memory_tools", []),
+                    tool_ids=self.agent_state.metadata_.get("offline_memory_tools", []),
                     include_base_tools=False,
                 )
                 self.offline_memory_agent.memory.update_block_value(label="conversation_block", value=recent_convo)

{letta_nightly-0.6.4.dev20241213193437 → letta_nightly-0.6.4.dev20241215104129}/letta/cli/cli.py

@@ -18,7 +18,6 @@ from letta.constants import (
 )
 from letta.local_llm.constants import ASSISTANT_MESSAGE_CLI_SYMBOL
 from letta.log import get_logger
-from letta.metadata import MetadataStore
 from letta.schemas.enums import OptionState
 from letta.schemas.memory import ChatMemory, Memory
 from letta.server.server import logger as server_logger
@@ -138,9 +137,7 @@ def run(
     config = LettaConfig.load()
 
     # read user id from config
-    ms = MetadataStore(config)
     client = create_client()
-    server = client.server
 
     # determine agent to use, if not provided
     if not yes and not agent:
@@ -165,8 +162,6 @@ def run(
     persona = persona if persona else config.persona
     if agent and agent_state:  # use existing agent
         typer.secho(f"\n🔁 Using existing agent {agent}", fg=typer.colors.GREEN)
-        # agent_config = AgentConfig.load(agent)
-        # agent_state = ms.get_agent(agent_name=agent, user_id=user_id)
         printd("Loading agent state:", agent_state.id)
         printd("Agent state:", agent_state.name)
         # printd("State path:", agent_config.save_state_dir())
@@ -224,8 +219,6 @@ def run(
         )
 
         # create agent
-        tools = [server.tool_manager.get_tool_by_name(tool_name=tool_name, actor=client.user) for tool_name in agent_state.tool_names]
-        agent_state.tools = tools
         letta_agent = Agent(agent_state=agent_state, interface=interface(), user=client.user)
 
     else:  # create new agent
@@ -317,7 +310,7 @@ def run(
             metadata=metadata,
         )
         assert isinstance(agent_state.memory, Memory), f"Expected Memory, got {type(agent_state.memory)}"
-        typer.secho(f"->  🛠️  {len(agent_state.tools)} tools: {', '.join([t for t in agent_state.tool_names])}", fg=typer.colors.WHITE)
+        typer.secho(f"->  🛠️  {len(agent_state.tools)} tools: {', '.join([t.name for t in agent_state.tools])}", fg=typer.colors.WHITE)
 
         letta_agent = Agent(
             interface=interface(),
@@ -326,7 +319,7 @@ def run(
             first_message_verify_mono=True if (model is not None and "gpt-4" in model) else False,
             user=client.user,
         )
-        save_agent(agent=letta_agent, ms=ms)
+        save_agent(agent=letta_agent)
         typer.secho(f"🎉 Created new agent '{letta_agent.agent_state.name}' (id={letta_agent.agent_state.id})", fg=typer.colors.GREEN)
 
     # start event loop
@@ -337,7 +330,6 @@ def run(
         letta_agent=letta_agent,
         config=config,
         first=first,
-        ms=ms,
         no_verify=no_verify,
         stream=stream,
     )  # TODO: add back no_verify