add tools to langgraph

app.py

@@ -10,8 +10,8 @@ DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
 
 # --- Choice of framework (either "langgraph" or "llamaindex") ---
-# FRAMEWORK = 'langgraph'
-FRAMEWORK = 'llamaindex'
+FRAMEWORK = 'langgraph'
+# FRAMEWORK = 'llamaindex'
 
 
 async def run_and_submit_all(profile: gr.OAuthProfile | None):
@@ -98,7 +98,10 @@ async def run_and_submit_all(profile: gr.OAuthProfile | None):
                     pass
 
             # call the agent
-            submitted_answer = await agent(question_text)
+            if FRAMEWORK == 'llamaindex':
+                submitted_answer = await agent(question_text)
+            else:
+                submitted_answer = agent(question_text)
             answers_payload.append({"task_id": task_id, "submitted_answer": submitted_answer})
             results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
             agent.ctx.clear() # clear context for next question

langgraph_dir/agent.py

@@ -1,12 +1,15 @@
-from typing import Literal
+import json
 
+from typing import Literal
 from langchain_openai import ChatOpenAI
 from langgraph.graph import MessagesState
 from langchain_core.messages import SystemMessage, HumanMessage, ToolMessage
 from langgraph.graph import StateGraph, START, END
+from langchain.agents import load_tools
+from langchain_community.tools.riza.command import ExecPython
 
 from .prompt import system_prompt
-from .custom_tools import multiply, add, divide
+from .custom_tools import multiply, add, subtract, divide, modulus, power
 
 
 class LangGraphAgent:
@@ -16,11 +19,18 @@ class LangGraphAgent:
                  show_prompt=True):
 
         # =========== LLM definition ===========
-        llm = ChatOpenAI(model=model_name, temperature=0)
+        llm = ChatOpenAI(model=model_name, temperature=0) # needs OPENAI_API_KEY
         print(f"LangGraphAgent initialized with model \"{model_name}\"")
 
         # =========== Augment the LLM with tools ===========
-        tools = [add, multiply, divide]
+        community_tool_names = [
+            "ddg-search", # DuckDuckGo search
+            "wikipedia",
+        ]
+        community_tools = load_tools(community_tool_names)
+        community_tools += [ExecPython()] # Riza code interpreter (needs RIZA_API_KEY) (not supported by load_tools)
+        custom_tools = [multiply, add, subtract, divide, modulus, power]
+        tools = community_tools + custom_tools
         tools_by_name = {tool.name: tool for tool in tools}
         llm_with_tools = llm.bind_tools(tools)
 
@@ -95,17 +105,15 @@ class LangGraphAgent:
         # Compile the agent
         self.agent = agent_builder.compile()
 
+        if show_tools_desc:
+            for i, tool in enumerate(llm_with_tools.kwargs['tools']):
+                print("\n" + "="*30 + f" Tool {i+1} " + "="*30)
+                print(json.dumps(tool[tool['type']], indent=4))
 
-        # if show_tools_desc:
-        #     for i, tool in enumerate(tool_spec_list):
-        #         print("\n" + "="*30 + f" Tool {i+1} " + "="*30)
-        #         print(tool.metadata.description)
+        if show_prompt:
+            print("\n" + "="*30 + f" System prompt " + "="*30)
+            print(system_prompt)
 
-        # if show_prompt:
-        #     prompt_dict = self.agent.get_prompts()
-        #     for k, v in prompt_dict.items():
-        #         print("\n" + "="*30 + f" Prompt: {k} " + "="*30)
-        #         print(v.template)
 
     def __call__(self, question: str) -> str:
         print("\n\n"+"*"*50)

langgraph_dir/custom_tools.py

@@ -1,33 +1,68 @@
 from langchain_core.tools import tool
 
 @tool
-def multiply(a: int, b: int) -> int:
-    """Multiply a and b.
-
+def multiply(a: float, b: float) -> float:
+    """
+    Multiplies two numbers.
     Args:
-        a: first int
-        b: second int
+        a (float): the first number
+        b (float): the second number
     """
     return a * b
 
 
 @tool
-def add(a: int, b: int) -> int:
-    """Adds a and b.
-
+def add(a: float, b: float) -> float:
+    """
+    Adds two numbers.
     Args:
-        a: first int
-        b: second int
+        a (float): the first number
+        b (float): the second number
     """
     return a + b
 
 
 @tool
-def divide(a: int, b: int) -> float:
-    """Divide a and b.
+def subtract(a: float, b: float) -> int:
+    """
+    Subtracts two numbers.
+    Args:
+        a (float): the first number
+        b (float): the second number
+    """
+    return a - b
+
+
+@tool
+def divide(a: float, b: float) -> float:
+    """
+    Divides two numbers.
+    Args:
+        a (float): the first float number
+        b (float): the second float number
+    """
+    if b == 0:
+        raise ValueError("Cannot divided by zero.")
+    return a / b
+
+
+@tool
+def modulus(a: int, b: int) -> int:
+    """
+    Get the modulus of two numbers.
+    Args:
+        a (int): the first number
+        b (int): the second number
+    """
+    return a % b
+
 
+@tool
+def power(a: float, b: float) -> float:
+    """
+    Get the power of two numbers.
     Args:
-        a: first int
-        b: second int
+        a (float): the first number
+        b (float): the second number
     """
-    return a / b
+    return a**b

requirements.txt

@@ -7,4 +7,7 @@ llama_index.tools.duckduckgo
 llama_index.tools.code_interpreter
 langchain
 langgraph
-langchain-openai
+langchain-openai
+langchain-community
+duckduckgo-search
+rizaio