dayhoff-tools 1.11.8__py3-none-any.whl → 1.11.10__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/cli/utility_commands.py

@@ -862,6 +862,8 @@ def add_dependency(
     package_name = re.split(r"[<>=~!\[]", package)[0].strip()
     has_version_spec = any(c in package for c in ["<", ">", "=", "~", "!"])
 
+    added_count = 0
+
     for manifest_file in manifest_files:
         try:
             content = manifest_file.read_text()
@@ -939,11 +941,17 @@ def add_dependency(
 
             manifest_file.write_text(new_content)
             print(f"✅ Added '{package}' to {manifest_file}")
+            added_count += 1
 
         except Exception as e:
             print(f"Error updating {manifest_file}: {e}")
 
-    print(f"\n✅ Added '{package}' to all platform manifests")
+    # If nothing was added, exit early
+    if added_count == 0:
+        print(f"\n⚠️  Package '{package_name}' already exists in all manifests")
+        return
+
+    print(f"\n✅ Added '{package}' to {added_count} platform manifest(s)")
 
     # If no version specified, resolve and add version constraint
     if not has_version_spec:
@@ -981,7 +989,7 @@ def add_dependency(
                     print(f"Warning: Could not update version in {manifest_file}: {e}")
 
             print(
-                f"\n✅ Added '{package_name}>={resolved_version}' to all platform manifests"
+                f"\n✅ Added '{package_name}>={resolved_version}' to {added_count} platform manifest(s)"
             )
         else:
             print(
@@ -1031,17 +1039,19 @@ def remove_dependency(
             content = manifest_file.read_text()
 
             # Pattern to match the dependency line (with optional version spec)
-            # Matches:  "package...",  or  "package...",\n
+            # Matches:  "package...",  or  "package...",\n (including the newline)
             pattern = re.compile(
-                rf'^\s*["\']({package_esc}[<>=~!\[].+?|{package_esc})["\'],?\s*(?:#.*)?$',
+                rf'^\s*["\']({package_esc}[<>=~!\[].+?|{package_esc})["\'],?\s*(?:#.*)?$\n?',
                 re.MULTILINE,
             )
 
             new_content, num_removed = pattern.subn("", content)
 
             if num_removed > 0:
-                # Clean up any double blank lines
+                # Clean up any consecutive blank lines (more than one)
                 new_content = re.sub(r"\n\n\n+", "\n\n", new_content)
+                # Also clean up trailing whitespace on lines
+                new_content = re.sub(r"[ \t]+$", "", new_content, flags=re.MULTILINE)
                 manifest_file.write_text(new_content)
                 print(f"✅ Removed '{package}' from {manifest_file}")
                 removed_count += 1

{dayhoff_tools-1.11.8.dist-info → dayhoff_tools-1.11.10.dist-info}/METADATA

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

{dayhoff_tools-1.11.8.dist-info → dayhoff_tools-1.11.10.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
@@ -12,7 +12,7 @@ dayhoff_tools/cli/engine/shared.py,sha256=Ecx6I1jtzmxQDn3BezKpgpQ4SJeZf4SZjUCLg-
 dayhoff_tools/cli/engine/studio_commands.py,sha256=VwTQujz32-uMcYusDRE73SdzRpgvIkv7ZAF4zRv6AzA,30266
 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=iMj2Oj6Q9LcUTwwZismFqc2QTW_oSeIDR1o_eC7kj-Q,50331
+dayhoff_tools/cli/utility_commands.py,sha256=e2P4dCCtoqMUGNyb0lFBZ6GZpl5Zslm1qqE5qIvsy38,50765
 dayhoff_tools/deployment/base.py,sha256=48KE76QlWMeIZJefcBOZVbyChS2V_mgs7IQ31odPV2o,17806
 dayhoff_tools/deployment/deploy_aws.py,sha256=gfqh09hGbz0q3oPqVm0imd_CEjKF2k8moGNRIL26qqE,18614
 dayhoff_tools/deployment/deploy_gcp.py,sha256=xgaOVsUDmP6wSEMYNkm1yRNcVskfdz80qJtCulkBIAM,8860
@@ -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.8.dist-info/METADATA,sha256=BVSPi89Q4l1JH1DPOXHcwbxq9U1jJ66KJCaqsz5Sqrg,2980
-dayhoff_tools-1.11.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dayhoff_tools-1.11.8.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.11.8.dist-info/RECORD,,
+dayhoff_tools-1.11.10.dist-info/METADATA,sha256=3VZrQN31QyCVvRDNN0d4RQW6vqEjI6Q8tyW9O_Gz95o,2981
+dayhoff_tools-1.11.10.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dayhoff_tools-1.11.10.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.11.10.dist-info/RECORD,,