Use common sessions config

Author: nikdoof

hackspaceapi/services/homeassistant.py

@@ -7,14 +7,20 @@
 from prometheus_client import Summary
 
 from hackspaceapi.config import settings
+from hackspaceapi.services.session import get_requests_session
 
-session = requests.session()
-session.headers = {
-    "Authorization": "Bearer {0}".format(settings.homeassistant_token),
-    "content-type": "application/json",
-}
+session = get_requests_session()
+session.headers.update(
+    {
+        "Authorization": "Bearer {0}".format(settings.homeassistant_token),
+        "content-type": "application/json",
+    }
+)
+
+call_homeassistant_metrics = Summary(
+    "hackspaceapi_homeassistant_api_time", "Summary of calls to the Home Assistant API"
+)
 
-call_homeassistant_metrics = Summary('hackspaceapi_homeassistant_api_time', 'Summary of calls to the Home Assistant API')
 
 @ttl_cache(ttl=60)
 @call_homeassistant_metrics.time()

hackspaceapi/services/prometheus.py

@@ -7,6 +7,9 @@
 from prometheus_client import Summary
 
 from hackspaceapi.config import settings
+from hackspaceapi.services.session import get_requests_session
+
+session = get_requests_session()
 
 prometheus_metric_summary = Summary('hackspaceapi_prometheus_api_time', 'Summary of calls to the Prometheus API')
 
@@ -15,7 +18,7 @@
 def get_prometheus_metric(query: str) -> Optional[Dict]:
     url = urljoin(settings.prometheus_instance, "/api/v1/query")
     try:
-        resp = requests.get(url, params={"query": query})
+        resp = session.get(url, params={"query": query})
         if resp.ok:
             data = resp.json()
             if "status" in data and data["status"] == "success":

hackspaceapi/services/session.py

@@ -0,0 +1,14 @@
+import requests
+
+from hackspaceapi import VERSION
+
+
+def get_requests_session() -> requests.Session:
+    """
+    Creates a Requests session pre-configured with the common values used by
+    all outbound requests
+    """
+    session = requests.session()
+    session.headers = {"User-Agent": "HackspaceAPI/{0}".format(VERSION)}
+
+    return session

hackspaceapi/services/website.py

@@ -5,6 +5,9 @@
 from cachetools.func import ttl_cache
 from prometheus_client import Summary
 
+from hackspaceapi.services.session import get_requests_session
+
+session = get_requests_session()
 
 website_metric_summary = Summary(
     "hackspaceapi_website_data_time", "Summary of calls to the Website data"
@@ -16,7 +19,7 @@
 def get_membership_data() -> Optional[Iterable]:
     url = "https://web-test.leighhack.org/membership/index.json"
     try:
-        resp = requests.get(url)
+        resp = session.get(url)
         if resp.ok:
             data = resp.json()
             return data["memberships"]