From ee65d95bb55bff1073f959f9e462cca2e86662d8 Mon Sep 17 00:00:00 2001
From: Jeff Tang <jeff.x.tang@gmail.com>
Date: Sun, 8 Dec 2024 10:54:32 -0800
Subject: [PATCH] use customtool's get_tool_definition to remove duplication in
 agentconfig

---
 .../04_Tool_Calling101.ipynb                  | 21 ++++----------
 ..._Using_Together's_Llama_Stack_Server.ipynb | 28 +++++--------------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/docs/zero_to_hero_guide/04_Tool_Calling101.ipynb b/docs/zero_to_hero_guide/04_Tool_Calling101.ipynb
index 9719ad31e4..4f0d2e887e 100644
--- a/docs/zero_to_hero_guide/04_Tool_Calling101.ipynb
+++ b/docs/zero_to_hero_guide/04_Tool_Calling101.ipynb
@@ -286,6 +286,9 @@
     "    input_shields = [] if disable_safety else [\"llama_guard\"]\n",
     "    output_shields = [] if disable_safety else [\"llama_guard\"]\n",
     "\n",
+    "    # Initialize custom tool (ensure `WebSearchTool` is defined earlier in the notebook)\n",
+    "    webSearchTool = WebSearchTool(api_key=BRAVE_SEARCH_API_KEY)\n",
+    "    \n",
     "    # Define the agent configuration, including the model and tool setup\n",
     "    agent_config = AgentConfig(\n",
     "        model=MODEL_NAME,\n",
@@ -296,18 +299,7 @@
     "            \"top_p\": 0.9,\n",
     "        },\n",
     "        tools=[\n",
-    "            {\n",
-    "                \"function_name\": \"web_search\",  # Name of the tool being integrated\n",
-    "                \"description\": \"Search the web for a given query\",\n",
-    "                \"parameters\": {\n",
-    "                    \"query\": {\n",
-    "                        \"param_type\": \"str\",\n",
-    "                        \"description\": \"The query to search for\",\n",
-    "                        \"required\": True,\n",
-    "                    }\n",
-    "                },\n",
-    "                \"type\": \"function_call\",\n",
-    "            },\n",
+    "            webSearchTool.get_tool_definition()\n",
     "        ],\n",
     "        tool_choice=\"auto\",\n",
     "        tool_prompt_format=\"python_list\",\n",
@@ -316,11 +308,8 @@
     "        enable_session_persistence=False,\n",
     "    )\n",
     "\n",
-    "    # Initialize custom tools (ensure `WebSearchTool` is defined earlier in the notebook)\n",
-    "    custom_tools = [WebSearchTool(api_key=BRAVE_SEARCH_API_KEY)]\n",
-    "\n",
     "    # Create an agent instance with the client and configuration\n",
-    "    agent = Agent(client, agent_config, custom_tools)\n",
+    "    agent = Agent(client, agent_config, [webSearchTool])\n",
     "\n",
     "    # Create a session for interaction and print the session ID\n",
     "    session_id = agent.create_session(\"test-session\")\n",
diff --git a/docs/zero_to_hero_guide/Tool_Calling101_Using_Together's_Llama_Stack_Server.ipynb b/docs/zero_to_hero_guide/Tool_Calling101_Using_Together's_Llama_Stack_Server.ipynb
index 8e3949e942..b21f3d64ca 100644
--- a/docs/zero_to_hero_guide/Tool_Calling101_Using_Together's_Llama_Stack_Server.ipynb
+++ b/docs/zero_to_hero_guide/Tool_Calling101_Using_Together's_Llama_Stack_Server.ipynb
@@ -71,7 +71,8 @@
     }
    ],
    "source": [
-    "!pip install llama-stack-client==0.0.50"
+    "!pip install llama-stack-client==0.0.50\n",
+    "!pip install -U httpx==0.27.2 # https://github.com/meta-llama/llama-stack-apps/issues/131"
    ]
   },
   {
@@ -355,6 +356,9 @@
     "async def create_weather_agent(client: LlamaStackClient) -> Agent:\n",
     "    \"\"\"Create an agent with weather tool capability.\"\"\"\n",
     "\n",
+    "    # Create the agent with the tool\n",
+    "    weather_tool = WeatherTool()\n",
+    "    \n",
     "    agent_config = AgentConfig(\n",
     "        model=LLAMA31_8B_INSTRUCT,\n",
     "        #model=model_name,\n",
@@ -369,23 +373,7 @@
     "            \"top_p\": 0.9,\n",
     "        },\n",
     "        tools=[\n",
-    "            {\n",
-    "                \"function_name\": \"get_weather\",\n",
-    "                \"description\": \"Get weather information for a location\",\n",
-    "                \"parameters\": {\n",
-    "                    \"location\": {\n",
-    "                        \"param_type\": \"str\",\n",
-    "                        \"description\": \"City or location name\",\n",
-    "                        \"required\": True,\n",
-    "                    },\n",
-    "                    \"date\": {\n",
-    "                        \"param_type\": \"str\",\n",
-    "                        \"description\": \"Optional date (YYYY-MM-DD)\",\n",
-    "                        \"required\": False,\n",
-    "                    },\n",
-    "                },\n",
-    "                \"type\": \"function_call\",\n",
-    "            }\n",
+    "            weather_tool.get_tool_definition()\n",
     "        ],\n",
     "        tool_choice=\"auto\",\n",
     "        tool_prompt_format=\"json\",\n",
@@ -394,8 +382,6 @@
     "        enable_session_persistence=True\n",
     "    )\n",
     "\n",
-    "    # Create the agent with the tool\n",
-    "    weather_tool = WeatherTool()\n",
     "    agent = Agent(\n",
     "        client=client,\n",
     "        agent_config=agent_config,\n",
@@ -470,5 +456,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 4
 }