lsrestclient 1.5.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

lsrestclient/client.py

@@ -66,6 +66,7 @@ class LsRestClient(Session):
         self._mocks = {}
         self.base_url = base_url
         self.base_headers = {"content-type": "application/json"}
+        self.base_kwargs = {}
         self.name = name
         super().__init__()
         self._clients[name] = self
@@ -164,6 +165,7 @@ class LsRestClient(Session):
 
         headers = self.base_headers | bearer_headers | kwargs.get("headers", {})
 
+        kwargs |= self.base_kwargs
         kwargs |= dict(headers=headers)
 
         # params

lsrestclient/exceptions.py

@@ -1,9 +1,9 @@
 import contextlib
+import logging
 from typing import Optional, List, Type
 
 import pydash
 from webexception.webexception import WebException
-import logging
 
 log = logging.getLogger(__name__)
 
@@ -43,8 +43,12 @@ class DownStreamError(Exception):
 
 
 @contextlib.contextmanager
-def raise_errors(r, exceptions: List[Type[Exception]]):
-    exceptions_by_class = {e.__name__: e for e in exceptions}
+def raise_errors(r, exceptions: Optional[List[Type[Exception]]] = None):
+    if exceptions is None:
+        exceptions_by_class = {}
+    else:
+        exceptions_by_class = {e.__name__: e for e in exceptions}
+
     if r.status_code < 399:
         yield r
     else:

lsrestclient/mock.py

@@ -1,5 +1,6 @@
 import dataclasses
 from contextlib import contextmanager
+from typing import Union
 from unittest.mock import MagicMock
 
 from lsrestclient import LsRestClient
@@ -7,40 +8,40 @@ from lsrestclient import LsRestClient
 
 @dataclasses.dataclass
 class LsRestClientMockModel:
-	mock_name: str
-	client: LsRestClient
-	mock: MagicMock
+    mock_name: str
+    client: LsRestClient
+    mock: MagicMock
 
 
 class LsRestClientMocker(object):
-	def __init__(self):
-		super().__init__()
-		self.mocks = {}
+    def __init__(self):
+        super().__init__()
+        self.mocks = {}
 
-	def mock(self, client: LsRestClient | str, method: str, url: str, *args, **kwargs):
-		if isinstance(client, str):
-			client = LsRestClient.client(client)
+    def mock(self, client: Union[LsRestClient, str], method: str, url: str, *args, **kwargs):
+        if isinstance(client, str):
+            client = LsRestClient.client(client)
 
-		mock_name = LsRestClient.mock_name(client.name, method, url)
-		mock = MagicMock(*args, **kwargs)
-		client.mock(mock_name, mock)
-		self.mocks[mock_name] = LsRestClientMockModel(client=client, mock_name=mock_name, mock=mock)
-		return mock
+        mock_name = LsRestClient.mock_name(client.name, method, url)
+        mock = MagicMock(*args, **kwargs)
+        client.mock(mock_name, mock)
+        self.mocks[mock_name] = LsRestClientMockModel(client=client, mock_name=mock_name, mock=mock)
+        return mock
 
-	def unmock_all(self):
-		for mock_name, mock_model in self.mocks.items():
-			mock_model.client.unmock(mock_name)
-		self.mocks = {}
+    def unmock_all(self):
+        for mock_name, mock_model in self.mocks.items():
+            mock_model.client.unmock(mock_name)
+        self.mocks = {}
 
-	def unmock(self, client: LsRestClient, method: str, url: str):
-		mock_name = LsRestClient.mock_name(client.name, method, url)
-		mock_model = self.mocks[mock_name]
-		mock_model.client.unmock(mock_name)
-		del self.mocks[mock_name]
+    def unmock(self, client: LsRestClient, method: str, url: str):
+        mock_name = LsRestClient.mock_name(client.name, method, url)
+        mock_model = self.mocks[mock_name]
+        mock_model.client.unmock(mock_name)
+        del self.mocks[mock_name]
 
 
 @contextmanager
 def lsrestclient_mock_context():
-	mocker = LsRestClientMocker()
-	yield mocker
-	mocker.unmock_all()
+    mocker = LsRestClientMocker()
+    yield mocker
+    mocker.unmock_all()

lsrestclient/response.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Optional
 
 import lsjsonclasses
+import pydash
 from requests import Response
 from requests.structures import CaseInsensitiveDict
 
@@ -33,9 +34,11 @@ class LsRestClientResponse:
         :return: An instance of LsRestClientResponse representing the response.
         :rtype: LsRestClientResponse
         """
+
+        encoding = pydash.get(response, "encoding", None)
         return cls(
             status_code=response.status_code,
-            content=response.content.decode("utf8"),
+            content=response.content.decode("utf8" if encoding is None else encoding),
             headers=response.headers,
         )
 

{lsrestclient-1.5.1.dist-info → lsrestclient-2.0.0.dist-info}/METADATA

@@ -1,16 +1,18 @@
 Metadata-Version: 2.1
 Name: lsrestclient
-Version: 1.5.1
+Version: 2.0.0
 Summary: REST Api Client
 Author: mba
 Author-email: bartel@electronic-shop.lu
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: lsjsonclasses (>=2.0.0,<3.0.0)
-Requires-Dist: pydash (>=7.0.6,<8.0.0)
+Requires-Dist: lsjsonclasses (>=2.0.1,<3.0.0)
+Requires-Dist: pydash (>4.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
-Requires-Dist: webexception (>=1.0.4,<2.0.0)
+Requires-Dist: webexception (>=1.0.5,<2.0.0)
 Description-Content-Type: text/markdown
 
 # lsrestclient

lsrestclient-2.0.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+lsrestclient/__init__.py,sha256=lI62SHmG0m-iukB5UEwdN5dO4cKnDasOt-TmR1rgaWI,72
+lsrestclient/auth.py,sha256=n9f5GkKDbzin2jHNv9D7QBb6ZLEjamfbkzzlGpNdjLE,468
+lsrestclient/client.py,sha256=44fUG8VOKkZIZM8d5EhqVE4rMmq32vLu_9yYXZWcHNg,11159
+lsrestclient/contexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lsrestclient/contexts/bearer_token.py,sha256=GZZOzAI2Ng_9DvFCbhv1Wwb8wJ1AYCca3fQeNtt2NaU,753
+lsrestclient/exceptions.py,sha256=IkIk9bLUHv_Ds9oJ24fbdpdP2nnoUQM5RGX25hzQSdI,2197
+lsrestclient/fixtures.py,sha256=dFkAYQXL6xqTOwRofb03Nsu_cIjq1sG10Rh8dxWfz9s,239
+lsrestclient/mock.py,sha256=Ya12F0t5sXHTSt-X4jDDj5ILJx6y6QaBAMXutQMsIRI,1376
+lsrestclient/response.py,sha256=Bj9X9jQT2hI0jbXrxDasjDczo3QVWAj_J6yaElBQegw,1923
+lsrestclient-2.0.0.dist-info/METADATA,sha256=4JzX2tULgW7EnU5EQUHkhsoaRjNq3At3A7Y3O8KIAiU,6748
+lsrestclient-2.0.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+lsrestclient-2.0.0.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
+lsrestclient-2.0.0.dist-info/RECORD,,

lsrestclient-1.5.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-lsrestclient/__init__.py,sha256=lI62SHmG0m-iukB5UEwdN5dO4cKnDasOt-TmR1rgaWI,72
-lsrestclient/auth.py,sha256=n9f5GkKDbzin2jHNv9D7QBb6ZLEjamfbkzzlGpNdjLE,468
-lsrestclient/client.py,sha256=BEywDmQ86XsIr8aVtrbXYmm-EBN7SN-fPrakbZ1ZpX8,11094
-lsrestclient/contexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lsrestclient/contexts/bearer_token.py,sha256=GZZOzAI2Ng_9DvFCbhv1Wwb8wJ1AYCca3fQeNtt2NaU,753
-lsrestclient/exceptions.py,sha256=Ze_UZutdTxmKXq8brvciZclUIkEGpmFrybPzk6TVk4Q,2105
-lsrestclient/fixtures.py,sha256=dFkAYQXL6xqTOwRofb03Nsu_cIjq1sG10Rh8dxWfz9s,239
-lsrestclient/mock.py,sha256=YanA_CQdaIMd99VkHaWDv3ro59fjBJsNUTZb14rC5aE,1213
-lsrestclient/response.py,sha256=IXjIgb7ySF-1FdAtnOKRyF3k9LJRB3OFyzIIZI1GNxM,1816
-lsrestclient-1.5.1.dist-info/METADATA,sha256=6srj7rUx01jtO29kbyLMeKwclS7x2ND67E_P8GvOOSA,6656
-lsrestclient-1.5.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-lsrestclient-1.5.1.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
-lsrestclient-1.5.1.dist-info/RECORD,,