dh-cli 0.13.0__tar.gz → 0.13.3__tar.gz

{dh_cli-0.13.0 → dh_cli-0.13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dh-cli
-Version: 0.13.0
+Version: 0.13.3
 Summary: Dayhoff Labs developer CLI
 Author-email: Dayhoff Labs <dev@dayhofflabs.com>
 License: # PolyForm Noncommercial License 1.0.0
@@ -131,7 +131,6 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: questionary>=2.0.1
 Requires-Dist: requests>=2.31.0
-Requires-Dist: toml>=0.10
 Requires-Dist: typer>=0.9.0
 Provides-Extra: h5
 Requires-Dist: h5py>=3.0; extra == 'h5'

{dh_cli-0.13.0 → dh_cli-0.13.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dh-cli"
-version = "0.13.0"
+version = "0.13.3"
 description = "Dayhoff Labs developer CLI"
 requires-python = ">=3.11"
 readme = "README.md"
@@ -20,7 +20,6 @@ dependencies = [
     "pyyaml>=6.0",
     "questionary>=2.0.1",
     "requests>=2.31.0",
-    "toml>=0.10",
     "typer>=0.9.0",
 ]
 

{dh_cli-0.13.0 → dh_cli-0.13.3}/src/dh_cli/bedrock/cost_report.py

@@ -113,6 +113,7 @@ _BASE_MODELS = (
     "sonnet-4-5",
     "haiku-4-5",
     "fable-5",
+    "fable-5-1",
 )
 
 
@@ -122,9 +123,13 @@ def resolve_base_model(model_id: str) -> str:
         if stripped.startswith(prefix):
             stripped = stripped[len(prefix) :]
             break
-    for base in _BASE_MODELS:
-        if base in stripped:
-            return base
+    # Longest match wins: one base model's name can be a prefix of another's
+    # (`fable-5` inside `claude-fable-5-1`), and a first match would silently
+    # price the newer model at the older one's rates. Matching on length rather
+    # than position keeps `_BASE_MODELS` order irrelevant.
+    matches = [base for base in _BASE_MODELS if base in stripped]
+    if matches:
+        return max(matches, key=len)
     raise UnknownModel(f"Unrecognized modelId: {model_id}")
 
 

{dh_cli-0.13.0 → dh_cli-0.13.3}/src/dh_cli/bedrock/pricing.yaml

@@ -26,6 +26,12 @@ models:
     output_per_1m: 50.00
     cache_write_per_1m: 12.50
     cache_read_per_1m: 1.00
+  fable-5-1:
+    input_per_1m: 10.00
+    output_per_1m: 50.00
+    cache_write_per_1m: 12.50
+    # Fable 5.1 cut cache reads 75% vs Fable 5; the only rate that differs.
+    cache_read_per_1m: 0.25
   sonnet-5:
     input_per_1m: 2.00
     output_per_1m: 10.00

{dh_cli-0.13.0 → dh_cli-0.13.3}/src/dh_cli/github_commands.py

@@ -41,6 +41,12 @@ NC = "\033[0m"
 MAX_PAT_AGE_DAYS = 90
 WARN_PAT_AGE_DAYS = 87
 
+# Account that holds the github-pat/* secrets (dev). Used only to turn a
+# ResourceNotFound into a "you're in the wrong account" diagnosis; the
+# authoritative grant is the per-secret resource policy in
+# blueprints/terraform/environments/dev/github_pat_secrets.tf.
+PAT_ACCOUNT_ID = "074735440724"
+
 # Path to the gh hosts file (resolved at call time via Path.home()).
 _HOSTS_YML_RELATIVE = Path(".config") / "gh" / "hosts.yml"
 
@@ -178,6 +184,46 @@ def _access_denied_diagnosis(session, requested_handle: str) -> None:
     raise typer.Exit(1)
 
 
+def _not_found_diagnosis(session, secret_id: str) -> None:
+    """Explain a ResourceNotFound on the PAT secret. Always exits 1.
+
+    A not-found is far more often a wrong-account session than
+    un-provisioned Terraform: `awslogin <admin-profile>` persists
+    AWS_PROFILE into ~/.bashrc, so every subsequent shell talks to that
+    account, where `github-pat/*` genuinely does not exist. Name the
+    account mismatch before sending anyone to an admin.
+    """
+    try:
+        arn = session.client("sts").get_caller_identity()["Arn"]
+        # arn:aws:sts::<account>:assumed-role/... — account is field 4.
+        # Parsed from the ARN rather than GetCallerIdentity's "Account"
+        # because the ARN is the identity fact this module already
+        # trusts for handle resolution (see _identity.py).
+        account = arn.split(":")[4]
+    except Exception:  # noqa: BLE001 — diagnosis must not mask the original error
+        account = ""
+
+    if account and account != PAT_ACCOUNT_ID:
+        typer.echo(
+            RED
+            + f"Secret `{secret_id}` not found — your session is in account "
+            + f"{account}, but GitHub PATs live in {PAT_ACCOUNT_ID} (dev). "
+            + "Run `awslogin dev-devaccess` and retry."
+            + NC,
+            err=True,
+        )
+    else:
+        typer.echo(
+            RED
+            + f"GitHub PAT secret `{secret_id}` does not exist. "
+            + "Ask an admin to run the Terraform that provisions "
+            + "per-developer github_pat_secrets."
+            + NC,
+            err=True,
+        )
+    raise typer.Exit(1)
+
+
 def _fetch_pat_and_metadata(session, handle: str) -> Tuple[str, dt.datetime]:
     """Fetch the PAT and its CreatedDate from Secrets Manager.
 
@@ -192,15 +238,7 @@ def _fetch_pat_and_metadata(session, handle: str) -> Tuple[str, dt.datetime]:
     try:
         describe = sm.describe_secret(SecretId=secret_id)
     except sm.exceptions.ResourceNotFoundException:
-        typer.echo(
-            RED
-            + f"GitHub PAT secret `{secret_id}` does not exist. "
-            + "Ask an admin to run the Terraform that provisions "
-            + "per-developer github_pat_secrets."
-            + NC,
-            err=True,
-        )
-        raise typer.Exit(1)
+        _not_found_diagnosis(session, secret_id)
     except botocore.exceptions.ClientError as exc:
         code = exc.response.get("Error", {}).get("Code", "")
         if code == "AccessDeniedException":
@@ -623,15 +661,7 @@ def gh_rotate(
     try:
         describe = sm.describe_secret(SecretId=secret_id)
     except sm.exceptions.ResourceNotFoundException:
-        typer.echo(
-            RED
-            + f"GitHub PAT secret `{secret_id}` does not exist. "
-            + "Ask an admin to run the Terraform that provisions "
-            + "per-developer github_pat_secrets."
-            + NC,
-            err=True,
-        )
-        raise typer.Exit(1)
+        _not_found_diagnosis(session, secret_id)
     except botocore.exceptions.ClientError as exc:
         code = exc.response.get("Error", {}).get("Code", "")
         if code == "AccessDeniedException":

{dh_cli-0.13.0 → dh_cli-0.13.3}/src/dh_cli/main.py

@@ -7,7 +7,6 @@ import typer
 from dh_cli.cloud_commands import aws_app, gcp_app
 from dh_cli.github_commands import gh_app
 from dh_cli.sweep import sweep
-from dh_cli.utility_commands import build_and_upload_wheel
 from dh_cli.warehouse import get_from_warehouse_typer
 
 
@@ -112,7 +111,7 @@ def _version_option(
 @app.command("wheel")
 def wheel_command(
     target: str = typer.Argument(
-        help="What to publish: 'cli', 'batch', 'embedders', 'chem', or 'legacy' (PyPI).",
+        help="What to publish: 'cli', 'batch', 'embedders', or 'chem'.",
     ),
     bump: str = typer.Option(
         "patch",
@@ -146,7 +145,6 @@ def wheel_command(
       batch      Build and publish dh-batch to CodeArtifact
       embedders  Build and publish dh-embedders to CodeArtifact
       chem       Build and publish dh-chem to CodeArtifact
-      legacy     Build and publish dayhoff-tools to PyPI (default)
     """
     from dh_cli.codeartifact import PACKAGE_DIRS
 
@@ -160,10 +158,8 @@ def wheel_command(
             dry_run=dry_run,
             skip_pypi=no_pypi,
         )
-    elif target == "legacy":
-        build_and_upload_wheel(bump_part=bump)
     else:
-        typer.echo(f"Unknown target '{target}'. Use 'cli', 'batch', 'embedders', 'chem', or 'legacy'.")
+        typer.echo(f"Unknown target '{target}'. Use 'cli', 'batch', 'embedders', or 'chem'.")
         raise typer.Exit(1)
 
 

dh_cli-0.13.3/tests/bedrock/test_resolve_base_model.py

@@ -0,0 +1,98 @@
+"""Model-ID resolution tests.
+
+A Bedrock modelId can appear in three shapes for the same underlying
+model:
+  - direct:   anthropic.claude-opus-4-7
+  - US profile: us.anthropic.claude-opus-4-7
+  - Global profile: global.anthropic.claude-opus-4-7
+
+`resolve_base_model` must collapse all three to the same pricing key.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+
+@pytest.mark.parametrize(
+    "model_id, expected_base",
+    [
+        ("anthropic.claude-opus-4-7", "opus-4-7"),
+        ("us.anthropic.claude-opus-4-7", "opus-4-7"),
+        ("global.anthropic.claude-opus-4-7", "opus-4-7"),
+        ("anthropic.claude-opus-4-8", "opus-4-8"),
+        ("us.anthropic.claude-opus-4-8", "opus-4-8"),
+        ("global.anthropic.claude-opus-4-8", "opus-4-8"),
+        ("anthropic.claude-opus-4-6-v1", "opus-4-6"),
+        ("us.anthropic.claude-opus-4-6-v1", "opus-4-6"),
+        ("global.anthropic.claude-opus-4-6-v1", "opus-4-6"),
+        ("anthropic.claude-sonnet-4-6", "sonnet-4-6"),
+        ("us.anthropic.claude-sonnet-4-6", "sonnet-4-6"),
+        ("global.anthropic.claude-sonnet-4-6", "sonnet-4-6"),
+        ("anthropic.claude-haiku-4-5-20251001-v1:0", "haiku-4-5"),
+        ("us.anthropic.claude-haiku-4-5-20251001-v1:0", "haiku-4-5"),
+        ("global.anthropic.claude-haiku-4-5-20251001-v1:0", "haiku-4-5"),
+        ("anthropic.claude-fable-5", "fable-5"),
+        ("us.anthropic.claude-fable-5", "fable-5"),
+        ("global.anthropic.claude-fable-5", "fable-5"),
+        # A base model whose name is a prefix of a newer one must not swallow
+        # it: `fable-5` is a substring of `claude-fable-5-1`, so a first-match
+        # or badly-ordered scan silently prices 5.1 as 5. The two differ only
+        # in cache reads ($1.00/M vs $0.25/M), so the error is invisible in
+        # every other column.
+        ("anthropic.claude-fable-5-1", "fable-5-1"),
+        ("us.anthropic.claude-fable-5-1", "fable-5-1"),
+        ("global.anthropic.claude-fable-5-1", "fable-5-1"),
+    ],
+)
+def test_resolve_base_model_known(model_id: str, expected_base: str):
+    from dh_cli.bedrock.cost_report import resolve_base_model
+
+    assert resolve_base_model(model_id) == expected_base
+
+
+def test_resolve_prefers_the_most_specific_base():
+    """Resolution must not depend on `_BASE_MODELS` ordering.
+
+    Reversing the tuple would flip a first-match implementation's answer.
+    """
+    from dh_cli.bedrock import cost_report
+
+    original = cost_report._BASE_MODELS
+    try:
+        cost_report._BASE_MODELS = tuple(reversed(original))
+        assert cost_report.resolve_base_model("global.anthropic.claude-fable-5-1") == "fable-5-1"
+        assert cost_report.resolve_base_model("global.anthropic.claude-fable-5") == "fable-5"
+    finally:
+        cost_report._BASE_MODELS = original
+
+
+def test_every_base_model_has_pricing():
+    """A resolvable base with no pricing row raises only at report time."""
+    from dh_cli.bedrock.cost_report import (
+        _BASE_MODELS,
+        default_pricing_path,
+        load_pricing,
+    )
+
+    pricing = load_pricing(default_pricing_path())
+    missing = [base for base in _BASE_MODELS if base not in pricing]
+    assert not missing, f"base models with no pricing entry: {missing}"
+
+
+def test_fable_51_cache_reads_are_priced_below_fable_5():
+    """The one rate that differs between the two Fable versions."""
+    from dh_cli.bedrock.cost_report import default_pricing_path, load_pricing
+
+    pricing = load_pricing(default_pricing_path())
+    assert pricing["fable-5-1"]["cache_read_per_1m"] == 0.25
+    assert pricing["fable-5"]["cache_read_per_1m"] == 1.00
+    for rate in ("input_per_1m", "output_per_1m", "cache_write_per_1m"):
+        assert pricing["fable-5-1"][rate] == pricing["fable-5"][rate]
+
+
+def test_resolve_base_model_unknown_raises():
+    from dh_cli.bedrock.cost_report import UnknownModel, resolve_base_model
+
+    with pytest.raises(UnknownModel):
+        resolve_base_model("global.anthropic.claude-someshinynew-99-v42")

{dh_cli-0.13.0 → dh_cli-0.13.3}/tests/github/test_login_error_paths.py

@@ -80,6 +80,36 @@ def test_login_secret_not_found_tells_user_to_ask_admin(fake_subprocess, patch_g
     assert "--init" not in combined
 
 
+def test_login_secret_not_found_in_wrong_account_says_wrong_account(fake_subprocess, patch_gh_path, tmp_hosts_yml):
+    """A not-found in a non-dev account is a wrong-profile error.
+
+    Regression: `awslogin admin-secadmin` persists AWS_PROFILE into
+    ~/.bashrc, so every later shell talks to the admin account, where
+    github-pat/* genuinely does not exist. The old message blamed
+    un-provisioned Terraform and sent the user to an admin.
+    """
+    session = make_session(arn="arn:aws:sts::293882909581:assumed-role/AWSReservedSSO_SecurityAdministrator_abc123/dma")
+    err_response = {
+        "Error": {
+            "Code": "ResourceNotFoundException",
+            "Message": "Secrets Manager can't find the specified secret.",
+        }
+    }
+    session._sm.describe_secret.side_effect = session._sm.exceptions.ResourceNotFoundException(
+        err_response, "DescribeSecret"
+    )
+
+    result = _invoke([], session=session, fake_subprocess=fake_subprocess)
+    assert result.exit_code != 0
+    combined = _all(result)
+    # Names both accounts so the user can see the mismatch.
+    assert "293882909581" in combined
+    assert "074735440724" in combined
+    # Points at the fix, not at an admin.
+    assert "awslogin dev-devaccess" in combined
+    assert "ask an admin" not in combined.lower()
+
+
 def test_login_empty_secret_suggests_rotate_init(fake_subprocess, patch_gh_path, tmp_hosts_yml):
     # Secret exists but no AWSCURRENT version — new-hire state.
     session = make_session(version_stages={})

dh_cli-0.13.0/src/dh_cli/utility_commands.py

@@ -1,194 +0,0 @@
-"""CLI commands common to all repos."""
-
-import os
-import re
-import shutil
-import subprocess
-from pathlib import Path
-
-import toml
-
-# Import cloud helper lazily inside functions to avoid heavy deps at module load
-
-
-def get_current_version_from_toml(file_path="pyproject.toml"):
-    """Reads the version from a pyproject.toml file."""
-    try:
-        with open(file_path, "r") as f:
-            content = f.read()
-        version_match = re.search(r'^version\s*=\s*"([^"]+)"', content, re.MULTILINE)
-        if version_match:
-            return version_match.group(1)
-        else:
-            raise ValueError(f"Could not find version string in {file_path}")
-    except FileNotFoundError:
-        raise FileNotFoundError(f"{file_path} not found.")
-    except Exception as e:
-        raise e
-
-
-def build_and_upload_wheel(bump_part: str = "patch"):
-    """Build a Python wheel and upload to PyPI using UV.
-
-    Automatically increments the version number in pyproject.toml before building
-    based on the bump_part argument ('major', 'minor', 'patch').
-
-    Expects PyPI authentication to be configured via the environment variable:
-    - UV_PUBLISH_TOKEN
-
-    Args:
-        bump_part (str): The part of the version to bump. Defaults to 'patch'.
-    """
-    if bump_part not in ["major", "minor", "patch"]:
-        print(f"Error: Invalid bump_part '{bump_part}'. Must be 'major', 'minor', or 'patch'.")
-        return
-
-    # ANSI color codes
-    BLUE = "\033[94m"
-    RESET = "\033[0m"
-
-    # --- Authentication Setup ---
-    token = os.environ.get("UV_PUBLISH_TOKEN")
-
-    if not token:
-        print("Error: PyPI authentication not configured.")
-        print("Please set the UV_PUBLISH_TOKEN environment variable with your PyPI API token.")
-        return
-
-    # Build the command with token authentication
-    # IMPORTANT: Mask token for printing
-    publish_cmd_safe_print = ["uv", "publish", "--token", "*****"]
-    publish_cmd = ["uv", "publish", "--token", token]
-    print("Using UV_PUBLISH_TOKEN for authentication.")
-
-    # Use standard pyproject.toml
-    pyproject_path = "pyproject.toml"
-    if not Path(pyproject_path).exists():
-        print("Error: pyproject.toml not found in current directory.")
-        return
-    current_version = None  # Initialize in case the first try block fails
-
-    try:
-        # --- Clean dist directory ---
-        dist_dir = Path("dist")
-        if dist_dir.exists():
-            print(f"Removing existing build directory: {dist_dir}")
-            shutil.rmtree(dist_dir)
-        # --- End Clean dist directory ---
-
-        # --- Version Bumping Logic ---
-        current_version = get_current_version_from_toml(pyproject_path)
-        print(f"Current version: {current_version}")
-
-        try:
-            major, minor, patch = map(int, current_version.split("."))
-        except ValueError:
-            print(f"Error: Could not parse version '{current_version}'. Expected format X.Y.Z")
-            return
-
-        if bump_part == "major":
-            major += 1
-            minor = 0
-            patch = 0
-        elif bump_part == "minor":
-            minor += 1
-            patch = 0
-        else:  # patch
-            patch += 1
-
-        new_version = f"{major}.{minor}.{patch}"
-        print(f"Bumping {bump_part} version to: {new_version}")
-
-        # Read pyproject.toml
-        with open(pyproject_path, "r") as f:
-            content = f.read()
-
-        # Replace the version string
-        pattern = re.compile(f'^version\s*=\s*"{re.escape(current_version)}"', re.MULTILINE)
-        new_content, num_replacements = pattern.subn(f'version = "{new_version}"', content)
-
-        if num_replacements == 0:
-            print(f"Error: Could not find 'version = \"{current_version}\"' in {pyproject_path}")
-            return  # Exit before build/publish if version wasn't updated
-        if num_replacements > 1:
-            print(f"Warning: Found multiple version lines for '{current_version}'. Only the first was updated.")
-
-        # Write the updated content back
-        with open(pyproject_path, "w") as f:
-            f.write(new_content)
-        print(f"Updated {pyproject_path} with version {new_version}")
-
-        # --- End Version Bumping Logic ---
-
-        # Build wheel and sdist
-        build_cmd = ["uv", "build"]
-        print(f"Running command: {BLUE}{' '.join(build_cmd)}{RESET}")
-        subprocess.run(build_cmd, check=True)
-
-        # Upload to PyPI
-        print(f"Running command: {BLUE}{' '.join(publish_cmd_safe_print)}{RESET}")
-        subprocess.run(publish_cmd, check=True)
-
-        print(f"Successfully built and uploaded version {new_version} to PyPI")
-
-        # Re-install DHT in Pixi environment when building from DHT itself
-        try:
-            proj_toml = toml.load(pyproject_path)
-            proj_name = proj_toml.get("project", {}).get("name")
-            if proj_name == "dayhoff-tools":
-                print("Re-installing dayhoff-tools into the Pixi environment...")
-                # Detect if CUDA is available - use cpu environment if not
-                has_cuda = shutil.which("nvidia-smi") is not None
-                if has_cuda:
-                    reinstall_cmd = ["pixi", "install"]
-                else:
-                    reinstall_cmd = ["pixi", "install", "-e", "cpu"]
-                print(f"Running command: {BLUE}{' '.join(reinstall_cmd)}{RESET}")
-                subprocess.run(reinstall_cmd, check=True)
-                print("dayhoff-tools reinstalled in the Pixi environment.")
-        except subprocess.CalledProcessError as e:
-            print(f"Warning: Failed to reinstall dayhoff-tools locally: {e}")
-        except Exception:
-            pass  # Not dayhoff-tools or couldn't read toml
-
-    except FileNotFoundError:
-        print(f"Error: {pyproject_path} not found.")
-        # No version change happened, so no rollback needed
-    except subprocess.CalledProcessError as e:
-        print(f"Error during build/upload: {e}")
-        # Attempt to roll back version change only if it was bumped successfully
-        if current_version and new_version:
-            try:
-                print(f"Attempting to revert version in {pyproject_path} back to {current_version}...")
-                with open(pyproject_path, "r") as f:
-                    content_revert = f.read()
-                # Use new_version in pattern for reverting
-                pattern_revert = re.compile(f'^version\s*=\s*"{re.escape(new_version)}"', re.MULTILINE)
-                reverted_content, num_revert = pattern_revert.subn(f'version = "{current_version}"', content_revert)
-                if num_revert > 0:
-                    with open(pyproject_path, "w") as f:
-                        f.write(reverted_content)
-                    print(f"Successfully reverted version in {pyproject_path}.")
-                else:
-                    print(f"Warning: Could not find version {new_version} to revert in {pyproject_path}.")
-
-            except Exception as revert_e:
-                print(f"Warning: Failed to revert version change: {revert_e}")
-    except Exception as e:
-        print(f"An unexpected error occurred: {e}")
-        # Attempt rollback if version was bumped
-        if current_version and "new_version" in locals() and new_version:
-            try:
-                print(f"Attempting to revert version back to {current_version}...")
-                with open(pyproject_path, "r") as f:
-                    content_revert = f.read()
-                pattern_revert = re.compile(f'^version\\s*=\\s*"{re.escape(new_version)}"', re.MULTILINE)
-                reverted_content, num_revert = pattern_revert.subn(f'version = "{current_version}"', content_revert)
-                if num_revert > 0:
-                    with open(pyproject_path, "w") as f:
-                        f.write(reverted_content)
-                    print("Successfully reverted version in pyproject.toml.")
-                else:
-                    print(f"Warning: Could not find version {new_version} to revert.")
-            except Exception as revert_e:
-                print(f"Warning: Failed to revert version change: {revert_e}")

dh_cli-0.13.0/tests/bedrock/test_resolve_base_model.py

@@ -1,50 +0,0 @@
-"""Model-ID resolution tests.
-
-A Bedrock modelId can appear in three shapes for the same underlying
-model:
-  - direct:   anthropic.claude-opus-4-7
-  - US profile: us.anthropic.claude-opus-4-7
-  - Global profile: global.anthropic.claude-opus-4-7
-
-`resolve_base_model` must collapse all three to the same pricing key.
-"""
-
-from __future__ import annotations
-
-import pytest
-
-
-@pytest.mark.parametrize(
-    "model_id, expected_base",
-    [
-        ("anthropic.claude-opus-4-7", "opus-4-7"),
-        ("us.anthropic.claude-opus-4-7", "opus-4-7"),
-        ("global.anthropic.claude-opus-4-7", "opus-4-7"),
-        ("anthropic.claude-opus-4-8", "opus-4-8"),
-        ("us.anthropic.claude-opus-4-8", "opus-4-8"),
-        ("global.anthropic.claude-opus-4-8", "opus-4-8"),
-        ("anthropic.claude-opus-4-6-v1", "opus-4-6"),
-        ("us.anthropic.claude-opus-4-6-v1", "opus-4-6"),
-        ("global.anthropic.claude-opus-4-6-v1", "opus-4-6"),
-        ("anthropic.claude-sonnet-4-6", "sonnet-4-6"),
-        ("us.anthropic.claude-sonnet-4-6", "sonnet-4-6"),
-        ("global.anthropic.claude-sonnet-4-6", "sonnet-4-6"),
-        ("anthropic.claude-haiku-4-5-20251001-v1:0", "haiku-4-5"),
-        ("us.anthropic.claude-haiku-4-5-20251001-v1:0", "haiku-4-5"),
-        ("global.anthropic.claude-haiku-4-5-20251001-v1:0", "haiku-4-5"),
-        ("anthropic.claude-fable-5", "fable-5"),
-        ("us.anthropic.claude-fable-5", "fable-5"),
-        ("global.anthropic.claude-fable-5", "fable-5"),
-    ],
-)
-def test_resolve_base_model_known(model_id: str, expected_base: str):
-    from dh_cli.bedrock.cost_report import resolve_base_model
-
-    assert resolve_base_model(model_id) == expected_base
-
-
-def test_resolve_base_model_unknown_raises():
-    from dh_cli.bedrock.cost_report import UnknownModel, resolve_base_model
-
-    with pytest.raises(UnknownModel):
-        resolve_base_model("global.anthropic.claude-someshinynew-99-v42")