Update app.py

app.py

@@ -7,14 +7,10 @@ from tools.final_answer import FinalAnswerTool
 
 from Gradio_UI import GradioUI
 
-from typing import Optional, Dict, Any
-from pydantic import BaseModel, Field, validator
-
-from typing import Optional, Dict, Any
+from typing import Optional, Dict, Any, List
 import requests
 from pydantic import BaseModel, Field, validator
 
-# No change to PDOKLocationSearchInput needed, as it *was* correctly defined
 class PDOKLocationSearchInput(BaseModel):
     """Input for the PDOK location search tool."""
     postal_code: Optional[str] = Field(None, description="Postal code in the format '1234 AA'.")
@@ -35,31 +31,33 @@ class PDOKLocationSearchInput(BaseModel):
         elif self.street_name and self.city and self.house_number:
             return f"{self.street_name} {self.house_number}, {self.city}"
         else:
-            return ""  # Will raise error in the tool itself
+            return ""
 
 @tool
-def pdok_location_search(postal_code: Optional[str] = None, house_number: Optional[str] = None, street_name: Optional[str] = None, city: Optional[str] = None) -> str:
-    """A tool that queries the PDOK API to find location information in the Netherlands.
+def pdok_location_info(postal_code: Optional[str] = None, house_number: Optional[str] = None, street_name: Optional[str] = None, city: Optional[str] = None) -> str:
+    """Provides information about a Dutch address or postal code.
 
     Args:
         postal_code: Postal code in the format '1234 AA'.
         house_number: House number.
         street_name: Street name.
         city: City name.
+
+    Returns:
+        A string containing relevant information about the location, or an error message.
     """
     base_url = "https://api.pdok.nl/bzk/locatieserver/search/v3_1/free"
     headers = {"accept": "application/json"}
 
-    # Create an instance of the Pydantic model from the function arguments
     input_data = PDOKLocationSearchInput(postal_code=postal_code, house_number=house_number, street_name=street_name, city=city)
-
     query_string = input_data.construct_query()
+
     if not query_string:
         return "Please provide either a postal code and house number, or a street name, city, and house number."
 
     params = {
         "q": query_string,
-        "fl": "provincienaam",
+        "fl": "*",  # Request all fields
         "fq": "type:(gemeente OR woonplaats OR weg OR postcode OR adres)",
         "df": "tekst",
         "bq": "type:provincie^1.5",
@@ -84,18 +82,47 @@ def pdok_location_search(postal_code: Optional[str] = None, house_number: Option
             return "No results found for the given query."
 
         first_result = docs[0]
-        provincie_naam = first_result.get("provincienaam")
 
-        if provincie_naam:
-              return f"The province is: {provincie_naam}"
-        else:
-            return "Provincienaam not found in the API response."
+        # Format the output in a more readable and comprehensive way
+        output_lines = []
+        output_lines.append(f"Information about: {first_result.get('weergavenaam', 'N/A')}")
+        output_lines.append("-" * 30)
+
+        # Key information, handle potential missing values gracefully
+        output_lines.append(f"  Type: {first_result.get('type', 'N/A')}")
+        output_lines.append(f"  Street: {first_result.get('straatnaam', 'N/A')}")
+        output_lines.append(f"  House Number: {first_result.get('huisnummer', 'N/A')}")
+        if 'huisletter' in first_result:
+            output_lines.append(f"  House Letter: {first_result.get('huisletter', 'N/A')}")
+        if 'huisnummertoevoeging' in first_result:
+             output_lines.append(f"  House Number Addition: {first_result.get('huisnummertoevoeging', 'N/A')}")
+        output_lines.append(f"  Postal Code: {first_result.get('postcode', 'N/A')}")
+        output_lines.append(f"  City: {first_result.get('woonplaatsnaam', 'N/A')}")
+        output_lines.append(f"  Municipality: {first_result.get('gemeentenaam', 'N/A')}")
+        output_lines.append(f"  Province: {first_result.get('provincienaam', 'N/A')}")
+        output_lines.append(f"  Coordinates (Lat/Lon): {first_result.get('centroide_ll', 'N/A')}")
+        output_lines.append(f"  Coordinates (RD): {first_result.get('centroide_rd', 'N/A')}")
+
+        # Add more fields if they are present and relevant
+        if 'buurtnaam' in first_result:
+            output_lines.append(f"  Neighborhood: {first_result.get('buurtnaam', 'N/A')}")
+        if 'wijknaam' in first_result:
+            output_lines.append(f"  District: {first_result.get('wijknaam', 'N/A')}")
+        if 'waterschapsnaam' in first_result:
+            output_lines.append(f"  Water Authority: {first_result.get('waterschapsnaam', 'N/A')}")
+
+
+        return "\n".join(output_lines)
 
     except requests.exceptions.RequestException as e:
         return f"Error during API request: {e}"
     except (ValueError, KeyError) as e:
         return f"Error processing API response: {e}"
 
+# Corrected call: Use the correct function name (pdok_location_info)
+location_info = pdok_location_info(street_name="Emmastraat", house_number="13", city="Den Haag")
+return (location_info)
+
 @tool
 def my_custom_tool(arg1:str, arg2:int)-> str: #it's import to specify the return type
     #Keep this format for the description / args / args description but feel free to modify the tool