lsrestclient 3.0.1__py3-none-any.whl → 3.1.0__py3-none-any.whl

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/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.dist-info → lsrestclient-3.1.0.dist-info}/METADATA

@@ -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.dist-info → lsrestclient-3.1.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 lsrestclient/__init__.py,sha256=lI62SHmG0m-iukB5UEwdN5dO4cKnDasOt-TmR1rgaWI,72
 lsrestclient/auth.py,sha256=IC6niEht-xB_wC7da0HIeM05Ha785qhls-Q39P6dMHQ,467
-lsrestclient/client.py,sha256=JWhf9foS-2RC0_LZz-DoXD6CE7T-o2J-DuAtDE6aaXc,11336
+lsrestclient/client.py,sha256=dYdfQhPnvblJTg0SAmcljQraASuoEyVcLSDYD9RKSjc,11854
 lsrestclient/contexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lsrestclient/contexts/bearer_token.py,sha256=GZZOzAI2Ng_9DvFCbhv1Wwb8wJ1AYCca3fQeNtt2NaU,753
 lsrestclient/exceptions.py,sha256=exJd1BfygNkkAqekmWepVXvXlMiOInVzPRnq7TmPURs,2149
 lsrestclient/fixtures.py,sha256=dFkAYQXL6xqTOwRofb03Nsu_cIjq1sG10Rh8dxWfz9s,239
 lsrestclient/mock.py,sha256=Ya12F0t5sXHTSt-X4jDDj5ILJx6y6QaBAMXutQMsIRI,1376
-lsrestclient/response.py,sha256=zVisLH4TMG5Ww9gseLSb1rVpHUESoR03DNpL0bv1GCU,2165
-lsrestclient-3.0.1.dist-info/METADATA,sha256=-b5iizfnj9RQQXa4HFIzhI_RpIEjy9z88CnIEACx4P4,6748
-lsrestclient-3.0.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-lsrestclient-3.0.1.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
-lsrestclient-3.0.1.dist-info/RECORD,,
+lsrestclient/response.py,sha256=8ovVmVB8gLW3U1EkewdQlPdFYP-YLoOpIH3ATVQc3wc,2189
+lsrestclient-3.1.0.dist-info/METADATA,sha256=bX3k1GwgD-a_QgsbEpEAHdeY-0Vejny_s_sFOI6w6sw,6748
+lsrestclient-3.1.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+lsrestclient-3.1.0.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
+lsrestclient-3.1.0.dist-info/RECORD,,