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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dayhoff-tools
-Version: 1.11.7
+Version: 1.11.9
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com
@@ -29,7 +29,7 @@ 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
+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.7 → dayhoff_tools-1.11.9}/dayhoff_tools/cli/utility_commands.py

@@ -724,6 +724,64 @@ def _get_all_platform_manifests():
     return manifest_files
 
 
+def _resolve_package_version(package_name: str) -> str | None:
+    """Resolve a package version by running uv lock and parsing the lock file.
+
+    Args:
+        package_name: Name of the package to resolve
+
+    Returns:
+        Resolved version string, or None if resolution failed
+    """
+    import os
+
+    try:
+        # Determine which manifest to use (prefer Mac, then AWS)
+        platform = os.environ.get("STUDIO_PLATFORM", "aws")
+        manifest_path = None
+        uv_dir = None
+
+        if platform == "mac" and Path("pyproject.mac.toml").exists():
+            manifest_path = Path("pyproject.mac.toml")
+            uv_dir = Path(".mac_uv_project")
+        elif Path("pyproject.aws.toml").exists():
+            manifest_path = Path("pyproject.aws.toml")
+            uv_dir = Path(".aws_uv_project")
+        elif Path("pyproject.mac.toml").exists():
+            # Fallback to Mac if AWS doesn't exist
+            manifest_path = Path("pyproject.mac.toml")
+            uv_dir = Path(".mac_uv_project")
+        else:
+            return None
+
+        # Create temp directory and copy manifest
+        uv_dir.mkdir(parents=True, exist_ok=True)
+        (uv_dir / "pyproject.toml").write_text(manifest_path.read_text())
+
+        # Copy README if it exists
+        if Path("README.md").exists():
+            (uv_dir / "README.md").write_text(Path("README.md").read_text())
+
+        # Run uv lock (suppress output)
+        subprocess.run(["uv", "lock"], cwd=str(uv_dir), check=True, capture_output=True)
+
+        # Parse lock file
+        lock_file = uv_dir / "uv.lock"
+        if not lock_file.exists():
+            return None
+
+        lock_data = toml.load(lock_file)
+        for package in lock_data.get("package", []):
+            if package.get("name") == package_name:
+                return package.get("version")
+
+        return None
+
+    except Exception as e:
+        print(f"Warning: Failed to resolve version: {e}")
+        return None
+
+
 def _update_all_manifests_for_dayhoff_tools(new_version: str):
     """Update dayhoff-tools constraint in all platform manifests."""
     import re
@@ -800,8 +858,11 @@ def add_dependency(
     section_name = "dev dependencies" if dev else "main dependencies"
     print(f"Adding '{package}' to {section_name} in all platform manifests...")
 
-    # Parse package name to check for duplicates
+    # Parse package name to check for duplicates and version specs
     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:
@@ -880,11 +941,61 @@ 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:
+        print(f"\n🔍 Resolving version for '{package_name}'...")
+        resolved_version = _resolve_package_version(package_name)
+
+        if resolved_version:
+            print(f"📌 Resolved to version {resolved_version}")
+            print(
+                f"Updating manifests with version constraint '>={resolved_version}'..."
+            )
+
+            # Update all manifests to add version constraint
+            for manifest_file in manifest_files:
+                try:
+                    content = manifest_file.read_text()
+                    # Replace unversioned package with versioned one
+                    pattern = re.compile(
+                        rf'^(\s*["\']){re.escape(package_name)}(["\'],?)(.*)$',
+                        re.MULTILINE,
+                    )
+
+                    def replace_with_version(match):
+                        prefix = match.group(1)
+                        suffix = match.group(2)
+                        rest = match.group(3)
+                        return (
+                            f"{prefix}{package_name}>={resolved_version}{suffix}{rest}"
+                        )
+
+                    new_content = pattern.sub(replace_with_version, content)
+                    manifest_file.write_text(new_content)
+                    print(f"✅ Updated {manifest_file} with version constraint")
+                except Exception as e:
+                    print(f"Warning: Could not update version in {manifest_file}: {e}")
+
+            print(
+                f"\n✅ Added '{package_name}>={resolved_version}' to {added_count} platform manifest(s)"
+            )
+        else:
+            print(
+                f"⚠️  Could not resolve version for '{package_name}', left unversioned"
+            )
+
     print(
         f"\nRun {BLUE}dh tomlsync{RESET} to install the new dependency in your environment."
     )
@@ -928,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.7 → dayhoff_tools-1.11.9}/pyproject.toml

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