Update app.py

app.py

@@ -23,17 +23,11 @@ DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
 
 wikipedia = WikipediaAPIWrapper()
-@tool
 def wikipedia_search(query: str) -> str:
-    '''
-    Search Wikipedia and return a summary for a given query.
-    Args:
-        query: The search term or question to look up in Wikipedia.
-    '''
     return wikipedia.run(query)
 
 # --- Basic Agent Definition ---
-# ----- THIS IS WERE YOU CAN BUILD WHAT YOU WANT ------
+# ----- THIS IS WHERE YOU CAN BUILD WHAT YOU WANT ------
 class BasicAgent:
     def __init__(self):
         print('BasicAgent initialized.')
@@ -41,16 +35,36 @@ class BasicAgent:
     def __call__(self, question: str) -> str:
         print(f"Agent received question: {question[:50]}...")
 
+        # Define tools using the Tool class
+        web_search_tool = ToolNode(
+            tool=Tool(
+                name="WebSearch",
+                func=DuckDuckGoSearchRun().run,
+                description="Search the web for information."
+            )
+        )
+
+        open_webpage_tool = ToolNode(
+            tool=Tool(
+                name="OpenWebPage",
+                func=wikipedia_search,
+                description="Search Wikipedia for information."
+            )
+        )
+
+        # Instantiate the agent with the tools
         agent = ToolCallingAgent(
-            tools=[DuckDuckGoSearchTool(), wikipedia_search],
-            model = LiteLLMModel(model_id="ollama/qwen2:7b", api_base='http://192.168.1.77:11434'),
+            tools=[web_search_tool, open_webpage_tool],
+            model=LiteLLMModel(
+                model_id="ollama/qwen2:7b",
+                api_base='http://192.168.1.77:11434'
+            ),
             max_steps=15,
             verbosity_level=2,
         )
 
         return agent.run(question)
-        return answer
-
+    
 def run_and_submit_all( profile: gr.OAuthProfile | None):
     """
     Fetches all questions, runs the BasicAgent on them, submits all answers,
@@ -123,7 +137,7 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
         print("Agent did not produce any answers to submit.")
         return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
 
-    # 4. Prepare Submission 
+    # 4. Prepare Submission
     submission_data = {"username": username.strip(), "agent_code": agent_code, "answers": answers_payload}
     status_update = f"Agent finished. Submitting {len(answers_payload)} answers for user '{username}'..."
     print(status_update)
@@ -178,11 +192,9 @@ with gr.Blocks() as demo:
     gr.Markdown(
         """
         **Instructions:**
-
         1.  Please clone this space, then modify the code to define your agent's logic, the tools, the necessary packages, etc ...
         2.  Log in to your Hugging Face account using the button below. This uses your HF username for submission.
         3.  Click 'Run Evaluation & Submit All Answers' to fetch questions, run your agent, submit answers, and see the score.
-
         ---
         **Disclaimers:**
         Once clicking on the "submit button, it can take quite some time ( this is the time for the agent to go through all the questions).