Uses the position, or callsign to determine the Bing search market. (#18)

Author: afourney

src/aprs_assistant/_bot.py

@@ -18,7 +18,7 @@
 from ._bing import bing_search
 from ._bandcond import get_band_conditions
 from ._weather import get_weather, format_noaa_alerts, get_noaa_alerts
-from ._callsign import get_callsign_info
+from ._callsign import get_callsign_info, itu_prefix_lookup
 
 from ._tool_definitions import (
     TOOL_WEB_SEARCH,
@@ -73,11 +73,17 @@ def _generate_reply(fromcall, messages):
     bulletins_str = ""
     dts = ""
 
+    country_code = None
+
     if position is not None:
         position_str = "\n\nTheir last known position is:\n\n" + json.dumps(
             position, indent=4
         )
 
+        # Extract the country code
+        if "address" in position and "country_code" in position["address"]:
+            country_code = position["address"]["country_code"]
+
         # Attempt to get the timezone from the user's position
         user_local_tzname = tf.timezone_at(
             lat=position["latitude"], lng=position["longitude"]
@@ -128,6 +134,12 @@ def _generate_reply(fromcall, messages):
             f"\n\nYou looked up {fromcall}'s callsign and found:\n\n{callsign_info}"
         )
 
+    # Messy, but we will clean this up later
+    if country_code is None:
+        itu_prefix = itu_prefix_lookup(fromcall)
+        if itu_prefix is not None:
+            country_code = itu_prefix.country_code
+
     system_message = {
         "role": "system",
         "content": f"""You are an AI HAM radio operator, with call sign {BOT_CALLSIGN()}. You were created by KK7CMT. You are at home, in your cozy ham shack, monitoring the gobal APRS network. You have a computer and high-speed access to the Internet. You are answering questions from other human operators in the field who lack an internet connection. To this end, you are relaying vital information. Questions can be about anything -- not just HAM radio.
@@ -221,9 +233,10 @@ def _generate_reply(fromcall, messages):
                         args["query"],
                         lat=position["latitude"],
                         lon=position["longitude"],
+                        market=country_code,
                     )
                 else:
-                    results = bing_search(args["query"])
+                    results = bing_search(args["query"], market=country_code)
 
             elif function_name == TOOL_CALLSIGN_SEARCH["function"]["name"]:
                 results = get_callsign_info(args["callsign"])
@@ -234,11 +247,10 @@ def _generate_reply(fromcall, messages):
                 results = get_band_conditions()
 
             elif function_name == TOOL_USER_WEATHER["function"]["name"]:
-                country_code = position.get("address", {}).get("country_code", "")
                 results = get_weather(
                     lat=position["latitude"],
                     lon=position["longitude"],
-                    metric=False if country_code == "us" else True,
+                    metric=False if country_code.upper() == "US" else True,
                 )
 
             elif function_name == TOOL_REGIONAL_WEATHER["function"]["name"]: