lsrestclient 1.3.0__tar.gz → 1.3.2__tar.gz

{lsrestclient-1.3.0 → lsrestclient-1.3.2}/PKG-INFO

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

{lsrestclient-1.3.0 → lsrestclient-1.3.2}/lsrestclient/auth.py

@@ -1,10 +1,14 @@
 from lsrestclient import LsRestClient, DownStreamError
 
 
-def auth_am_login_apikey(org_id: str, api_key: str) -> str:
+def auth_am_login(**kwargs) -> str:
     am = LsRestClient.from_env("AM_BASE_URL", "am", True)
-    r = am.post("/auth/login", body=dict(ORG_ID=org_id, API_KEY=api_key))
+    r = am.post("/auth/login", body=kwargs)
     if r.status_code == 200:
         return r.json().get("access_token")
     else:
         raise DownStreamError("/auth/login", r.status_code, r.content)
+
+
+def auth_am_login_apikey(org_id: str, api_key: str) -> str:
+    return auth_am_login(ORG_ID=org_id, API_KEY=api_key)

{lsrestclient-1.3.0 → lsrestclient-1.3.2}/lsrestclient/exceptions.py

@@ -13,13 +13,13 @@ class ConnectionError(Exception):
     """Exception class for connection errors.
 
     Args:
-        url (Optional[str]): The URL that the connection could not be established to.
+            url (Optional[str]): The URL that the connection could not be established to.
 
     Attributes:
-        url (Optional[str]): The URL that the connection could not be established to.
+            url (Optional[str]): The URL that the connection could not be established to.
 
     Raises:
-        ConnectionError: If a connection could not be established to the given URL.
+            ConnectionError: If a connection could not be established to the given URL.
 
     """
 
@@ -51,8 +51,12 @@ def raise_errors(r, exceptions: List[Type[Exception]]):
         try:
             json = r.json()
             detail = pydash.get(json, "detail", json)
-            error_class = pydash.get(detail, "error_class")
-            payload = pydash.get(detail, "error_payload", {})
+            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)

lsrestclient-1.3.2/lsrestclient/mock.py

@@ -0,0 +1,46 @@
+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()

{lsrestclient-1.3.0 → lsrestclient-1.3.2}/pyproject.toml

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

lsrestclient-1.3.0/lsrestclient/mock.py

@@ -1,43 +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, method: str, url: str, *args, **kwargs):
-        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()