feat: Add orm for Tools and clean up Tool logic

.github/workflows/code_style_checks.yml

@@ -1,21 +1,13 @@
 name: Code Style Checks
 
 on:
+  push:
+    branches: [ main ]
   pull_request:
-    paths:
-      - '**.py'
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-  workflow_dispatch:
-
-permissions:
-  pull-requests: read
+    branches: [ main ]
 
 jobs:
-  validation-checks:
+  style-checks:
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/test_cli.yml

@@ -1,4 +1,4 @@
-name: Run CLI tests
+name: Test CLI
 
 env:
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
@@ -10,7 +10,7 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  test-cli:
     runs-on: ubuntu-latest
     timeout-minutes: 15
 

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Run All pytest Tests
+name: Unit Tests
 
 env:
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
@@ -13,7 +13,7 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  unit-tests:
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
@@ -37,6 +37,28 @@ jobs:
         poetry-version: "1.8.2"
         install-args: "-E dev -E postgres -E milvus -E external-tools -E tests"
 
+    - name: Run LocalClient tests
+      env:
+        LETTA_PG_PORT: 8888
+        LETTA_PG_USER: letta
+        LETTA_PG_PASSWORD: letta
+        LETTA_PG_DB: letta
+        LETTA_PG_HOST: localhost
+        LETTA_SERVER_PASS: test_server_token
+      run: |
+        poetry run pytest -s -vv tests/test_local_client.py
+
+    - name: Run RESTClient tests
+      env:
+        LETTA_PG_PORT: 8888
+        LETTA_PG_USER: letta
+        LETTA_PG_PASSWORD: letta
+        LETTA_PG_DB: letta
+        LETTA_PG_HOST: localhost
+        LETTA_SERVER_PASS: test_server_token
+      run: |
+        poetry run pytest -s -vv tests/test_client.py
+
     - name: Run server tests
       env:
         LETTA_PG_PORT: 8888
@@ -70,6 +92,17 @@ jobs:
       run: |
         poetry run pytest -s -vv tests/test_tools.py
 
+    - name: Run o1 agent tests
+      env:
+        LETTA_PG_PORT: 8888
+        LETTA_PG_USER: letta
+        LETTA_PG_PASSWORD: letta
+        LETTA_PG_DB: letta
+        LETTA_PG_HOST: localhost
+        LETTA_SERVER_PASS: test_server_token
+      run: |
+        poetry run pytest -s -vv tests/test_o1_agent.py
+
     - name: Run tests with pytest
       env:
         LETTA_PG_PORT: 8888
@@ -80,4 +113,4 @@ jobs:
         LETTA_SERVER_PASS: test_server_token
         PYTHONPATH: ${{ github.workspace }}:${{ env.PYTHONPATH }}
       run: |
-        poetry run pytest -s -vv -k "not test_cli.py and not test_tools.py and not test_concurrent_connections.py and not test_quickstart and not test_endpoints and not test_storage and not test_server and not test_openai_client and not test_providers" tests
+        poetry run pytest -s -vv -k "not test_local_client.py and not test_o1_agent.py and not test_cli.py and not test_tools.py and not test_concurrent_connections.py and not test_quickstart and not test_endpoints and not test_storage and not test_server and not test_openai_client and not test_providers and not test_client.py" tests

examples/composio_tool_usage.py

@@ -5,7 +5,6 @@
 from letta.schemas.embedding_config import EmbeddingConfig
 from letta.schemas.llm_config import LLMConfig
 from letta.schemas.memory import ChatMemory
-from letta.schemas.tool import Tool
 
 """
 Setup here.
@@ -46,13 +45,10 @@
 
 
 def main():
     from composio_langchain import Action
 
     # Add the composio tool
-    tool = Tool.get_composio_tool(action=Action.GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER)
-
-    # create tool
-    client.add_tool(tool)
+    tool = client.load_composio_tool(action=Action.GITHUB_STAR_A_REPOSITORY_FOR_THE_AUTHENTICATED_USER)
 
     persona = f"""
     My name is Letta.

examples/crewai_tool_usage.py

@@ -2,8 +2,9 @@
 import uuid
 
 from letta import create_client
+from letta.schemas.embedding_config import EmbeddingConfig
+from letta.schemas.llm_config import LLMConfig
 from letta.schemas.memory import ChatMemory
-from letta.schemas.tool import Tool
 
 """
 This example show how you can add CrewAI tools .
@@ -17,18 +18,18 @@
 
 
 def main():
     from crewai_tools import ScrapeWebsiteTool
 
     crewai_tool = ScrapeWebsiteTool(website_url="https://www.example.com")
 
-    example_website_scrape_tool = Tool.from_crewai(crewai_tool)
-    tool_name = example_website_scrape_tool.name
-
     # Create a `LocalClient` (you can also use a `RESTClient`, see the letta_rest_client.py example)
     client = create_client()
+    client.set_default_llm_config(LLMConfig.default_config("gpt-4o-mini"))
+    client.set_default_embedding_config(EmbeddingConfig.default_config(provider="openai"))
 
     # create tool
-    client.add_tool(example_website_scrape_tool)
+    example_website_scrape_tool = client.load_crewai_tool(crewai_tool)
+    tool_name = example_website_scrape_tool.name
 
     # Confirm that the tool is in
     tools = client.list_tools()

examples/langchain_tool_usage.py

@@ -5,7 +5,6 @@
 from letta.schemas.embedding_config import EmbeddingConfig
 from letta.schemas.llm_config import LLMConfig
 from letta.schemas.memory import ChatMemory
-from letta.schemas.tool import Tool
 
 """
 This example show how you can add LangChain tools .
@@ -20,32 +19,29 @@
 
 
 def main():
     from langchain_community.tools import WikipediaQueryRun
     from langchain_community.utilities import WikipediaAPIWrapper
 
     api_wrapper = WikipediaAPIWrapper(top_k_results=1, doc_content_chars_max=500)
     langchain_tool = WikipediaQueryRun(api_wrapper=api_wrapper)
 
-    # Translate to memGPT Tool
+    # Create a `LocalClient` (you can also use a `RESTClient`, see the letta_rest_client.py example)
+    client = create_client()
+    client.set_default_llm_config(LLMConfig.default_config("gpt-4o-mini"))
+    client.set_default_embedding_config(EmbeddingConfig.default_config(provider="openai"))
+
+    # create tool
     # Note the additional_imports_module_attr_map
     # We need to pass in a map of all the additional imports necessary to run this tool
     # Because an object of type WikipediaAPIWrapper is passed into WikipediaQueryRun to initialize langchain_tool,
     # We need to also import WikipediaAPIWrapper
     # The map is a mapping of the module name to the attribute name
     # langchain_community.utilities.WikipediaAPIWrapper
-    wikipedia_query_tool = Tool.from_langchain(
+    wikipedia_query_tool = client.load_langchain_tool(
         langchain_tool, additional_imports_module_attr_map={"langchain_community.utilities": "WikipediaAPIWrapper"}
     )
     tool_name = wikipedia_query_tool.name
 
-    # Create a `LocalClient` (you can also use a `RESTClient`, see the letta_rest_client.py example)
-    client = create_client()
-    client.set_default_llm_config(LLMConfig.default_config("gpt-4o-mini"))
-    client.set_default_embedding_config(EmbeddingConfig.default_config(provider="openai"))
-
-    # create tool
-    client.add_tool(wikipedia_query_tool)
-
     # Confirm that the tool is in
     tools = client.list_tools()
     assert wikipedia_query_tool.name in [t.name for t in tools]

letta/agent.py

@@ -240,7 +240,6 @@ def __init__(
         assert isinstance(self.agent_state.memory, Memory), f"Memory object is not of type Memory: {type(self.agent_state.memory)}"
 
         # link tools
-        self.tools = tools
         self.link_tools(tools)
 
         # gpt-4, gpt-3.5-turbo, ...
@@ -1521,10 +1520,6 @@ def save_agent(agent: Agent, ms: MetadataStore):
     else:
         ms.create_agent(agent_state)
 
-    for tool in agent.tools:
-        if ms.get_tool(tool_name=tool.name, user_id=tool.user_id) is None:
-            ms.create_tool(tool)
-
     agent.agent_state = ms.get_agent(agent_id=agent_id)
     assert isinstance(agent.agent_state.memory, Memory), f"Memory is not a Memory object: {type(agent_state.memory)}"
 

letta/cli/cli.py

@@ -133,6 +133,7 @@ def run(
     # read user id from config
     ms = MetadataStore(config)
     client = create_client()
+    server = client.server
 
     # determine agent to use, if not provided
     if not yes and not agent:
@@ -217,7 +218,9 @@ def run(
         )
 
         # create agent
-        tools = [ms.get_tool(tool_name, user_id=client.user_id) for tool_name in agent_state.tools]
+        tools = [
+            server.tool_manager.get_tool_by_name_and_user_id(tool_name=tool_name, user_id=client.user_id) for tool_name in agent_state.tools
+        ]
         letta_agent = Agent(agent_state=agent_state, interface=interface(), tools=tools)
 
     else:  # create new agent
@@ -297,7 +300,7 @@ def run(
         )
         assert isinstance(agent_state.memory, Memory), f"Expected Memory, got {type(agent_state.memory)}"
         typer.secho(f"->  🛠️  {len(agent_state.tools)} tools: {', '.join([t for t in agent_state.tools])}", fg=typer.colors.WHITE)
-        tools = [ms.get_tool(tool_name, user_id=client.user_id) for tool_name in agent_state.tools]
+        tools = [server.tool_manager.get_tool_by_name_and_user_id(tool_name, user_id=client.user_id) for tool_name in agent_state.tools]
 
         letta_agent = Agent(
             interface=interface(),