letta-nightly 0.6.6.dev20241221104005__py3-none-any.whl → 0.6.6.dev20241223104053__py3-none-any.whl

letta/agent.py

@@ -237,8 +237,8 @@ class Agent(BaseAgent):
                 )
                 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)
+                if updated_agent_state is not None:
+                    self.update_memory_if_change(updated_agent_state.memory)
         except Exception as e:
             # Need to catch error here, or else trunction wont happen
             # TODO: modify to function execution error
@@ -251,7 +251,7 @@ class Agent(BaseAgent):
     def _get_ai_reply(
         self,
         message_sequence: List[Message],
-        function_call: str = "auto",
+        function_call: Optional[str] = None,
         first_message: bool = False,
         stream: bool = False,  # TODO move to config?
         empty_response_retry_limit: int = 3,
@@ -282,7 +282,6 @@ class Agent(BaseAgent):
         # Force a tool call if exactly one tool is specified
         elif step_count is not None and step_count > 0 and len(allowed_tool_names) == 1:
             force_tool_call = allowed_tool_names[0]
-
         for attempt in range(1, empty_response_retry_limit + 1):
             try:
                 response = create(
@@ -314,7 +313,7 @@ class Agent(BaseAgent):
             except ValueError as ve:
                 if attempt >= empty_response_retry_limit:
                     warnings.warn(f"Retry limit reached. Final error: {ve}")
-                    break
+                    raise Exception(f"Retries exhausted and no valid response received. Final error: {ve}")
                 else:
                     delay = min(backoff_factor * (2 ** (attempt - 1)), max_delay)
                     warnings.warn(f"Attempt {attempt} failed: {ve}. Retrying in {delay} seconds...")
@@ -1043,6 +1042,7 @@ class Agent(BaseAgent):
             num_archival_memory=agent_manager_passage_size,
             num_recall_memory=message_manager_size,
             num_tokens_external_memory_summary=num_tokens_external_memory_summary,
+            external_memory_summary=external_memory_summary,
             # top-level information
             context_window_size_max=self.agent_state.llm_config.context_window,
             context_window_size_current=num_tokens_used_total,

letta/llm_api/helpers.py

@@ -250,6 +250,8 @@ def unpack_all_inner_thoughts_from_kwargs(
 
 def unpack_inner_thoughts_from_kwargs(choice: Choice, inner_thoughts_key: str) -> Choice:
     message = choice.message
+    rewritten_choice = choice  # inner thoughts unpacked out of the function
+
     if message.role == "assistant" and message.tool_calls and len(message.tool_calls) >= 1:
         if len(message.tool_calls) > 1:
             warnings.warn(f"Unpacking inner thoughts from more than one tool call ({len(message.tool_calls)}) is not supported")
@@ -271,14 +273,18 @@ def unpack_inner_thoughts_from_kwargs(choice: Choice, inner_thoughts_key: str) -
                     warnings.warn(f"Overwriting existing inner monologue ({new_choice.message.content}) with kwarg ({inner_thoughts})")
                 new_choice.message.content = inner_thoughts
 
-                return new_choice
+                # update the choice object
+                rewritten_choice = new_choice
             else:
                 warnings.warn(f"Did not find inner thoughts in tool call: {str(tool_call)}")
-                return choice
 
         except json.JSONDecodeError as e:
             warnings.warn(f"Failed to strip inner thoughts from kwargs: {e}")
             raise e
+    else:
+        warnings.warn(f"Did not find tool call in message: {str(message)}")
+
+    return rewritten_choice
 
 
 def is_context_overflow_error(exception: Union[requests.exceptions.RequestException, Exception]) -> bool:

letta/llm_api/llm_api_tools.py

@@ -110,7 +110,7 @@ def create(
     user_id: Optional[str] = None,  # option UUID to associate request with
     functions: Optional[list] = None,
     functions_python: Optional[dict] = None,
-    function_call: str = "auto",
+    function_call: Optional[str] = None,  # see: https://platform.openai.com/docs/api-reference/chat/create#chat-create-tool_choice
     # hint
     first_message: bool = False,
     force_tool_call: Optional[str] = None,  # Force a specific tool to be called
@@ -148,10 +148,19 @@ def create(
 
     # openai
     if llm_config.model_endpoint_type == "openai":
+
         if model_settings.openai_api_key is None and llm_config.model_endpoint == "https://api.openai.com/v1":
             # only is a problem if we are *not* using an openai proxy
             raise LettaConfigurationError(message="OpenAI key is missing from letta config file", missing_fields=["openai_api_key"])
 
+        if function_call is None and functions is not None and len(functions) > 0:
+            # force function calling for reliability, see https://platform.openai.com/docs/api-reference/chat/create#chat-create-tool_choice
+            # TODO(matt) move into LLMConfig
+            if llm_config.model_endpoint == "https://inference.memgpt.ai":
+                function_call = "auto"  # TODO change to "required" once proxy supports it
+            else:
+                function_call = "required"
+
         data = build_openai_chat_completions_request(llm_config, messages, user_id, functions, function_call, use_tool_naming, max_tokens)
         if stream:  # Client requested token streaming
             data.stream = True
@@ -255,12 +264,7 @@ def create(
 
         tool_call = None
         if force_tool_call is not None:
-            tool_call = {
-                "type": "function",
-                "function": {
-                    "name": force_tool_call
-                }
-            }
+            tool_call = {"type": "function", "function": {"name": force_tool_call}}
             assert functions is not None
 
         return anthropic_chat_completions_request(

letta/schemas/letta_response.py

@@ -47,7 +47,7 @@ class LettaResponse(BaseModel):
                 return f'<div class="content"><span class="function-name">{html.escape(msg.function_call.name)}</span>({args})</div>'
             elif msg.message_type == "tool_call_message":
                 args = format_json(msg.tool_call.arguments)
-                return f'<div class="content"><span class="function-name">{html.escape(msg.function_call.name)}</span>({args})</div>'
+                return f'<div class="content"><span class="function-name">{html.escape(msg.tool_call.name)}</span>({args})</div>'
             elif msg.message_type == "function_return":
                 return_value = format_json(msg.function_return)
                 # return f'<div class="status-line">Status: {html.escape(msg.status)}</div><div class="content">{return_value}</div>'

letta/schemas/memory.py

@@ -30,6 +30,9 @@ class ContextWindowOverview(BaseModel):
     num_tokens_external_memory_summary: int = Field(
         ..., description="The number of tokens in the external memory summary (archival + recall metadata)."
     )
+    external_memory_summary: str = Field(
+        ..., description="The metadata summary of the external memory sources (archival + recall metadata)."
+    )
 
     # context window breakdown (in tokens)
     # this should all add up to context_window_size_current

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

@@ -1,8 +1,10 @@
 from typing import List, Optional
 
+from composio.client import ComposioClientError, HTTPError, NoItemsFound
 from composio.client.collections import ActionModel, AppModel
 from composio.client.enums.base import EnumStringNotFound
-from composio.exceptions import ComposioSDKError
+from composio.exceptions import ApiKeyNotProvidedError, ComposioSDKError
+from composio.tools.base.abs import InvalidClassDefinition
 from fastapi import APIRouter, Body, Depends, Header, HTTPException
 
 from letta.errors import LettaToolCreateError
@@ -239,21 +241,66 @@ def add_composio_tool(
     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:
+    except EnumStringNotFound as e:
         raise HTTPException(
             status_code=400,  # Bad Request
             detail={
                 "code": "EnumStringNotFound",
-                "message": f"Cannot find composio action with name `{composio_action_name}`.",
+                "message": str(e),
                 "composio_action_name": composio_action_name,
             },
         )
-    except ComposioSDKError:
+    except HTTPError as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "HTTPError",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
+    except NoItemsFound as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "NoItemsFound",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
+    except ComposioClientError as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "ComposioClientError",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
+    except ApiKeyNotProvidedError as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "ApiKeyNotProvidedError",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
+    except InvalidClassDefinition as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "InvalidClassDefinition",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
+    except ComposioSDKError as e:
         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.",
+                "message": str(e),
                 "composio_action_name": composio_action_name,
             },
         )

letta/services/agent_manager.py

@@ -336,7 +336,7 @@ class AgentManager:
         curr_memory_str = agent_state.memory.compile()
         if curr_memory_str in curr_system_message_openai["content"] and not force:
             # NOTE: could this cause issues if a block is removed? (substring match would still work)
-            logger.info(
+            logger.debug(
                 f"Memory hasn't changed for agent id={agent_id} and actor=({actor.id}, {actor.name}), skipping system prompt rebuild"
             )
             return agent_state

{letta_nightly-0.6.6.dev20241221104005.dist-info → letta_nightly-0.6.6.dev20241223104053.dist-info}/METADATA

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

{letta_nightly-0.6.6.dev20241221104005.dist-info → letta_nightly-0.6.6.dev20241223104053.dist-info}/RECORD

@@ -1,6 +1,6 @@
 letta/__init__.py,sha256=kBJPc_H6xrNs2Y1U-Otm4HteKlgr6AfbLp8nRxMwfiQ,1014
 letta/__main__.py,sha256=6Hs2PV7EYc5Tid4g4OtcLXhqVHiNYTGzSBdoOnW2HXA,29
-letta/agent.py,sha256=4mkn4YzXv4e3DbQOOXcrBGTPDBhM9OlpRLVs_kY768s,54619
+letta/agent.py,sha256=RBP9GB2ANk6VTZaTQ7zhwSb84zQ0cAK63745JcncpiA,54824
 letta/benchmark/benchmark.py,sha256=ebvnwfp3yezaXOQyGXkYCDYpsmre-b9hvNtnyx4xkG0,3701
 letta/benchmark/constants.py,sha256=aXc5gdpMGJT327VuxsT5FngbCK2J41PQYeICBO7g_RE,536
 letta/chat_only_agent.py,sha256=ECqJS7KzXOsNkJc9mv7reKbcxBI_PKP_PQyk95tsT1Y,4761
@@ -36,8 +36,8 @@ letta/llm_api/azure_openai.py,sha256=Y1HKPog1XzM_f7ujUK_Gv2zQkoy5pU-1bKiUnvSxSrs
 letta/llm_api/azure_openai_constants.py,sha256=oXtKrgBFHf744gyt5l1thILXgyi8NDNUrKEa2GGGpjw,278
 letta/llm_api/cohere.py,sha256=vDRd-SUGp1t_JUIdwC3RkIhwMl0OY7n-tAU9uPORYkY,14826
 letta/llm_api/google_ai.py,sha256=xKz9JDZs3m6yzSfcgCAAUD_rjI20BBIINoiSvlcnOw0,17621
-letta/llm_api/helpers.py,sha256=F8xZDZgDojWX5v-0vakyeUQyCyBr1HmzmsITRdOsmVg,13457
-letta/llm_api/llm_api_tools.py,sha256=Qb1NsOOLmgMzMZ_A1J0v2EoQPm444Z2kZ9d-5j-FL6c,17731
+letta/llm_api/helpers.py,sha256=iP9EswPflaRzsmLqQuMGt1OCUQgPrPq1xTjrqmMKPiA,13675
+letta/llm_api/llm_api_tools.py,sha256=ID3tTWyoNqq6yk7ezHWgUuWbF9QG-sQ73i4TZ1IgoxE,18244
 letta/llm_api/mistral.py,sha256=fHdfD9ug-rQIk2qn8tRKay1U6w9maF11ryhKi91FfXM,1593
 letta/llm_api/openai.py,sha256=4GEGROTv4vLawSgODnAHCI-DeIWDqrhuxtKrqYzHvso,24160
 letta/local_llm/README.md,sha256=hFJyw5B0TU2jrh9nb0zGZMgdH-Ei1dSRfhvPQG_NSoU,168
@@ -146,9 +146,9 @@ letta/schemas/job.py,sha256=vRVVpMCHTxot9uaalLS8RARnqzJWvcLB1XP5XRBioPc,1398
 letta/schemas/letta_base.py,sha256=v3OvpVFVUfcuK1lIyTjM0x4fmWeWQw1DdlhKXHBUCz8,3608
 letta/schemas/letta_message.py,sha256=SpAxAEFQa-JMzxIQ5cqz0TENB5S9WsdrTAHGUJBLCQQ,8040
 letta/schemas/letta_request.py,sha256=Hfb66FB1tXmrpEX4_yLQVfTrTSMbPYeEvZY-vqW9Tj8,981
-letta/schemas/letta_response.py,sha256=PSHnIzGAz1MP1ACA_f7zyt4zXDnYJhNfcDRbV1HJpo4,6940
+letta/schemas/letta_response.py,sha256=Qx_OH8CttLeIT-BeiWE5huzxgLb6P6eNWadIiEZ2aQ0,6936
 letta/schemas/llm_config.py,sha256=zxygt_4imoEAgxMLO1nxNVAL-2ePGsOKEt-vQJOc0ow,4585
-letta/schemas/memory.py,sha256=iWEm15qMa4pWQQUMIt6mnlrBQvACII0MpfNX8QujGE8,10072
+letta/schemas/memory.py,sha256=dWF1AWhQKEp1MJ6yz8wVYrWNsmA2ADREAz2lS3d8I6c,10229
 letta/schemas/message.py,sha256=Z_k8YpURh0Dbx4BaFbo6Z7YP9JIkItL1UKtDnmZfVHE,34149
 letta/schemas/openai/chat_completion_request.py,sha256=AOIwgbN3CZKVqkuXeMHeSa53u4h0wVq69t3T_LJ0vIE,3389
 letta/schemas/openai/chat_completion_response.py,sha256=ub-oVSyLpuJd-5_yzCSIRR8tD3GM83IeDO1c1uAATa4,3970
@@ -188,7 +188,7 @@ letta/server/rest_api/routers/v1/llms.py,sha256=TcyvSx6MEM3je5F4DysL7ligmssL_pFl
 letta/server/rest_api/routers/v1/organizations.py,sha256=tyqVzXTpMtk3sKxI3Iz4aS6RhbGEbXDzFBB_CpW18v4,2080
 letta/server/rest_api/routers/v1/sandbox_configs.py,sha256=pG3X3bYbmsq90kRc-06qfnM6yalvYEpVVEQnTuZVm0o,5134
 letta/server/rest_api/routers/v1/sources.py,sha256=shjy4gbKulKfbK94GF52EW4ZbiDatcNgnyBysONCBCA,9946
-letta/server/rest_api/routers/v1/tools.py,sha256=bWgI5SExyfwqPASLf8o9reFWInSuMYyyJRV1DTTATps,11266
+letta/server/rest_api/routers/v1/tools.py,sha256=WpkM1UotqWyr61zBpEU3tAaoUfXIDMxJbjfPqpg1jpI,12720
 letta/server/rest_api/routers/v1/users.py,sha256=EBQe9IfCG3kzHpKmotz4yVGZioXz3SCSRy5yEhJK8hU,2293
 letta/server/rest_api/static_files.py,sha256=NG8sN4Z5EJ8JVQdj19tkFa9iQ1kBPTab9f_CUxd_u4Q,3143
 letta/server/rest_api/utils.py,sha256=78n6FMnCS7O3T_z1OXKmL8wKQVTnGnQ1LDlLTI-T5Kc,3952
@@ -206,7 +206,7 @@ letta/server/ws_api/interface.py,sha256=TWl9vkcMCnLsUtgsuENZ-ku2oMDA-OUTzLh_yNRo
 letta/server/ws_api/protocol.py,sha256=M_-gM5iuDBwa1cuN2IGNCG5GxMJwU2d3XW93XALv9s8,1821
 letta/server/ws_api/server.py,sha256=cBSzf-V4zT1bL_0i54OTI3cMXhTIIxqjSRF8pYjk7fg,5835
 letta/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-letta/services/agent_manager.py,sha256=y8020VlCWvTtDmKfhaBxJ4XOi-9zwEXyh9q2oK6Tpwg,38935
+letta/services/agent_manager.py,sha256=_-AzsHSClatNXk_cWlzdlaGvWsoBpIJOKaZGBVH3Ugc,38936
 letta/services/block_manager.py,sha256=HUj9HKW2LvAsENEsgCO3Pf3orvSy6XOimev38VKmRZ8,4929
 letta/services/helpers/agent_manager_helper.py,sha256=Q_nRk-eovoYTzLxOYvUbnsQVLWdRvFvjk8OcLUfjkJU,10568
 letta/services/job_manager.py,sha256=FrkSXloke48CZKuzlYdysxM5gKWoTu7FRigPrs_YW4A,3645
@@ -225,8 +225,8 @@ letta/streaming_interface.py,sha256=_FPUWy58j50evHcpXyd7zB1wWqeCc71NCFeWh_TBvnw,
 letta/streaming_utils.py,sha256=329fsvj1ZN0r0LpQtmMPZ2vSxkDBIUUwvGHZFkjm2I8,11745
 letta/system.py,sha256=buKYPqG5n2x41hVmWpu6JUpyd7vTWED9Km2_M7dLrvk,6960
 letta/utils.py,sha256=JZbKq-3KhbmilATo-SbY0OgOnwN-zkE40UD7dfAZMWI,33381
-letta_nightly-0.6.6.dev20241221104005.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
-letta_nightly-0.6.6.dev20241221104005.dist-info/METADATA,sha256=NjjF2UtUvzhYQzthHiAMd13gE9iWpiN76ruPjoOlDMk,21693
-letta_nightly-0.6.6.dev20241221104005.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-letta_nightly-0.6.6.dev20241221104005.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
-letta_nightly-0.6.6.dev20241221104005.dist-info/RECORD,,
+letta_nightly-0.6.6.dev20241223104053.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
+letta_nightly-0.6.6.dev20241223104053.dist-info/METADATA,sha256=N92E24my1TvWWRil2fDYjBNATWqRKLRMyHcuBZ_zbX4,21693
+letta_nightly-0.6.6.dev20241223104053.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+letta_nightly-0.6.6.dev20241223104053.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
+letta_nightly-0.6.6.dev20241223104053.dist-info/RECORD,,