dayhoff-tools 1.14.15__py3-none-any.whl → 1.15.0__py3-none-any.whl

dayhoff_tools/cli/main.py

@@ -5,19 +5,13 @@ from importlib.metadata import PackageNotFoundError, version
 
 import typer
 from dayhoff_tools.cli.cloud_commands import aws_app, gcp_app
+from dayhoff_tools.cli.engine1 import engine_app as engine1_app
+from dayhoff_tools.cli.engine1 import studio_app as studio1_app
 from dayhoff_tools.cli.github_commands import gh_app
-from dayhoff_tools.cli.engine1 import (
-    engine_app as engine1_app,
-    studio_app as studio1_app,
-)
 from dayhoff_tools.cli.utility_commands import (
-    add_dependency,
     build_and_upload_wheel,
     delete_local_branch,
-    remove_dependency,
-    sync_with_toml,
     test_github_actions_locally,
-    update_dependencies,
 )
 from dayhoff_tools.warehouse import (
     _warn_if_gcp_default_sa,
@@ -48,19 +42,6 @@ app = typer.Typer(
 # Utility commands
 app.command("clean")(delete_local_branch)
 
-# Dependency Management
-app.command(
-    "tomlsync",
-    help="Sync environment with platform-specific TOML manifest (install/update dependencies).",
-)(sync_with_toml)
-app.command("add", help="Add a dependency to all platform manifests.")(add_dependency)
-app.command("remove", help="Remove a dependency from all platform manifests.")(
-    remove_dependency
-)
-app.command("update", help="Update dayhoff-tools (or all deps) and sync environment.")(
-    update_dependencies
-)
-
 # Other Utilities
 app.command("gha")(test_github_actions_locally)
 app.command("wadd")(add_to_warehouse_typer)
@@ -183,44 +164,6 @@ def build_and_upload_wheel_command(
     build_and_upload_wheel(bump_part=bump)
 
 
-# Use lazy loading for slow-loading swarm commands
-@app.command("reset")
-def reset_wrapper(
-    firestore_collection: str = typer.Option(prompt=True),
-    old_status: str = typer.Option(default="failed", prompt=True),
-    new_status: str = typer.Option(default="available", prompt=True),
-    delete_old: bool = typer.Option(default=True, prompt=True),
-):
-    """Find all the documents in the database with a given status, and
-    make a new document with the same name and a new status."""
-    from dayhoff_tools.cli.swarm_commands import reset_failed_cards
-
-    reset_failed_cards(firestore_collection, old_status, new_status, delete_old)
-
-
-@app.command("zombie")
-def zombie_wrapper(
-    firestore_collection: str = typer.Option(prompt=True),
-    delete_old: bool = typer.Option(default=True, prompt=True),
-    minutes_threshold: int = typer.Option(default=60, prompt=True),
-):
-    """Find all the documents in the database with status "assigned", and "last_updated"
-    older than a specified threshold, and make a new "available" document for them."""
-    from dayhoff_tools.cli.swarm_commands import reset_zombie_cards
-
-    reset_zombie_cards(firestore_collection, delete_old, minutes_threshold)
-
-
-@app.command("status")
-def status_wrapper(
-    firestore_collection: str = typer.Argument(),
-):
-    """Count the various statuses of items in a given collection."""
-    from dayhoff_tools.cli.swarm_commands import get_firestore_collection_status
-
-    get_firestore_collection_status(firestore_collection)
-
-
 # Deployment commands - use lazy loading but preserve argument passing
 @app.command("deploy")
 def deploy_command(

dayhoff_tools/cli/utility_commands.py

@@ -260,891 +260,3 @@ def build_and_upload_wheel(bump_part: str = "patch"):
                 print(f"Warning: Failed to revert version change: {revert_e}")
 
 
-# --- Dependency Management Commands ---
-
-
-def sync_with_toml(
-    install_project: bool = typer.Option(
-        False,
-        "--install-project",
-        "-p",
-        help="Install the local project package itself (with 'full' extras) into the environment.",
-    ),
-):
-    """Sync environment with platform-specific TOML manifest (install/update dependencies).
-
-    Behavior by platform:
-    - Workstation (STUDIO_PLATFORM=workstation) with pyproject.workstation.toml:
-      * Uses pip with constraints.txt to preserve NGC PyTorch
-      * Parses dependencies directly from pyproject.workstation.toml
-      * Installs into .venv_workstation with --system-site-packages
-    - Mac (STUDIO_PLATFORM=mac) with pyproject.mac.toml:
-      * Ensure `.mac_uv_project/pyproject.toml` is a copy of `pyproject.mac.toml`
-      * Run `uv lock` and `uv sync` in `.mac_uv_project` targeting active venv with `--active`
-      * If `install_project` is true, install the project from repo root into the active env (editable, [full])
-    - AWS (default) with pyproject.aws.toml:
-      * Uses UV in temp directory `.aws_uv_project` similar to Mac
-      * Run `uv lock` and `uv sync` targeting active venv
-    """
-    # ANSI color codes
-    BLUE = "\033[94m"
-    RESET = "\033[0m"
-
-    try:
-        platform = os.environ.get("STUDIO_PLATFORM", "aws")
-
-        # Workstation platform: use pip with constraints
-        if platform == "workstation" and Path("pyproject.workstation.toml").exists():
-            print(
-                "Installing dependencies for workstation platform (using pip + constraints)..."
-            )
-
-            # Check for constraints.txt
-            if not Path("constraints.txt").exists():
-                print(
-                    "Error: constraints.txt not found. Run direnv to generate it first."
-                )
-                sys.exit(1)
-
-            # Parse and install dependencies from pyproject.workstation.toml
-            import re
-
-            with open("pyproject.workstation.toml", "r") as f:
-                content = f.read()
-
-            # Extract dependencies list using line-by-line parsing to handle [] in package names
-            lines = content.split("\n")
-            in_deps = False
-            deps_lines = []
-
-            for line in lines:
-                if re.match(r"\s*dependencies\s*=\s*\[", line):
-                    in_deps = True
-                    continue
-                if in_deps:
-                    if re.match(r"^\s*\]\s*$", line):
-                        break
-                    deps_lines.append(line)
-
-            deps = []
-            for line in deps_lines:
-                line = line.strip()
-                if line.startswith('"') or line.startswith("'"):
-                    dep = re.sub(r'["\']', "", line)
-                    dep = re.sub(r",?\s*#.*$", "", dep)
-                    dep = dep.strip().rstrip(",")
-                    if dep:
-                        deps.append(dep)
-
-            if deps:
-                pip_cmd = (
-                    [sys.executable, "-m", "pip", "install"]
-                    + deps
-                    + ["-c", "constraints.txt"]
-                )
-                print(
-                    f"Running command: {BLUE}{' '.join(pip_cmd[:5])} ... -c constraints.txt{RESET}"
-                )
-                subprocess.run(pip_cmd, check=True)
-
-            # Install dev dependencies using line-by-line parsing
-            in_dev_groups = False
-            in_dev_list = False
-            dev_lines = []
-
-            for line in lines:
-                if re.match(r"\s*\[dependency-groups\]", line):
-                    in_dev_groups = True
-                    continue
-                if in_dev_groups and re.match(r"\s*dev\s*=\s*\[", line):
-                    in_dev_list = True
-                    continue
-                if in_dev_list:
-                    if re.match(r"^\s*\]\s*$", line):
-                        break
-                    dev_lines.append(line)
-
-            dev_deps = []
-            for line in dev_lines:
-                line = line.strip()
-                if line.startswith('"') or line.startswith("'"):
-                    dep = re.sub(r'["\']', "", line)
-                    dep = re.sub(r",?\s*#.*$", "", dep)
-                    dep = dep.strip().rstrip(",")
-                    if dep:
-                        dev_deps.append(dep)
-
-            if dev_deps:
-                print("Installing dev dependencies...")
-                pip_cmd = (
-                    [sys.executable, "-m", "pip", "install"]
-                    + dev_deps
-                    + ["-c", "constraints.txt"]
-                )
-                print(
-                    f"Running command: {BLUE}{' '.join(pip_cmd[:5])} ... -c constraints.txt{RESET}"
-                )
-                subprocess.run(pip_cmd, check=True)
-
-            # Install project if requested
-            if install_project:
-                repo_name = Path.cwd().name
-                if repo_name == "dayhoff-tools":
-                    pip_cmd = [
-                        sys.executable,
-                        "-m",
-                        "pip",
-                        "install",
-                        "-e",
-                        ".[full]",
-                        "-c",
-                        "constraints.txt",
-                    ]
-                else:
-                    pip_cmd = [
-                        sys.executable,
-                        "-m",
-                        "pip",
-                        "install",
-                        "-e",
-                        ".",
-                        "-c",
-                        "constraints.txt",
-                    ]
-                print(f"Running command: {BLUE}{' '.join(pip_cmd)}{RESET}")
-                subprocess.run(pip_cmd, check=True)
-
-            print("✅ Dependencies installed successfully (workstation)")
-            return
-
-        # Mac platform: use UV with pyproject.mac.toml
-        is_mac = platform == "mac"
-        mac_manifest = Path("pyproject.mac.toml")
-        if is_mac and mac_manifest.exists():
-            # Mac devcontainer flow
-            mac_uv_dir = Path(".mac_uv_project")
-            mac_uv_dir.mkdir(parents=True, exist_ok=True)
-            mac_pyproject = mac_uv_dir / "pyproject.toml"
-            mac_pyproject.write_text(mac_manifest.read_text())
-
-            # Copy README.md if it exists (required by some build backends)
-            if Path("README.md").exists():
-                (mac_uv_dir / "README.md").write_text(Path("README.md").read_text())
-
-            # Ensure lock matches manifest (in mac temp dir)
-            print("Ensuring lock file matches pyproject.mac.toml (Mac devcon)…")
-            lock_cmd = ["uv", "lock"]
-            print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
-            subprocess.run(
-                lock_cmd, check=True, capture_output=True, cwd=str(mac_uv_dir)
-            )
-
-            # Sync into the active environment
-            if install_project:
-                print(
-                    "Syncing dependencies into ACTIVE env (project installed separately)…"
-                )
-                sync_cmd = [
-                    "uv",
-                    "sync",
-                    "--all-groups",
-                    "--no-install-project",
-                    "--active",
-                ]
-                print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-                subprocess.run(sync_cmd, check=True, cwd=str(mac_uv_dir))
-
-                # Install project from repo root (where source code actually is)
-                # Temporarily create pyproject.toml at repo root for UV
-                print("Installing project with 'full' extras from repo root…")
-                temp_pyproject = False
-                backup_created = False
-                try:
-                    if not Path("pyproject.toml").exists():
-                        # Create temp pyproject.toml from platform manifest
-                        Path("pyproject.toml").write_text(mac_manifest.read_text())
-                        temp_pyproject = True
-                    elif Path("pyproject.toml").is_symlink():
-                        # Backup existing symlink
-                        Path("pyproject.toml").rename("pyproject.toml.sync.bak")
-                        Path("pyproject.toml").write_text(mac_manifest.read_text())
-                        backup_created = True
-
-                    pip_install_cmd = ["uv", "pip", "install", "-e", ".[full]"]
-                    print(f"Running command: {BLUE}{' '.join(pip_install_cmd)}{RESET}")
-                    subprocess.run(pip_install_cmd, check=True)
-                    print("Project installed with 'full' extras successfully.")
-                finally:
-                    # Clean up temp pyproject.toml
-                    if temp_pyproject and Path("pyproject.toml").exists():
-                        Path("pyproject.toml").unlink()
-                    if backup_created and Path("pyproject.toml.sync.bak").exists():
-                        Path("pyproject.toml.sync.bak").rename("pyproject.toml")
-            else:
-                print("Syncing dependencies into ACTIVE env (project not installed)…")
-                sync_cmd = [
-                    "uv",
-                    "sync",
-                    "--all-groups",
-                    "--no-install-project",
-                    "--active",
-                ]
-                print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-                subprocess.run(sync_cmd, check=True, cwd=str(mac_uv_dir))
-                print("Dependencies synced successfully (project not installed).")
-        else:
-            # AWS platform (or fallback): use UV with pyproject.aws.toml
-            aws_manifest = Path("pyproject.aws.toml")
-            if aws_manifest.exists():
-                # AWS devcontainer flow (similar to Mac)
-                aws_uv_dir = Path(".aws_uv_project")
-                aws_uv_dir.mkdir(parents=True, exist_ok=True)
-                aws_pyproject = aws_uv_dir / "pyproject.toml"
-                aws_pyproject.write_text(aws_manifest.read_text())
-
-                # Copy README.md if it exists (required by some build backends)
-                if Path("README.md").exists():
-                    (aws_uv_dir / "README.md").write_text(Path("README.md").read_text())
-
-                # Ensure lock matches manifest (in aws temp dir)
-                print("Ensuring lock file matches pyproject.aws.toml (AWS devcon)…")
-                lock_cmd = ["uv", "lock"]
-                print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
-                subprocess.run(
-                    lock_cmd, check=True, capture_output=True, cwd=str(aws_uv_dir)
-                )
-
-                # Sync into the active environment
-                if install_project:
-                    print(
-                        "Syncing dependencies into ACTIVE env (project installed separately)…"
-                    )
-                    sync_cmd = [
-                        "uv",
-                        "sync",
-                        "--all-groups",
-                        "--no-install-project",
-                        "--active",
-                    ]
-                    print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-                    subprocess.run(sync_cmd, check=True, cwd=str(aws_uv_dir))
-
-                    # Install project from repo root (where source code actually is)
-                    # Temporarily create pyproject.toml at repo root for UV
-                    print("Installing project with 'full' extras from repo root…")
-                    temp_pyproject = False
-                    backup_created = False
-                    try:
-                        if not Path("pyproject.toml").exists():
-                            # Create temp pyproject.toml from platform manifest
-                            Path("pyproject.toml").write_text(aws_manifest.read_text())
-                            temp_pyproject = True
-                        elif Path("pyproject.toml").is_symlink():
-                            # Backup existing symlink
-                            Path("pyproject.toml").rename("pyproject.toml.sync.bak")
-                            Path("pyproject.toml").write_text(aws_manifest.read_text())
-                            backup_created = True
-
-                        pip_install_cmd = ["uv", "pip", "install", "-e", ".[full]"]
-                        print(
-                            f"Running command: {BLUE}{' '.join(pip_install_cmd)}{RESET}"
-                        )
-                        subprocess.run(pip_install_cmd, check=True)
-                        print("Project installed with 'full' extras successfully.")
-                    finally:
-                        # Clean up temp pyproject.toml
-                        if temp_pyproject and Path("pyproject.toml").exists():
-                            Path("pyproject.toml").unlink()
-                        if backup_created and Path("pyproject.toml.sync.bak").exists():
-                            Path("pyproject.toml.sync.bak").rename("pyproject.toml")
-                else:
-                    print(
-                        "Syncing dependencies into ACTIVE env (project not installed)…"
-                    )
-                    sync_cmd = [
-                        "uv",
-                        "sync",
-                        "--all-groups",
-                        "--no-install-project",
-                        "--active",
-                    ]
-                    print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-                    subprocess.run(sync_cmd, check=True, cwd=str(aws_uv_dir))
-                    print("Dependencies synced successfully (project not installed).")
-            else:
-                print(
-                    "Error: No platform-specific manifest found (pyproject.aws.toml, pyproject.mac.toml, or pyproject.workstation.toml)"
-                )
-                sys.exit(1)
-
-    except subprocess.CalledProcessError as e:
-        stderr_output = e.stderr.decode() if e.stderr else "No stderr output."
-        print(f"Error occurred during dependency installation/sync: {e}")
-        print(f"Stderr: {stderr_output}")
-        if "NoSolution" in stderr_output:
-            print(
-                "\nHint: Could not find a compatible set of dependencies. Check constraints in pyproject.toml."
-            )
-        sys.exit(1)
-    except FileNotFoundError:
-        print("Error: 'uv' command not found. Is uv installed and in PATH?")
-        sys.exit(1)
-    except Exception as e:
-        print(f"An unexpected error occurred: {e}")
-        sys.exit(1)
-
-
-def _get_all_platform_manifests():
-    """Get list of all platform manifests that exist."""
-    manifest_files = []
-    for fname in [
-        "pyproject.aws.toml",
-        "pyproject.mac.toml",
-        "pyproject.workstation.toml",
-    ]:
-        if Path(fname).exists():
-            manifest_files.append(Path(fname))
-    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
-
-    manifest_files = _get_all_platform_manifests()
-
-    if not manifest_files:
-        print("Warning: No platform manifests found to update.")
-        return
-
-    package_name = "dayhoff-tools"
-    package_name_esc = re.escape(package_name)
-
-    # Regex to match the dependency line, with optional extras and version spec
-    pattern = re.compile(
-        rf"^(\s*['\"]){package_name_esc}(\[[^]]+\])?(?:[><=~^][^'\"]*)?(['\"].*)$",
-        re.MULTILINE,
-    )
-
-    new_constraint_text = f">={new_version}"
-
-    def _repl(match: re.Match):
-        prefix = match.group(1)
-        extras = match.group(2) or ""
-        suffix = match.group(3)
-        return f"{prefix}{package_name}{extras}{new_constraint_text}{suffix}"
-
-    # Update all manifest files
-    for manifest_file in manifest_files:
-        try:
-            print(f"Updating {manifest_file} version constraint...")
-            content = manifest_file.read_text()
-            new_content, num_replacements = pattern.subn(_repl, content)
-            if num_replacements > 0:
-                manifest_file.write_text(new_content)
-                print(
-                    f"Updated dayhoff-tools constraint in {manifest_file} to '{new_constraint_text}'"
-                )
-            else:
-                print(
-                    f"Warning: Could not find dayhoff-tools dependency line in {manifest_file}"
-                )
-        except Exception as e:
-            print(f"Error updating {manifest_file}: {e}")
-
-
-def add_dependency(
-    package: str,
-    dev: bool = typer.Option(
-        False, "--dev", "-d", help="Add to dev dependencies instead of main."
-    ),
-):
-    """Add a dependency to all platform-specific manifests.
-
-    Args:
-        package: Package specification (e.g., "numpy>=1.24.0" or "pandas")
-        dev: If True, add to [dependency-groups] dev instead of [project] dependencies
-    """
-    import re
-
-    # ANSI color codes
-    BLUE = "\033[94m"
-    RESET = "\033[0m"
-
-    manifest_files = _get_all_platform_manifests()
-
-    if not manifest_files:
-        print(
-            "Error: No platform-specific manifests found (pyproject.aws.toml, pyproject.mac.toml, or pyproject.workstation.toml)"
-        )
-        sys.exit(1)
-
-    # Determine section to add to
-    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 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:
-            content = manifest_file.read_text()
-
-            # Check if package already exists
-            existing_check = re.search(
-                rf'^(\s*["\']){re.escape(package_name)}[<>=~!\[]',
-                content,
-                re.MULTILINE,
-            )
-            if existing_check:
-                print(
-                    f"⚠️  Package '{package_name}' already exists in {manifest_file}, skipping"
-                )
-                continue
-
-            if dev:
-                # Add to [dependency-groups] dev section
-                # Use line-by-line parsing to handle [] in dependency names like dayhoff-tools[full]
-                lines = content.split("\n")
-                in_dev_groups = False
-                in_dev_list = False
-                dev_start_idx = None
-                dev_end_idx = None
-
-                for idx, line in enumerate(lines):
-                    if re.match(r"\s*\[dependency-groups\]", line):
-                        in_dev_groups = True
-                        continue
-                    if in_dev_groups and re.match(r"\s*dev\s*=\s*\[", line):
-                        in_dev_list = True
-                        dev_start_idx = idx
-                        continue
-                    if in_dev_list and re.match(r"^\s*\]\s*$", line):
-                        dev_end_idx = idx
-                        break
-
-                if dev_start_idx is None or dev_end_idx is None:
-                    print(
-                        f"Warning: Could not find [dependency-groups] dev section in {manifest_file}"
-                    )
-                    continue
-
-                # Insert new dependency before the closing ]
-                new_dep = f'    "{package}",'
-                lines.insert(dev_end_idx, new_dep)
-                new_content = "\n".join(lines)
-            else:
-                # Add to [project] dependencies section
-                # Use line-by-line parsing to handle [] in dependency names like dayhoff-tools[full]
-                lines = content.split("\n")
-                in_deps = False
-                deps_start_idx = None
-                deps_end_idx = None
-
-                for idx, line in enumerate(lines):
-                    if re.match(r"\s*dependencies\s*=\s*\[", line):
-                        in_deps = True
-                        deps_start_idx = idx
-                        continue
-                    if in_deps and re.match(r"^\s*\]\s*$", line):
-                        deps_end_idx = idx
-                        break
-
-                if deps_start_idx is None or deps_end_idx is None:
-                    print(
-                        f"Warning: Could not find dependencies section in {manifest_file}"
-                    )
-                    continue
-
-                # Insert new dependency before the closing ]
-                new_dep = f'    "{package}",'
-                lines.insert(deps_end_idx, new_dep)
-                new_content = "\n".join(lines)
-
-            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}")
-
-    # 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."
-    )
-
-
-def remove_dependency(
-    package: str,
-    dev: bool = typer.Option(
-        False, "--dev", "-d", help="Remove from dev dependencies instead of main."
-    ),
-):
-    """Remove a dependency from all platform-specific manifests.
-
-    Args:
-        package: Package name (e.g., "numpy" or "pandas")
-        dev: If True, remove from [dependency-groups] dev instead of [project] dependencies
-    """
-    import re
-
-    # ANSI color codes
-    BLUE = "\033[94m"
-    RESET = "\033[0m"
-
-    manifest_files = _get_all_platform_manifests()
-
-    if not manifest_files:
-        print(
-            "Error: No platform-specific manifests found (pyproject.aws.toml, pyproject.mac.toml, or pyproject.workstation.toml)"
-        )
-        sys.exit(1)
-
-    section_name = "dev dependencies" if dev else "main dependencies"
-    print(f"Removing '{package}' from {section_name} in all platform manifests...")
-
-    # Escape package name for regex
-    package_esc = re.escape(package)
-
-    removed_count = 0
-    for manifest_file in manifest_files:
-        try:
-            content = manifest_file.read_text()
-
-            # Pattern to match the dependency line (with optional version spec)
-            # Matches:  "package...",  or  "package...",\n (including the newline)
-            pattern = re.compile(
-                rf'^\s*["\']({package_esc}[<>=~!\[].+?|{package_esc})["\'],?\s*(?:#.*)?$\n?',
-                re.MULTILINE,
-            )
-
-            new_content, num_removed = pattern.subn("", content)
-
-            if num_removed > 0:
-                # 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
-            else:
-                print(f"⚠️  Package '{package}' not found in {manifest_file}")
-
-        except Exception as e:
-            print(f"Error updating {manifest_file}: {e}")
-
-    if removed_count > 0:
-        print(f"\n✅ Removed '{package}' from {removed_count} platform manifest(s)")
-        print(
-            f"\nRun {BLUE}dh tomlsync{RESET} to uninstall the dependency from your environment."
-        )
-    else:
-        print(f"\n⚠️  Package '{package}' was not found in any manifests")
-
-
-def update_dependencies(
-    update_all: bool = typer.Option(
-        False,
-        "--all",
-        "-a",
-        help="Update all dependencies instead of just dayhoff-tools.",
-    ),
-):
-    """Update dependencies to newer versions (platform-aware).
-
-    - Default Action (no flags): Updates only 'dayhoff-tools' package to latest,
-      updates ALL manifest files with the version constraint, and syncs.
-    - Flags:
-      --all/-a: Updates all dependencies and syncs.
-
-    Cross-platform behavior:
-    - Workstation: Uses pip to upgrade packages, regenerates constraints.txt
-    - Mac/AWS: Uses UV with platform-specific manifests (.mac_uv_project or .aws_uv_project)
-    - Always updates ALL platform manifests (pyproject.aws.toml, pyproject.mac.toml,
-      pyproject.workstation.toml) to ensure version consistency
-    """
-    # ANSI color codes
-    BLUE = "\033[94m"
-    RESET = "\033[0m"
-
-    platform = os.environ.get("STUDIO_PLATFORM", "aws")
-
-    # Workstation platform: use pip upgrade
-    if platform == "workstation" and Path("pyproject.workstation.toml").exists():
-        print("Updating dependencies for workstation platform (using pip)...")
-
-        if update_all:
-            print("Error: --all flag not supported on workstation platform yet.")
-            print("Use 'pip install --upgrade <package>' manually for now.")
-            sys.exit(1)
-
-        # Update dayhoff-tools only (default behavior)
-        print("Upgrading dayhoff-tools to latest version...")
-        upgrade_cmd = [
-            sys.executable,
-            "-m",
-            "pip",
-            "install",
-            "--upgrade",
-            "dayhoff-tools[full]",
-        ]
-        print(f"Running command: {BLUE}{' '.join(upgrade_cmd)}{RESET}")
-        subprocess.run(upgrade_cmd, check=True)
-
-        # Get new version
-        result = subprocess.run(
-            [sys.executable, "-m", "pip", "show", "dayhoff-tools"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        version_line = [
-            l for l in result.stdout.split("\n") if l.startswith("Version:")
-        ]
-        if version_line:
-            new_version = version_line[0].split(":", 1)[1].strip()
-            print(f"Updated to dayhoff-tools {new_version}")
-
-            # Update all platform manifests with new constraint
-            _update_all_manifests_for_dayhoff_tools(new_version)
-
-        print("✅ Dependencies updated successfully (workstation)")
-        return
-
-    # Mac/AWS platforms: use UV
-    mac_manifest = Path("pyproject.mac.toml")
-    aws_manifest = Path("pyproject.aws.toml")
-    mac_uv_dir = Path(".mac_uv_project")
-    aws_uv_dir = Path(".aws_uv_project")
-    lock_file_path = Path("uv.lock")
-
-    # Determine action based on flags
-    lock_cmd = ["uv", "lock"]
-    action_description = ""
-    run_pyproject_update = False
-
-    if update_all:
-        lock_cmd.append("--upgrade")
-        action_description = (
-            "Updating lock file for all dependencies to latest versions..."
-        )
-    else:  # Default behavior: update dayhoff-tools
-        lock_cmd.extend(["--upgrade-package", "dayhoff-tools"])
-        action_description = (
-            "Updating dayhoff-tools lock and pyproject.toml (default behavior)..."
-        )
-        run_pyproject_update = (
-            True  # Only update pyproject if we are doing the dayhoff update
-        )
-
-    try:
-        # Choose working directory for uv operations based on platform
-        uv_cwd = None
-        manifest_path_for_constraint = None
-
-        if platform == "mac" and mac_manifest.exists():
-            mac_uv_dir.mkdir(parents=True, exist_ok=True)
-            (mac_uv_dir / "pyproject.toml").write_text(mac_manifest.read_text())
-            # Copy README.md if it exists (required by some build backends)
-            if Path("README.md").exists():
-                (mac_uv_dir / "README.md").write_text(Path("README.md").read_text())
-            uv_cwd = str(mac_uv_dir)
-            lock_file_path = mac_uv_dir / "uv.lock"
-            manifest_path_for_constraint = mac_manifest
-        elif aws_manifest.exists():
-            # AWS platform (default)
-            aws_uv_dir.mkdir(parents=True, exist_ok=True)
-            (aws_uv_dir / "pyproject.toml").write_text(aws_manifest.read_text())
-            # Copy README.md if it exists (required by some build backends)
-            if Path("README.md").exists():
-                (aws_uv_dir / "README.md").write_text(Path("README.md").read_text())
-            uv_cwd = str(aws_uv_dir)
-            lock_file_path = aws_uv_dir / "uv.lock"
-            manifest_path_for_constraint = aws_manifest
-        else:
-            print(
-                "Error: No platform-specific manifest found (pyproject.aws.toml or pyproject.mac.toml)"
-            )
-            sys.exit(1)
-
-        # Step 1: Run the update lock command
-        print(action_description)
-        print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
-        subprocess.run(lock_cmd, check=True, capture_output=True, cwd=uv_cwd)
-
-        # Step 2: Update both manifest files if doing the dayhoff update (default)
-        if run_pyproject_update:
-            print(f"Reading {lock_file_path} to find new dayhoff-tools version...")
-            if not lock_file_path.exists():
-                print(f"Error: {lock_file_path} not found after lock command.")
-                return
-            locked_version = None
-            try:
-                lock_data = toml.load(lock_file_path)
-                for package in lock_data.get("package", []):
-                    if package.get("name") == "dayhoff-tools":
-                        locked_version = package.get("version")
-                        break
-            except toml.TomlDecodeError as e:
-                print(f"Error parsing {lock_file_path}: {e}")
-                return
-            except Exception as e:
-                print(f"Error reading lock file: {e}")
-                return
-
-            if not locked_version:
-                print(
-                    f"Error: Could not find dayhoff-tools version in {lock_file_path}."
-                )
-                return
-
-            print(f"Found dayhoff-tools version {locked_version} in lock file.")
-
-            # Update all platform manifest files to ensure consistency
-            _update_all_manifests_for_dayhoff_tools(locked_version)
-
-        # Step 3: Sync environment
-        print("Syncing environment with updated lock file...")
-        # Always use --no-install-project for updates
-        sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project", "--active"]
-        print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-        subprocess.run(sync_cmd, check=True, cwd=uv_cwd)
-
-        # Final status message
-        if update_all:
-            print("All dependencies updated and environment synced successfully.")
-        else:  # Default case (dayhoff update)
-            print(
-                "dayhoff-tools updated, manifest files modified, and environment synced successfully."
-            )
-
-    except subprocess.CalledProcessError as e:
-        stderr_output = e.stderr.decode() if e.stderr else "No stderr output."
-        print(f"Error occurred during dependency update/sync: {e}")
-        print(f"Stderr: {stderr_output}")
-        if "NoSolution" in stderr_output:
-            print(
-                "\nHint: Could not find a compatible set of dependencies. Check constraints in pyproject.toml."
-            )
-        elif "unrecognized arguments: --upgrade" in stderr_output:
-            print(
-                "\nHint: Your version of 'uv' might be too old to support '--upgrade'. Try updating uv."
-            )
-        sys.exit(1)
-    except FileNotFoundError:
-        print("Error: 'uv' command not found. Is uv installed and in PATH?")
-        sys.exit(1)
-    except Exception as e:
-        print(f"An unexpected error occurred: {e}")
-        sys.exit(1)

{dayhoff_tools-1.14.15.dist-info → dayhoff_tools-1.15.0.dist-info}/METADATA

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

{dayhoff_tools-1.14.15.dist-info → dayhoff_tools-1.15.0.dist-info}/RECORD

@@ -48,9 +48,9 @@ dayhoff_tools/cli/engines_studios/simulators/studio_status_simulator.py,sha256=6
 dayhoff_tools/cli/engines_studios/ssh_config.py,sha256=UCv-jf_zSuk7FUStkCQBAJz1QkxiSEwZbdSrwt_9SMU,2932
 dayhoff_tools/cli/engines_studios/studio_commands.py,sha256=KGSNZQS8MmM_DfQzT9SRZvuR3OK6NdIdOrqI2wJFyes,25984
 dayhoff_tools/cli/github_commands.py,sha256=pfrxI68LObGm_gtPlQN-gHPahHV4l9k9T4GqO99NNL0,8948
-dayhoff_tools/cli/main.py,sha256=6ffnaFzui-bVd1ME7yThk_ZrMOofwStamEUkkYlminY,8503
+dayhoff_tools/cli/main.py,sha256=E4UXtOBRRAhcrJ3RgLCQFpJdamFN-p9xViMkX45kNgw,6456
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
-dayhoff_tools/cli/utility_commands.py,sha256=O6vy3rONTeuPYZyhjnFeqf8GxUlyc7i2O11d1s3shH4,45513
+dayhoff_tools/cli/utility_commands.py,sha256=IMFd20OZrl0vIGL7Xrg3OoHNxOhG5KdeeieAUctolUk,9834
 dayhoff_tools/deployment/base.py,sha256=uZnFvnPQx6pH_HmJbdThweAs3BrxMaDohpE3iX_-yk4,18377
 dayhoff_tools/deployment/deploy_aws.py,sha256=1j16aE4hmln4pQVtcSGuIGVWbOBfWwveytvihjofADo,21519
 dayhoff_tools/deployment/deploy_gcp.py,sha256=xgaOVsUDmP6wSEMYNkm1yRNcVskfdz80qJtCulkBIAM,8860
@@ -71,7 +71,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.14.15.dist-info/METADATA,sha256=YBP4lpBDAIhxYuJ65DR_ADrajk6hyLC1e_UCVc_bwx8,3136
-dayhoff_tools-1.14.15.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-dayhoff_tools-1.14.15.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.14.15.dist-info/RECORD,,
+dayhoff_tools-1.15.0.dist-info/METADATA,sha256=YvxzOOhTeXVfO3NVsZ16ciDQME_kK3YYaNwbRKkIBso,3135
+dayhoff_tools-1.15.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+dayhoff_tools-1.15.0.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.15.0.dist-info/RECORD,,