masstack-python-client 0.0.1__tar.gz → 0.0.2__tar.gz

{masstack_python_client-0.0.1/src/masstack_python_client.egg-info → masstack_python_client-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: masstack-python-client
-Version: 0.0.1
+Version: 0.0.2
 Summary: This Python API client provides access to masmovil core API domains
 Author-email: Borja Gimeno <borja.gimeno@somconnexio.coop>
 License: GPL-3.0-only

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2}/pyproject.toml

@@ -74,7 +74,6 @@ requires = ["tox>=4.20"]
 env_list = [
     "style",
     "py3119",
-    "coverage",
     "pep8"
 ]
 
@@ -90,9 +89,9 @@ commands = [
     ["pre-commit", "run", "--all-files", "--show-diff-on-failure"],
 ]
 
-[tool.tox.env.coverage]
+[tool.tox.env.py3119]
 commands = [
-    ["pytest", "--cov", "--cov-report", "term:skip-covered", "--cov-report", "html"],
+    ["pytest", "--cov=masstack_python_client", "--cov-report=term:skip-covered", "--cov-report=html", "--cov-report=term-missing"],
 ]
 
 [tool.tox.env.pep8]
@@ -100,3 +99,8 @@ deps = ["flake8"]
 commands = [
     ["flake8"],
 ]
+
+[tool.tox.env.coverage]
+commands = [
+    ["pytest", "--cov=masstack_python_client", "--cov-report=term-missing", "--cov-fail-under=95"],
+]

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2}/src/masstack_python_client/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.1"
+__version__ = "0.0.2"
 __homepage__ = "https://somconnexio.coop/"
 __author__ = "Borja Gimeno <borja.gimeno@somconnexio.coop>"
 __license__ = "GPL-3.0-only"

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2}/src/masstack_python_client/auth/token_manager.py

@@ -56,17 +56,18 @@ class TokenManager:
         try:
             key = RSAKey.import_key(self._private_key)
             assertion = jwt.encode(jwt_header, claims, key)
+            data = {
+                "assertion": assertion,
+                "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
+            }
             response = requests.post(
                 self._token_uri,
-                data={
-                    "assertion": assertion,
-                    "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
-                },
+                data=data,
                 headers={"Content-Type": "application/x-www-form-urlencoded"},
             )
             response.raise_for_status()
         except HTTPError:
-            raise ErrorFetchingToKen(response.status_code, response.text)
+            raise ErrorFetchingToKen(response.status_code, response.text, data)
         except Exception as e:
             raise ErrorFetchingToKen(500, str(e))
         data = response.json()

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2}/src/masstack_python_client/exceptions.py

@@ -8,19 +8,19 @@ class MasstackClientException(Exception):
     _message: Optional[str] = None
 
     def __init__(self, status_code: int, message: str):
-        super(Exception, self).__init__(message)
+        super(MasstackClientException, self).__init__(message)
         self._message = message
         self._status_code = status_code
 
     @property
     def status_code(self) -> int:
         """The status_code property."""
-        return self._status_code or 0
+        return 0 if self._status_code is None else self._status_code
 
     @property
     def message(self) -> str:
         """The error message property."""
-        return self._message or ""
+        return "" if self._message is None else self._message
 
     def _params_to_string(self, params):
         if not params or len(params) == 0:
@@ -32,9 +32,11 @@ class MasstackClientException(Exception):
 
 
 class ErrorFetchingToKen(MasstackClientException):
-    def __init__(self, status_code: int, error_msg: str):
-        message = "Error fetching token with the next error message: {}".format(
-            error_msg
+    def __init__(self, status_code: int, error_msg: str, body: Optional[dict] = None):
+        message = (
+            "Error fetching token with the next error message: {}\nBody:\n{}".format(
+                error_msg, self._params_to_string(body)
+            )
         )
         super(ErrorFetchingToKen, self).__init__(status_code, message)
 

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2/src/masstack_python_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: masstack-python-client
-Version: 0.0.1
+Version: 0.0.2
 Summary: This Python API client provides access to masmovil core API domains
 Author-email: Borja Gimeno <borja.gimeno@somconnexio.coop>
 License: GPL-3.0-only

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2}/src/masstack_python_client.egg-info/SOURCES.txt

@@ -21,4 +21,5 @@ src/masstack_python_client/data/unit_translation.csv
 src/masstack_python_client/resources/__init__.py
 src/masstack_python_client/resources/feasibility.py
 src/masstack_python_client/resources/models/address.py
-tests/test_client.py
+tests/test_client.py
+tests/test_exceptions.py

{masstack_python_client-0.0.1 → masstack_python_client-0.0.2}/tests/test_client.py

@@ -25,7 +25,6 @@ class ClientTestCase(unittest.TestCase):
         self.version = "v1"
         self.endpoint = "testapi"
         self.params = {"param1": "value1", "param2": "value2"}
-        self.header = {"Custom-Header": "HeaderValue"}
 
     """
         test get
@@ -36,9 +35,7 @@ class ClientTestCase(unittest.TestCase):
             status_code=200, json=lambda: {"data": "test_data"}
         )
         self.assertEqual(
-            MasstackClient().get(
-                self.api, self.version, self.endpoint, self.params, self.header
-            ),
+            MasstackClient().get(self.api, self.version, self.endpoint, self.params),
             {"data": "test_data"},
         )
         mock_token_manager.assert_called_once()
@@ -48,7 +45,6 @@ class ClientTestCase(unittest.TestCase):
             headers={
                 "Authorization": "Bearer test_token",
                 "Accept": "application/json",
-                **self.header,
             },
             json=None,
             params=self.params,
@@ -65,7 +61,6 @@ class ClientTestCase(unittest.TestCase):
             self.version,
             self.endpoint,
             self.params,
-            self.header,
         )
 
     """
@@ -73,16 +68,13 @@ class ClientTestCase(unittest.TestCase):
     """
 
     def test_post_ok(self, mock_request, mock_token_manager):
+        extra_header = {"Custom-Header": "HeaderValue"}
         mock_request.return_value = Mock(
             status_code=200, json=lambda: {"data": "test_data"}
         )
         self.assertEqual(
             MasstackClient().post(
-                self.api,
-                self.version,
-                self.endpoint,
-                self.params,
-                self.header,
+                self.api, self.version, self.endpoint, self.params, extra_header
             ),
             {"data": "test_data"},
         )
@@ -93,7 +85,7 @@ class ClientTestCase(unittest.TestCase):
             headers={
                 "Authorization": "Bearer test_token",
                 "Accept": "application/json",
-                **self.header,
+                **extra_header,
             },
             json=self.params,
             params=None,
@@ -110,5 +102,4 @@ class ClientTestCase(unittest.TestCase):
             self.version,
             self.endpoint,
             self.params,
-            self.header,
         )

masstack_python_client-0.0.2/tests/test_exceptions.py

@@ -0,0 +1,14 @@
+import unittest
+
+from masstack_python_client.exceptions import MasstackClientException
+
+
+class MasstackClientExceptionTestCase(unittest.TestCase):
+    def test_exception_fallback_properties(self):
+        exc = MasstackClientException(0, "")
+
+        exc._status_code = None
+        exc._message = None
+
+        self.assertEqual(exc.status_code, 0)
+        self.assertEqual(exc.message, "")