sima-cli 0.0.29__py3-none-any.whl → 0.0.30__py3-none-any.whl

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.29"
+__version__ = "0.0.30"

sima_cli/auth/basic_auth.py

@@ -78,55 +78,116 @@ def _fetch_and_store_csrf_token(session: requests.Session) -> str:
 
 
 def login_external():
-    """Interactive login workflow with CSRF token, cookie caching, and dummy session validation."""
+    """Interactive login workflow with CSRF token, cookie caching, and TOTP handling."""
     for attempt in range(1, 4):
         session = requests.Session()
         session.headers.update(HEADERS)
 
         _load_cookie_jar(session)
-        csrf_token = _load_csrf_token()
-
-        if not csrf_token:
-            csrf_token = _fetch_and_store_csrf_token(session)
-
+        csrf_token = _load_csrf_token() or _fetch_and_store_csrf_token(session)
         if not csrf_token:
             click.echo("❌ CSRF token is missing or invalid.")
             continue
-
         session.headers["X-CSRF-Token"] = csrf_token
 
         if _is_session_valid(session):
             click.echo("🚀 You are already logged in.")
             return session
 
-        # Prompt user login
+        # Fresh login prompt
         _delete_auth_files()
         click.echo(f"🔐 Sima.ai Developer Portal Login Attempt {attempt}/3")
         username = click.prompt("Email or Username")
         password = getpass.getpass("Password: ")
 
-        login_data = {
+        # Base payload (no TOTP yet)
+        base_data = {
             "login": username,
             "password": password,
-            "second_factor_method": "1"
+            "second_factor_method": "1",  # TOTP
         }
 
-        try:
-            resp = session.post(LOGIN_URL, data=login_data)
-            name = resp.json().get('users')[0]['name'] if 'users' in resp.json() else ''
-            if resp.status_code != 200:
-                click.echo(f"⚠️ Login request returned status {resp.status_code}")
-                continue
-        except Exception as e:
-            click.echo(f"❌ Login request failed: {e}")
-            continue
-
-        if _is_session_valid(session):
+        def _post_login(payload: dict):
+            """POST and return (status_code, json or None, text) with robust error handling."""
+            try:
+                resp = session.post(LOGIN_URL, data=payload, timeout=30)
+            except Exception as e:
+                return None, None, f"request failed: {e}"
+            j = None
+            try:
+                j = resp.json()
+            except Exception:
+                pass
+            return resp.status_code, j, (j or resp.text)
+
+        # First try without TOTP (server may ask for it)
+        status, j, raw = _post_login(base_data)
+
+        # Helper: decide if success
+        def _success():
+            # Prefer server 'ok': True, but also double-check the session cookie validity
+            if j and j.get("ok") is True:
+                return True
+            return _is_session_valid(session)
+
+        # If immediate success
+        if status == 200 and _success():
             _save_cookie_jar(session)
-            click.echo(f"✅ Login successful. Welcome to Sima Developer Portal, {name}!")
+            welcome = (j.get("users", [{}])[0].get("name") if isinstance(j, dict) else "") or ""
+            click.echo(f"✅ Login successful. Welcome to Sima Developer Portal{', ' + welcome if welcome else ''}!")
             return session
+
+        # See if TOTP is required/invalid; then prompt and retry up to 3 times
+        def _needs_totp(payload_json):
+            if not isinstance(payload_json, dict):
+                return False
+            if payload_json.get("totp_enabled") is True:
+                return True
+            reason = payload_json.get("reason") or payload_json.get("error")
+            return str(reason) in {"invalid_second_factor", "second_factor_required"}
+
+        if _needs_totp(j):
+            # Try up to 3 TOTP attempts within this login attempt
+            for totp_try in range(1, 4):
+                totp = click.prompt(f"🔢 Enter TOTP code (attempt {totp_try}/3)", hide_input=True)
+                data = dict(base_data)
+                data["second_factor_token"] = totp
+
+                status, j2, raw2 = _post_login(data)
+                if status == 200 and (j2 and j2.get("ok") is True or _is_session_valid(session)):
+                    _save_cookie_jar(session)
+                    welcome = (j2.get("users", [{}])[0].get("name") if isinstance(j2, dict) else "") or ""
+                    click.echo(f"✅ Login successful. Welcome to Sima Developer Portal{', ' + welcome if welcome else ''}!")
+                    return session
+
+                # If still invalid 2FA, let user try again; otherwise break to outer loop
+                msg = ""
+                if isinstance(j2, dict):
+                    reason = j2.get("reason") or j2.get("error") or ""
+                    msg = f" ({reason})" if reason else ""
+                if isinstance(j2, dict) and str(j2.get("reason")) in {"invalid_second_factor"}:
+                    click.echo(f"❌ Invalid authentication code. Please try again.{msg}")
+                    continue
+                else:
+                    click.echo(f"❌ Login failed with TOTP{msg}.")
+                    break  # go to next overall attempt
+
+            # exhausted TOTP tries
+            click.echo("❌ TOTP verification failed after 3 attempts.")
+            continue  # next overall attempt
+
+        # Not a TOTP case; report error and continue
+        err_detail = ""
+        if isinstance(j, dict):
+            err_detail = j.get("error") or j.get("message") or ""
+            reason = j.get("reason")
+            if reason and reason != err_detail:
+                err_detail = f"{err_detail} ({reason})" if err_detail else reason
         else:
-            click.echo("❌ Login failed.")
+            err_detail = str(raw)[:200]
+
+        click.echo(f"❌ Login failed. {err_detail or 'Please check your credentials and try again.'}")
 
     click.echo("❌ Login failed after 3 attempts.")
     raise SystemExit(1)
+

{sima_cli-0.0.29.dist-info → sima_cli-0.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 0.0.29
+Version: 0.0.30
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://developer.sima.ai/
 Author: SiMa.ai

{sima_cli-0.0.29.dist-info → sima_cli-0.0.30.dist-info}/RECORD

@@ -1,11 +1,11 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=2CZTSSWitwWN8SjkJ0aMqI9jsY-Mo2BPRi6u1w3Ympk,49
+sima_cli/__version__.py,sha256=fcUZK1xhI360Deo68dmn4Df_ffnBdYiwwdvLTu09P58,49
 sima_cli/cli.py,sha256=GYmQ7_XObl9VgFwuWWkWDo-_Y_Vn6lM53F7mKiYGubI,17126
 sima_cli/app_zoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/app_zoo/app.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sima_cli/auth/basic_auth.py,sha256=pcocI6v496vC7v5MLYPZq3AEgD-2DdkzNFZiKsbx3eQ,4290
+sima_cli/auth/basic_auth.py,sha256=mEmPrj32TVu1s34xR_UrJlIKHA3xBh98i_FzIZvAWag,7364
 sima_cli/auth/login.py,sha256=yCYXWgrfbP4jSTZ3hITfxlgHkdVQVzsd8hQKpqaqCKs,3780
 sima_cli/data/resources_internal.yaml,sha256=zlQD4cSnZK86bLtTWuvEudZTARKiuIKmB--Jv4ajL8o,200
 sima_cli/data/resources_public.yaml,sha256=U7hmUomGeQ2ULdo1BU2OQHr0PyKBamIdK9qrutDlX8o,201
@@ -44,7 +44,7 @@ sima_cli/utils/disk.py,sha256=66Kr631yhc_ny19up2aijfycWfD35AeLQOJgUsuH2hY,446
 sima_cli/utils/env.py,sha256=IP5HrH0lE7RMSiBeXcEt5GCLMT5p-QQroG-uGzl5XFU,8181
 sima_cli/utils/net.py,sha256=WVntA4CqipkNrrkA4tBVRadJft_pMcGYh4Re5xk3rqo,971
 sima_cli/utils/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
-sima_cli-0.0.29.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.30.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_app_zoo.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_auth.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,8 +53,8 @@ tests/test_download.py,sha256=t87DwxlHs26_ws9rpcHGwr_OrcRPd3hz6Zmm0vRee2U,4465
 tests/test_firmware.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_model_zoo.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sima_cli-0.0.29.dist-info/METADATA,sha256=1MSfBv5taVOiFdadoLN9hElB33o0aKhHRgU-EgnH-e8,3705
-sima_cli-0.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.29.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.29.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.29.dist-info/RECORD,,
+sima_cli-0.0.30.dist-info/METADATA,sha256=CywF-g-sv44c9qK1UIAu3AROiPOwnPISqiSSQMnOEiY,3705
+sima_cli-0.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sima_cli-0.0.30.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
+sima_cli-0.0.30.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
+sima_cli-0.0.30.dist-info/RECORD,,