lightning-sdk 2025.12.2__py3-none-any.whl → 2025.12.9__py3-none-any.whl

lightning_sdk/cli/entrypoint.py

@@ -21,6 +21,7 @@ from lightning_sdk.cli.groups import (
 from lightning_sdk.cli.utils import CustomHelpFormatter
 from lightning_sdk.cli.utils.logging import CommandLoggingGroup, logging_excepthook
 from lightning_sdk.lightning_cloud.login import Auth
+from lightning_sdk.utils.resolve import _get_authed_user, in_studio
 
 
 @click.group(
@@ -39,9 +40,22 @@ main_cli.context_class.formatter_class = CustomHelpFormatter
 @main_cli.command
 def login() -> None:
     """Login to Lightning AI Studios."""
+    # try to fetch credentials, if successful (e.g. in a Studio or already logged in), no need to relogin
     auth = Auth()
-    auth.clear()
+    if (auth.user_id and auth.api_key) or auth.load():
+        try:
+            auth_user = _get_authed_user()
+            click.echo(f'You are currently logged in as "{auth_user.name}"')
+        except Exception:
+            click.echo("You are already logged in")
+        click.echo('"lightning login" is not required within a Studio or when already logged in')
+        return
+
+    if in_studio():
+        # this is unexpected, as we automatically auth within a Studio
+        raise RuntimeError("Unable to login within a Studio. Did you change your shell setup?") from None
 
+    auth.clear()
     try:
         auth.authenticate()
     except ConnectionError:

lightning_sdk/cli/studio/cp.py

@@ -1,5 +1,6 @@
 """Studio cp command."""
 
+import os
 from pathlib import Path
 from typing import Optional, TypedDict
 
@@ -7,7 +8,6 @@ import click
 from rich.console import Console
 
 from lightning_sdk.api.utils import _get_cloud_url
-from lightning_sdk.cli.legacy.exceptions import StudioCliError
 from lightning_sdk.cli.utils.owner_selection import OwnerMenu
 from lightning_sdk.cli.utils.studio_selection import StudiosMenu
 from lightning_sdk.cli.utils.teamspace_selection import TeamspacesMenu
@@ -38,7 +38,7 @@ def cp_impl(source: str, destination: str) -> None:
         raise ValueError("Either source or destination must be a Studio file.")
     elif "lit://" in source:
         # Download from Studio to local
-        cp_download(studio_file_path=source, local_file_path=destination)
+        cp_download(studio_path=source, local_path=destination)
     else:
         # Upload from local to Studio
         cp_upload(local_file_path=source, studio_file_path=destination)
@@ -92,12 +92,8 @@ def cp_upload(
     studio_file_path: str,
 ) -> None:
     console = Console()
-    if Path(local_file_path).is_dir():
-        raise StudioCliError(
-            f"The provided path is a folder: {local_file_path}. Use `lightning upload folder` instead."
-        )
     if not Path(local_file_path).exists():
-        raise FileNotFoundError(f"The provided path does not exist: {local_file_path}.")
+        raise FileNotFoundError(f"The provided path does not exist: {local_file_path}")
 
     studio_path_result = parse_studio_path(studio_file_path)
 
@@ -106,7 +102,14 @@ def cp_upload(
     )
     console.print(f"Uploading to {selected_studio.teamspace.name}/{selected_studio.name}")
 
-    selected_studio.upload_file(local_file_path, studio_path_result["destination"])
+    if Path(local_file_path).is_dir():
+        selected_studio.upload_folder(local_file_path, studio_path_result["destination"])
+    else:
+        if studio_file_path.endswith(("/", "\\")):
+            # if destination ends with / or \, treat it as a directory
+            file_name = os.path.basename(local_file_path)
+            studio_path_result["destination"] = os.path.join(studio_path_result["destination"], file_name)
+        selected_studio.upload_file(local_file_path, studio_path_result["destination"])
 
     studio_url = (
         _get_cloud_url().replace(":443", "")
@@ -121,10 +124,43 @@ def cp_upload(
 
 
 def cp_download(
-    studio_file_path: str,
-    local_file_path: str,
+    studio_path: str,
+    local_path: str,
 ) -> None:
-    raise NotImplementedError("Download functionality is not implemented yet.")
+    console = Console()
+    studio_path_result = parse_studio_path(studio_path)
+
+    selected_studio = resolve_studio(
+        studio_path_result["studio"], studio_path_result["teamspace"], studio_path_result["owner"]
+    )
+
+    # check if file/folder exists
+    path_info = selected_studio._studio_api.get_path_info(
+        selected_studio._studio.id, selected_studio._teamspace.id, path=studio_path_result["destination"]
+    )
+    if not path_info["exists"]:
+        raise FileNotFoundError(
+            f"The provided path does not exist in the studio: {studio_path_result['destination']} "
+            "Note that empty folders may not be detected as existing."
+        )
+
+    console.print(f"Downloading from {selected_studio.teamspace.name}/{selected_studio.name}")
+    if path_info["type"] == "directory":
+        folder_name = os.path.basename(studio_path_result["destination"].rstrip("/"))
+        target_path = os.path.join(local_path, folder_name)
+
+        selected_studio.download_folder(studio_path_result["destination"], target_path)
+        console.print(f"See your folder at {target_path}")
+    else:
+        if os.path.isdir(local_path) or local_path.endswith(("/", "\\")):
+            # if local_path ends with / or \ or is a directory, treat it as a directory
+            file_name = os.path.basename(studio_path_result["destination"])
+            target_path = os.path.join(local_path, file_name)
+        else:
+            target_path = local_path
+        os.makedirs(os.path.dirname(target_path), exist_ok=True)
+        selected_studio.download_file(studio_path_result["destination"], target_path)
+        console.print(f"See your file at {target_path}")
 
 
 def resolve_studio(studio_name: Optional[str], teamspace: Optional[str], owner: Optional[str]) -> Studio:

lightning_sdk/lightning_cloud/login.py

@@ -268,7 +268,7 @@ class Auth:
         self.save(user_id=user_id, api_key=api_key)
         logger.info("Successfully authenticated as a guest user.")
 
-        return self.auth_header
+        return self.authenticate()
 
     def token_login(self, token_key: str, save_token: bool = True) -> Optional[str]:
         """Performs token-based authentication.