lsrestclient 1.5.1__tar.gz → 1.7.0__tar.gz

{lsrestclient-1.5.1 → lsrestclient-1.7.0}/PKG-INFO

@@ -1,16 +1,18 @@
 Metadata-Version: 2.1
 Name: lsrestclient
-Version: 1.5.1
+Version: 1.7.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-1.5.1 → lsrestclient-1.7.0}/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-1.5.1 → lsrestclient-1.7.0}/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-1.7.0/lsrestclient/mock.py

@@ -0,0 +1,47 @@
+import dataclasses
+from contextlib import contextmanager
+from typing import Union
+from unittest.mock import MagicMock
+
+from lsrestclient import LsRestClient
+
+
+@dataclasses.dataclass
+class LsRestClientMockModel:
+    mock_name: str
+    client: LsRestClient
+    mock: MagicMock
+
+
+class LsRestClientMocker(object):
+    def __init__(self):
+        super().__init__()
+        self.mocks = {}
+
+    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
+
+    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]
+
+
+@contextmanager
+def lsrestclient_mock_context():
+    mocker = LsRestClientMocker()
+    yield mocker
+    mocker.unmock_all()

{lsrestclient-1.5.1 → lsrestclient-1.7.0}/lsrestclient/response.py

@@ -2,10 +2,10 @@ from dataclasses import dataclass
 from typing import Optional
 
 import lsjsonclasses
+import pydash
 from requests import Response
 from requests.structures import CaseInsensitiveDict
 
-
 @dataclass
 class LsRestClientResponse:
     """
@@ -33,9 +33,18 @@ class LsRestClientResponse:
         :return: An instance of LsRestClientResponse representing the response.
         :rtype: LsRestClientResponse
         """
+
+        encoding = pydash.get(response, "encoding", None)
+        headers = pydash.get(response, "headers", None)
+        content_type = headers.get("Content-Type", None)
+        if content_type == 'application/pdf':
+            content = response.content
+        else:
+            content = response.content.decode("utf8" if encoding is None else encoding)
+
         return cls(
             status_code=response.status_code,
-            content=response.content.decode("utf8"),
+            content=content,
             headers=response.headers,
         )
 

{lsrestclient-1.5.1 → lsrestclient-1.7.0}/pyproject.toml

@@ -1,16 +1,16 @@
 [tool.poetry]
 name = "lsrestclient"
-version = "1.5.1"
+version = "1.7.0"
 description = "REST Api Client"
 authors = ["mba <bartel@electronic-shop.lu>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.9"
 requests = "^2.31.0"
-lsjsonclasses = "^2.0.0"
-pydash = "^7.0.6"
-webexception = "^1.0.4"
+lsjsonclasses = "^2.0.1"
+pydash = ">4.0.0"
+webexception = "^1.0.5"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"

lsrestclient-1.5.1/lsrestclient/mock.py

@@ -1,46 +0,0 @@
-import dataclasses
-from contextlib import contextmanager
-from unittest.mock import MagicMock
-
-from lsrestclient import LsRestClient
-
-
-@dataclasses.dataclass
-class LsRestClientMockModel:
-	mock_name: str
-	client: LsRestClient
-	mock: MagicMock
-
-
-class LsRestClientMocker(object):
-	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)
-
-		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(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()