fix: relogin judgement (#1542)

* fix: relogin judgement

* Move client implementation to internal.pkg.client

Refactor: extract and relocate the HTTP client implementation from internal.core_python.client to a new internal.pkg.client package (including session, bootstrap and utils). Update all imports/usages across the codebase and tests to reference the new package, adjust typing modules accordingly, and add new pkg typing stubs. Add/rename login helpers (login_raw / login_interactive) and wire them through CLI and init code. Update top-level exports (sdk and package __init__ files) to expose helper/console/fs/safe and updated run/login APIs, and use helper.get_swanlab_version for __version__. Minor cleanup: fix safe package import, add __all__ entries, and move/rename multiple tests to match the new module layout.

* Export raw auth funcs; update imports/tests

Expose low-level auth helpers at swanlab.sdk (verify_raw, logout_raw, etc.) and flatten cmd exports. Update CLI auth commands to import swanlab.sdk and call the new top-level raw functions. Rename raw_logout to logout_raw and wire logout() to call it. Adjust unit tests and fixtures to use the new function names and corrected patch targets for the pkg client, plus minor test refactors to match the new API surface.

---------

Co-authored-by: Kang Li <79990647+SAKURA-CAT@users.noreply.github.com>

Author: Nexisato

swanlab/__init__.py

@@ -11,8 +11,8 @@
     define_scalar,
     finish,
     get_run,
-    get_swanlab_version,
     has_run,
+    helper,
     init,
     log,
     log_audio,
@@ -27,7 +27,7 @@
 
 from . import utils
 
-__version__ = get_swanlab_version()
+__version__ = helper.get_swanlab_version()
 
 __all__ = [
     # cmd

swanlab/__init__.pyi

@@ -10,11 +10,8 @@ from concurrent.futures import Future
 from typing import Any, Callable, List, Mapping, Optional, Union
 
 from . import utils
-from .sdk import Callback, config
+from .sdk import Audio, Callback, Image, Run, Settings, Text, Video, config, logout, verify
 from .sdk.cmd.init import ConfigLike
-from .sdk.internal.run import Run
-from .sdk.internal.run.transforms import Audio, Image, Text, Video
-from .sdk.internal.settings import Settings
 from .sdk.typings.run import AsyncLogType, FinishType, ModeType, ResumeType
 from .sdk.typings.run.column import ScalarXAxisType
 from .sdk.typings.run.transforms import CaptionsType
@@ -31,6 +28,8 @@ __all__ = [
     "init",
     "finish",
     "login",
+    "logout",
+    "verify",
     "log",
     "log_text",
     "log_image",
@@ -39,7 +38,7 @@ __all__ = [
     "define_scalar",
     "async_log",
     # run
-    "run",
+    "run",  # type: ignore [no-redef]
     "Run",
     "has_run",
     "get_run",
@@ -52,8 +51,8 @@ __all__ = [
     "Video",
     # utils
     "utils",
-    "Callback",
     "Settings",
+    "Callback",
 ]
 
 # ── lifecycle ──────────────────────────────────────────────────────────────────

swanlab/cli/auth/login.py

@@ -7,7 +7,7 @@
 
 import click
 
-from swanlab.sdk.cmd.login import interactive_login
+from swanlab import sdk
 
 
 @click.command()
@@ -40,4 +40,4 @@
 )
 def login(api_key: str, relogin: bool, host: str, save: bool):
     """Login to the SwanLab cloud."""
-    interactive_login(api_key=api_key, relogin=relogin, host=host, save=save)
+    sdk.login_interactive(api_key=api_key, relogin=relogin, host=host, save=save)

swanlab/cli/auth/logout.py

@@ -9,7 +9,7 @@
 
 import click
 
-from swanlab.sdk.cmd.logout import raw_logout
+from swanlab import sdk
 
 
 @click.command()
@@ -22,6 +22,6 @@
 )
 def logout(force: bool):
     """Logout from the SwanLab cloud."""
-    success = raw_logout(force=force)
+    success = sdk.logout_raw(force=force)
     if not success:
         sys.exit(1)

swanlab/cli/auth/verify.py

@@ -9,12 +9,12 @@
 
 import click
 
-from swanlab.sdk.cmd.verify import raw_verify
+from swanlab import sdk
 
 
 @click.command()
 def verify():
     """Verify the current login status."""
-    success = raw_verify()
+    success = sdk.verify_raw()
     if not success:
         sys.exit(1)

swanlab/sdk/__init__.py

@@ -6,27 +6,20 @@
 """
 
 from .cmd.init import init
-from .cmd.login import login
-from .cmd.logout import logout
-from .cmd.merge_settings import Settings, merge_settings
+from .cmd.login import login, login_interactive
+from .cmd.logout import logout, logout_raw
+from .cmd.merge_settings import merge_settings
 from .cmd.run import async_log, define_scalar, finish, log, log_audio, log_image, log_text, log_video
-from .cmd.verify import verify
-from .internal.pkg.helper import get_swanlab_version
-from .internal.pkg.safe import block, decorator
+from .cmd.verify import verify, verify_raw
+from .internal.pkg import console, fs, helper, safe
 from .internal.protocol import Callback
 from .internal.run import Run, clear_run, get_run, has_run, set_run
 from .internal.run.config import config
 from .internal.run.transforms import Audio, Image, Text, Video
+from .internal.settings import Settings
 
 __all__ = [
-    "Callback",
-    "get_swanlab_version",
-    "Audio",
-    "Image",
-    "Text",
-    "Video",
-    "merge_settings",
-    "Settings",
+    # cmd
     "init",
     "finish",
     "login",
@@ -38,13 +31,29 @@
     "log_audio",
     "log_video",
     "async_log",
+    "verify_raw",
+    "logout_raw",
     "define_scalar",
-    "Run",
+    "merge_settings",
+    "login_interactive",
+    # run
     "has_run",
     "get_run",
     "set_run",
     "clear_run",
     "config",
-    "block",
-    "decorator",
+    # utils
+    "safe",
+    "helper",
+    "console",
+    "fs",
+    # data
+    "Audio",
+    "Image",
+    "Text",
+    "Video",
+    # protocol
+    "Callback",
+    "Settings",
+    "Run",
 ]

swanlab/sdk/cmd/init.py

@@ -36,7 +36,9 @@
 from ..internal.settings import Settings
 from ..internal.settings import settings as global_settings
 from ..typings.run import ModeType, ResumeType
-from .login import interactive_login, raw_login
+from .login import login_interactive, login_raw
+
+__all__ = ["init", "ConfigLike"]
 
 
 def set_nested_value(d: dict, key: str, value: Any):
@@ -443,7 +445,7 @@ def prompt_init_mode(settings: Settings) -> Tuple[ModeType, bool]:
         return mode, client.exists()
     if mode == "cloud":
         if apikey.exists():
-            raw_login(api_key=apikey.get())
+            login_raw(api_key=apikey.get())
             return "cloud", True
 
         console.info("Using SwanLab to track your experiments.")
@@ -464,13 +466,13 @@ def prompt_init_mode(settings: Settings) -> Tuple[ModeType, bool]:
                 console.info("Create a SwanLab account here:", "yellow")
                 console.info(f"{settings.web_host}/login", "blue")
                 # 注册后紧接着触发登录循环
-                success = interactive_login(save=True)
+                success = login_interactive(save=True)
                 return "cloud", success
 
             if choice == "2":
                 console.info(f"Logging into {settings.web_host}...")
                 # 触发带循环容错的登录接口
-                success = interactive_login(save=True)
+                success = login_interactive(save=True)
                 return "cloud", success
 
             console.warning("Invalid choice, please enter 1, 2, or 3.")

swanlab/sdk/cmd/login.py

@@ -18,7 +18,9 @@
 from swanlab.sdk.internal.core_python import client
 from swanlab.sdk.internal.pkg import console, helper, scope
 from swanlab.sdk.internal.settings import Settings, settings
-from swanlab.sdk.typings.core_python.api.bootstrap import LoginResponse
+from swanlab.sdk.typings.pkg.client.bootstrap import LoginResponse
+
+__all__ = ["login", "login_interactive", "login_raw"]
 
 
 @with_cmd_lock
@@ -74,10 +76,53 @@ def login(
         >>> swanlab.login(api_key="new_api_key", relogin=True, save=True)
         >>> swanlab.init(mode="cloud")
     """
-    return raw_login(api_key=api_key, relogin=relogin, host=host, save=save, timeout=timeout)
+    return login_raw(api_key=api_key, relogin=relogin, host=host, save=save, timeout=timeout)
+
+
+def login_interactive(
+    api_key: Optional[str] = None,
+    relogin: bool = False,
+    host: Optional[str] = None,
+    save: bool = False,
+    timeout: int = 10,
+) -> bool:
+    """
+    带循环输入容错的交互式登录接口。
+    主要为 CLI 环境或需要极高容错的终端调用设计。
+    当捕获到 AuthenticationError 时，如果环境允许交互，则会无限循环提示用户重新输入 API Key。
+    """
+    # CLI 每次是新进程，client.exists() 必为 False，需要检查本地凭证判断是否已登录
+    if apikey.exists_locally() and not relogin:
+        console.info(
+            "You are already logged in. Use",
+            Text("`swanlab login --relogin`", style="bold"),
+            "to force relogin.",
+            sep=" ",
+        )
+        return True
+    try:
+        # 首次尝试登录，复用原子接口
+        return login_raw(api_key=api_key, relogin=relogin, host=host, save=save, timeout=timeout)
+    except AuthenticationError as e:
+        # 如果全局配置禁用了交互模式，直接抛出异常
+        if not settings.interactive:
+            raise e
+        console.error(str(e))
+
+    # 进入容错重试循环
+    while True:
+        try:
+            # 重新要求用户输入新的 Key
+            new_key = apikey.prompt()
+            return login_raw(api_key=new_key, relogin=relogin, host=host, save=save, timeout=timeout)
+        except AuthenticationError as e:
+            console.error(str(e))
+        except (KeyboardInterrupt, EOFError):
+            console.info("\nLogin cancelled by user.")
+            return False
 
 
-def raw_login(
+def login_raw(
     api_key: Optional[str] = None,
     relogin: bool = False,
     host: Optional[str] = None,
@@ -150,49 +195,6 @@ def raw_login(
         return True
 
 
-def interactive_login(
-    api_key: Optional[str] = None,
-    relogin: bool = False,
-    host: Optional[str] = None,
-    save: bool = False,
-    timeout: int = 10,
-) -> bool:
-    """
-    带循环输入容错的交互式登录接口。
-    主要为 CLI 环境或需要极高容错的终端调用设计。
-    当捕获到 AuthenticationError 时，如果环境允许交互，则会无限循环提示用户重新输入 API Key。
-    """
-    # CLI 每次是新进程，client.exists() 必为 False，需要检查本地凭证判断是否已登录
-    if not relogin and api_key is None and host is None and apikey.exists():
-        console.info(
-            "You are already logged in. Use",
-            Text("`swanlab login --relogin`", style="bold"),
-            "to force relogin.",
-            sep=" ",
-        )
-        return True
-    try:
-        # 首次尝试登录，复用原子接口
-        return raw_login(api_key=api_key, relogin=relogin, host=host, save=save, timeout=timeout)
-    except AuthenticationError as e:
-        # 如果全局配置禁用了交互模式，直接抛出异常
-        if not settings.interactive:
-            raise e
-        console.error(str(e))
-
-    # 进入容错重试循环
-    while True:
-        try:
-            # 重新要求用户输入新的 Key
-            new_key = apikey.prompt()
-            return raw_login(api_key=new_key, relogin=relogin, host=host, save=save, timeout=timeout)
-        except AuthenticationError as e:
-            console.error(str(e))
-        except (KeyboardInterrupt, EOFError):
-            console.info("\nLogin cancelled by user.")
-            return False
-
-
 @helper.with_loading_animation()
 def create_client(ctx: RunContext, timeout: int = 10):
     assert ctx.config.settings.api_key is not None, "API Key not provided"

swanlab/sdk/cmd/logout.py

@@ -11,6 +11,8 @@
 from swanlab.sdk.internal.pkg import console
 from swanlab.sdk.internal.settings import settings
 
+__all__ = ["logout", "logout_raw"]
+
 
 @with_cmd_lock
 @without_run("logout")
@@ -39,10 +41,10 @@ def logout(force: bool = False) -> bool:
         >>> import swanlab
         >>> swanlab.logout(force=True)
     """
-    return raw_logout(force=force)
+    return logout_raw(force=force)
 
 
-def raw_logout(force: bool = False) -> bool:
+def logout_raw(force: bool = False) -> bool:
     # 1. 检查是否已登录
     if not apikey.exists():
         console.info("You are not logged in. Use `swanlab login` to login.")

swanlab/sdk/cmd/merge_settings.py

@@ -11,6 +11,8 @@
 from swanlab.sdk.internal.settings import Settings
 from swanlab.sdk.internal.settings import settings as swanlab_settings
 
+__all__ = ["merge_settings"]
+
 
 @with_cmd_lock
 @without_run("merge_settings")