dayhoff-tools 1.11.9__tar.gz → 1.11.11__tar.gz

{dayhoff_tools-1.11.9 → dayhoff_tools-1.11.11}/PKG-INFO

@@ -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 → dayhoff_tools-1.11.11}/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-1.11.9 → dayhoff_tools-1.11.11}/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-1.11.9 → dayhoff_tools-1.11.11}/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 → dayhoff_tools-1.11.11}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.11.9"
+version = "1.11.11"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}
@@ -21,7 +21,6 @@ dependencies = [
     "questionary>=2.0.1",
     "tzdata>=2025.2",
     "boto3>=1.36.8",
-    "seaborn>=0.13.2",
 ]
 requires-python = ">=3.10,<4.0"