dayhoff-tools 1.1.16__py3-none-any.whl → 1.1.18__py3-none-any.whl

dayhoff_tools/cli/cloud_commands.py

@@ -902,6 +902,72 @@ def gcp_use_devcon_adc():
         sys.exit(1)
 
 
+@gcp_app.command("logout")
+def gcp_logout():
+    """Clear all GCP credentials for testing or role switching purposes.
+
+    This removes the active user's gcloud login, disables impersonation,
+    and invalidates Application Default Credentials (ADC).
+    """
+    print(f"{BLUE}Clearing all GCP credentials...{NC}")
+
+    try:
+        gcloud_path = _find_executable("gcloud")
+        errors = []
+
+        # 1. Revoke user-level credentials
+        print(f"{BLUE}Revoking active gcloud credentials...{NC}")
+        revoke_cmd = [gcloud_path, "auth", "revoke", "--all", "--quiet"]
+        revoke_code, _, revoke_err = _run_command(revoke_cmd, capture=True, check=False)
+        if revoke_code != 0 and revoke_err:
+            errors.append(f"Failed to revoke credentials: {revoke_err}")
+
+        # 2. Unset impersonation config
+        print(f"{BLUE}Disabling service account impersonation...{NC}")
+        unset_code, _, unset_err = _gcloud_unset_config(
+            "auth/impersonate_service_account"
+        )
+        if unset_code != 0 and unset_err:
+            errors.append(f"Failed to unset impersonation: {unset_err}")
+
+        # 3. Revoke ADC
+        print(f"{BLUE}Revoking Application Default Credentials (ADC)...{NC}")
+        adc_cmd = [gcloud_path, "auth", "application-default", "revoke", "--quiet"]
+        adc_code, _, adc_err = _run_command(adc_cmd, capture=True, check=False)
+
+        # 4. Additionally remove ADC file if it exists (belt-and-suspenders approach)
+        adc_file = (
+            Path.home() / ".config" / "gcloud" / "application_default_credentials.json"
+        )
+        if adc_file.exists():
+            try:
+                adc_file.unlink()
+                print(f"{BLUE}Removed ADC file: {adc_file}{NC}")
+            except Exception as e:
+                errors.append(f"Failed to delete ADC file: {e}")
+
+        if errors:
+            print(f"{YELLOW}Logged out with some warnings:{NC}")
+            for err in errors:
+                print(f"{YELLOW}  - {err}{NC}")
+        else:
+            print(f"{GREEN}Successfully logged out from GCP.{NC}")
+
+        # Always show how to log back in
+        print(f"\n{BLUE}To log back in:{NC}")
+        print(f"  {YELLOW}dh gcp login{NC}")
+
+        # Show current (now-cleared) status
+        print(f"\n{BLUE}Current status:{NC}")
+        gcp_status()
+
+    except Exception as e:
+        print(f"{RED}Error during logout: {e}{NC}", file=sys.stderr)
+        print(f"{YELLOW}You may need to manually run:{NC}")
+        print(f"  {YELLOW}gcloud auth revoke --all{NC}")
+        print(f"  {YELLOW}gcloud auth application-default revoke{NC}")
+
+
 # === End NEW ADC Commands ===
 
 

dayhoff_tools/cli/main.py

@@ -1,5 +1,7 @@
 """Entry file for the CLI, which aggregates and aliases all commands."""
 
+import sys
+
 import typer
 from dayhoff_tools.cli.cloud_commands import aws_app, gcp_app
 from dayhoff_tools.cli.utility_commands import (
@@ -96,6 +98,24 @@ def deploy_command(
     config_path: str = typer.Argument(help="Path to the YAML configuration file"),
 ):
     """Unified deployment command."""
+    # Check GCP credentials if deploying in batch mode with GCP
+    # Do this early to fail fast before importing deployment code
+    if mode == "batch":
+        try:
+            # Check cloud provider in config
+            import yaml
+
+            with open(config_path, "r") as f:
+                config = yaml.safe_load(f)
+
+            if config.get("cloud") == "gcp":
+                from dayhoff_tools.cli.utility_commands import _warn_if_gcp_default_sa
+
+                _warn_if_gcp_default_sa(force_prompt=True)
+        except Exception as e:
+            # Don't block deployment if config can't be read or other errors occur
+            print(f"Warning: Could not check GCP credentials: {e}", file=sys.stderr)
+
     from dayhoff_tools.deployment.base import deploy
 
     deploy(mode, config_path)

dayhoff_tools/deployment/base.py

@@ -394,6 +394,50 @@ def deploy(
             get_boto_session(config)
             print("AWS credentials verified.")
 
+        # Check GCP credentials early if using GCP
+        elif cloud == "gcp":
+            print("\nVerifying GCP credentials...")
+            from dayhoff_tools.cli.cloud_commands import (
+                _is_adc_authenticated,
+                _is_gcp_user_authenticated,
+            )
+
+            user_creds_valid = _is_gcp_user_authenticated()
+            adc_creds_valid = _is_adc_authenticated()
+
+            if not user_creds_valid:
+                print(
+                    "\n⚠️  Warning: Your GCP user credentials appear to be stale/expired."
+                )
+                print(
+                    "   This may cause authentication issues when deploying to GCP Batch."
+                )
+                print("   Consider running 'dh gcp login' to refresh your credentials.")
+
+            if not adc_creds_valid:
+                print(
+                    "\n⚠️  Warning: Your Application Default Credentials (ADC) appear to be stale/expired."
+                )
+                print(
+                    "   This may cause authentication issues with API client libraries."
+                )
+                print(
+                    "   Consider running 'dh gcp use-user-adc' or 'dh gcp use-devcon-adc' to refresh your ADC."
+                )
+
+            if user_creds_valid and adc_creds_valid:
+                print("GCP credentials verified.")
+            else:
+                # Ask for confirmation before proceeding with possibly invalid credentials
+                proceed = (
+                    input("\nProceed with potentially invalid credentials? (y/n): ")
+                    .lower()
+                    .strip()
+                )
+                if proceed != "y":
+                    print("Deployment aborted.")
+                    return
+
     # Track if we built a new image
     had_image_uri = bool(config["docker"]["image_uri"])
 

{dayhoff_tools-1.1.16.dist-info → dayhoff_tools-1.1.18.dist-info}/METADATA

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

{dayhoff_tools-1.1.16.dist-info → dayhoff_tools-1.1.18.dist-info}/RECORD

@@ -2,11 +2,11 @@ dayhoff_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dayhoff_tools/chemistry/standardizer.py,sha256=uMn7VwHnx02nc404eO6fRuS4rsl4dvSPf2ElfZDXEpY,11188
 dayhoff_tools/chemistry/utils.py,sha256=jt-7JgF-GeeVC421acX-bobKbLU_X94KNOW24p_P-_M,2257
 dayhoff_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dayhoff_tools/cli/cloud_commands.py,sha256=ekUD2B6kL335ZMrP00I-tKD0qMgSMBWdR-WJRzwJRFY,38182
-dayhoff_tools/cli/main.py,sha256=Ae0Bee2VjRzUge1I2DJoDVqoXpQnKfxGhdiMSmIWJwo,3788
+dayhoff_tools/cli/cloud_commands.py,sha256=NGux28-cjDyCADF-L1tjdEMzkCMYX8V4xNvpK6EWcZA,40802
+dayhoff_tools/cli/main.py,sha256=47EGb28ALaYFc7oAUGlY1D66AIDmc4RZiXxN-gPVrpQ,4519
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=PRShdh4O35JfjVxTOsduZ8-grGF5-SfXihcptcFT-hk,23584
-dayhoff_tools/deployment/base.py,sha256=u-AjbtHnFLoLt33dhYXHIpV-6jcieMEHHGBGN_U9Hm0,15626
+dayhoff_tools/deployment/base.py,sha256=8tXwsPYvRo-zV-aNhHw1c7Rji-KWg8S5xoCCznFnVVI,17412
 dayhoff_tools/deployment/deploy_aws.py,sha256=O0gQxHioSU_sNU8T8MD4wSOPvWc--V8eRRZzlRu035I,16446
 dayhoff_tools/deployment/deploy_gcp.py,sha256=DxBM4sUzwPK9RWLP9bSfr38n1HHl-TVrp4TsbdN8pUA,5795
 dayhoff_tools/deployment/deploy_utils.py,sha256=StFwbqnr2_FWiKVg3xnJF4kagTHzndqqDkpaIOaAn_4,26027
@@ -26,7 +26,7 @@ dayhoff_tools/intake/uniprot.py,sha256=BZYJQF63OtPcBBnQ7_P9gulxzJtqyorgyuDiPeOJq
 dayhoff_tools/logs.py,sha256=DKdeP0k0kliRcilwvX0mUB2eipO5BdWUeHwh-VnsICs,838
 dayhoff_tools/sqlite.py,sha256=jV55ikF8VpTfeQqqlHSbY8OgfyfHj8zgHNpZjBLos_E,18672
 dayhoff_tools/warehouse.py,sha256=TqV8nex1AluNaL4JuXH5zuu9P7qmE89lSo6f_oViy6U,14965
-dayhoff_tools-1.1.16.dist-info/METADATA,sha256=R7gtNrSoRE5dq3m7_eQHu-u9ztkzzPWtvT-xl8ajvhE,2225
-dayhoff_tools-1.1.16.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.1.16.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.1.16.dist-info/RECORD,,
+dayhoff_tools-1.1.18.dist-info/METADATA,sha256=9uJXFcLDGpuxssU_xBvmehDR58gPs-gFtKShHhEw4u4,2225
+dayhoff_tools-1.1.18.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.1.18.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.1.18.dist-info/RECORD,,