lsrestclient 3.0.1__tar.gz → 3.1.0__tar.gz

{lsrestclient-3.0.1 → lsrestclient-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsrestclient
-Version: 3.0.1
+Version: 3.1.0
 Summary: REST Api Client
 Author: mba
 Author-email: bartel@electronic-shop.lu

{lsrestclient-3.0.1 → lsrestclient-3.1.0}/lsrestclient/client.py

@@ -63,12 +63,21 @@ class LsRestClient(Session):
         self,
         base_url: str = None,
         name: str = "default",
+        headers: dict = None,
+        ignore_bearer_token: bool = False,
     ) -> None:
         """Class representing a REST client for JSON API."""
 
         self._mocks = {}
         self.base_url = base_url
+        self.ignore_bearer_token = ignore_bearer_token
         self.base_headers = {"content-type": "application/json"}
+
+        with bearer_token_context() as bearer_token:
+            bearer_headers = {"Authorization": f"Bearer {bearer_token}"} if bearer_token is not None else {}
+            self.base_headers.update(bearer_headers)
+        if headers is not None:
+            self.base_headers.update(headers)
         self.base_kwargs = {}
         self.name = name
         super().__init__()
@@ -162,9 +171,12 @@ class LsRestClient(Session):
         Note: This method raises a `ConnectionError` if a connection error occurs during the request.
         """
         # apply base_headers
-
         with bearer_token_context() as bearer_token:
-            bearer_headers = {"Authorization": f"Bearer {bearer_token}"} if bearer_token is not None else {}
+            bearer_headers = (
+                {"Authorization": f"Bearer {bearer_token}"}
+                if bearer_token is not None and not self.ignore_bearer_token
+                else {}
+            )
 
         headers = self.base_headers | bearer_headers | kwargs.get("headers", {})
 

{lsrestclient-3.0.1 → lsrestclient-3.1.0}/lsrestclient/response.py

@@ -6,6 +6,7 @@ import pydash
 from requests import Response
 from requests.structures import CaseInsensitiveDict
 
+
 @dataclass
 class LsRestClientResponse:
     """
@@ -19,7 +20,7 @@ class LsRestClientResponse:
     _json: Optional[dict] = None
 
     def json(self):
-        if self._json is None:
+        if self._json is None and self.content != "":
             self._json = lsjsonclasses.LSoftJSONDecoder.loads(self.content)
         return self._json
 
@@ -37,7 +38,7 @@ class 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':
+        if content_type == "application/pdf":
             content = response.content
         else:
             content = response.content.decode("utf8" if encoding is None else encoding)

{lsrestclient-3.0.1 → lsrestclient-3.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lsrestclient"
-version = "3.0.1"
+version = "3.1.0"
 description = "REST Api Client"
 authors = ["mba <bartel@electronic-shop.lu>"]
 readme = "README.md"