letta-nightly 0.6.25.dev20250213104102__py3-none-any.whl → 0.6.26.dev20250214013434__py3-none-any.whl

letta/server/rest_api/interface.py

@@ -7,6 +7,7 @@ from datetime import datetime
 from typing import AsyncGenerator, Literal, Optional, Union
 
 from letta.constants import DEFAULT_MESSAGE_TOOL, DEFAULT_MESSAGE_TOOL_KWARG
+from letta.helpers.datetime_helpers import is_utc_datetime
 from letta.interface import AgentInterface
 from letta.local_llm.constants import INNER_THOUGHTS_KWARG
 from letta.schemas.enums import MessageStreamStatus
@@ -25,7 +26,6 @@ from letta.schemas.message import Message
 from letta.schemas.openai.chat_completion_response import ChatCompletionChunkResponse
 from letta.streaming_interface import AgentChunkStreamingInterface
 from letta.streaming_utils import FunctionArgumentsStreamHandler, JSONInnerThoughtsExtractor
-from letta.utils import is_utc_datetime
 
 
 # TODO strip from code / deprecate

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

@@ -2,20 +2,23 @@ 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 ApiKeyNotProvidedError, ComposioSDKError
-from composio.tools.base.abs import InvalidClassDefinition
+from composio.exceptions import (
+    ApiKeyNotProvidedError,
+    ComposioSDKError,
+    ConnectedAccountNotFoundError,
+    EnumMetadataNotFound,
+    EnumStringNotFound,
+)
 from fastapi import APIRouter, Body, Depends, Header, HTTPException
 
 from letta.errors import LettaToolCreateError
+from letta.helpers.composio_helpers import get_composio_api_key
 from letta.log import get_logger
 from letta.orm.errors import UniqueConstraintViolationError
 from letta.schemas.letta_message import ToolReturnMessage
 from letta.schemas.tool import Tool, ToolCreate, ToolRunFromSource, ToolUpdate
-from letta.schemas.user import User
 from letta.server.rest_api.utils import get_letta_server
 from letta.server.server import SyncServer
-from letta.settings import tool_settings
 
 router = APIRouter(prefix="/tools", tags=["tools"])
 
@@ -205,15 +208,18 @@ def run_tool_from_source(
 
 
 # Specific routes for Composio
-
-
 @router.get("/composio/apps", response_model=List[AppModel], operation_id="list_composio_apps")
 def list_composio_apps(server: SyncServer = Depends(get_letta_server), user_id: Optional[str] = Header(None, alias="user_id")):
     """
     Get a list of all Composio apps
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    composio_api_key = get_composio_key(server, actor=actor)
+    composio_api_key = get_composio_api_key(actor=actor, logger=logger)
+    if not composio_api_key:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail=f"No API keys found for Composio. Please add your Composio API Key as an environment variable for your sandbox configuration, or set it as environment variable COMPOSIO_API_KEY.",
+        )
     return server.get_composio_apps(api_key=composio_api_key)
 
 
@@ -227,7 +233,12 @@ def list_composio_actions_by_app(
     Get a list of all Composio actions for a specific app
     """
     actor = server.user_manager.get_user_or_default(user_id=user_id)
-    composio_api_key = get_composio_key(server, actor=actor)
+    composio_api_key = get_composio_api_key(actor=actor, logger=logger)
+    if not composio_api_key:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail=f"No API keys found for Composio. Please add your Composio API Key as an environment variable for your sandbox configuration, or set it as environment variable COMPOSIO_API_KEY.",
+        )
     return server.get_composio_actions_from_app_name(composio_app_name=composio_app_name, api_key=composio_api_key)
 
 
@@ -245,6 +256,15 @@ def add_composio_tool(
     try:
         tool_create = ToolCreate.from_composio(action_name=composio_action_name)
         return server.tool_manager.create_or_update_composio_tool(tool_create=tool_create, actor=actor)
+    except ConnectedAccountNotFoundError as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "ConnectedAccountNotFoundError",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
     except EnumStringNotFound as e:
         raise HTTPException(
             status_code=400,  # Bad Request
@@ -254,6 +274,15 @@ def add_composio_tool(
                 "composio_action_name": composio_action_name,
             },
         )
+    except EnumMetadataNotFound as e:
+        raise HTTPException(
+            status_code=400,  # Bad Request
+            detail={
+                "code": "EnumMetadataNotFound",
+                "message": str(e),
+                "composio_action_name": composio_action_name,
+            },
+        )
     except HTTPError as e:
         raise HTTPException(
             status_code=400,  # Bad Request
@@ -290,15 +319,6 @@ def add_composio_tool(
                 "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
@@ -308,24 +328,3 @@ def add_composio_tool(
                 "composio_action_name": composio_action_name,
             },
         )
-
-
-# TODO: Factor this out to somewhere else
-def get_composio_key(server: SyncServer, actor: User):
-    api_keys = server.sandbox_config_manager.list_sandbox_env_vars_by_key(key="COMPOSIO_API_KEY", actor=actor)
-    if not api_keys:
-        logger.warning(f"No API keys found for Composio. Defaulting to the environment variable...")
-
-        if tool_settings.composio_api_key:
-            return tool_settings.composio_api_key
-        else:
-            # Nothing, raise fatal warning
-            raise HTTPException(
-                status_code=400,  # Bad Request
-                detail=f"No API keys found for Composio. Please add your Composio API Key as an environment variable for your sandbox configuration, or set it as environment variable COMPOSIO_API_KEY.",
-            )
-    else:
-        # TODO: Add more protections around this
-        # Ideally, not tied to a specific sandbox, but for now we just get the first one
-        # Theoretically possible for someone to have different composio api keys per sandbox
-        return api_keys[0].value

letta/server/server.py

@@ -19,6 +19,8 @@ import letta.system as system
 from letta.agent import Agent, save_agent
 from letta.chat_only_agent import ChatOnlyAgent
 from letta.data_sources.connectors import DataConnector, load_data
+from letta.helpers.datetime_helpers import get_utc_time
+from letta.helpers.json_helpers import json_dumps, json_loads
 
 # TODO use custom interface
 from letta.interface import AgentInterface  # abstract
@@ -80,7 +82,7 @@ from letta.services.step_manager import StepManager
 from letta.services.tool_execution_sandbox import ToolExecutionSandbox
 from letta.services.tool_manager import ToolManager
 from letta.services.user_manager import UserManager
-from letta.utils import get_friendly_error_msg, get_utc_time, json_dumps, json_loads
+from letta.utils import get_friendly_error_msg
 
 logger = get_logger(__name__)
 
@@ -296,7 +298,7 @@ class SyncServer(Server):
         self.tool_manager = ToolManager()
         self.block_manager = BlockManager()
         self.source_manager = SourceManager()
-        self.sandbox_config_manager = SandboxConfigManager(tool_settings)
+        self.sandbox_config_manager = SandboxConfigManager()
         self.message_manager = MessageManager()
         self.job_manager = JobManager()
         self.agent_manager = AgentManager()
@@ -315,7 +317,7 @@ class SyncServer(Server):
 
             # Add composio keys to the tool sandbox env vars of the org
             if tool_settings.composio_api_key:
-                manager = SandboxConfigManager(tool_settings)
+                manager = SandboxConfigManager()
                 sandbox_config = manager.get_or_create_default_sandbox_config(sandbox_type=SandboxType.LOCAL, actor=self.default_user)
 
                 manager.create_sandbox_env_var(
@@ -1112,6 +1114,8 @@ class SyncServer(Server):
             if context_window_limit > llm_config.context_window:
                 raise ValueError(f"Context window limit ({context_window_limit}) is greater than maximum of ({llm_config.context_window})")
             llm_config.context_window = context_window_limit
+        else:
+            llm_config.context_window = min(llm_config.context_window, constants.DEFAULT_CONTEXT_WINDOW_SIZE)
 
         return llm_config
 

letta/server/ws_api/protocol.py

@@ -1,4 +1,4 @@
-from letta.utils import json_dumps
+from letta.helpers.json_helpers import json_dumps
 
 # Server -> client
 

letta/services/agent_manager.py

@@ -6,6 +6,7 @@ from sqlalchemy import Select, and_, func, literal, or_, select, union_all
 
 from letta.constants import BASE_MEMORY_TOOLS, BASE_TOOLS, MAX_EMBEDDING_DIM, MULTI_AGENT_TOOLS
 from letta.embeddings import embedding_model
+from letta.helpers.datetime_helpers import get_utc_time
 from letta.log import get_logger
 from letta.orm import Agent as AgentModel
 from letta.orm import AgentPassage, AgentsTags
@@ -42,7 +43,7 @@ from letta.services.message_manager import MessageManager
 from letta.services.source_manager import SourceManager
 from letta.services.tool_manager import ToolManager
 from letta.settings import settings
-from letta.utils import enforce_types, get_utc_time, united_diff
+from letta.utils import enforce_types, united_diff
 
 logger = get_logger(__name__)
 

letta/services/helpers/agent_manager_helper.py

@@ -4,6 +4,7 @@ from typing import List, Literal, Optional
 from letta import system
 from letta.constants import IN_CONTEXT_MEMORY_KEYWORD, STRUCTURED_OUTPUT_MODELS
 from letta.helpers import ToolRulesSolver
+from letta.helpers.datetime_helpers import get_local_time
 from letta.orm.agent import Agent as AgentModel
 from letta.orm.agents_tags import AgentsTags
 from letta.orm.errors import NoResultFound
@@ -15,7 +16,6 @@ from letta.schemas.message import Message, MessageCreate, TextContent
 from letta.schemas.tool_rule import ToolRule
 from letta.schemas.user import User
 from letta.system import get_initial_boot_messages, get_login_event
-from letta.utils import get_local_time
 
 
 # Static methods

letta/services/job_manager.py

@@ -5,6 +5,7 @@ from typing import List, Literal, Optional, Union
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
+from letta.helpers.datetime_helpers import get_utc_time
 from letta.orm.enums import JobType
 from letta.orm.errors import NoResultFound
 from letta.orm.job import Job as JobModel
@@ -20,7 +21,7 @@ from letta.schemas.message import Message as PydanticMessage
 from letta.schemas.run import Run as PydanticRun
 from letta.schemas.usage import LettaUsageStatistics
 from letta.schemas.user import User as PydanticUser
-from letta.utils import enforce_types, get_utc_time
+from letta.utils import enforce_types
 
 
 class JobManager:

letta/services/sandbox_config_manager.py

@@ -19,7 +19,7 @@ logger = get_logger(__name__)
 class SandboxConfigManager:
     """Manager class to handle business logic related to SandboxConfig and SandboxEnvironmentVariable."""
 
-    def __init__(self, settings):
+    def __init__(self):
         from letta.server.server import db_context
 
         self.session_maker = db_context

letta/services/tool_execution_sandbox.py

@@ -62,7 +62,7 @@ class ToolExecutionSandbox:
                     f"Agent attempted to invoke tool {self.tool_name} that does not exist for organization {self.user.organization_id}"
                 )
 
-        self.sandbox_config_manager = SandboxConfigManager(tool_settings)
+        self.sandbox_config_manager = SandboxConfigManager()
         self.force_recreate = force_recreate
         self.force_recreate_venv = force_recreate_venv
 

letta/system.py

@@ -9,7 +9,8 @@ from .constants import (
     INITIAL_BOOT_MESSAGE_SEND_MESSAGE_THOUGHT,
     MESSAGE_SUMMARY_WARNING_STR,
 )
-from .utils import get_local_time, json_dumps
+from .helpers.datetime_helpers import get_local_time
+from .helpers.json_helpers import json_dumps
 
 
 def get_initial_boot_messages(version="startup"):

letta/utils.py

@@ -4,7 +4,6 @@ import difflib
 import hashlib
 import inspect
 import io
-import json
 import os
 import pickle
 import platform
@@ -14,14 +13,13 @@ import subprocess
 import sys
 import uuid
 from contextlib import contextmanager
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timezone
 from functools import wraps
 from logging import Logger
 from typing import Any, Coroutine, List, Union, _GenericAlias, get_args, get_origin, get_type_hints
 from urllib.parse import urljoin, urlparse
 
 import demjson3 as demjson
-import pytz
 import tiktoken
 from pathvalidate import sanitize_filename as pathvalidate_sanitize_filename
 
@@ -35,6 +33,7 @@ from letta.constants import (
     MAX_FILENAME_LENGTH,
     TOOL_CALL_ID_MAX_LEN,
 )
+from letta.helpers.json_helpers import json_dumps, json_loads
 from letta.schemas.openai.chat_completion_response import ChatCompletionResponse
 
 DEBUG = False
@@ -487,10 +486,6 @@ def smart_urljoin(base_url: str, relative_url: str) -> str:
     return urljoin(base_url, relative_url)
 
 
-def is_utc_datetime(dt: datetime) -> bool:
-    return dt.tzinfo is not None and dt.tzinfo.utcoffset(dt) == timedelta(0)
-
-
 def get_tool_call_id() -> str:
     # TODO(sarah) make this a slug-style string?
     # e.g. OpenAI: "call_xlIfzR1HqAW7xJPa3ExJSg3C"
@@ -824,72 +819,6 @@ def united_diff(str1, str2):
     return "".join(diff)
 
 
-def parse_formatted_time(formatted_time):
-    # parse times returned by letta.utils.get_formatted_time()
-    return datetime.strptime(formatted_time, "%Y-%m-%d %I:%M:%S %p %Z%z")
-
-
-def datetime_to_timestamp(dt):
-    # convert datetime object to integer timestamp
-    return int(dt.timestamp())
-
-
-def timestamp_to_datetime(ts):
-    # convert integer timestamp to datetime object
-    return datetime.fromtimestamp(ts)
-
-
-def get_local_time_military():
-    # Get the current time in UTC
-    current_time_utc = datetime.now(pytz.utc)
-
-    # Convert to San Francisco's time zone (PST/PDT)
-    sf_time_zone = pytz.timezone("America/Los_Angeles")
-    local_time = current_time_utc.astimezone(sf_time_zone)
-
-    # You may format it as you desire
-    formatted_time = local_time.strftime("%Y-%m-%d %H:%M:%S %Z%z")
-
-    return formatted_time
-
-
-def get_local_time_timezone(timezone="America/Los_Angeles"):
-    # Get the current time in UTC
-    current_time_utc = datetime.now(pytz.utc)
-
-    # Convert to San Francisco's time zone (PST/PDT)
-    sf_time_zone = pytz.timezone(timezone)
-    local_time = current_time_utc.astimezone(sf_time_zone)
-
-    # You may format it as you desire, including AM/PM
-    formatted_time = local_time.strftime("%Y-%m-%d %I:%M:%S %p %Z%z")
-
-    return formatted_time
-
-
-def get_local_time(timezone=None):
-    if timezone is not None:
-        time_str = get_local_time_timezone(timezone)
-    else:
-        # Get the current time, which will be in the local timezone of the computer
-        local_time = datetime.now().astimezone()
-
-        # You may format it as you desire, including AM/PM
-        time_str = local_time.strftime("%Y-%m-%d %I:%M:%S %p %Z%z")
-
-    return time_str.strip()
-
-
-def get_utc_time() -> datetime:
-    """Get the current UTC time"""
-    # return datetime.now(pytz.utc)
-    return datetime.now(timezone.utc)
-
-
-def format_datetime(dt):
-    return dt.strftime("%Y-%m-%d %I:%M:%S %p %Z%z")
-
-
 def parse_json(string) -> dict:
     """Parse JSON string into JSON with both json and demjson"""
     result = None
@@ -1046,23 +975,6 @@ def get_schema_diff(schema_a, schema_b):
     return "".join(difference)
 
 
-# datetime related
-def validate_date_format(date_str):
-    """Validate the given date string in the format 'YYYY-MM-DD'."""
-    try:
-        datetime.strptime(date_str, "%Y-%m-%d")
-        return True
-    except (ValueError, TypeError):
-        return False
-
-
-def extract_date_from_timestamp(timestamp):
-    """Extracts and returns the date from the given timestamp."""
-    # Extracts the date (ignoring the time and timezone)
-    match = re.match(r"(\d{4}-\d{2}-\d{2})", timestamp)
-    return match.group(1) if match else None
-
-
 def create_uuid_from_string(val: str):
     """
     Generate consistent UUID from a string
@@ -1072,19 +984,6 @@ def create_uuid_from_string(val: str):
     return uuid.UUID(hex=hex_string)
 
 
-def json_dumps(data, indent=2):
-    def safe_serializer(obj):
-        if isinstance(obj, datetime):
-            return obj.isoformat()
-        raise TypeError(f"Type {type(obj)} not serializable")
-
-    return json.dumps(data, indent=indent, default=safe_serializer, ensure_ascii=False)
-
-
-def json_loads(data):
-    return json.loads(data, strict=False)
-
-
 def sanitize_filename(filename: str) -> str:
     """
     Sanitize the given filename to prevent directory traversal, invalid characters,

{letta_nightly-0.6.25.dev20250213104102.dist-info → letta_nightly-0.6.26.dev20250214013434.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.6.25.dev20250213104102
+Version: 0.6.26.dev20250214013434
 Summary: Create LLM agents with long-term memory and custom tools
 License: Apache License
 Author: Letta Team
@@ -27,8 +27,8 @@ Requires-Dist: autoflake (>=2.3.0,<3.0.0) ; extra == "dev" or extra == "all"
 Requires-Dist: black[jupyter] (>=24.2.0,<25.0.0) ; extra == "dev" or extra == "all"
 Requires-Dist: brotli (>=1.1.0,<2.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: composio-core (>=0.6.19,<0.7.0)
-Requires-Dist: composio-langchain (>=0.6.19,<0.7.0)
+Requires-Dist: composio-core (>=0.7.2,<0.8.0)
+Requires-Dist: composio-langchain (>=0.7.2,<0.8.0)
 Requires-Dist: datasets (>=2.14.6,<3.0.0) ; extra == "dev" or extra == "all"
 Requires-Dist: demjson3 (>=3.0.6,<4.0.0)
 Requires-Dist: docker (>=7.1.0,<8.0.0) ; extra == "external-tools" or extra == "all"