biolmai 0.2.4__py2.py3-none-any.whl → 0.2.5__py2.py3-none-any.whl

biolmai/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for BioLM AI."""
 __author__ = """Nikhil Haas"""
 __email__ = "nikhil@biolm.ai"
-__version__ = '0.2.4'
+__version__ = '0.2.5'
 
 from biolmai.client import BioLMApi, BioLMApiClient
 from biolmai.biolmai import BioLM

biolmai/auth.py

@@ -1,3 +1,4 @@
+import ast
 import json
 import os
 import pprint
@@ -9,6 +10,47 @@ import requests
 from biolmai.const import ACCESS_TOK_PATH, BASE_DOMAIN, GEN_TOKEN_URL, USER_BIOLM_DIR
 
 
+def parse_credentials_file(file_path):
+    """Parse credentials file, handling JSON, Python dict syntax, and mixed types.
+    
+    Returns a dict with 'access' and 'refresh' keys as strings, or None if parsing fails.
+    Uses ast.literal_eval() which is safe and only evaluates Python literals.
+    """
+    try:
+        with open(file_path, 'r') as f:
+            content = f.read().strip()
+        
+        # Try JSON first
+        try:
+            data = json.loads(content)
+        except json.JSONDecodeError:
+            # Fall back to safe Python literal evaluation for dict syntax like {access: 123, refresh: 456}
+            # ast.literal_eval() is safe - it only evaluates literals, no code execution
+            try:
+                data = ast.literal_eval(content)
+            except (ValueError, SyntaxError):
+                return None
+        
+        # Ensure we have a dictionary
+        if not isinstance(data, dict):
+            return None
+            
+        # Extract access and refresh, converting to strings
+        access = data.get("access")
+        refresh = data.get("refresh")
+        
+        # Convert to strings if they exist
+        if access is not None:
+            access = str(access)
+        if refresh is not None:
+            refresh = str(refresh)
+            
+        return {"access": access, "refresh": refresh}
+        
+    except Exception:
+        return None
+
+
 def validate_user_auth(api_token=None, access=None, refresh=None):
     """Validates an API token, to be used as 'Authorization: Token 1235abc'
     authentication method."""
@@ -61,8 +103,12 @@ def get_auth_status():
     elif os.path.exists(ACCESS_TOK_PATH):
         msg = f"Credentials file found {ACCESS_TOK_PATH}. Validating token..."
         click.echo(msg)
-        with open(ACCESS_TOK_PATH) as f:
-            access_refresh_dict = json.load(f)
+        access_refresh_dict = parse_credentials_file(ACCESS_TOK_PATH)
+        if access_refresh_dict is None:
+            click.echo(f"Error reading credentials file {ACCESS_TOK_PATH}.")
+            click.echo("The file may be corrupted or contain invalid data.")
+            click.echo("Please login again by running `biolmai login`.")
+            return
         access = access_refresh_dict.get("access")
         refresh = access_refresh_dict.get("refresh")
         resp = validate_user_auth(access=access, refresh=refresh)
@@ -156,8 +202,14 @@ def get_user_auth_header():
     if api_token:
         headers = {"Authorization": f"Token {api_token}"}
     elif os.path.exists(ACCESS_TOK_PATH):
-        with open(ACCESS_TOK_PATH) as f:
-            access_refresh_dict = json.load(f)
+        access_refresh_dict = parse_credentials_file(ACCESS_TOK_PATH)
+        if access_refresh_dict is None:
+            err = (
+                f"Error reading credentials file {ACCESS_TOK_PATH}. "
+                "The file may be corrupted or contain invalid data. "
+                "Please run `biolmai login` to re-authenticate."
+            )
+            raise AssertionError(err)
         access = access_refresh_dict.get("access")
         refresh = access_refresh_dict.get("refresh")
         headers = {

{biolmai-0.2.4.dist-info → biolmai-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: biolmai
-Version: 0.2.4
+Version: 0.2.5
 Summary: BioLM Python client
 Home-page: https://github.com/BioLM/py-biolm
 Author: BioLM

{biolmai-0.2.4.dist-info → biolmai-0.2.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
-biolmai/__init__.py,sha256=Rt-5K0TkHdQdPjK_h_plsb8YHSfO6xSkTApCIhY081U,693
+biolmai/__init__.py,sha256=Gt1leXWNTQMB_CEaZP16IqKYBHVx5Rl8gKFmwS_-uSI,693
 biolmai/api.py,sha256=tqxQ-FoZosE88YmLJPQKskjNQdcb5jzZccywGP73lDc,13002
 biolmai/asynch.py,sha256=BVypJhhEEK2Bek2AhqNGn7FIRJehAbJflUdeeslbXFE,9073
-biolmai/auth.py,sha256=flI9KAD90qdXyLDnpJTrc9voKsiK0uWtD2ehsPBn8r4,6329
+biolmai/auth.py,sha256=cjU0ZTJAWTg8IdOYYQ1d-jLXinkYN1EbAyt12lJohgg,8317
 biolmai/biolmai.py,sha256=_NxDPiwT7cnKgnRCRoGZvzBd4jVHJ8DNCuSu3FTznCs,4373
 biolmai/cli.py,sha256=bdb4q8QlN73A6Ttz0e-dBIwoct7PYqy5WSc52jCMIyU,1967
 biolmai/client.py,sha256=nD6sjjnQGinn0tzDVxaKWhsw2AQ3VNhgbsX-Smm9ghc,28310
@@ -10,10 +10,10 @@ biolmai/const.py,sha256=vCSj-itsusZWoLR27DYQSpuq024GQz3-uKJuDUoPF0Y,1153
 biolmai/ltc.py,sha256=al7HZc5tLyUR5fmpIb95hOz5ctudVsc0xzjd_c2Ew3M,49
 biolmai/payloads.py,sha256=BOhEKl9kWkKMXy1YiNw2_eC6MJ4Dn6vKNvkhEBsM7Lw,1735
 biolmai/validate.py,sha256=58XMWrdWoDRmfiNAayWqrYaH3_bjRmEpG_yx6XSjTrM,4168
-biolmai-0.2.4.dist-info/licenses/AUTHORS.rst,sha256=TB_ACuFPgVmxn1NspYwksTdT6jdZeShcxfafmi-XWKQ,158
-biolmai-0.2.4.dist-info/licenses/LICENSE,sha256=8yt0SdP38I7a3g0zWqZjNe0VSDQhJA4bWLQSqqKtAVg,583
-biolmai-0.2.4.dist-info/METADATA,sha256=-m6zspmcBxVhCZxoDHYrIR8o5NH-5wobPl-hlHzj0MI,4619
-biolmai-0.2.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-biolmai-0.2.4.dist-info/entry_points.txt,sha256=ylQnDpCYrxF1F9z_T7NRQcYMWYF5ia_KsTUuboxjEAM,44
-biolmai-0.2.4.dist-info/top_level.txt,sha256=jyQO45JN3g_jbdI8WqMnb0aEIzf4h1MrmPAZkKgfnwY,8
-biolmai-0.2.4.dist-info/RECORD,,
+biolmai-0.2.5.dist-info/licenses/AUTHORS.rst,sha256=TB_ACuFPgVmxn1NspYwksTdT6jdZeShcxfafmi-XWKQ,158
+biolmai-0.2.5.dist-info/licenses/LICENSE,sha256=8yt0SdP38I7a3g0zWqZjNe0VSDQhJA4bWLQSqqKtAVg,583
+biolmai-0.2.5.dist-info/METADATA,sha256=oIrF-Bn8ujjYoZmJfbofhQ4alJBzGEQ-vt27pOTWK0s,4619
+biolmai-0.2.5.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+biolmai-0.2.5.dist-info/entry_points.txt,sha256=ylQnDpCYrxF1F9z_T7NRQcYMWYF5ia_KsTUuboxjEAM,44
+biolmai-0.2.5.dist-info/top_level.txt,sha256=jyQO45JN3g_jbdI8WqMnb0aEIzf4h1MrmPAZkKgfnwY,8
+biolmai-0.2.5.dist-info/RECORD,,