Update to grafana-client 4.0.0

Author: amotl

.github/workflows/tests.yml

@@ -23,6 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         os: [ "ubuntu-latest" ]
         python-version: [ "3.7", "3.11" ]

CHANGES.rst

@@ -5,6 +5,7 @@ grafana-wtf changelog
 
 in progress
 ===========
+- Updated to grafana-client 4.0.0.
 
 2024-03-07 0.18.0
 =================

grafana_wtf/core.py

@@ -11,7 +11,7 @@
 from urllib.parse import parse_qs, urljoin, urlparse
 
 import colored
-import requests
+import niquests
 import requests_cache
 from grafana_client.api import GrafanaApi
 from grafana_client.client import GrafanaClientError, GrafanaUnauthorizedError
@@ -107,9 +107,7 @@ def setup(self):
         # Todo: Review the pool settings and eventually adjust according to concurrency level or other parameters.
         # https://urllib3.readthedocs.io/en/latest/advanced-usage.html#customizing-pool-behavior
         # https://laike9m.com/blog/requests-secret-pool_connections-and-pool_maxsize,89/
-        adapter = requests.adapters.HTTPAdapter(pool_connections=100, pool_maxsize=100, max_retries=5, pool_block=True)
-        self.grafana.client.s.mount("http://", adapter)
-        self.grafana.client.s.mount("https://", adapter)
+        self.grafana.client.s = niquests.Session(pool_connections=100, pool_maxsize=100, retries=5)
 
         return self
 

setup.py

@@ -19,8 +19,7 @@
     f"pandas<2.3; {no_linux_on_arm}",
     f"duckdb<0.11; {no_linux_on_arm}",
     # Grafana
-    "requests>=2.26,<3",
-    "grafana-client>=3.9.1,<4",
+    "grafana-client>=4,<5",
     "jsonpath-rw>=1.4.0,<2",
     # Caching
     "requests-cache>=0.8.0,<2",