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

lsrestclient/auth.py

@@ -2,7 +2,7 @@ from lsrestclient import LsRestClient, DownStreamError
 
 
 def auth_am_login(**kwargs) -> str:
-    am = LsRestClient.from_env("AM_BASE_URL", "am", True)
+    am = LsRestClient.from_env("AM_API_URL", "am", True)
     r = am.post("/auth/login", body=kwargs)
     if r.status_code == 200:
         return r.json().get("access_token")

lsrestclient/client.py

@@ -56,6 +56,9 @@ class LsRestClient(Session):
         except KeyError:
             raise Exception(f"LsRestClient with name '{name}' not initialized.")
 
+    def __repr__(self):
+        return f"<LsRestClient name:'{self.name}' base_url:'{self.base_url}'>"
+
     def __init__(
         self,
         base_url: str = None,
@@ -95,7 +98,7 @@ class LsRestClient(Session):
 
         :param url: The relative URL to be used to build the full URL.
         :param params: An optional dictionary that contains the parameters to be used in formatting the URL.
-                       Default is None. Used parameters get removed from the dictionary.
+                                   Default is None. Used parameters get removed from the dictionary.
         :return: The full URL with the parameters replaced.
         """
 
@@ -174,6 +177,16 @@ class LsRestClient(Session):
         if body is not None:
             kwargs["data"] = lsjsonclasses.LSoftJSONEncoder.dumps(body).encode("utf8")
 
+        return self.real_request(method, url, *args, params=params, **kwargs)
+
+    def real_request(
+        self,
+        method: str,
+        url: str,
+        *args,
+        params: Optional[Dict[str, Any]] = None,
+        **kwargs,
+    ):
         full_url = self.full_url(url, params)
 
         try:
@@ -199,6 +212,7 @@ class LsRestClient(Session):
         :param kwargs: Additional keyword arguments for the request.
         :return: The response object of type LsRestClientResponse.
         """
+
         return self.caller("GET", *args, **kwargs)
 
     def post(self, *args, **kwargs) -> LsRestClientResponse:
@@ -278,17 +292,13 @@ class LsRestClientTestClient(LsRestClient):
         super().__init__(base_url=None, name=name)
         self.test_client = test_client
 
-    def request(
+    def real_request(
         self,
         method: str,
         url: str,
         *args,
         params: Optional[Dict[str, Any]] = None,
-        body: Optional[Dict[str, Any]] = None,
         **kwargs,
-    ) -> LsRestClientResponse:
-        if body is not None:
-            kwargs["data"] = lsjsonclasses.LSoftJSONEncoder.dumps(body).encode("utf8")
-
+    ):
         r = self.test_client.request(method, url, *args, params=params, **kwargs)
         return LsRestClientResponse(status_code=r.status_code, content=r.content.decode("utf8"), headers=r.headers)

lsrestclient/exceptions.py

@@ -54,20 +54,20 @@ def raise_errors(r, exceptions: Optional[List[Type[Exception]]] = None):
     else:
         try:
             json = r.json()
-            detail = pydash.get(json, "detail", json)
-            error_class = pydash.get(detail, "error_class", None)
-            if error_class is not None:
-                payload = pydash.get(detail, "error_payload", {})
-            else:
-                error_class = pydash.get(detail, "ERROR_CLASS", None)
-                payload = {}
-
-            if error_class in exceptions_by_class:
-                e = exceptions_by_class[error_class](**payload)
-                raise e
-            # backend errors
-            raise WebException(status_code=r.status_code, detail=detail)
-
         except Exception as e:
             log.error(r.content)
             raise WebException(status_code=r.status_code, detail=r.content)
+
+        detail = pydash.get(json, "detail", json)
+        error_class = pydash.get(detail, "error_class", None)
+        if error_class is not None:
+            payload = pydash.get(detail, "error_payload", {})
+        else:
+            error_class = pydash.get(detail, "ERROR_CLASS", None)
+            payload = {}
+
+        if error_class in exceptions_by_class:
+            e = exceptions_by_class[error_class](**payload)
+            raise e
+        # backend errors
+        raise WebException(status_code=r.status_code, detail=detail)

{lsrestclient-2.1.0.dist-info → lsrestclient-3.0.1.dist-info}/METADATA

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

{lsrestclient-2.1.0.dist-info → lsrestclient-3.0.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 lsrestclient/__init__.py,sha256=lI62SHmG0m-iukB5UEwdN5dO4cKnDasOt-TmR1rgaWI,72
-lsrestclient/auth.py,sha256=n9f5GkKDbzin2jHNv9D7QBb6ZLEjamfbkzzlGpNdjLE,468
-lsrestclient/client.py,sha256=44fUG8VOKkZIZM8d5EhqVE4rMmq32vLu_9yYXZWcHNg,11159
+lsrestclient/auth.py,sha256=IC6niEht-xB_wC7da0HIeM05Ha785qhls-Q39P6dMHQ,467
+lsrestclient/client.py,sha256=JWhf9foS-2RC0_LZz-DoXD6CE7T-o2J-DuAtDE6aaXc,11336
 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/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-2.1.0.dist-info/METADATA,sha256=repSCR3U_52T6EStuuR2IY2Sx02ZNf1BXVZlLjJTShM,6748
-lsrestclient-2.1.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-lsrestclient-2.1.0.dist-info/entry_points.txt,sha256=7lN1XN3lq5Jv5PlpOdIlFrLlFlwzE5MaEWSgMhKASOM,47
-lsrestclient-2.1.0.dist-info/RECORD,,
+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,,