letta-nightly 0.1.7.dev20241002104051__tar.gz → 0.1.7.dev20241003104113__tar.gz

{letta_nightly-0.1.7.dev20241002104051 → letta_nightly-0.1.7.dev20241003104113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: letta-nightly
-Version: 0.1.7.dev20241002104051
+Version: 0.1.7.dev20241003104113
 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 → letta_nightly-0.1.7.dev20241003104113}/letta/__init__.py

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

{letta_nightly-0.1.7.dev20241002104051 → letta_nightly-0.1.7.dev20241003104113}/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_nightly-0.1.7.dev20241002104051 → letta_nightly-0.1.7.dev20241003104113}/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_nightly-0.1.7.dev20241002104051 → letta_nightly-0.1.7.dev20241003104113}/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_nightly-0.1.7.dev20241003104113/letta/schemas/health.py

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

{letta_nightly-0.1.7.dev20241002104051 → letta_nightly-0.1.7.dev20241003104113}/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_nightly-0.1.7.dev20241002104051 → letta_nightly-0.1.7.dev20241003104113}/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_nightly-0.1.7.dev20241003104113/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 → letta_nightly-0.1.7.dev20241003104113}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "letta-nightly"
-version = "0.1.7.dev20241002104051"
+version = "0.1.7.dev20241003104113"
 packages = [
     {include = "letta"}
 ]
@@ -74,6 +74,8 @@ llama-index-embeddings-ollama = "^0.3.1"
 wikipedia = {version = "^1.4.0", optional = true}
 langchain = {version = "^0.2.16", optional = true}
 langchain-community = {version = "^0.2.17", optional = true}
+composio-langchain = "^0.5.28"
+composio-core = "^0.5.28"
 
 [tool.poetry.extras]
 #local = ["llama-index-embeddings-huggingface"]
@@ -84,7 +86,7 @@ server = ["websockets", "fastapi", "uvicorn"]
 autogen = ["pyautogen"]
 qdrant = ["qdrant-client"]
 ollama = ["llama-index-embeddings-ollama"]
-external-tools = ["crewai", "docker", "crewai-tools", "langchain", "wikipedia", "langchain-community"]
+external-tools = ["crewai", "docker", "crewai-tools", "langchain", "wikipedia", "langchain-community", "composio-core", "composio-langchain"]
 tests = ["wikipedia"]
 
 [tool.poetry.group.dev.dependencies]