letta-nightly 0.6.42.dev20250317175208__tar.gz → 0.6.43.dev20250318104149__tar.gz

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.6.42.dev20250317175208
+Version: 0.6.43.dev20250318104149
 Summary: Create LLM agents with long-term memory and custom tools
 License: Apache License
 Author: Letta Team
@@ -31,7 +31,7 @@ Requires-Dist: brotli (>=1.1.0,<2.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
 Requires-Dist: composio-core (>=0.7.7,<0.8.0)
 Requires-Dist: composio-langchain (>=0.7.7,<0.8.0)
-Requires-Dist: datamodel-code-generator[http] (>=0.25.0,<0.26.0) ; extra == "desktop" or extra == "all"
+Requires-Dist: datamodel-code-generator[http] (>=0.25.0,<0.26.0)
 Requires-Dist: demjson3 (>=3.0.6,<4.0.0)
 Requires-Dist: docker (>=7.1.0,<8.0.0) ; extra == "external-tools" or extra == "desktop" or extra == "all"
 Requires-Dist: docstring-parser (>=0.16,<0.17)

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.41"
+__version__ = "0.6.43"
 
 # import clients
 from letta.client.client import LocalClient, RESTClient, create_client

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/agent.py

@@ -367,7 +367,10 @@ class Agent(BaseAgent):
     ) -> ChatCompletionResponse:
         """Get response from LLM API with robust retry mechanism."""
         log_telemetry(self.logger, "_get_ai_reply start")
-        allowed_tool_names = self.tool_rules_solver.get_allowed_tool_names(last_function_response=self.last_function_response)
+        available_tools = set([t.name for t in self.agent_state.tools])
+        allowed_tool_names = self.tool_rules_solver.get_allowed_tool_names(
+            available_tools=available_tools, last_function_response=self.last_function_response
+        )
         agent_state_tool_jsons = [t.json_schema for t in self.agent_state.tools]
 
         allowed_functions = (
@@ -377,8 +380,8 @@ class Agent(BaseAgent):
         )
 
         # Don't allow a tool to be called if it failed last time
-        if last_function_failed and self.tool_rules_solver.last_tool_name:
-            allowed_functions = [f for f in allowed_functions if f["name"] != self.tool_rules_solver.last_tool_name]
+        if last_function_failed and self.tool_rules_solver.tool_call_history:
+            allowed_functions = [f for f in allowed_functions if f["name"] != self.tool_rules_solver.tool_call_history[-1]]
             if not allowed_functions:
                 return None
 
@@ -773,6 +776,11 @@ class Agent(BaseAgent):
         **kwargs,
     ) -> LettaUsageStatistics:
         """Run Agent.step in a loop, handling chaining via heartbeat requests and function failures"""
+        # Defensively clear the tool rules solver history
+        # Usually this would be extraneous as Agent loop is re-loaded on every message send
+        # But just to be safe
+        self.tool_rules_solver.clear_tool_history()
+
         next_input_message = messages if isinstance(messages, list) else [messages]
         counter = 0
         total_usage = UsageStatistics()

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/helpers/converters.py

@@ -20,7 +20,15 @@ from letta.schemas.letta_message_content import (
 )
 from letta.schemas.llm_config import LLMConfig
 from letta.schemas.message import ToolReturn
-from letta.schemas.tool_rule import ChildToolRule, ConditionalToolRule, ContinueToolRule, InitToolRule, TerminalToolRule, ToolRule
+from letta.schemas.tool_rule import (
+    ChildToolRule,
+    ConditionalToolRule,
+    ContinueToolRule,
+    InitToolRule,
+    MaxCountPerStepToolRule,
+    TerminalToolRule,
+    ToolRule,
+)
 
 # --------------------------
 # LLMConfig Serialization
@@ -85,23 +93,27 @@ def deserialize_tool_rules(data: Optional[List[Dict]]) -> List[Union[ChildToolRu
     return [deserialize_tool_rule(rule_data) for rule_data in data]
 
 
-def deserialize_tool_rule(data: Dict) -> Union[ChildToolRule, InitToolRule, TerminalToolRule, ConditionalToolRule, ContinueToolRule]:
+def deserialize_tool_rule(
+    data: Dict,
+) -> Union[ChildToolRule, InitToolRule, TerminalToolRule, ConditionalToolRule, ContinueToolRule, MaxCountPerStepToolRule]:
     """Deserialize a dictionary to the appropriate ToolRule subclass based on 'type'."""
     rule_type = ToolRuleType(data.get("type"))
 
-    if rule_type == ToolRuleType.run_first or rule_type == ToolRuleType.InitToolRule:
+    if rule_type == ToolRuleType.run_first:
         data["type"] = ToolRuleType.run_first
         return InitToolRule(**data)
-    elif rule_type == ToolRuleType.exit_loop or rule_type == ToolRuleType.TerminalToolRule:
+    elif rule_type == ToolRuleType.exit_loop:
         data["type"] = ToolRuleType.exit_loop
         return TerminalToolRule(**data)
-    elif rule_type == ToolRuleType.constrain_child_tools or rule_type == ToolRuleType.ToolRule:
+    elif rule_type == ToolRuleType.constrain_child_tools:
         data["type"] = ToolRuleType.constrain_child_tools
         return ChildToolRule(**data)
     elif rule_type == ToolRuleType.conditional:
         return ConditionalToolRule(**data)
     elif rule_type == ToolRuleType.continue_loop:
         return ContinueToolRule(**data)
+    elif rule_type == ToolRuleType.max_count_per_step:
+        return MaxCountPerStepToolRule(**data)
     raise ValueError(f"Unknown ToolRule type: {rule_type}")
 
 

letta_nightly-0.6.43.dev20250318104149/letta/helpers/tool_rule_solver.py

@@ -0,0 +1,129 @@
+from typing import List, Optional, Set, Union
+
+from pydantic import BaseModel, Field
+
+from letta.schemas.enums import ToolRuleType
+from letta.schemas.tool_rule import (
+    BaseToolRule,
+    ChildToolRule,
+    ConditionalToolRule,
+    ContinueToolRule,
+    InitToolRule,
+    MaxCountPerStepToolRule,
+    TerminalToolRule,
+)
+
+
+class ToolRuleValidationError(Exception):
+    """Custom exception for tool rule validation errors in ToolRulesSolver."""
+
+    def __init__(self, message: str):
+        super().__init__(f"ToolRuleValidationError: {message}")
+
+
+class ToolRulesSolver(BaseModel):
+    init_tool_rules: List[InitToolRule] = Field(
+        default_factory=list, description="Initial tool rules to be used at the start of tool execution."
+    )
+    continue_tool_rules: List[ContinueToolRule] = Field(
+        default_factory=list, description="Continue tool rules to be used to continue tool execution."
+    )
+    # TODO: This should be renamed?
+    # TODO: These are tools that control the set of allowed functions in the next turn
+    child_based_tool_rules: List[Union[ChildToolRule, ConditionalToolRule, MaxCountPerStepToolRule]] = Field(
+        default_factory=list, description="Standard tool rules for controlling execution sequence and allowed transitions."
+    )
+    terminal_tool_rules: List[TerminalToolRule] = Field(
+        default_factory=list, description="Terminal tool rules that end the agent loop if called."
+    )
+    tool_call_history: List[str] = Field(default_factory=list, description="History of tool calls, updated with each tool call.")
+
+    def __init__(self, tool_rules: List[BaseToolRule], **kwargs):
+        super().__init__(**kwargs)
+        # Separate the provided tool rules into init, standard, and terminal categories
+        for rule in tool_rules:
+            if rule.type == ToolRuleType.run_first:
+                assert isinstance(rule, InitToolRule)
+                self.init_tool_rules.append(rule)
+            elif rule.type == ToolRuleType.constrain_child_tools:
+                assert isinstance(rule, ChildToolRule)
+                self.child_based_tool_rules.append(rule)
+            elif rule.type == ToolRuleType.conditional:
+                assert isinstance(rule, ConditionalToolRule)
+                self.validate_conditional_tool(rule)
+                self.child_based_tool_rules.append(rule)
+            elif rule.type == ToolRuleType.exit_loop:
+                assert isinstance(rule, TerminalToolRule)
+                self.terminal_tool_rules.append(rule)
+            elif rule.type == ToolRuleType.continue_loop:
+                assert isinstance(rule, ContinueToolRule)
+                self.continue_tool_rules.append(rule)
+            elif rule.type == ToolRuleType.max_count_per_step:
+                assert isinstance(rule, MaxCountPerStepToolRule)
+                self.child_based_tool_rules.append(rule)
+
+    def update_tool_usage(self, tool_name: str):
+        """Update the internal state to track tool call history."""
+        self.tool_call_history.append(tool_name)
+
+    def clear_tool_history(self):
+        """Clear the history of tool calls."""
+        self.tool_call_history.clear()
+
+    def get_allowed_tool_names(
+        self, available_tools: Set[str], error_on_empty: bool = False, last_function_response: Optional[str] = None
+    ) -> List[str]:
+        """Get a list of tool names allowed based on the last tool called."""
+        # TODO: This piece of code here is quite ugly and deserves a refactor
+        # TODO: There's some weird logic encoded here:
+        # TODO: -> This only takes into consideration Init, and a set of Child/Conditional/MaxSteps tool rules
+        # TODO: -> Init tool rules outputs are treated additively, Child/Conditional/MaxSteps are intersection based
+        # TODO: -> Tool rules should probably be refactored to take in a set of tool names?
+        # If no tool has been called yet, return InitToolRules additively
+        if not self.tool_call_history:
+            if self.init_tool_rules:
+                # If there are init tool rules, only return those defined in the init tool rules
+                return [rule.tool_name for rule in self.init_tool_rules]
+            else:
+                # Otherwise, return all the available tools
+                return list(available_tools)
+        else:
+            # Collect valid tools from all child-based rules
+            valid_tool_sets = [
+                rule.get_valid_tools(self.tool_call_history, available_tools, last_function_response)
+                for rule in self.child_based_tool_rules
+            ]
+
+            # Compute intersection of all valid tool sets
+            final_allowed_tools = set.intersection(*valid_tool_sets) if valid_tool_sets else available_tools
+
+            if error_on_empty and not final_allowed_tools:
+                raise ValueError("No valid tools found based on tool rules.")
+
+            return list(final_allowed_tools)
+
+    def is_terminal_tool(self, tool_name: str) -> bool:
+        """Check if the tool is defined as a terminal tool in the terminal tool rules."""
+        return any(rule.tool_name == tool_name for rule in self.terminal_tool_rules)
+
+    def has_children_tools(self, tool_name):
+        """Check if the tool has children tools"""
+        return any(rule.tool_name == tool_name for rule in self.child_based_tool_rules)
+
+    def is_continue_tool(self, tool_name):
+        """Check if the tool is defined as a continue tool in the tool rules."""
+        return any(rule.tool_name == tool_name for rule in self.continue_tool_rules)
+
+    def validate_conditional_tool(self, rule: ConditionalToolRule):
+        """
+        Validate a conditional tool rule
+
+        Args:
+            rule (ConditionalToolRule): The conditional tool rule to validate
+
+        Raises:
+            ToolRuleValidationError: If the rule is invalid
+        """
+        if len(rule.child_output_mapping) == 0:
+            raise ToolRuleValidationError("Conditional tool rule must have at least one child tool.")
+        return True

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/orm/sqlalchemy_base.py

@@ -508,10 +508,13 @@ class SqlalchemyBase(CommonSqlalchemyMetaMixins, Base):
         raise NotImplementedError("Sqlalchemy models must declare a __pydantic_model__ property to be convertable.")
 
     def to_pydantic(self) -> "BaseModel":
-        """converts to the basic pydantic model counterpart"""
-        model = self.__pydantic_model__.model_validate(self)
-        if hasattr(self, "metadata_"):
-            model.metadata = self.metadata_
+        """Converts the SQLAlchemy model to its corresponding Pydantic model."""
+        model = self.__pydantic_model__.model_validate(self, from_attributes=True)
+
+        # Explicitly map metadata_ to metadata in Pydantic model
+        if hasattr(self, "metadata_") and hasattr(model, "metadata_"):
+            setattr(model, "metadata_", self.metadata_)  # Ensures correct assignment
+
         return model
 
     def pretty_print_columns(self) -> str:

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/orm/tool.py

@@ -44,5 +44,6 @@ class Tool(SqlalchemyBase, OrganizationMixin):
     source_code: Mapped[Optional[str]] = mapped_column(String, doc="The source code of the function.")
     json_schema: Mapped[Optional[dict]] = mapped_column(JSON, default=lambda: {}, doc="The OAI compatable JSON schema of the function.")
     args_json_schema: Mapped[Optional[dict]] = mapped_column(JSON, default=lambda: {}, doc="The JSON schema of the function arguments.")
+    metadata_: Mapped[Optional[dict]] = mapped_column(JSON, default=lambda: {}, doc="A dictionary of additional metadata for the tool.")
     # relationships
     organization: Mapped["Organization"] = relationship("Organization", back_populates="tools", lazy="selectin")

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/schemas/enums.py

@@ -47,8 +47,4 @@ class ToolRuleType(str, Enum):
     continue_loop = "continue_loop"
     conditional = "conditional"
     constrain_child_tools = "constrain_child_tools"
-    require_parent_tools = "require_parent_tools"
-    # Deprecated
-    InitToolRule = "InitToolRule"
-    TerminalToolRule = "TerminalToolRule"
-    ToolRule = "ToolRule"
+    max_count_per_step = "max_count_per_step"

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/schemas/message.py

@@ -748,6 +748,12 @@ class Message(BaseMessage):
         else:
             raise ValueError(self.role)
 
+        # Validate that parts is never empty before returning
+        if "parts" not in google_ai_message or not google_ai_message["parts"]:
+            # If parts is empty, add a default text part
+            google_ai_message["parts"] = [{"text": "empty message"}]
+            warnings.warn(f"Empty 'parts' detected in message with role '{self.role}'. Added default empty text part.")
+
         return google_ai_message
 
     def to_cohere_dict(

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/schemas/tool.py

@@ -66,6 +66,7 @@ class Tool(BaseTool):
     # metadata fields
     created_by_id: Optional[str] = Field(None, description="The id of the user that made this Tool.")
     last_updated_by_id: Optional[str] = Field(None, description="The id of the user that made this Tool.")
+    metadata_: Optional[Dict[str, Any]] = Field(default_factory=dict, description="A dictionary of additional metadata for the tool.")
 
     @model_validator(mode="after")
     def refresh_source_code_and_json_schema(self):
@@ -137,10 +138,6 @@ class ToolCreate(LettaBase):
 
     @classmethod
     def from_mcp(cls, mcp_server_name: str, mcp_tool: MCPTool) -> "ToolCreate":
-
-        # Get the MCP tool from the MCP server
-        # NVM
-
         # Pass the MCP tool to the schema generator
         json_schema = generate_tool_schema_for_mcp(mcp_tool=mcp_tool)
 

letta_nightly-0.6.43.dev20250318104149/letta/schemas/tool_rule.py

@@ -0,0 +1,133 @@
+import json
+from typing import Annotated, Any, Dict, List, Literal, Optional, Set, Union
+
+from pydantic import Field
+
+from letta.schemas.enums import ToolRuleType
+from letta.schemas.letta_base import LettaBase
+
+
+class BaseToolRule(LettaBase):
+    __id_prefix__ = "tool_rule"
+    tool_name: str = Field(..., description="The name of the tool. Must exist in the database for the user's organization.")
+    type: ToolRuleType = Field(..., description="The type of the message.")
+
+    def get_valid_tools(self, tool_call_history: List[str], available_tools: Set[str], last_function_response: Optional[str]) -> set[str]:
+        raise NotImplementedError
+
+
+class ChildToolRule(BaseToolRule):
+    """
+    A ToolRule represents a tool that can be invoked by the agent.
+    """
+
+    type: Literal[ToolRuleType.constrain_child_tools] = ToolRuleType.constrain_child_tools
+    children: List[str] = Field(..., description="The children tools that can be invoked.")
+
+    def get_valid_tools(self, tool_call_history: List[str], available_tools: Set[str], last_function_response: Optional[str]) -> Set[str]:
+        last_tool = tool_call_history[-1] if tool_call_history else None
+        return set(self.children) if last_tool == self.tool_name else available_tools
+
+
+class ConditionalToolRule(BaseToolRule):
+    """
+    A ToolRule that conditionally maps to different child tools based on the output.
+    """
+
+    type: Literal[ToolRuleType.conditional] = 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")
+
+    def get_valid_tools(self, tool_call_history: List[str], available_tools: Set[str], last_function_response: Optional[str]) -> Set[str]:
+        """Determine valid tools based on function output mapping."""
+        if not tool_call_history or tool_call_history[-1] != self.tool_name:
+            return available_tools  # No constraints if this rule doesn't apply
+
+        if not last_function_response:
+            raise ValueError("Conditional tool rule requires an LLM response to determine which child tool to use")
+
+        try:
+            json_response = json.loads(last_function_response)
+            function_output = json_response.get("message", "")
+        except json.JSONDecodeError:
+            if self.require_output_mapping:
+                return set()  # Strict mode: Invalid response means no allowed tools
+            return {self.default_child} if self.default_child else available_tools
+
+        # Match function output to a mapped child tool
+        for key, tool in self.child_output_mapping.items():
+            if self._matches_key(function_output, key):
+                return {tool}
+
+        # If no match found, use default or allow all tools if no default is set
+        if self.require_output_mapping:
+            return set()  # Strict mode: No match means no valid tools
+
+        return {self.default_child} if self.default_child else available_tools
+
+    def _matches_key(self, function_output: str, key: Any) -> bool:
+        """Helper function to determine if function output matches a mapping key."""
+        if isinstance(key, bool):
+            return function_output.lower() == "true" if key else function_output.lower() == "false"
+        elif isinstance(key, int):
+            try:
+                return int(function_output) == key
+            except ValueError:
+                return False
+        elif isinstance(key, float):
+            try:
+                return float(function_output) == key
+            except ValueError:
+                return False
+        else:  # Assume string
+            return str(function_output) == str(key)
+
+
+class InitToolRule(BaseToolRule):
+    """
+    Represents the initial tool rule configuration.
+    """
+
+    type: Literal[ToolRuleType.run_first] = ToolRuleType.run_first
+
+
+class TerminalToolRule(BaseToolRule):
+    """
+    Represents a terminal tool rule configuration where if this tool gets called, it must end the agent loop.
+    """
+
+    type: Literal[ToolRuleType.exit_loop] = ToolRuleType.exit_loop
+
+
+class ContinueToolRule(BaseToolRule):
+    """
+    Represents a tool rule configuration where if this tool gets called, it must continue the agent loop.
+    """
+
+    type: Literal[ToolRuleType.continue_loop] = ToolRuleType.continue_loop
+
+
+class MaxCountPerStepToolRule(BaseToolRule):
+    """
+    Represents a tool rule configuration which constrains the total number of times this tool can be invoked in a single step.
+    """
+
+    type: Literal[ToolRuleType.max_count_per_step] = ToolRuleType.max_count_per_step
+    max_count_limit: int = Field(..., description="The max limit for the total number of times this tool can be invoked in a single step.")
+
+    def get_valid_tools(self, tool_call_history: List[str], available_tools: Set[str], last_function_response: Optional[str]) -> Set[str]:
+        """Restricts the tool if it has been called max_count_limit times in the current step."""
+        count = tool_call_history.count(self.tool_name)
+
+        # If the tool has been used max_count_limit times, it is no longer allowed
+        if count >= self.max_count_limit:
+            return available_tools - {self.tool_name}
+
+        return available_tools
+
+
+ToolRule = Annotated[
+    Union[ChildToolRule, InitToolRule, TerminalToolRule, ConditionalToolRule, ContinueToolRule, MaxCountPerStepToolRule],
+    Field(discriminator="type"),
+]

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/serialize_schemas/pydantic_agent_schema.py

@@ -15,7 +15,7 @@ class CoreMemoryBlockSchema(BaseModel):
     is_template: bool
     label: str
     limit: int
-    metadata_: Dict[str, Any] = Field(default_factory=dict)
+    metadata_: Optional[Dict] = None
     template_name: Optional[str]
     updated_at: str
     value: str
@@ -85,6 +85,7 @@ class ToolSchema(BaseModel):
     tags: List[str]
     tool_type: str
     updated_at: str
+    metadata_: Optional[Dict] = None
 
 
 class AgentSchema(BaseModel):
@@ -99,7 +100,7 @@ class AgentSchema(BaseModel):
     llm_config: LLMConfig
     message_buffer_autoclear: bool
     messages: List[MessageSchema]
-    metadata_: Dict
+    metadata_: Optional[Dict] = None
     multi_agent_group: Optional[Any]
     name: str
     system: str

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/server/rest_api/app.py

@@ -257,7 +257,7 @@ def create_application() -> "FastAPI":
 
     # Set up OpenTelemetry tracing
     otlp_endpoint = settings.otel_exporter_otlp_endpoint
-    if otlp_endpoint:
+    if otlp_endpoint and not settings.disable_tracing:
         print(f"▶ Using OTLP tracing with endpoint: {otlp_endpoint}")
         env_name_suffix = os.getenv("ENV_NAME")
         service_name = f"letta-server-{env_name_suffix.lower()}" if env_name_suffix else "letta-server"

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/server/rest_api/routers/v1/tools.py

@@ -398,7 +398,7 @@ def add_mcp_tool(
         )
 
     tool_create = ToolCreate.from_mcp(mcp_server_name=mcp_server_name, mcp_tool=mcp_tool)
-    return server.tool_manager.create_or_update_mcp_tool(tool_create=tool_create, actor=actor)
+    return server.tool_manager.create_or_update_mcp_tool(tool_create=tool_create, mcp_server_name=mcp_server_name, actor=actor)
 
 
 @router.put("/mcp/servers", response_model=List[Union[StdioServerConfig, SSEServerConfig]], operation_id="add_mcp_server")

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/server/server.py

@@ -723,10 +723,17 @@ class SyncServer(Server):
                 assert isinstance(message, MessageCreate)
 
                 # If wrapping is enabled, wrap with metadata before placing content inside the Message object
+                if isinstance(message.content, str):
+                    message_content = message.content
+                elif message.content and len(message.content) > 0 and isinstance(message.content[0], TextContent):
+                    message_content = message.content[0].text
+                else:
+                    assert message_content is not None, "Message content is empty"
+
                 if message.role == MessageRole.user and wrap_user_message:
-                    message.content = system.package_user_message(user_message=message.content)
+                    message_content = system.package_user_message(user_message=message_content)
                 elif message.role == MessageRole.system and wrap_system_message:
-                    message.content = system.package_system_message(system_message=message.content)
+                    message_content = system.package_system_message(system_message=message_content)
                 else:
                     raise ValueError(f"Invalid message role: {message.role}")
 
@@ -735,7 +742,7 @@ class SyncServer(Server):
                     Message(
                         agent_id=agent_id,
                         role=message.role,
-                        content=[TextContent(text=message.content)] if message.content else [],
+                        content=[TextContent(text=message_content)] if message_content else [],
                         name=message.name,
                         # assigned later?
                         model=None,

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/services/tool_manager.py

@@ -2,7 +2,7 @@ import importlib
 import warnings
 from typing import List, Optional
 
-from letta.constants import BASE_FUNCTION_RETURN_CHAR_LIMIT, BASE_MEMORY_TOOLS, BASE_TOOLS, MULTI_AGENT_TOOLS
+from letta.constants import BASE_FUNCTION_RETURN_CHAR_LIMIT, BASE_MEMORY_TOOLS, BASE_TOOLS, MCP_TOOL_TAG_NAME_PREFIX, MULTI_AGENT_TOOLS
 from letta.functions.functions import derive_openai_json_schema, load_function_set
 from letta.log import get_logger
 from letta.orm.enums import ToolType
@@ -57,9 +57,13 @@ class ToolManager:
         return tool
 
     @enforce_types
-    def create_or_update_mcp_tool(self, tool_create: ToolCreate, actor: PydanticUser) -> PydanticTool:
+    def create_or_update_mcp_tool(self, tool_create: ToolCreate, mcp_server_name: str, actor: PydanticUser) -> PydanticTool:
+        metadata = {MCP_TOOL_TAG_NAME_PREFIX: {"server_name": mcp_server_name}}
         return self.create_or_update_tool(
-            PydanticTool(tool_type=ToolType.EXTERNAL_MCP, name=tool_create.json_schema["name"], **tool_create.model_dump()), actor
+            PydanticTool(
+                tool_type=ToolType.EXTERNAL_MCP, name=tool_create.json_schema["name"], metadata_=metadata, **tool_create.model_dump()
+            ),
+            actor,
         )
 
     @enforce_types

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/settings.py

@@ -180,6 +180,7 @@ class Settings(BaseSettings):
     # telemetry logging
     verbose_telemetry_logging: bool = False
     otel_exporter_otlp_endpoint: str = "http://localhost:4317"
+    disable_tracing: bool = False
 
     # uvicorn settings
     uvicorn_workers: int = 1

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/letta/tracing.py

@@ -112,6 +112,16 @@ def setup_tracing(
     global _is_tracing_initialized
 
     provider = TracerProvider(resource=Resource.create({"service.name": service_name}))
+    import uuid
+
+    provider = TracerProvider(
+        resource=Resource.create(
+            {
+                "service.name": service_name,
+                "device.id": uuid.getnode(),  # MAC address as unique device identifier
+            }
+        )
+    )
     if endpoint:
         provider.add_span_processor(BatchSpanProcessor(OTLPSpanExporter(endpoint=endpoint)))
         _is_tracing_initialized = True

{letta_nightly-0.6.42.dev20250317175208 → letta_nightly-0.6.43.dev20250318104149}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "letta-nightly"
-version = "0.6.42.dev20250317175208"
+version = "0.6.43.dev20250318104149"
 packages = [
     {include = "letta"},
 ]
@@ -100,8 +100,8 @@ external-tools = ["docker", "langchain", "wikipedia", "langchain-community"]
 tests = ["wikipedia"]
 bedrock = ["boto3"]
 google = ["google-genai"]
-desktop = ["pgvector", "pg8000", "psycopg2-binary", "psycopg2", "pyright", "websockets", "fastapi", "uvicorn", "docker", "langchain", "wikipedia", "langchain-community", "locust", "datamodel-code-generator"]
-all = ["pgvector", "pg8000", "psycopg2-binary", "psycopg2", "pytest", "pytest-asyncio", "pexpect", "black", "pre-commit", "pyright", "pytest-order", "autoflake", "isort", "websockets", "fastapi", "uvicorn", "docker", "langchain", "wikipedia", "langchain-community", "locust", "datamodel-code-generator"]
+desktop = ["pgvector", "pg8000", "psycopg2-binary", "psycopg2", "pyright", "websockets", "fastapi", "uvicorn", "docker", "langchain", "wikipedia", "langchain-community", "locust"]
+all = ["pgvector", "pg8000", "psycopg2-binary", "psycopg2", "pytest", "pytest-asyncio", "pexpect", "black", "pre-commit", "pyright", "pytest-order", "autoflake", "isort", "websockets", "fastapi", "uvicorn", "docker", "langchain", "wikipedia", "langchain-community", "locust"]
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.4.2"