From 150240c7a76d332a54450f3fe177277441b446ce Mon Sep 17 00:00:00 2001
From: Matthew Zhou <mattzh1314@gmail.com>
Date: Fri, 25 Oct 2024 13:15:36 -0700
Subject: [PATCH] fix: Fix `letta delete-agent` (#1940)

---
 letta/cli/cli.py       | 3 +--
 letta/client/client.py | 4 ++--
 letta/server/server.py | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/letta/cli/cli.py b/letta/cli/cli.py
index 3a21f2c7..dbecab15 100644
--- a/letta/cli/cli.py
+++ b/letta/cli/cli.py
@@ -325,13 +325,12 @@ def run(
 
 def delete_agent(
     agent_name: Annotated[str, typer.Option(help="Specify agent to delete")],
-    user_id: Annotated[Optional[str], typer.Option(help="User ID to associate with the agent.")] = None,
 ):
     """Delete an agent from the database"""
     # use client ID is no user_id provided
     config = LettaConfig.load()
     MetadataStore(config)
-    client = create_client(user_id=user_id)
+    client = create_client()
     agent = client.get_agent_by_name(agent_name)
     if not agent:
         typer.secho(f"Couldn't find agent named '{agent_name}' to delete", fg=typer.colors.RED)
diff --git a/letta/client/client.py b/letta/client/client.py
index 4f17e12a..35aed129 100644
--- a/letta/client/client.py
+++ b/letta/client/client.py
@@ -1777,7 +1777,7 @@ class LocalClient(AbstractClient):
         """
         self.server.delete_agent(user_id=self.user_id, agent_id=agent_id)
 
-    def get_agent_by_name(self, agent_name: str, user_id: str) -> AgentState:
+    def get_agent_by_name(self, agent_name: str) -> AgentState:
         """
         Get an agent by its name
 
@@ -1788,7 +1788,7 @@ class LocalClient(AbstractClient):
             agent_state (AgentState): State of the agent
         """
         self.interface.clear()
-        return self.server.get_agent(agent_name=agent_name, user_id=user_id, agent_id=None)
+        return self.server.get_agent(agent_name=agent_name, user_id=self.user_id, agent_id=None)
 
     def get_agent(self, agent_id: str) -> AgentState:
         """
diff --git a/letta/server/server.py b/letta/server/server.py
index 40ce0364..34363ad1 100644
--- a/letta/server/server.py
+++ b/letta/server/server.py
@@ -1222,9 +1222,9 @@ class SyncServer(Server):
             raise ValueError("Source does not exist")
         return existing_source.id
 
-    def get_agent(self, user_id: str, agent_id: str, agent_name: Optional[str] = None):
+    def get_agent(self, user_id: str, agent_id: Optional[str] = None, agent_name: Optional[str] = None):
         """Get the agent state"""
-        return self.ms.get_agent(agent_id=agent_id, user_id=user_id)
+        return self.ms.get_agent(agent_id=agent_id, agent_name=agent_name, user_id=user_id)
 
     # def get_user(self, user_id: str) -> User:
     #     """Get the user"""