pytest-argus-reporter: cache client/session to minimize opening http requests

since we in some situation go via cloudflare, we should do our best to minimize
the session we are opening up

Author: fruch

argus/client/base.py

@@ -37,16 +37,14 @@ def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_heade
         self._auth_token = auth_token
         self._base_url = base_url
         self._api_ver = api_version
-        self._extra_headers = extra_headers or {}
+        self.session = requests.Session()
+        if extra_headers:
+            self.session.headers.update(extra_headers)
 
     @property
     def auth_token(self) -> str:
         return self._auth_token
 
-    @property
-    def extra_headers(self) -> dict:
-        return self._extra_headers
-
     def verify_location_params(self, endpoint: str, location_params: dict[str, str]) -> bool:
         required_params: list[str] = re.findall(r"\$[\w_]+", endpoint)
         for param in required_params:
@@ -92,7 +90,6 @@ def request_headers(self):
             "Authorization": f"token {self.auth_token}",
             "Accept": "application/json",
             "Content-Type": "application/json",
-            **self.extra_headers,
         }
 
     def get(self, endpoint: str, location_params: dict[str, str] = None, params: dict = None) -> requests.Response:
@@ -101,7 +98,7 @@ def get(self, endpoint: str, location_params: dict[str, str] = None, params: dic
             location_params=location_params
         )
         LOGGER.debug("GET Request: %s, params: %s", url, params)
-        response = requests.get(
+        response = self.session.get(
             url=url,
             params=params,
             headers=self.request_headers
@@ -122,7 +119,7 @@ def post(
             location_params=location_params
         )
         LOGGER.debug("POST Request: %s, params: %s, body: %s", url, params, body)
-        response = requests.post(
+        response = self.session.post(
             url=url,
             params=params,
             json=body,

pytest-argus-reporter/pytest_argus_reporter.py

@@ -13,6 +13,7 @@
 import concurrent.futures
 import json
 from json import JSONDecodeError
+from functools import cached_property
 
 import six
 import pytest
@@ -180,7 +181,7 @@ def __init__(self, config):
         self.is_slave = False
         self.slices_query_fields = dict()
 
-    @property
+    @cached_property
     def argus_client(self):
         return ArgusGenericClient(auth_token=self.api_key, base_url=self.base_url, extra_headers=self.extra_headers)