working child objects

Signed-off-by: John Seekins <[email protected]>

Author: johnseekins

enricher.py

@@ -40,11 +40,11 @@ def enrich_facility(facility_data: tuple) -> tuple:
     logger.info("Enriching facility %s...", facility_name)
     enriched_facility = copy.deepcopy(facility)
 
-    wiki = wikipedia.Wikipedia({"facility_name": facility_name})
+    wiki = wikipedia.Wikipedia(facility_name=facility_name)
     wiki_res = wiki.search()
-    wd = wikidata.Wikidata({"facility_name": facility_name})
+    wd = wikidata.Wikidata(facility_name=facility_name)
     wd_res = wd.search()
-    osm = openstreetmap.OpenStreetMap({"facility_name": facility_name, "address": facility.get("address", {})})
+    osm = openstreetmap.OpenStreetMap(facility_name=facility_name, address=facility.get("address", {}))
     osm_res = osm.search()
     enriched_facility["wikipedia"]["page_url"] = wiki_res.get("url", "")
     enriched_facility["wikipedia"]["search_query"] = wiki_res.get("search_query_steps", "")

enrichers/__init__.py

@@ -26,7 +26,8 @@ def search(self) -> dict:
 
     def _req(self, url: str, params: dict = {}, timeout: int = 10) -> requests.Response:
         """requests response wrapper to ensure we honor waits"""
-        response = session.get(url, allow_redirects=True, timeout=timeout)
+
+        response = session.get(url, allow_redirects=True, timeout=timeout, params=params)
         response.raise_for_status()
         time.sleep(self.wait_time)
         return response

enrichers/openstreetmap.py

@@ -23,6 +23,7 @@ def search(self) -> dict:
             self.resp_info["search_query_steps"].append(search_name)  # type: ignore [attr-defined]
             try:
                 response = self._req(search_url, params=params, timeout=15)
+                logger.debug("Response: %s", response.text)
                 data = response.json()
             except Exception as e:
                 logger.debug(" OSM search error for '%s': %s", facility_name, e)

enrichers/wikipedia.py

@@ -1,4 +1,5 @@
 from enrichers import Enrichment
+import requests
 from urllib.parse import quote
 from utils import logger
 
@@ -36,7 +37,6 @@ def search(self) -> dict:
         except Exception as e:
             logger.debug("  Wikipedia search error for '%s': %s", wiki_url, e)
             self.resp_info["search_query_steps"].append(f"(Failed -> {e})")  # type: ignore [attr-defined]
-        if response.status_code != 200:
             wiki_url = f"{self.static_search}{quote(facility_name.replace(' ', '_').replace('|', '_'))}"
             self.resp_info["search_query_steps"].append(wiki_url)  # type: ignore [attr-defined]
             try: