request headers cleanup

bento_aggregation_service/search/dataset_search.py

@@ -11,8 +11,6 @@
 from bento_aggregation_service.search import query_utils
 from bento_aggregation_service.service_manager import ServiceManager
 
-from .query_utils import forward_auth_if_available
-
 
 __all__ = [
     "run_search_on_dataset",
@@ -260,7 +258,6 @@ async def _run_search(
             url_args = query_utils.construct_gohan_query_params(reloaded_converted, supplemental_url_args)
 
         # Run the search
-        headers = forward_auth_if_available(request)
         res = await http_session.get(search_path, params=url_args, headers=headers)
         r = await res.json()
 
@@ -455,6 +452,6 @@ async def run_search_on_dataset(
     r = await http_session.post(
         f"{config.katsu_url.rstrip('/')}/private/datasets/{dataset_id}/search",
         json=request_body,
-        headers=forward_auth_if_available(request),
+        headers=headers,
     )
     return await r.json()

bento_aggregation_service/search/handlers/datasets.py

@@ -18,7 +18,7 @@
 from bento_aggregation_service.service_manager import ServiceManager, ServiceManagerDependency
 
 from ..dataset_search import run_search_on_dataset
-from ..query_utils import forward_auth_if_available, test_queries
+from ..query_utils import service_request_headers, test_queries
 
 
 __all__ = [
@@ -63,6 +63,7 @@ async def _search_dataset(dataset: dict) -> tuple[str, dict[str, list] | None]:
                 logger,
                 request,
                 service_manager,
+                headers=service_request_headers(request)
             )
             return dataset_id, dataset_results
 
@@ -115,7 +116,7 @@ async def all_datasets_search_handler(
         logger.debug("fetching projects from Katsu")
         res = await http_session.get(
             urljoin(config.katsu_url, "api/projects"),
-            headers=forward_auth_if_available(request),
+            headers=service_request_headers(request),
             raise_for_status=True,
         )
 
@@ -190,7 +191,7 @@ async def dataset_search_handler(
         logger.debug(f"fetching dataset {dataset_id} from Katsu")
         res = await http_session.get(
             urljoin(config.katsu_url, f"api/datasets/{dataset_id}"),
-            headers=forward_auth_if_available(request),
+            headers=service_request_headers(request),
             raise_for_status=True,
         )
 
@@ -215,7 +216,7 @@ async def dataset_search_handler(
             logger=logger,
             request=request,
             service_manager=service_manager,
-            headers=forward_auth_if_available(request)
+            headers=service_request_headers(request)
         )
 
         return {**dataset, **dataset_results}

bento_aggregation_service/search/query_utils.py

@@ -6,7 +6,7 @@
 
 
 __all__ = [
-    "forward_auth_if_available",
+    "service_request_headers",
     "test_queries",
 ]
 
@@ -18,6 +18,13 @@ def forward_auth_if_available(request: Request) -> dict[str, str]:
     }
 
 
+def service_request_headers(request: Request) -> dict[str, str]:
+    return {
+        **forward_auth_if_available(request),
+        "Content-Type": "application/json",
+    }
+
+
 def test_queries(queries: Iterable[Query]) -> None:
     """
     Throws an error if a query in the iterable cannot be compiled.

bento_aggregation_service/service_manager.py

@@ -83,7 +83,6 @@ async def fetch_data_types(
         existing_session: aiohttp.ClientSession | None = None,
         headers: dict[str, str] | None = None,
     ) -> dict[str, DataType]:
-        headers["content-type"] = "application/json"
         services = await self.fetch_service_list(headers=headers)
         data_services = [s for s in services if s.get("bento", {}).get("dataService")]