dayhoff-tools 1.11.9__py3-none-any.whl → 1.11.11__py3-none-any.whl

dayhoff_tools/cli/cloud_commands.py

@@ -485,10 +485,14 @@ def _get_current_aws_profile() -> str:
         cmd = [aws_path, "configure", "list", "--no-cli-pager"]
         _, stdout, _ = _run_command(cmd, capture=True, check=False)
 
-        # Extract profile from output
-        profile_match = re.search(r"profile\s+(\S+)", stdout)
-        if profile_match and profile_match.group(1) not in ("<not", "not"):
-            return profile_match.group(1)
+        # Extract profile from output (format: "profile    : <value>    : <type>    : <location>")
+        # Match the line starting with "profile" and capture the value after the first colon
+        profile_match = re.search(r"^profile\s+:\s+(\S+)", stdout, re.MULTILINE)
+        if profile_match:
+            profile_value = profile_match.group(1)
+            # Check if the profile is actually set (not "<not" or "not")
+            if profile_value not in ("<not", "not"):
+                return profile_value
     except:
         pass
 

dayhoff_tools/deployment/base.py

@@ -128,8 +128,9 @@ def build_job_image(config: dict) -> str:
 
     This function handles the complete image building process:
     1. Ensures we're in the repo root
-    2. Constructs the image URI based on config
-    3. Builds the image using docker build
+    2. Cleans Docker config to avoid credential helper conflicts
+    3. Constructs the image URI based on config
+    4. Builds the image using docker build
 
     Args:
         config: Dictionary containing the configuration loaded from YAML.
@@ -146,6 +147,11 @@ def build_job_image(config: dict) -> str:
     """
     move_to_repo_root()
 
+    # Clean Docker config to avoid VS Code dev container credential helper conflicts
+    from dayhoff_tools.deployment.deploy_utils import clean_docker_config
+
+    clean_docker_config()
+
     # Get image URI
     image_uri = _build_image_uri(config)
     docker_config = config["docker"]

dayhoff_tools/deployment/deploy_utils.py

@@ -614,6 +614,24 @@ def setup_rxnfp() -> None:
     )
 
 
+def clean_docker_config() -> None:
+    """Clean Docker configuration to avoid credential helper conflicts.
+
+    VS Code dev containers can set up credential helpers that interfere with
+    Docker builds and registry operations. This function creates a clean
+    configuration that disables problematic credential helpers.
+
+    This is automatically called before Docker builds and registry operations
+    to prevent authentication failures.
+    """
+    docker_config_dir = os.path.expanduser("~/.docker")
+    os.makedirs(docker_config_dir, exist_ok=True)
+
+    # Write a minimal config file that disables credential helpers
+    with open(os.path.join(docker_config_dir, "config.json"), "w") as f:
+        json.dump({"auths": {}, "credsStore": ""}, f)
+
+
 def docker_login(registry: str, username: str, password: str) -> None:
     """Login to a Docker registry using provided credentials.
 
@@ -625,13 +643,8 @@ def docker_login(registry: str, username: str, password: str) -> None:
     Raises:
         subprocess.CalledProcessError: If Docker login fails
     """
-    # Create .docker directory if it doesn't exist
-    docker_config_dir = os.path.expanduser("~/.docker")
-    os.makedirs(docker_config_dir, exist_ok=True)
-
-    # Write a minimal config file that disables credential helpers
-    with open(os.path.join(docker_config_dir, "config.json"), "w") as f:
-        json.dump({"auths": {}, "credsStore": ""}, f)
+    # Clean Docker config to avoid credential helper conflicts
+    clean_docker_config()
 
     # Login to Docker using the credentials
     login_process = subprocess.run(

{dayhoff_tools-1.11.9.dist-info → dayhoff_tools-1.11.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dayhoff-tools
-Version: 1.11.9
+Version: 1.11.11
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com
@@ -29,7 +29,6 @@ Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: questionary (>=2.0.1)
 Requires-Dist: rdkit-pypi (>=2022.9.5) ; extra == "full"
 Requires-Dist: requests (>=2.31.0)
-Requires-Dist: seaborn (>=0.13.2)
 Requires-Dist: sentencepiece (>=0.2.0) ; extra == "embedders"
 Requires-Dist: sentencepiece (>=0.2.0) ; extra == "full"
 Requires-Dist: sqlalchemy (>=2.0.40,<3.0.0) ; extra == "full"

{dayhoff_tools-1.11.9.dist-info → dayhoff_tools-1.11.11.dist-info}/RECORD

@@ -2,7 +2,7 @@ dayhoff_tools/__init__.py,sha256=M5zThPyEBRYa5CfwlzKhcqTevWn3OKu62cjV6Zqie2A,469
 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=33qcWLmq-FwEXMdL3F0OHm-5Stlh2r65CldyEZgQ1no,40904
+dayhoff_tools/cli/cloud_commands.py,sha256=xrWQZm48e09GTh8RmYh3JqXUzW8mMy07dHk_77LqZx8,41199
 dayhoff_tools/cli/engine/__init__.py,sha256=RE45X2IPCNUvQp6_OHI2lbjwoqexkH3roUPccIHkeJo,9540
 dayhoff_tools/cli/engine/engine_core.py,sha256=TECO6766GCZTtbxOY7QRggwmjpMH9JZSuxjbwF46unU,27061
 dayhoff_tools/cli/engine/engine_lifecycle.py,sha256=_Dk-EZs_qbm8APdOuGOuxhlbK6RgkkoLk2nrwKoo1-A,4519
@@ -13,10 +13,10 @@ dayhoff_tools/cli/engine/studio_commands.py,sha256=VwTQujz32-uMcYusDRE73SdzRpgvI
 dayhoff_tools/cli/main.py,sha256=Ii5boey--93yGthB_eS2LC7ZR3WHGsJXDHY7uElEtso,6169
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=e2P4dCCtoqMUGNyb0lFBZ6GZpl5Zslm1qqE5qIvsy38,50765
-dayhoff_tools/deployment/base.py,sha256=48KE76QlWMeIZJefcBOZVbyChS2V_mgs7IQ31odPV2o,17806
+dayhoff_tools/deployment/base.py,sha256=fM9zyhuRvIK8YqY6ooYg9j6wy_8touA_L-dkV7FA5q4,18058
 dayhoff_tools/deployment/deploy_aws.py,sha256=gfqh09hGbz0q3oPqVm0imd_CEjKF2k8moGNRIL26qqE,18614
 dayhoff_tools/deployment/deploy_gcp.py,sha256=xgaOVsUDmP6wSEMYNkm1yRNcVskfdz80qJtCulkBIAM,8860
-dayhoff_tools/deployment/deploy_utils.py,sha256=StFwbqnr2_FWiKVg3xnJF4kagTHzndqqDkpaIOaAn_4,26027
+dayhoff_tools/deployment/deploy_utils.py,sha256=KyUFZZWn8NGT9QpR0HGqkX-huOFubvYCabko9SlC5Gg,26516
 dayhoff_tools/deployment/job_runner.py,sha256=hljvFpH2Bw96uYyUup5Ths72PZRL_X27KxlYzBMgguo,5086
 dayhoff_tools/deployment/processors.py,sha256=LM0CQbr4XCb3AtLbrcuDQm4tYPXsoNqgVJ4WQYDjzJc,12406
 dayhoff_tools/deployment/swarm.py,sha256=YJfvVOcAS8cYcIj2fiN4qwC2leh0I9w5A4px8ZWSF6g,22833
@@ -33,7 +33,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=UETBtZD3r7WgvURqfGbyHlT7cxoiVq8isjzMuerKw8I,24475
-dayhoff_tools-1.11.9.dist-info/METADATA,sha256=POBxTDcl6NafsxeUli-dgk5-CZ7SvytEjEONN8OEazA,3014
-dayhoff_tools-1.11.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dayhoff_tools-1.11.9.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.11.9.dist-info/RECORD,,
+dayhoff_tools-1.11.11.dist-info/METADATA,sha256=GC2z-0AdLxc-bKHH_6-hIgA1TS2Mcd-LRF06MXC8hsU,2981
+dayhoff_tools-1.11.11.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dayhoff_tools-1.11.11.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.11.11.dist-info/RECORD,,