Update app.py

app.py

@@ -32,7 +32,7 @@ class PDOKLocationSearchInput(BaseModel):
         else:
             return ""
 
-class PDOKLocationInfo(BaseModel):
+class PDOKLocationInfo(BaseModel):  # This is not used in the tool's return anymore
     type: str
     weergavenaam: str
     straatnaam: Optional[str] = None
@@ -51,7 +51,7 @@ class PDOKLocationInfo(BaseModel):
 
 @tool
 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.
+    """Provides information about a Dutch address or postal code, including a Google Maps link.
     
     Args:
         postal_code: Postal code in the format '1234 AA'.
@@ -60,7 +60,7 @@ def pdok_location_info(postal_code: Optional[str] = None, house_number: Optional
         city: Name of the city.
 
     Returns:
-        str: JSON string containing the location information or error message with debug info.
+        str: JSON string containing the location information, including a Google Maps link, or an error message.
     """
     
     debug_info = []
@@ -84,16 +84,14 @@ def pdok_location_info(postal_code: Optional[str] = None, house_number: Optional
     params = {
         "q": query_string,
         "fl": "*",
-        "fq": "type:(gemeente OR woonplaats OR weg OR postcode OR adres)",
+        "fq": "type:(gemeente OR woonplaats OR postcode OR adres)",
         "df": "tekst",
-        "bq": "type:provincie^1.5",
         "bq": "type:gemeente^1.5",
         "bq": "type:woonplaats^1.5",
-        "bq": "type:weg^1.5",
         "bq": "type:postcode^0.5",
         "bq": "type:adres^1",
         "start": 0,
-        "rows": 10,
+        "rows": 1,
         "sort": "score desc,sortering asc,weergavenaam asc",
         "wt": "json",
     }
@@ -114,7 +112,7 @@ def pdok_location_info(postal_code: Optional[str] = None, house_number: Optional
         first_result = docs[0]
         debug_info.append(f"First result data: {first_result}")
         
-        # Create a dictionary with only the fields we need
+        # Create a dictionary with only the fields we need, *including* the Google Maps link
         location_info = {
             "straatnaam": first_result.get("straatnaam", ""),
             "huisnummer": first_result.get("huisnummer", ""),
@@ -127,48 +125,21 @@ def pdok_location_info(postal_code: Optional[str] = None, house_number: Optional
             "centroide_ll": first_result.get("centroide_ll", ""),
             "centroide_rd": first_result.get("centroide_rd", "")
         }
+
+        # Add Google Maps link *to the dictionary that will be returned*
+        centroide_ll = location_info.get('centroide_ll')
+        if centroide_ll:
+            lon, lat = centroide_ll.replace("POINT(", "").replace(")", "").split()
+            location_info["google_maps_url"] = f"https://www.google.com/maps/search/?api=1&query={lat},{lon}"
         
-        return json.dumps(location_info)
+        return json.dumps(location_info)  # Return the dictionary as a JSON string
         
     except requests.exceptions.RequestException as e:
         return f"Error during API request: {e}\nDebug info:\n" + "\n".join(debug_info)
     except (ValueError, KeyError) as e:
         return f"Error processing API response: {e}\nDebug info:\n" + "\n".join(debug_info)
 
-# Usage code:
-location_info_str = pdok_location_info(postal_code=None, house_number="13", street_name="Emmastraat", city="Den Haag")
-
-try:
-    location_info = json.loads(location_info_str)
-    if location_info:
-        print(f"Street Name: {location_info.get('straatnaam', 'N/A')}")
-        print(f"House Number: {location_info.get('huisnummer', 'N/A')}")
-        print(f"Postal Code: {location_info.get('postcode', 'N/A')}")
-        print(f"City: {location_info.get('woonplaatsnaam', 'N/A')}")
-        print(f"Municipality: {location_info.get('gemeentenaam', 'N/A')}")
-        print(f"Province: {location_info.get('provincienaam', 'N/A')}")
-        print(f"Neighborhood: {location_info.get('buurtnaam', 'N/A')}")
-        print(f"District: {location_info.get('wijknaam', 'N/A')}")
-        print(f"Centroid (Lat/Lon): {location_info.get('centroide_ll', 'N/A')}")
-        print(f"Centroid (RD): {location_info.get('centroide_rd', 'N/A')}")
-
-        # Add Google Maps link
-        centroide_ll = location_info.get('centroide_ll')
-        if centroide_ll:
-            # Extract latitude and longitude from POINT(lon lat)
-            lon, lat = centroide_ll.replace("POINT(", "").replace(")", "").split()
-            google_maps_url = f"https://www.google.com/maps/search/?api=1&query={lat},{lon}"
-            print(f"Google Maps Link: {google_maps_url}")
-
-    else:
-        print("No information found for the given address.")
-except json.JSONDecodeError:
-    print(f"Error parsing response: {location_info_str}")
-except Exception as e:
-    print(f"Error: {str(e)}")
-    print(f"Raw response: {location_info_str}")
-
-
+# ---  Rest of your code (agent definition, etc.) remains the same ---
 
 @tool
 def my_custom_tool(arg1:str, arg2:int)-> str: #it's import to specify the return type