qmenta-core 4.1.dev712__tar.gz → 4.1.dev713__tar.gz

{qmenta_core-4.1.dev712 → qmenta_core-4.1.dev713}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qmenta-core
-Version: 4.1.dev712
+Version: 4.1.dev713
 Summary: QMENTA core library to communicate with the QMENTA platform.
 License: Proprietary
 Author: QMENTA

{qmenta_core-4.1.dev712 → qmenta_core-4.1.dev713}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qmenta-core"
-version = "4.1.dev712"
+version = "4.1.dev713"
 description = "QMENTA core library to communicate with the QMENTA platform."
 license = "Proprietary"
 authors = ["QMENTA <dev@qmenta.com>"]

{qmenta_core-4.1.dev712 → qmenta_core-4.1.dev713}/src/qmenta/core/auth.py

@@ -4,7 +4,7 @@ import os
 import requests
 from getpass import getpass
 from pathlib import Path
-from typing import Optional, Dict, Any
+from typing import Optional, Dict
 from urllib.parse import urljoin, urlparse
 
 from xdg import xdg_data_home
@@ -149,7 +149,7 @@ class Auth:
         ------
         ConnectionError
             If there was a problem setting up the network connection with the
-            platform.
+            platform and for 404 and 5xx response status code.
         InvalidResponseError
             If the platform returned an invalid response.
         InvalidLoginError
@@ -164,25 +164,33 @@ class Auth:
         url: str = urljoin(base_url, '/login')
 
         try:
-            r: requests.Response = requests.post(
+            response: requests.Response = requests.post(
                 url, data={
                     'username': username, 'password': password,
                     'code_2fa': code_2fa
                 }
             )
+            # Raises an exception for 4xx and 5xx status codes
+            response.raise_for_status()
+            # Assuming the response contains JSON data
+            data: dict = response.json()
+            # Process the data here
+        except requests.exceptions.HTTPError as e:
+            if e.response.status_code == 404:
+                raise ConnectionError("API returned a 404 error: Not Found")
+            else:
+                raise ConnectionError("API returned an error:", e)
+        except InvalidResponseError as e:
+            raise InvalidResponseError("Invalid Response Error:", e)
         except requests.RequestException as e:
             raise ConnectionError(str(e))
+        except Exception as e:
+            raise Exception("An error occurred:", e)
 
         try:
-            d: Dict[str, Any] = r.json()
-        except ValueError:
-            raise InvalidResponseError(
-                f'Could not decode JSON for response {r}')
-
-        try:
-            if d["success"] != 1:
+            if data["success"] != 1:
                 # Login was not successful
-                if 'account_state' in d and d['account_state'] == '2fa_need':
+                if data.get("account_state", "") == '2fa_need':
                     if ask_for_2fa_input:
                         input_2fa = input("Please enter your 2FA code: ")
                         return Auth.login(
@@ -195,9 +203,9 @@ class Auth:
                             'or set the ask_for_2fa_input parameter'
                         )
                 else:
-                    raise InvalidLoginError(d['error'])
+                    raise InvalidLoginError(data['error'])
 
-            token: str = d['token']
+            token: str = data['token']
         except KeyError as e:
             raise InvalidResponseError(f'Missing key: {e}')