From b4776da67097b8faf84357d6e8d7ca575cbb6ab5 Mon Sep 17 00:00:00 2001
From: hanishkvc <hanishkvc@gmail.com>
Date: Sun, 12 Oct 2025 02:53:08 +0530
Subject: [PATCH] SimpleChatTC: Trap any exception raised during tool call

and inform the GenAi/LLM about the same
---
 tools/server/public_simplechat/simplechat.js         | 8 ++++++--
 tools/server/public_simplechat/test-tools-cmdline.sh | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/server/public_simplechat/simplechat.js b/tools/server/public_simplechat/simplechat.js
index 618bb95679..36cd5a5937 100644
--- a/tools/server/public_simplechat/simplechat.js
+++ b/tools/server/public_simplechat/simplechat.js
@@ -536,8 +536,12 @@ class SimpleChat {
         }
         for (const fn in tools.tc_switch) {
             if (fn == toolname) {
-                tools.tc_switch[fn]["handler"](JSON.parse(ar.response.toolargs))
-                return tools.tc_switch[fn]["result"]
+                try {
+                    tools.tc_switch[fn]["handler"](JSON.parse(ar.response.toolargs))
+                    return tools.tc_switch[fn]["result"]
+                } catch (error) {
+                    return `Tool/Function call raised an exception:${error.name}:${error.message}`
+                }
             }
         }
         return `Unknown Tool/Function Call:${toolname}`
diff --git a/tools/server/public_simplechat/test-tools-cmdline.sh b/tools/server/public_simplechat/test-tools-cmdline.sh
index adea59cb6c..8fc62d2af9 100644
--- a/tools/server/public_simplechat/test-tools-cmdline.sh
+++ b/tools/server/public_simplechat/test-tools-cmdline.sh
@@ -73,10 +73,12 @@ exit
 
         "content": "what is your name."
         "content": "What and all tools you have access to"
+        "content": "do you have access to any tools"
         "content": "Print a hello world message with python."
         "content": "Print a hello world message with javascript."
         "content": "Calculate the sum of 5 and 27."
         "content": "Can you get me todays date."
+        "content": "Can you get me a summary of latest news from bbc world"
         "content": "Can you get todays date. And inturn add 10 to todays date"
         "content": "Who is known as father of the nation in India, also is there a similar figure for USA as well as UK"
         "content": "Who is known as father of the nation in India, Add 10 to double his year of birth and show me the results."