letta-nightly 0.1.7.dev20241002104051__py3-none-any.whl → 0.4.1.dev20241004012408__py3-none-any.whl

letta/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.17"
+__version__ = "0.4.1"
 
 # import clients
 from letta.client.admin import Admin

letta/benchmark/benchmark.py

@@ -2,11 +2,11 @@
 
 import time
 import uuid
-from typing import Annotated
+from typing import Annotated, Union
 
 import typer
 
-from letta import create_client
+from letta import LocalClient, RESTClient, create_client
 from letta.benchmark.constants import HUMAN, PERSONA, PROMPTS, TRIES
 from letta.config import LettaConfig
 
@@ -17,11 +17,13 @@ from letta.utils import get_human_text, get_persona_text
 app = typer.Typer()
 
 
-def send_message(message: str, agent_id, turn: int, fn_type: str, print_msg: bool = False, n_tries: int = TRIES):
+def send_message(
+    client: Union[LocalClient, RESTClient], message: str, agent_id, turn: int, fn_type: str, print_msg: bool = False, n_tries: int = TRIES
+):
     try:
         print_msg = f"\t-> Now running {fn_type}. Progress: {turn}/{n_tries}"
         print(print_msg, end="\r", flush=True)
-        response = client.user_message(agent_id=agent_id, message=message, return_token_count=True)
+        response = client.user_message(agent_id=agent_id, message=message)
 
         if turn + 1 == n_tries:
             print("  " * len(print_msg), end="\r", flush=True)
@@ -65,7 +67,7 @@ def bench(
 
             agent_id = agent.id
             result, msg = send_message(
-                message=message, agent_id=agent_id, turn=i, fn_type=fn_type, print_msg=print_messages, n_tries=n_tries
+                client=client, message=message, agent_id=agent_id, turn=i, fn_type=fn_type, print_msg=print_messages, n_tries=n_tries
             )
 
             if print_messages:

letta/functions/helpers.py

@@ -3,6 +3,31 @@ from typing import Any, Optional, Union
 from pydantic import BaseModel
 
 
+def generate_composio_tool_wrapper(action: "ActionType") -> tuple[str, str]:
+    # Instantiate the object
+    tool_instantiation_str = f"composio_toolset.get_tools(actions=[Action.{action.name}])[0]"
+
+    # Generate func name
+    func_name = f"run_{action.name}"
+
+    wrapper_function_str = f"""
+def {func_name}(**kwargs):
+    if 'self' in kwargs:
+        del kwargs['self']
+    from composio import Action, App, Tag
+    from composio_langchain import ComposioToolSet
+
+    composio_toolset = ComposioToolSet()
+    tool = {tool_instantiation_str}
+    tool.func(**kwargs)
+    """
+
+    # Compile safety check
+    assert_code_gen_compilable(wrapper_function_str)
+
+    return func_name, wrapper_function_str
+
+
 def generate_langchain_tool_wrapper(
     tool: "LangChainBaseTool", additional_imports_module_attr_map: dict[str, str] = None
 ) -> tuple[str, str]:
@@ -28,6 +53,10 @@ def {func_name}(**kwargs):
     {tool_instantiation}
     {run_call}
 """
+
+    # Compile safety check
+    assert_code_gen_compilable(wrapper_function_str)
+
     return func_name, wrapper_function_str
 
 
@@ -48,14 +77,26 @@ def generate_crewai_tool_wrapper(tool: "CrewAIBaseTool", additional_imports_modu
 def {func_name}(**kwargs):
     if 'self' in kwargs:
         del kwargs['self']
+    import importlib
     {import_statement}
     {extra_module_imports}
     {tool_instantiation}
     {run_call}
 """
+
+    # Compile safety check
+    assert_code_gen_compilable(wrapper_function_str)
+
     return func_name, wrapper_function_str
 
 
+def assert_code_gen_compilable(code_str):
+    try:
+        compile(code_str, "<string>", "exec")
+    except SyntaxError as e:
+        print(f"Syntax error in code: {e}")
+
+
 def assert_all_classes_are_imported(
     tool: Union["LangChainBaseTool", "CrewAIBaseTool"], additional_imports_module_attr_map: dict[str, str]
 ) -> None:
@@ -129,7 +170,7 @@ def generate_imported_tool_instantiation_call_str(obj: Any) -> Optional[str]:
         # e.g. {arg}={value}
         # The reason why this is recursive, is because the value can be another BaseModel that we need to stringify
         model_name = obj.__class__.__name__
-        fields = dict(obj)
+        fields = obj.dict()
         # Generate code for each field, skipping empty or None values
         field_assignments = []
         for arg, value in fields.items():
@@ -168,6 +209,11 @@ def generate_imported_tool_instantiation_call_str(obj: Any) -> Optional[str]:
         print(
             f"[WARNING] Skipping parsing unknown class {obj.__class__.__name__} (does not inherit from the Pydantic BaseModel and is not a basic Python type)"
         )
+        if obj.__class__.__name__ == "function":
+            import inspect
+
+            print(inspect.getsource(obj))
+
         return None
 
 

letta/llm_api/openai.py

@@ -419,6 +419,8 @@ def openai_chat_completions_request(
     try:
         response = requests.post(url, headers=headers, json=data)
         printd(f"response = {response}, response.text = {response.text}")
+        # print(json.dumps(data, indent=4))
+        # raise requests.exceptions.HTTPError
         response.raise_for_status()  # Raises HTTPError for 4XX/5XX status
 
         response = response.json()  # convert to dict from string

letta/schemas/block.py

@@ -46,15 +46,7 @@ class BaseBlock(LettaBase, validate_assignment=True):
         return self
 
     def __len__(self):
-        return len(str(self))
-
-    def __str__(self) -> str:
-        if isinstance(self.value, list):
-            return ",".join(self.value)
-        elif isinstance(self.value, str):
-            return self.value
-        else:
-            return ""
+        return len(self.value)
 
     def __setattr__(self, name, value):
         """Run validation if self.value is updated"""

letta/schemas/health.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+
+class Health(BaseModel):
+    """
+    Health check response body
+    """
+
+    version: str
+    status: str

letta/schemas/tool.py

@@ -3,6 +3,7 @@ from typing import Dict, List, Optional
 from pydantic import Field
 
 from letta.functions.helpers import (
+    generate_composio_tool_wrapper,
     generate_crewai_tool_wrapper,
     generate_langchain_tool_wrapper,
 )
@@ -57,6 +58,54 @@ class Tool(BaseTool):
             )
         )
 
+    @classmethod
+    def get_composio_tool(
+        cls,
+        action: "ActionType",
+    ) -> "Tool":
+        """
+        Class method to create an instance of Letta-compatible Composio Tool.
+        Check https://docs.composio.dev/introduction/intro/overview to look at options for get_composio_tool
+
+        This function will error if we find more than one tool, or 0 tools.
+
+        Args:
+            action ActionType: A action name to filter tools by.
+        Returns:
+            Tool: A Letta Tool initialized with attributes derived from the Composio tool.
+        """
+        from composio_langchain import ComposioToolSet
+
+        composio_toolset = ComposioToolSet()
+        composio_tools = composio_toolset.get_tools(actions=[action])
+
+        assert len(composio_tools) > 0, "User supplied parameters do not match any Composio tools"
+        assert len(composio_tools) == 1, f"User supplied parameters match too many Composio tools; {len(composio_tools)} > 1"
+
+        composio_tool = composio_tools[0]
+
+        description = composio_tool.description
+        source_type = "python"
+        tags = ["composio"]
+        wrapper_func_name, wrapper_function_str = generate_composio_tool_wrapper(action)
+        json_schema = generate_schema_from_args_schema(composio_tool.args_schema, name=wrapper_func_name, description=description)
+
+        # append heartbeat (necessary for triggering another reasoning step after this tool call)
+        json_schema["parameters"]["properties"]["request_heartbeat"] = {
+            "type": "boolean",
+            "description": "Request an immediate heartbeat after function execution. Set to 'true' if you want to send a follow-up message or run a follow-up function.",
+        }
+        json_schema["parameters"]["required"].append("request_heartbeat")
+
+        return cls(
+            name=wrapper_func_name,
+            description=description,
+            source_type=source_type,
+            tags=tags,
+            source_code=wrapper_function_str,
+            json_schema=json_schema,
+        )
+
     @classmethod
     def from_langchain(cls, langchain_tool: "LangChainBaseTool", additional_imports_module_attr_map: dict[str, str] = None) -> "Tool":
         """

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

@@ -1,5 +1,6 @@
 from letta.server.rest_api.routers.v1.agents import router as agents_router
 from letta.server.rest_api.routers.v1.blocks import router as blocks_router
+from letta.server.rest_api.routers.v1.health import router as health_router
 from letta.server.rest_api.routers.v1.jobs import router as jobs_router
 from letta.server.rest_api.routers.v1.llms import router as llm_router
 from letta.server.rest_api.routers.v1.sources import router as sources_router
@@ -12,4 +13,5 @@ ROUTERS = [
     llm_router,
     blocks_router,
     jobs_router,
+    health_router,
 ]

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

@@ -0,0 +1,20 @@
+from typing import TYPE_CHECKING
+
+from fastapi import APIRouter
+
+from letta.cli.cli import version
+from letta.schemas.health import Health
+
+if TYPE_CHECKING:
+    pass
+
+router = APIRouter(prefix="/health", tags=["health"])
+
+
+# Health check
+@router.get("/", response_model=Health, operation_id="health_check")
+def health_check():
+    return Health(
+        version=version(),
+        status="ok",
+    )

{letta_nightly-0.1.7.dev20241002104051.dist-info → letta_nightly-0.4.1.dev20241004012408.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.1.7.dev20241002104051
+Version: 0.4.1.dev20241004012408
 Summary: Create LLM agents with long-term memory and custom tools
 License: Apache License
 Author: Letta Team
@@ -23,6 +23,8 @@ Provides-Extra: tests
 Requires-Dist: autoflake (>=2.3.0,<3.0.0) ; extra == "dev"
 Requires-Dist: black[jupyter] (>=24.2.0,<25.0.0) ; extra == "dev"
 Requires-Dist: chromadb (>=0.4.24,<0.5.0)
+Requires-Dist: composio-core (>=0.5.28,<0.6.0) ; extra == "external-tools"
+Requires-Dist: composio-langchain (>=0.5.28,<0.6.0) ; extra == "external-tools"
 Requires-Dist: crewai (>=0.41.1,<0.42.0) ; extra == "external-tools"
 Requires-Dist: crewai-tools (>=0.8.3,<0.9.0) ; extra == "external-tools"
 Requires-Dist: datasets (>=2.14.6,<3.0.0) ; extra == "dev"

{letta_nightly-0.1.7.dev20241002104051.dist-info → letta_nightly-0.4.1.dev20241004012408.dist-info}/RECORD

@@ -1,4 +1,4 @@
-letta/__init__.py,sha256=GLC0hUCM1OicDGDXuV0_AX6m4Irjqy2K_GSy43nbdLc,997
+letta/__init__.py,sha256=btKRPdyhkpIyHlCPRLwwz-SCSVcEGNBeheYA-XNesiI,996
 letta/__main__.py,sha256=6Hs2PV7EYc5Tid4g4OtcLXhqVHiNYTGzSBdoOnW2HXA,29
 letta/agent.py,sha256=GdNhMG_ypSmkU8FDqNf3BQMMftRsIrNAbzyhqlIv2jE,65251
 letta/agent_store/chroma.py,sha256=upR5zGnGs6I6btulEYbiZdGG87BgKjxUJOQZ4Y-RQ_M,12492
@@ -7,7 +7,7 @@ letta/agent_store/lancedb.py,sha256=8RWmqVjowm5g0cc6DNRcb6f1FHGEqFnccnuekhWY39U,
 letta/agent_store/milvus.py,sha256=VxEKz9XR7_3QTY59K_38NtJCCQvi41rhHoFibfzW7yw,8469
 letta/agent_store/qdrant.py,sha256=qIEJhXJb6GzcT4wp8iV5Ox5W1CFMvcPViTI4HLSh59E,7879
 letta/agent_store/storage.py,sha256=QWrPdIEJCnsPg1xnPrG1xbOXmbjpz37ZNhvuH52M7A8,6642
-letta/benchmark/benchmark.py,sha256=JjCQE7piz2VHh3QCGwJX-9DelaSlUYV4Qw01hQuVolU,3633
+letta/benchmark/benchmark.py,sha256=ebvnwfp3yezaXOQyGXkYCDYpsmre-b9hvNtnyx4xkG0,3701
 letta/benchmark/constants.py,sha256=aXc5gdpMGJT327VuxsT5FngbCK2J41PQYeICBO7g_RE,536
 letta/cli/cli.py,sha256=saohjAsXFs4_kwzd95xk4JSZnd0T0OYN4TTj-ZOYEpQ,31195
 letta/cli/cli_config.py,sha256=MSxqbS5F9jUSjCgLkd-6T5Hj3ca_l-AoSwXc6dgy13E,57093
@@ -30,7 +30,7 @@ letta/functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/functions/function_sets/base.py,sha256=N4QmOjL6gDEyOg67ocF6zVKM-NquTo-yXG_T8r18buA,6440
 letta/functions/function_sets/extras.py,sha256=Jik3UiDqYTm4Lam1XPTvuVjvgUHwIAhopsnbmVhGMBg,4732
 letta/functions/functions.py,sha256=OU98c-Rds9UCQ8CufzdrpzSZsQ0a02uDv_x5VqoNFfw,3381
-letta/functions/helpers.py,sha256=YpUdt_XshDdsM4OJB6CFNNKB0c-heOqNKTgJeiFMzFc,8693
+letta/functions/helpers.py,sha256=dzeQ1hsxI-20QcVzkS8y55aCJw3iGbtm4oqBobb_tIM,9876
 letta/functions/schema_generator.py,sha256=v3LXdA5UVQXqpBkURK2H5PZuZoLlpZygleG35T3vMBc,6488
 letta/humans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/humans/examples/basic.txt,sha256=Lcp8YESTWvOJgO4Yf_yyQmgo5bKakeB1nIVrwEGG6PA,17
@@ -42,7 +42,7 @@ letta/llm_api/azure_openai.py,sha256=NjAVifNpjbTSGa9dZ4lS12sjwRWZBsmB1wlIGD4m4aI
 letta/llm_api/cohere.py,sha256=vDRd-SUGp1t_JUIdwC3RkIhwMl0OY7n-tAU9uPORYkY,14826
 letta/llm_api/google_ai.py,sha256=Ksf4vlYoWRe5JtiPOqxaArDnjUbAS8fxX_zwgt-2buQ,19100
 letta/llm_api/llm_api_tools.py,sha256=hoWYAG11YNN5YzOuemePKX2gPURCROvi0ra4XAMMsO8,20529
-letta/llm_api/openai.py,sha256=iJVKnfT0vQ447wkhv6_eZCI_K0gauV86IPuJ0BnPAuc,21064
+letta/llm_api/openai.py,sha256=BViGY7gybFgK8qmvVn_HDAHGd_lcWxMRzrzF0imzfdY,21154
 letta/local_llm/README.md,sha256=hFJyw5B0TU2jrh9nb0zGZMgdH-Ei1dSRfhvPQG_NSoU,168
 letta/local_llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/local_llm/chat_completion_proxy.py,sha256=CQ3G9Ci6AUAd2DiJ8QOgpnUNFt6WaM0fNQeuP7ao6H4,13296
@@ -111,10 +111,11 @@ letta/prompts/system/memgpt_modified_chat.txt,sha256=HOaPVurEftD8KsuwsclDgE2afIf
 letta/pytest.ini,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/schemas/agent.py,sha256=OUnKIKK2WRtXp5F9tGiaWL-h80Ep5LZFK0K85vulzr4,5856
 letta/schemas/api_key.py,sha256=u07yzzMn-hBAHZIIKbWY16KsgiFjSNR8lAghpMUo3_4,682
-letta/schemas/block.py,sha256=1QuHtgEM3SXO0bI2eF_tZ6EVP0LOB39L08G6rLLyfiE,4205
+letta/schemas/block.py,sha256=3u8bQoNh21a5Paa-QkAX76DWFC0sK0XA33Ct7TAfkvA,3986
 letta/schemas/document.py,sha256=JpvU0YkvOVLvHaDNcg-ihFzpeHC2zqsWBgyJ6zHnfNw,745
 letta/schemas/embedding_config.py,sha256=KhEOStOD8VbHFyLI9pkQVbTG1Av2g-Ql0yf9M868LME,2570
 letta/schemas/enums.py,sha256=WfRYpLh_pD-VyhEnp3Y6pPfx063zq2o4jky6PulqO8w,629
+letta/schemas/health.py,sha256=zT6mYovvD17iJRuu2rcaQQzbEEYrkwvAE9TB7iU824c,139
 letta/schemas/job.py,sha256=bYDrjbJm2B4LUTSkLUdQR_HDhL2E23g0EHf7E23ezYU,1547
 letta/schemas/letta_base.py,sha256=4QXFgyjCHqIagi8B6_4nmqb9eoJ52Y6aCxBxQpGX48M,2832
 letta/schemas/letta_message.py,sha256=Slgxa59qZfdvqXuCVHOt03u-7JL456ZY-WLaK5UYYKU,6234
@@ -131,7 +132,7 @@ letta/schemas/openai/openai.py,sha256=Hilo5BiLAGabzxCwnwfzK5QrWqwYD8epaEKFa4Pwnd
 letta/schemas/organization.py,sha256=JSc3hLl0IO_c9iOqf367sU5tJ0Dx_kPzbokCEg0eS4g,601
 letta/schemas/passage.py,sha256=ZO8-WOToLgf-DzUkREp9MQF274SLYeZwnSoNo2sKPHc,3573
 letta/schemas/source.py,sha256=rAM3Xjt7zJ3JLXpUxWmdYIujns4ZuqGCsozmNAWX5kI,2570
-letta/schemas/tool.py,sha256=JZE93JgN2pOds2dMjXF4uoP6AK7F5I72DjfnLRIJDNk,6502
+letta/schemas/tool.py,sha256=Xutv0JyoSmxgmUykQI_lYtn54bf85CG-2hZQs6TIbKc,8591
 letta/schemas/usage.py,sha256=lvn1ooHwLEdv6gwQpw5PBUbcwn_gwdT6HA-fCiix6sY,817
 letta/schemas/user.py,sha256=D7DiPzieXZIHOLInJdYZlHjKOy2bl7KxGCesNk0yf5E,1003
 letta/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -154,9 +155,10 @@ letta/server/rest_api/routers/openai/assistants/schemas.py,sha256=d3LdBLUI-mMUCP
 letta/server/rest_api/routers/openai/assistants/threads.py,sha256=5-5XsbEDLIZ_xyur5LJVELWLc5PyDc-mkqLQ9t4awmw,13554
 letta/server/rest_api/routers/openai/chat_completions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 letta/server/rest_api/routers/openai/chat_completions/chat_completions.py,sha256=5RxCClOm0JCDzLAbh1K8C-dGIrERKUxC4DJPlMcPcgw,4758
-letta/server/rest_api/routers/v1/__init__.py,sha256=xzNnC4_aIbWJNhpoh0o3hGjLpS8X2gFtxsNS5IGCWPI,571
+letta/server/rest_api/routers/v1/__init__.py,sha256=sqlVZa-u9DJwdRsp0_8YUGrac9DHguIB4wETlEDRylA,666
 letta/server/rest_api/routers/v1/agents.py,sha256=AsLvhZjXBRd7_hbxrvKvccKQtkcjkHpZmEqm6xe5w8U,19462
 letta/server/rest_api/routers/v1/blocks.py,sha256=xY-9k2e2dTRsU9Zh-kT164Z977O0Ed_YYBjLaWKbDpE,2293
+letta/server/rest_api/routers/v1/health.py,sha256=pKCuVESlVOhGIb4VC4K-H82eZqfghmT6kvj2iOkkKuc,401
 letta/server/rest_api/routers/v1/jobs.py,sha256=YHEKALAkSCvF_gzIhvsTkqaLdIhFBYrTNmwCtnzohhM,1574
 letta/server/rest_api/routers/v1/llms.py,sha256=1O1YiSNeJBnSZY1dFiH58Gk3dodR2GrsgAkG-hR9p9c,797
 letta/server/rest_api/routers/v1/organizations.py,sha256=i3S9E1hu2Zj9g0pRv6wnQhz1VJ_RMIHCrGzgwY-Wj3Y,1945
@@ -182,8 +184,8 @@ letta/settings.py,sha256=1S0CN3fCGdZIdhIWPNJO5k2vmosrNRux4arnCj7dYQg,6502
 letta/streaming_interface.py,sha256=LPY1NmXtptcjdHrfVOOKL4-v3AyUD8SIyQMt1Dypd1A,15532
 letta/system.py,sha256=buKYPqG5n2x41hVmWpu6JUpyd7vTWED9Km2_M7dLrvk,6960
 letta/utils.py,sha256=LyqSRz_FejtsdelKigpV86kT8GRVrLwkXIOVQLHPm7Q,30661
-letta_nightly-0.1.7.dev20241002104051.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
-letta_nightly-0.1.7.dev20241002104051.dist-info/METADATA,sha256=CZRkBRUH41egw16NT07RzK7gInHg883ZJl2ksmU2mbc,5812
-letta_nightly-0.1.7.dev20241002104051.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-letta_nightly-0.1.7.dev20241002104051.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
-letta_nightly-0.1.7.dev20241002104051.dist-info/RECORD,,
+letta_nightly-0.4.1.dev20241004012408.dist-info/LICENSE,sha256=mExtuZ_GYJgDEI38GWdiEYZizZS4KkVt2SF1g_GPNhI,10759
+letta_nightly-0.4.1.dev20241004012408.dist-info/METADATA,sha256=qx7pv3QJc_760ltIgPfj8SYiNVDbSZZho8o5Ybv07FA,5967
+letta_nightly-0.4.1.dev20241004012408.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+letta_nightly-0.4.1.dev20241004012408.dist-info/entry_points.txt,sha256=2zdiyGNEZGV5oYBuS-y2nAAgjDgcC9yM_mHJBFSRt5U,40
+letta_nightly-0.4.1.dev20241004012408.dist-info/RECORD,,