pyrelukko 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

pyrelukko/pyrelukko.py

@@ -2,22 +2,20 @@
 TBD
 """
 import asyncio
+import json
 import logging
 import os
-import json
-import threading
 import ssl
+import threading
 import time
-
 from datetime import datetime
-from typing import Dict, List, Union
 from pathlib import Path
-from urllib3.util import Url, parse_url
-from urllib3.util.retry import Retry
+from typing import Dict, List, Union
 
 import requests
+from urllib3.util import Url, parse_url
+from urllib3.util.retry import Retry
 from websockets import ConnectionClosed as WsConnectionClosed
-
 from websockets.asyncio.client import connect as ws_connect
 
 from .retry import retry
@@ -30,6 +28,14 @@ SSL_KWARGS = [
     'options',
 ]
 
+RETRY_KWARGS = [
+    'tries',
+    'delay',
+    'backoff',
+    'max_delay',
+    'exceptions'
+]
+
 logger = logging.getLogger(__name__)
 
 
@@ -50,12 +56,21 @@ class RelukkoClient:
         """
         self.session = requests.Session()
         self.api_key = api_key
+        self.tries=4
+        self.delay=5
+        self.backoff=2.0
+        self.max_delay=None
+        self.exceptions = (
+            requests.ConnectionError,
+            RelukkoDoRetry,
+        )
         self._setup_session(api_key, **kwargs)
         self._setup_http_adapters_retry(**kwargs)
+        self._setup_pyrelukko_retry(**kwargs)
 
         self.base_url = self._setup_base_url(base_url)
         self.ws_url = self._setup_ws_url(str(self.base_url))
-        self.ssl_ctx = None
+        self.ssl_ctx: ssl.SSLContext = None
         self._setup_ssl_ctx(**kwargs)
 
         # event for websocket thread to signal it got a message
@@ -75,6 +90,15 @@ class RelukkoClient:
         self.base_url = self._setup_base_url(base_url or self.base_url)
         self.ws_url = self._setup_ws_url(str(self.base_url))
         self._setup_ssl_ctx(**kwargs)
+        self._setup_pyrelukko_retry(**kwargs)
+
+    def _setup_pyrelukko_retry(self, **kwargs):
+        for kwarg in RETRY_KWARGS:
+            setattr(
+                self,
+                kwarg,
+                kwargs.get(kwarg, getattr(self, kwarg))
+            )
 
     def _setup_http_adapters_retry(self, **kwargs):
         for _, http_adapter in self.session.adapters.items():
@@ -85,7 +109,7 @@ class RelukkoClient:
             http_adapter.max_retries = http_retry
 
     def _setup_session(self, api_key: str, **kwargs):
-        self.session.headers = {'X-api-Key': api_key}
+        self.session.headers['X-api-Key'] = api_key
         for key, value in kwargs.items():
             if hasattr(self.session, key):
                 setattr(self.session, key, value)
@@ -116,7 +140,7 @@ class RelukkoClient:
 
             # values from kwargs take precedence env vars
             ca_file = kwargs.get('cafile', ca_bundle_file)
-            ca_path = kwargs.get('capath', ca_bundle_path)
+            ca_path = kwargs.get('capath', f"{ca_bundle_path}/")
             ca_data = kwargs.get('cadata')
 
             if ca_file or ca_path or ca_data:
@@ -196,7 +220,7 @@ class RelukkoClient:
 
     def _check_response(self, response: requests.Response):
         match response.status_code:
-            case 200 | 201 | 404:
+            case 200 | 201 | 404 | 422:
                 return response.json()
             case 400 | 403:
                 err = response.json()
@@ -207,10 +231,12 @@ class RelukkoClient:
                 logger.info(err.get('status'), err.get('message'))
                 return None
             case 500 | 502 | 503 | 504:
-                logger.warning(response.status_code, response.text)
+                logger.warning("[%d](%s) %s",
+                    response.status_code, response.reason, response.text)
                 raise RelukkoDoRetry()
             case _:
-                logger.warning(response.status_code, response.text)
+                logger.warning("[%d](%s) %s",
+                    response.status_code, response.reason, response.text)
                 raise RuntimeError()
 
     def _make_request(
@@ -219,12 +245,10 @@ class RelukkoClient:
             method: str,
             payload: Dict=None) -> requests.Response:
 
-        excpetions = (
-            requests.ConnectionError,
-            RelukkoDoRetry,
-        )
 
-        @retry(logger, exceptions=excpetions, delay=10)
+        @retry(logger, exceptions=self.exceptions, tries=self.tries,
+               delay=self.delay, backoff=self.backoff,
+               max_delay=self.max_delay)
         def _do_request():
             response = self.session.request(
                 method=method,
@@ -274,13 +298,14 @@ class RelukkoClient:
         url = f"{self.base_url}/v1/locks/"
         return self._make_request(url, "GET")
 
-    def update_relukko(self, lock_id: str, creator: str, expires_at: datetime):
+    def update_relukko(
+            self, lock_id: str, creator: str=None, expires_at: datetime=None):
         """
         TBD
         """
         if isinstance(expires_at, datetime):
             expires_at = expires_at.isoformat()
-        else:
+        elif expires_at is not None:
             raise ValueError("has to be datetime!")
 
         payload = {
@@ -288,7 +313,7 @@ class RelukkoClient:
             "expires_at": expires_at,
         }
         url = f"{self.base_url}/v1/locks/{lock_id}"
-        return self._make_request(url, "POST", payload)
+        return self._make_request(url, "PUT", payload)
 
     def delete_relukko(self, lock_id: str):
         """

pyrelukko/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=all
-__version__ = "0.1.0"
+__version__ = "0.2.0"

{pyrelukko-0.1.0.dist-info → pyrelukko-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyrelukko
-Version: 0.1.0
+Version: 0.2.0
 Summary: Relukko client.
 Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
 Requires-Python: >=3.12

pyrelukko-0.2.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+pyrelukko/__init__.py,sha256=n-mTJV7AOfr4bljtDxok3E3gXIBRk-kFa2_Ql3S8Ht0,61
+pyrelukko/pyrelukko.py,sha256=5bDqueUMxbMSxbuSOE9L7aHpAP3bax4DHQqATeuHs1s,11435
+pyrelukko/retry.py,sha256=XeCc0trPhAggdEnu2nwtpFderlHaDQFTXH_O1dLeiGQ,1587
+pyrelukko/version.py,sha256=5ajVDlNTAW-Ykqh9HwJkug5LWeNtanZQhZox4hNtxio,44
+pyrelukko-0.2.0.dist-info/LICENSE,sha256=aEI4dThWmRUiEPch0-KaZQmHZgTyuz88Edmp25H6tAw,1089
+pyrelukko-0.2.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+pyrelukko-0.2.0.dist-info/METADATA,sha256=0tOto4sHXUD_sFAfTvC6EhV2l4NER-gNyYE66ori8TQ,701
+pyrelukko-0.2.0.dist-info/RECORD,,

pyrelukko-0.1.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-pyrelukko/__init__.py,sha256=n-mTJV7AOfr4bljtDxok3E3gXIBRk-kFa2_Ql3S8Ht0,61
-pyrelukko/pyrelukko.py,sha256=xW97JA3Za7cg0K0P8cu134sDs7i-wM75vB-Wh1CkWqw,10646
-pyrelukko/retry.py,sha256=XeCc0trPhAggdEnu2nwtpFderlHaDQFTXH_O1dLeiGQ,1587
-pyrelukko/version.py,sha256=AaOhlz8bhe74XhrpzHuwnyjVm0cDxwlXlZGQ3Qvzs0o,44
-pyrelukko-0.1.0.dist-info/LICENSE,sha256=aEI4dThWmRUiEPch0-KaZQmHZgTyuz88Edmp25H6tAw,1089
-pyrelukko-0.1.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-pyrelukko-0.1.0.dist-info/METADATA,sha256=G7uhJSin6c3wyWUj5HSdcOyP9pCfIoco_P2Ulw0WY9o,701
-pyrelukko-0.1.0.dist-info/RECORD,,