Added location header to Bing search.

Author: afourney

src/aprs_assistant/__main__.py

@@ -39,4 +39,4 @@
     if request == "quit" or request == "exit":
         break
     response = generate_reply(fromcall, request)
-    print(f"\n{BOT_CALLSIGN}: {response}\n")
+    print(f"\n{BOT_CALLSIGN()}: {response}\n")

src/aprs_assistant/_bing.py

@@ -13,8 +13,8 @@
 from urllib.parse import quote, quote_plus, unquote, urlparse, urlunparse
 
 
-def bing_search(query, interleave_results=True):
-    results = _bing_api_call(query)
+def bing_search(query, lat=None, lon=None, interleave_results=True):
+    results = _bing_api_call(query, lat, lon)
     snippets = {}
 
     def _processFacts(elm):
@@ -154,12 +154,18 @@ def _processFacts(elm):
     return f"## A Bing search for '{query}' found {idx} results:\n\n" + content.strip()
 
 
-def _bing_api_call(query: str):
+def _bing_api_call(query, lat=None, lon=None):
     # Prepare the request parameters
     request_kwargs = {}
     request_kwargs["headers"] = {}
     request_kwargs["headers"]["Ocp-Apim-Subscription-Key"] = os.environ["BING_API_KEY"]
 
+    # Specify the user's location
+    if lat is not None or lon is not None:
+        if lat is None or lon is None:
+            raise ValueError("If lat is specified, lon must also be specified.")
+        request_kwargs["headers"]["X-Search-Location"] = f"lat:{lat};long:{lon};re:22m"
+
     request_kwargs["params"] = {}
     request_kwargs["params"]["q"] = query
     request_kwargs["params"]["textDecorations"] = False
@@ -184,18 +190,3 @@ def _markdown_link(anchor, href):
         return f"[{anchor}]({href})"
     except ValueError:  # It's not clear if this ever gets thrown
         return f"[{anchor}]({href})"
-
-
-def _bing_news_call():
-    request_kwargs = {}
-    request_kwargs["headers"] = {}
-    request_kwargs["headers"]["Ocp-Apim-Subscription-Key"] = os.environ["BING_API_KEY"]
-    request_kwargs["stream"] = False
-
-    # Make the request
-    response = requests.get(
-        "https://api.bing.microsoft.com/v7.0/news/search?q=&mkt=en-us", **request_kwargs
-    )
-    response.raise_for_status()
-    results = response.json()
-    return results

src/aprs_assistant/_bot.py

@@ -216,7 +216,14 @@ def _generate_reply(fromcall, messages):
 
             # Step 3: Call the function and retrieve results. Append the results to the messages list.
             if function_name == TOOL_WEB_SEARCH["function"]["name"]:
-                results = bing_search(args["query"])
+                if position is not None:
+                    results = bing_search(
+                        args["query"],
+                        lat=position["latitude"],
+                        lon=position["longitude"],
+                    )
+                else:
+                    results = bing_search(args["query"])
 
             elif function_name == TOOL_CALLSIGN_SEARCH["function"]["name"]:
                 results = get_callsign_info(args["callsign"])