erioon 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

erioon/client.py

@@ -5,23 +5,12 @@ from datetime import datetime, timezone
 from erioon.database import Database
 
 class ErioonClient:
-    """
-    Client SDK for interacting with the Erioon API.
-
-    Handles:
-    - User authentication with email/password and API key
-    - Token caching to avoid re-authenticating every time
-    - SAS token expiration detection and auto-renewal
-    - Access to user-specific databases
-    """
-
     def __init__(self, api, email, password, base_url="https://sdk.erioon.com"):
         self.api = api
         self.email = email
         self.password = password
         self.base_url = base_url
         self.user_id = None
-        self.error = None
         self.token_path = os.path.expanduser(f"~/.erioon_token_{self._safe_filename(email)}")
         self.login_metadata = None
 
@@ -29,42 +18,28 @@ class ErioonClient:
             self.login_metadata = self._load_or_login()
             self._update_metadata_fields()
         except Exception as e:
-            self.error = str(e)
+            print(f"[ErioonClient] Initialization error: {e}")
 
     def _safe_filename(self, text):
-        """
-        Converts unsafe filename characters to underscores for cache file naming.
-        """
         return "".join(c if c.isalnum() else "_" for c in text)
 
     def _do_login_and_cache(self):
-        """
-        Logs in to the API and writes the returned metadata (e.g. SAS token, user ID) to a local file.
-        """
         metadata = self._login()
         with open(self.token_path, "w") as f:
             json.dump(metadata, f)
         return metadata
 
     def _load_or_login(self):
-        """
-        Tries to load the cached login metadata.
-        If token is expired or file does not exist, performs a fresh login.
-        """
         if os.path.exists(self.token_path):
             with open(self.token_path, "r") as f:
                 metadata = json.load(f)
             if self._is_sas_expired(metadata):
-                metadata = self._do_login_and_cache()
+                return self._do_login_and_cache()
             return metadata
         else:
             return self._do_login_and_cache()
 
     def _login(self):
-        """
-        Sends login request to Erioon API using API key, email, and password.
-        Returns authentication metadata including SAS token.
-        """
         url = f"{self.base_url}/login_with_credentials"
         payload = {"api_key": self.api, "email": self.email, "password": self.password}
         headers = {"Content-Type": "application/json"}
@@ -76,37 +51,30 @@ class ErioonClient:
             self._update_metadata_fields()
             return data
         else:
-            raise Exception("Invalid account")
+            try:
+                msg = response.json().get("error", "Login failed")
+            except Exception:
+                msg = response.text
+            print(f"[ErioonClient] Login failed: {msg}")
+            raise RuntimeError(msg)
 
     def _update_metadata_fields(self):
-        """
-        Updates internal fields like user_id, database name, and cluster info
-        from login metadata.
-        """
         if self.login_metadata:
             self.user_id = self.login_metadata.get("_id")
-            self.database = self.login_metadata.get("database")
             self.cluster = self.login_metadata.get("cluster")
+            self.database = self.login_metadata.get("database")
+            self.sas_tokens = self.login_metadata.get("sas_tokens", {})
 
     def _clear_cached_token(self):
-        """
-        Clears the locally cached authentication token and resets internal state.
-        """
         if os.path.exists(self.token_path):
             os.remove(self.token_path)
         self.user_id = None
         self.login_metadata = None
 
     def _is_sas_expired(self, metadata):
-        """
-        Determines whether the SAS token has expired by comparing the 'sas_token_expiry'
-        or 'expiry' field with the current UTC time.
-        """
         expiry_str = metadata.get("sas_token_expiry") or metadata.get("expiry")
-
         if not expiry_str:
             return True
-
         try:
             expiry_dt = datetime.fromisoformat(expiry_str.replace("Z", "+00:00"))
             now = datetime.now(timezone.utc)
@@ -115,50 +83,45 @@ class ErioonClient:
             return True
 
     def __getitem__(self, db_id):
-        """
-        Allows syntax like `client["my_database_id"]` to access a database.
-        If the token is expired or invalid, it attempts reauthentication.
-        """
         if not self.user_id:
-            raise ValueError("Client not authenticated. Cannot access database.")
+            print(f"[ErioonClient] Not authenticated. Cannot access database {db_id}.")
+            raise ValueError("Client not authenticated.")
 
         try:
             return self._get_database_info(db_id)
         except Exception as e:
-            err_msg = str(e).lower()
-            if f"database with {db_id.lower()}" in err_msg or "database" in err_msg:
-                self._clear_cached_token()
-                try:
-                    self.login_metadata = self._do_login_and_cache()
-                    self._update_metadata_fields()
-                except Exception:
-                    return "Login error"
-
-                try:
-                    return self._get_database_info(db_id)
-                except Exception:
-                    return f"❌ Database with _id {db_id} ..."
-            else:
-                raise e
+            print(f"[ErioonClient] Access failed for DB {db_id}, retrying login... ({e})")
+            self._clear_cached_token()
+
+            try:
+                self.login_metadata = self._do_login_and_cache()
+                self._update_metadata_fields()
+            except Exception as login_error:
+                print(f"[ErioonClient] Re-login failed: {login_error}")
+                raise RuntimeError(login_error)
+
+            try:
+                return self._get_database_info(db_id)
+            except Exception as second_error:
+                print(f"[ErioonClient] DB fetch after re-auth failed: {second_error}")
+                raise RuntimeError(second_error)
 
     def _get_database_info(self, db_id):
-        """
-        Sends a POST request to fetch metadata for a given database ID.
-        Returns a `Database` instance initialized with SAS URL and metadata.
-        """
         payload = {"user_id": self.user_id, "db_id": db_id}
         headers = {"Content-Type": "application/json"}
-
         response = requests.post(f"{self.base_url}/db_info", json=payload, headers=headers)
 
         if response.status_code == 200:
             db_info = response.json()
+            sas_info = self.sas_tokens.get(db_id)
+            if not sas_info:
+                raise Exception(f"No SAS token info for database id {db_id}")
 
-            container_url = self.login_metadata.get("container_url")
-            sas_token = self.login_metadata.get("sas_token")
+            container_url = sas_info.get("container_url")
+            sas_token = sas_info.get("sas_token")
 
             if not container_url or not sas_token:
-                raise Exception("Missing SAS URL components for storage access")
+                raise Exception("Missing SAS URL components")
 
             if not sas_token.startswith("?"):
                 sas_token = "?" + sas_token
@@ -178,16 +141,10 @@ class ErioonClient:
                 error_msg = error_json.get("error", response.text)
             except Exception:
                 error_msg = response.text
-            raise Exception(error_msg)
+            raise Exception(f"Failed to fetch database info: {error_msg}")
 
     def __str__(self):
-        """
-        Returns user_id or error string when printed.
-        """
-        return self.user_id if self.user_id else self.error
+        return self.user_id if self.user_id else "[ErioonClient] Unauthenticated"
 
     def __repr__(self):
-        """
-        Developer-friendly representation of the client.
-        """
-        return f"<ErioonClient user_id={self.user_id}>" if self.user_id else f"<ErioonClient error='{self.error}'>"
+        return f"<ErioonClient user_id={self.user_id}>" if self.user_id else "<ErioonClient unauthenticated>"

{erioon-0.1.0.dist-info → erioon-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: erioon
-Version: 0.1.0
+Version: 0.1.2
 Summary: Erioon SDF for Python
 Author: Zyber Pireci
 Author-email: zyber.pireci@erioon.com

{erioon-0.1.0.dist-info → erioon-0.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 erioon/auth.py,sha256=McktLrdxsWVyxhiFuk0qFokx63RI1yB8_qP3Mo7uZCI,724
-erioon/client.py,sha256=XUdktzV35uPq5dNAMXNN_1h3dva60p_qgJa-HOpzEOQ,6928
+erioon/client.py,sha256=5Sd-s95UQokJLByA15ViYCxjAHennnb1vITj-nNtBKE,5714
 erioon/collection.py,sha256=EyNHpoOEBBMH29gMy51zzR338z2uI79kl0_ZB7laHpM,9700
 erioon/create.py,sha256=ilx0e3urK0lfYiaM3CSUe3Bf3l7GhHuwZyz0Z6ij0ok,10202
 erioon/database.py,sha256=hj5sgaEDXmItg4aeZlO3MP6_hV3jeS-d9qycEnw7xHQ,2449
@@ -8,8 +8,8 @@ erioon/functions.py,sha256=LWrqslAok-l9QlMEynT-Pvksy5hwkogWoeK5rJf464A,12479
 erioon/ping.py,sha256=BC0vZiane5YgCc07syZA5dKFcqbq1_Z8BUTmvIGRPcs,1829
 erioon/read.py,sha256=kzzqqRuLtYmlniAnkd2xeWNZm4AwMQ2oAMcpKt6JhcQ,10580
 erioon/update.py,sha256=E3d-dYJWh12bcAHx_vT9NFTscF__hViY3K9ZssN7At4,6060
-erioon-0.1.0.dist-info/LICENSE,sha256=xwnq3DNlZpQyteOK9HvtHRhMdYviXTTaCDljEodFRnQ,569
-erioon-0.1.0.dist-info/METADATA,sha256=cH2iOTgGtxzOLYNqcIN1T-YcNqaAxvq9ATlGBsFQAEQ,715
-erioon-0.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-erioon-0.1.0.dist-info/top_level.txt,sha256=yjKEg85X5Q5ot46IMML_xukvIGG5YfdrLWcemjalItc,7
-erioon-0.1.0.dist-info/RECORD,,
+erioon-0.1.2.dist-info/LICENSE,sha256=xwnq3DNlZpQyteOK9HvtHRhMdYviXTTaCDljEodFRnQ,569
+erioon-0.1.2.dist-info/METADATA,sha256=IZzuMRl69uhU0QqDGhwa-iaLPALcwbhBlR7Pke0HlGU,715
+erioon-0.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+erioon-0.1.2.dist-info/top_level.txt,sha256=yjKEg85X5Q5ot46IMML_xukvIGG5YfdrLWcemjalItc,7
+erioon-0.1.2.dist-info/RECORD,,