dayhoff-tools 1.1.14__tar.gz → 1.1.15__tar.gz

{dayhoff_tools-1.1.14 → dayhoff_tools-1.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.1.14
+Version: 1.1.15
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.1.14 → dayhoff_tools-1.1.15}/dayhoff_tools/cli/utility_commands.py

@@ -6,7 +6,6 @@ import shutil
 import subprocess
 import sys
 from pathlib import Path
-from typing import Optional
 
 import toml
 import typer
@@ -15,6 +14,44 @@ import yaml
 # Import cloud helper lazily inside functions to avoid heavy deps at module load
 
 
+def _warn_if_gcp_default_sa(force_prompt: bool = False) -> None:
+    """Warn the user when the active gcloud principal is the default VM service
+    account.  See detailed docstring later in file (duplicate for early
+    availability)."""
+
+    from dayhoff_tools.cli import cloud_commands as _cc
+
+    try:
+        impersonation = _cc._get_current_gcp_impersonation()
+        user = _cc._get_current_gcp_user()
+        active = impersonation if impersonation != "None" else user
+        short = _cc._get_short_name(active)
+    except Exception:
+        return
+
+    if short != "default VM service account":
+        return
+
+    YELLOW = getattr(_cc, "YELLOW", "\033[0;33m")
+    BLUE = getattr(_cc, "BLUE", "\033[0;36m")
+    RED = getattr(_cc, "RED", "\033[0;31m")
+    NC = getattr(_cc, "NC", "\033[0m")
+
+    print(
+        f"{YELLOW}⚠  You are currently authenticated as the *default VM service account*.{NC}\n"
+        f"{YELLOW}   This will block gsutil/DVC access to private buckets (e.g. warehouse).{NC}\n"
+        f"{YELLOW}   Run {BLUE}dh gcp login{YELLOW} or {BLUE}dh gcp use-devcon{YELLOW} before retrying.{NC}",
+        file=sys.stderr,
+    )
+
+    if force_prompt and sys.stdin.isatty() and sys.stdout.isatty():
+        import questionary
+
+        if not questionary.confirm("Proceed anyway?", default=False).ask():
+            print(f"{RED}Aborted due to unsafe GCP credentials.{NC}", file=sys.stderr)
+            raise SystemExit(1)
+
+
 def test_github_actions_locally():
     """Run the script test_pytest_in_github_actions_container.sh.sh."""
     script_path = ".devcontainer/scripts/test_pytest_in_github_actions_container.sh"
@@ -571,63 +608,3 @@ def update_dependencies(
 # ----------------------
 # Cloud credential guard
 # ----------------------
-
-
-def _warn_if_gcp_default_sa(force_prompt: bool = False) -> None:
-    """Warn the user when the active gcloud principal is the default VM service
-    account.
-
-    This situation prevents gsutil/DVC from accessing private buckets and is
-    almost never what we want when interacting with the warehouse.  The
-    function prints a coloured warning and, when *force_prompt* is *True* and
-    the session is interactive, asks the user whether to continue or abort the
-    command.
-
-    Parameters
-    ----------
-    force_prompt : bool, default False
-        When *True* and running in an interactive shell (stdin & stdout are
-        TTYs), display a yes/no prompt (via *questionary.confirm*) asking the
-        user whether to proceed.  If the user declines, ``SystemExit(1)`` is
-        raised to stop the CLI command immediately.  In non-interactive
-        contexts the function merely prints the warning without prompting.
-    """
-
-    # Delay heavy import until the function is actually needed
-    from dayhoff_tools.cli import cloud_commands as _cc  # local import to ease testing
-
-    try:
-        impersonation = _cc._get_current_gcp_impersonation()
-        user = _cc._get_current_gcp_user()
-        active = impersonation if impersonation != "None" else user
-        short_name = _cc._get_short_name(active)
-    except Exception:
-        # If gcloud is missing or some other unexpected error occurs, fail
-        # gracefully by doing nothing.
-        return
-
-    if short_name != "default VM service account":
-        # All good – nothing to warn about
-        return
-
-    # Colour constants – fall back to empty strings if not available
-    RED = getattr(_cc, "RED", "\033[0;31m")
-    YELLOW = getattr(_cc, "YELLOW", "\033[0;33m")
-    BLUE = getattr(_cc, "BLUE", "\033[0;36m")
-    NC = getattr(_cc, "NC", "\033[0m")
-
-    warning_msg = (
-        f"{YELLOW}⚠  You are currently authenticated as the *default VM service account*.{NC}\n"
-        f"{YELLOW}   This will block gsutil/DVC access to private buckets (e.g. warehouse).{NC}\n"
-        f"{YELLOW}   Run {BLUE}dh gcp login{YELLOW} or {BLUE}dh gcp use-devcon{YELLOW} before retrying.{NC}"
-    )
-    print(warning_msg, file=sys.stderr)
-
-    interactive = sys.stdin.isatty() and sys.stdout.isatty()
-    if force_prompt and interactive:
-        import questionary
-
-        proceed = questionary.confirm("Proceed anyway?", default=False).ask()
-        if not proceed:
-            print(f"{RED}Aborted due to unsafe GCP credentials.{NC}", file=sys.stderr)
-            raise SystemExit(1)

{dayhoff_tools-1.1.14 → dayhoff_tools-1.1.15}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.1.14"
+version = "1.1.15"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}