From d212c8cbe2a42ba8bca053bc4a7bc1edd875f5db Mon Sep 17 00:00:00 2001
From: xainaz <zaina.abushaban@aixplain.com>
Date: Wed, 30 Oct 2024 19:11:00 +0300
Subject: [PATCH 1/3] Error message update

---
 agenttest.py                       | 28 ++++++++++++++++++++++++++++
 aixplain/modules/agent/__init__.py |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 agenttest.py

diff --git a/agenttest.py b/agenttest.py
new file mode 100644
index 00000000..0dc63ebc
--- /dev/null
+++ b/agenttest.py
@@ -0,0 +1,28 @@
+from aixplain.modules.agent import ModelTool, PipelineTool
+from aixplain.factories import AgentFactory
+from aixplain.factories import TeamAgentFactory
+
+model_tool = ModelTool(
+    model="66b2708c6eb5635d1c71f611"
+)
+
+
+agent = AgentFactory.create(
+    name="agent delete test error 2",
+    tools=[
+        model_tool,
+    ],
+    description="desc",
+    llm_id="66b2708c6eb5635d1c71f611",
+)
+
+team = TeamAgentFactory.create(
+    name="agent team for delete 2test",
+    description="desc",
+    agents=[
+        agent
+    ],
+    llm_id="66b2708c6eb5635d1c71f611"
+)
+
+print(agent.delete())
\ No newline at end of file
diff --git a/aixplain/modules/agent/__init__.py b/aixplain/modules/agent/__init__.py
index a7586c8b..b9d452c2 100644
--- a/aixplain/modules/agent/__init__.py
+++ b/aixplain/modules/agent/__init__.py
@@ -252,6 +252,7 @@ def delete(self) -> None:
             if r.status_code != 200:
                 raise Exception()
         except Exception:
-            message = f"Agent Deletion Error (HTTP {r.status_code}): Make sure the agent exists and you are the owner."
+            response_json = r.json()
+            message = f"Agent Deletion Error (HTTP {r.status_code}): {response_json.get('message')}."
             logging.error(message)
             raise Exception(f"{message}")

From cba3dd1ad14fa715bea8d0941c3b3b91a7b191ea Mon Sep 17 00:00:00 2001
From: xainaz <zaina.abushaban@aixplain.com>
Date: Wed, 30 Oct 2024 19:16:51 +0300
Subject: [PATCH 2/3] Error message update

---
 agenttest.py | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 agenttest.py

diff --git a/agenttest.py b/agenttest.py
deleted file mode 100644
index 0dc63ebc..00000000
--- a/agenttest.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from aixplain.modules.agent import ModelTool, PipelineTool
-from aixplain.factories import AgentFactory
-from aixplain.factories import TeamAgentFactory
-
-model_tool = ModelTool(
-    model="66b2708c6eb5635d1c71f611"
-)
-
-
-agent = AgentFactory.create(
-    name="agent delete test error 2",
-    tools=[
-        model_tool,
-    ],
-    description="desc",
-    llm_id="66b2708c6eb5635d1c71f611",
-)
-
-team = TeamAgentFactory.create(
-    name="agent team for delete 2test",
-    description="desc",
-    agents=[
-        agent
-    ],
-    llm_id="66b2708c6eb5635d1c71f611"
-)
-
-print(agent.delete())
\ No newline at end of file

From 965304cbc6f52905e4ea9f1e5cd2ff7e324bb954 Mon Sep 17 00:00:00 2001
From: xainaz <zaina.abushaban@aixplain.com>
Date: Wed, 30 Oct 2024 19:48:35 +0300
Subject: [PATCH 3/3] added try catch

---
 aixplain/modules/agent/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/aixplain/modules/agent/__init__.py b/aixplain/modules/agent/__init__.py
index b9d452c2..41bb0a2e 100644
--- a/aixplain/modules/agent/__init__.py
+++ b/aixplain/modules/agent/__init__.py
@@ -252,7 +252,10 @@ def delete(self) -> None:
             if r.status_code != 200:
                 raise Exception()
         except Exception:
-            response_json = r.json()
-            message = f"Agent Deletion Error (HTTP {r.status_code}): {response_json.get('message')}."
+            try:
+                response_json = r.json()
+                message = f"Agent Deletion Error (HTTP {r.status_code}): {response_json.get('message')}."
+            except ValueError:
+                message = f"Agent Deletion Error (HTTP {r.status_code}): There was an error in deleting the agent."
             logging.error(message)
-            raise Exception(f"{message}")
+            raise Exception(message)
\ No newline at end of file