letta-nightly 0.6.5.dev20241218213641__py3-none-any.whl → 0.6.5.dev20241220104040__py3-none-any.whl

letta/orm/passage.py

@@ -1,26 +1,26 @@
 from typing import TYPE_CHECKING
-from sqlalchemy import Column, JSON, Index
-from sqlalchemy.orm import Mapped, mapped_column, relationship, declared_attr
 
-from letta.orm.mixins import FileMixin, OrganizationMixin
+from sqlalchemy import JSON, Column, Index
+from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
+
+from letta.config import LettaConfig
+from letta.constants import MAX_EMBEDDING_DIM
 from letta.orm.custom_columns import CommonVector, EmbeddingConfigColumn
-from letta.orm.sqlalchemy_base import SqlalchemyBase
 from letta.orm.mixins import AgentMixin, FileMixin, OrganizationMixin, SourceMixin
+from letta.orm.sqlalchemy_base import SqlalchemyBase
 from letta.schemas.passage import Passage as PydanticPassage
 from letta.settings import settings
 
-from letta.config import LettaConfig
-from letta.constants import MAX_EMBEDDING_DIM
-
 config = LettaConfig()
 
 if TYPE_CHECKING:
-    from letta.orm.organization import Organization
     from letta.orm.agent import Agent
+    from letta.orm.organization import Organization
 
 
 class BasePassage(SqlalchemyBase, OrganizationMixin):
     """Base class for all passage types with common fields"""
+
     __abstract__ = True
     __pydantic_model__ = PydanticPassage
 
@@ -45,17 +45,15 @@ class BasePassage(SqlalchemyBase, OrganizationMixin):
     @declared_attr
     def __table_args__(cls):
         if settings.letta_pg_uri_no_default:
-            return (
-                Index(f'{cls.__tablename__}_org_idx', 'organization_id'),
-                {"extend_existing": True}
-            )
+            return (Index(f"{cls.__tablename__}_org_idx", "organization_id"), {"extend_existing": True})
         return ({"extend_existing": True},)
 
 
 class SourcePassage(BasePassage, FileMixin, SourceMixin):
     """Passages derived from external files/sources"""
+
     __tablename__ = "source_passages"
-    
+
     @declared_attr
     def file(cls) -> Mapped["FileMetadata"]:
         """Relationship to file"""
@@ -64,7 +62,7 @@ class SourcePassage(BasePassage, FileMixin, SourceMixin):
     @declared_attr
     def organization(cls) -> Mapped["Organization"]:
         return relationship("Organization", back_populates="source_passages", lazy="selectin")
-        
+
     @declared_attr
     def source(cls) -> Mapped["Source"]:
         """Relationship to source"""
@@ -73,8 +71,9 @@ class SourcePassage(BasePassage, FileMixin, SourceMixin):
 
 class AgentPassage(BasePassage, AgentMixin):
     """Passages created by agents as archival memories"""
+
     __tablename__ = "agent_passages"
-    
+
     @declared_attr
     def organization(cls) -> Mapped["Organization"]:
         return relationship("Organization", back_populates="agent_passages", lazy="selectin")

letta/providers.py

@@ -482,7 +482,8 @@ class GoogleAIProvider(Provider):
         model_options = [mo[len("models/") :] if mo.startswith("models/") else mo for mo in model_options]
 
         # TODO remove manual filtering for gemini-pro
-        model_options = [mo for mo in model_options if str(mo).startswith("gemini") and "-pro" in str(mo)]
+        # Add support for all gemini models
+        model_options = [mo for mo in model_options if str(mo).startswith("gemini-")]
 
         configs = []
         for model in model_options:

letta/schemas/enums.py

@@ -45,5 +45,6 @@ class ToolRuleType(str, Enum):
     run_first = "InitToolRule"
     exit_loop = "TerminalToolRule"  # reasoning loop should exit
     continue_loop = "continue_loop"  # reasoning loop should continue
+    conditional = "conditional"
     constrain_child_tools = "ToolRule"
     require_parent_tools = "require_parent_tools"

letta/schemas/letta_message.py

@@ -9,7 +9,7 @@ from pydantic import BaseModel, Field, field_serializer, field_validator
 
 class LettaMessage(BaseModel):
     """
-    Base class for simplified Letta message response type. This is intended to be used for developers who want the internal monologue, function calls, and function returns in a simplified format that does not include additional information other than the content and timestamp.
+    Base class for simplified Letta message response type. This is intended to be used for developers who want the internal monologue, tool calls, and tool returns in a simplified format that does not include additional information other than the content and timestamp.
 
     Attributes:
         id (str): The ID of the message
@@ -60,32 +60,32 @@ class UserMessage(LettaMessage):
     message: str
 
 
-class InternalMonologue(LettaMessage):
+class ReasoningMessage(LettaMessage):
     """
-    Representation of an agent's internal monologue.
+    Representation of an agent's internal reasoning.
 
     Attributes:
-        internal_monologue (str): The internal monologue of the agent
+        reasoning (str): The internal reasoning of the agent
         id (str): The ID of the message
         date (datetime): The date the message was created in ISO format
     """
 
-    message_type: Literal["internal_monologue"] = "internal_monologue"
-    internal_monologue: str
+    message_type: Literal["reasoning_message"] = "reasoning_message"
+    reasoning: str
 
 
-class FunctionCall(BaseModel):
+class ToolCall(BaseModel):
 
     name: str
     arguments: str
-    function_call_id: str
+    tool_call_id: str
 
 
-class FunctionCallDelta(BaseModel):
+class ToolCallDelta(BaseModel):
 
     name: Optional[str]
     arguments: Optional[str]
-    function_call_id: Optional[str]
+    tool_call_id: Optional[str]
 
     # NOTE: this is a workaround to exclude None values from the JSON dump,
     # since the OpenAI style of returning chunks doesn't include keys with null values
@@ -97,50 +97,84 @@ class FunctionCallDelta(BaseModel):
         return json.dumps(self.model_dump(exclude_none=True), *args, **kwargs)
 
 
-class FunctionCallMessage(LettaMessage):
+class ToolCallMessage(LettaMessage):
     """
-    A message representing a request to call a function (generated by the LLM to trigger function execution).
+    A message representing a request to call a tool (generated by the LLM to trigger tool execution).
 
     Attributes:
-        function_call (Union[FunctionCall, FunctionCallDelta]): The function call
+        tool_call (Union[ToolCall, ToolCallDelta]): The tool call
         id (str): The ID of the message
         date (datetime): The date the message was created in ISO format
     """
 
-    message_type: Literal["function_call"] = "function_call"
-    function_call: Union[FunctionCall, FunctionCallDelta]
+    message_type: Literal["tool_call_message"] = "tool_call_message"
+    tool_call: Union[ToolCall, ToolCallDelta]
 
-    # NOTE: this is required for the FunctionCallDelta exclude_none to work correctly
+    # NOTE: this is required for the ToolCallDelta exclude_none to work correctly
     def model_dump(self, *args, **kwargs):
         kwargs["exclude_none"] = True
         data = super().model_dump(*args, **kwargs)
-        if isinstance(data["function_call"], dict):
-            data["function_call"] = {k: v for k, v in data["function_call"].items() if v is not None}
+        if isinstance(data["tool_call"], dict):
+            data["tool_call"] = {k: v for k, v in data["tool_call"].items() if v is not None}
         return data
 
     class Config:
         json_encoders = {
-            FunctionCallDelta: lambda v: v.model_dump(exclude_none=True),
-            FunctionCall: lambda v: v.model_dump(exclude_none=True),
+            ToolCallDelta: lambda v: v.model_dump(exclude_none=True),
+            ToolCall: lambda v: v.model_dump(exclude_none=True),
         }
 
-    # NOTE: this is required to cast dicts into FunctionCallMessage objects
+    # NOTE: this is required to cast dicts into ToolCallMessage objects
     # Without this extra validator, Pydantic will throw an error if 'name' or 'arguments' are None
-    # (instead of properly casting to FunctionCallDelta instead of FunctionCall)
-    @field_validator("function_call", mode="before")
+    # (instead of properly casting to ToolCallDelta instead of ToolCall)
+    @field_validator("tool_call", mode="before")
     @classmethod
-    def validate_function_call(cls, v):
+    def validate_tool_call(cls, v):
         if isinstance(v, dict):
-            if "name" in v and "arguments" in v and "function_call_id" in v:
-                return FunctionCall(name=v["name"], arguments=v["arguments"], function_call_id=v["function_call_id"])
-            elif "name" in v or "arguments" in v or "function_call_id" in v:
-                return FunctionCallDelta(name=v.get("name"), arguments=v.get("arguments"), function_call_id=v.get("function_call_id"))
+            if "name" in v and "arguments" in v and "tool_call_id" in v:
+                return ToolCall(name=v["name"], arguments=v["arguments"], tool_call_id=v["tool_call_id"])
+            elif "name" in v or "arguments" in v or "tool_call_id" in v:
+                return ToolCallDelta(name=v.get("name"), arguments=v.get("arguments"), tool_call_id=v.get("tool_call_id"))
             else:
-                raise ValueError("function_call must contain either 'name' or 'arguments'")
+                raise ValueError("tool_call must contain either 'name' or 'arguments'")
         return v
 
 
-class FunctionReturn(LettaMessage):
+class ToolReturnMessage(LettaMessage):
+    """
+    A message representing the return value of a tool call (generated by Letta executing the requested tool).
+
+    Attributes:
+        tool_return (str): The return value of the tool
+        status (Literal["success", "error"]): The status of the tool call
+        id (str): The ID of the message
+        date (datetime): The date the message was created in ISO format
+        tool_call_id (str): A unique identifier for the tool call that generated this message
+        stdout (Optional[List(str)]): Captured stdout (e.g. prints, logs) from the tool invocation
+        stderr (Optional[List(str)]): Captured stderr from the tool invocation
+    """
+
+    message_type: Literal["tool_return_message"] = "tool_return_message"
+    tool_return: str
+    status: Literal["success", "error"]
+    tool_call_id: str
+    stdout: Optional[List[str]] = None
+    stderr: Optional[List[str]] = None
+
+
+# Legacy Letta API had an additional type "assistant_message" and the "function_call" was a formatted string
+
+
+class AssistantMessage(LettaMessage):
+    message_type: Literal["assistant_message"] = "assistant_message"
+    assistant_message: str
+
+
+class LegacyFunctionCallMessage(LettaMessage):
+    function_call: str
+
+
+class LegacyFunctionReturn(LettaMessage):
     """
     A message representing the return value of a function call (generated by Letta executing the requested function).
 
@@ -162,22 +196,24 @@ class FunctionReturn(LettaMessage):
     stderr: Optional[List[str]] = None
 
 
-# Legacy Letta API had an additional type "assistant_message" and the "function_call" was a formatted string
-
-
-class AssistantMessage(LettaMessage):
-    message_type: Literal["assistant_message"] = "assistant_message"
-    assistant_message: str
+class LegacyInternalMonologue(LettaMessage):
+    """
+    Representation of an agent's internal monologue.
 
+    Attributes:
+        internal_monologue (str): The internal monologue of the agent
+        id (str): The ID of the message
+        date (datetime): The date the message was created in ISO format
+    """
 
-class LegacyFunctionCallMessage(LettaMessage):
-    function_call: str
+    message_type: Literal["internal_monologue"] = "internal_monologue"
+    internal_monologue: str
 
 
-LegacyLettaMessage = Union[InternalMonologue, AssistantMessage, LegacyFunctionCallMessage, FunctionReturn]
+LegacyLettaMessage = Union[LegacyInternalMonologue, AssistantMessage, LegacyFunctionCallMessage, LegacyFunctionReturn]
 
 
 LettaMessageUnion = Annotated[
-    Union[SystemMessage, UserMessage, InternalMonologue, FunctionCallMessage, FunctionReturn, AssistantMessage],
+    Union[SystemMessage, UserMessage, ReasoningMessage, ToolCallMessage, ToolReturnMessage, AssistantMessage],
     Field(discriminator="message_type"),
 ]

letta/schemas/letta_response.py

@@ -40,14 +40,22 @@ class LettaResponse(BaseModel):
         def get_formatted_content(msg):
             if msg.message_type == "internal_monologue":
                 return f'<div class="content"><span class="internal-monologue">{html.escape(msg.internal_monologue)}</span></div>'
+            if msg.message_type == "reasoning_message":
+                return f'<div class="content"><span class="internal-monologue">{html.escape(msg.reasoning)}</span></div>'
             elif msg.message_type == "function_call":
                 args = format_json(msg.function_call.arguments)
                 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>'
             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>'
                 return f'<div class="content">{return_value}</div>'
+            elif msg.message_type == "tool_return_message":
+                return_value = format_json(msg.tool_return)
+                # return f'<div class="status-line">Status: {html.escape(msg.status)}</div><div class="content">{return_value}</div>'
+                return f'<div class="content">{return_value}</div>'
             elif msg.message_type == "user_message":
                 if is_json(msg.message):
                     return f'<div class="content">{format_json(msg.message)}</div>'

letta/schemas/message.py

@@ -16,10 +16,10 @@ from letta.schemas.enums import MessageRole
 from letta.schemas.letta_base import OrmMetadataBase
 from letta.schemas.letta_message import (
     AssistantMessage,
-    FunctionCall,
-    FunctionCallMessage,
-    FunctionReturn,
-    InternalMonologue,
+    ToolCall as LettaToolCall,
+    ToolCallMessage,
+    ToolReturnMessage,
+    ReasoningMessage,
     LettaMessage,
     SystemMessage,
     UserMessage,
@@ -145,10 +145,10 @@ class Message(BaseMessage):
             if self.text is not None:
                 # This is type InnerThoughts
                 messages.append(
-                    InternalMonologue(
+                    ReasoningMessage(
                         id=self.id,
                         date=self.created_at,
-                        internal_monologue=self.text,
+                        reasoning=self.text,
                     )
                 )
             if self.tool_calls is not None:
@@ -172,18 +172,18 @@ class Message(BaseMessage):
                         )
                     else:
                         messages.append(
-                            FunctionCallMessage(
+                            ToolCallMessage(
                                 id=self.id,
                                 date=self.created_at,
-                                function_call=FunctionCall(
+                                tool_call=LettaToolCall(
                                     name=tool_call.function.name,
                                     arguments=tool_call.function.arguments,
-                                    function_call_id=tool_call.id,
+                                    tool_call_id=tool_call.id,
                                 ),
                             )
                         )
         elif self.role == MessageRole.tool:
-            # This is type FunctionReturn
+            # This is type ToolReturnMessage
             # Try to interpret the function return, recall that this is how we packaged:
             # def package_function_response(was_success, response_string, timestamp=None):
             #     formatted_time = get_local_time() if timestamp is None else timestamp
@@ -208,12 +208,12 @@ class Message(BaseMessage):
             messages.append(
                 # TODO make sure this is what the API returns
                 # function_return may not match exactly...
-                FunctionReturn(
+                ToolReturnMessage(
                     id=self.id,
                     date=self.created_at,
-                    function_return=self.text,
+                    tool_return=self.text,
                     status=status_enum,
-                    function_call_id=self.tool_call_id,
+                    tool_call_id=self.tool_call_id,
                 )
             )
         elif self.role == MessageRole.user:

letta/schemas/tool_rule.py

@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import Any, Dict, List, Optional, Union
 
 from pydantic import Field
 
@@ -21,6 +21,16 @@ class ChildToolRule(BaseToolRule):
     children: List[str] = Field(..., description="The children tools that can be invoked.")
 
 
+class ConditionalToolRule(BaseToolRule):
+    """
+    A ToolRule that conditionally maps to different child tools based on the output.
+    """
+    type: ToolRuleType = ToolRuleType.conditional
+    default_child: Optional[str] = Field(None, description="The default child tool to be called. If None, any tool can be called.")
+    child_output_mapping: Dict[Any, str] = Field(..., description="The output case to check for mapping")
+    require_output_mapping: bool = Field(default=False, description="Whether to throw an error when output doesn't match any case")
+
+
 class InitToolRule(BaseToolRule):
     """
     Represents the initial tool rule configuration.
@@ -37,4 +47,4 @@ class TerminalToolRule(BaseToolRule):
     type: ToolRuleType = ToolRuleType.exit_loop
 
 
-ToolRule = Union[ChildToolRule, InitToolRule, TerminalToolRule]
+ToolRule = Union[ChildToolRule, InitToolRule, TerminalToolRule, ConditionalToolRule]