nab-python 0.0.5__tar.gz → 0.0.6__tar.gz

{nab_python-0.0.5 → nab_python-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nab-python
-Version: 0.0.5
+Version: 0.0.6
 Summary: Index-backed provider, lockfile emitter, and downloader for nab
 Project-URL: Homepage, https://github.com/notatallshaw/nab
 Project-URL: Documentation, https://nab.readthedocs.io/
@@ -20,8 +20,8 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Requires-Dist: build>=1.2
 Requires-Dist: installer>=0.7
-Requires-Dist: nab-index==0.0.5
-Requires-Dist: nab-resolver==0.0.5
+Requires-Dist: nab-index==0.0.6
+Requires-Dist: nab-resolver==0.0.6
 Requires-Dist: pyproject-hooks>=1.2
 Requires-Dist: tomli-w>=1.2
 Requires-Dist: tomli>=2.0

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/_profile_runner.py

@@ -96,7 +96,7 @@ def build_inputs(name: str, scenario: dict) -> dict:
         "constraints": constraints,
         "marker_environment": marker_environment or None,
         "indexes": sc.parse_indexes(name, scenario),
-        "index_overrides": sc.parse_index_overrides(name, scenario) or None,
+        "index_routes": sc.parse_index_routes(name, scenario) or None,
         "build_policy_overrides": build_policy_overrides or None,
         "resolution_strategy": resolution_strategy,
     }

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/canary.py

@@ -1,9 +1,9 @@
 """Quick canary benchmark for fast iteration.
 
 Runs a curated subset of scenarios (canaries + hard cases) N times each
-and reports median decisions, conflicts, and wall time. The set is
-small enough to finish in a few minutes so it can be re-run after each
-algorithm change.
+and reports median decisions, distributions seen (search breadth), and
+wall time. The set is small enough to finish in a few minutes so it can
+be re-run after each algorithm change.
 
 Usage:
     python nab-python/benchmarks/canary.py [--commit LABEL] [--runs N]
@@ -38,11 +38,12 @@ from nab_python._vendor.packaging.markers import default_environment
 from nab_python._vendor.packaging.ranges import VersionRange
 from nab_python._vendor.packaging.requirements import Requirement
 from nab_python._vendor.packaging.utils import canonicalize_name
+from nab_python.config import PackageOverride
 from nab_python.fetch import (
     DEFAULT_INDEX_NAME,
     DEFAULT_INDEX_URL,
     FetchCoordinator,
-    IndexOverride,
+    IndexRoute,
 )
 from nab_python.provider import (
     BuildPolicy,
@@ -62,26 +63,30 @@ DEFAULT_INDEXES: tuple[IndexConfig, ...] = (
     IndexConfig(DEFAULT_INDEX_NAME, DEFAULT_INDEX_URL),
 )
 
+# Each entry pins its TOML variant as ``stem:name``. Most of these names also
+# live in -lowest / -lowest-direct siblings with different counts; the pins
+# record the variant the suite already ran so the numbers are reproducible
+# instead of depending on directory scan order.
 CANARY_SCENARIOS = [
-    "boto3-urllib3-transient",
-    "trustllm",
-    "copick",
-    "promptflow-vectordb",
-    "ultralytics-export",
-    "datacontract-cli",
-    "pandas-aws-boto3-dandi-frenzy",
-    "vllm-transformers-floor",
-    "google-bigquery-soda",
-    "langchain-ml-course",
-    "airflow-3-0-2-awswrangler",
-    "airflow-3-0-3-pandas-sqlalchemy",
-    "airflow-portalocker-qdrant",
-    "airflow-fastapi-121",
-    "so-dbt-core-snowflake-79744735",
-    "uv-issue-16601-xinference",
-    "uv-issue-16601-xinference-fixed",
-    "rag-chroma-langchain",
-    "streamlit-langchain",
+    "uv-lowest:boto3-urllib3-transient",
+    "pip-lowest:trustllm",
+    "pip-lowest:copick",
+    "pip-lowest:promptflow-vectordb",
+    "pip-lowest:ultralytics-export",
+    "pip-lowest:datacontract-cli",
+    "pip-lowest:pandas-aws-boto3-dandi-frenzy",
+    "ai-stack:vllm-transformers-floor",
+    "pip-lowest:google-bigquery-soda",
+    "pip-lowest:langchain-ml-course",
+    "airflow-lowest-direct:airflow-3-0-2-awswrangler",
+    "airflow-lowest-direct:airflow-3-0-3-pandas-sqlalchemy",
+    "airflow-lowest-direct:airflow-portalocker-qdrant",
+    "airflow-lowest-direct:airflow-fastapi-121",
+    "forums-lowest-direct:so-dbt-core-snowflake-79744735",
+    "uv-lowest:uv-issue-16601-xinference",
+    "uv-lowest:uv-issue-16601-xinference-fixed",
+    "ai-stack:rag-chroma-langchain",
+    "ai-stack:streamlit-langchain",
 ]
 
 WALL_TIMEOUT_S = 60
@@ -150,7 +155,7 @@ def parse_requirements(
             )
             raise NotImplementedError(msg)
         name = canonicalize_name(req.name)
-        reqs[name] = req.specifier.to_range()
+        reqs[name] = reqs.get(name, VersionRange.full()) & req.specifier.to_range()
         for extra in req.extras:
             reqs[f"{name}[{extra}]"] = VersionRange.full()
     return reqs
@@ -208,17 +213,25 @@ def run_one(  # noqa: PLR0913 - one wrapper per scenario knob
     constraints: dict[str, VersionRange] | None,
     marker_environment: dict[str, str] | None = None,
     indexes: list[IndexConfig] | None = None,
-    index_overrides: list[IndexOverride] | None = None,
+    index_routes: list[IndexRoute] | None = None,
     build_policy_overrides: Mapping[str, BuildPolicy] | None = None,
     *,
     trust_unverified_sdist_deps: bool = False,
 ) -> dict:
+    package_overrides = tuple(
+        PackageOverride(
+            requirement=Requirement(name),
+            name=canonicalize_name(name),
+            version_range=VersionRange.full(),
+            build_policy=policy,
+        )
+        for name, policy in (build_policy_overrides or {}).items()
+    )
     with FetchCoordinator(
         HttpxAsyncTransport(),
         indexes=indexes,
         cache_dir=CACHE_DIR,
-        index_overrides=index_overrides,
-        marker_environment=marker_environment,
+        index_routes=index_routes,
     ) as coordinator:
         provider = Provider(
             coordinator,
@@ -227,7 +240,7 @@ def run_one(  # noqa: PLR0913 - one wrapper per scenario knob
             uploaded_prior_to=uploaded_prior_to,
             dist_policy=DistPolicy.WHEEL_OR_SDIST,
             build_policy=BuildPolicy.NEVER,
-            build_policy_overrides=build_policy_overrides,
+            package_overrides=package_overrides,
             trust_unverified_sdist_deps=trust_unverified_sdist_deps,
             marker_environment=marker_environment,
         )
@@ -268,19 +281,46 @@ def run_one(  # noqa: PLR0913 - one wrapper per scenario knob
             "restarts": rs.restarts,
             "incompatibilities_learned": rs.incompatibilities_learned,
             "metadata_fetched": ps.metadata_fetched,
+            "distributions_seen": ps.distributions_seen,
             "look_ahead_rejections": ps.look_ahead_rejections,
             "packages": packages,
             "wall_time_seconds": round(elapsed, 3),
         }
 
 
-def find_scenario(scenario_name: str) -> dict | None:
-    for toml_file in SCENARIOS_DIR.glob("*.toml"):
+def find_scenario(spec: str) -> dict | None:
+    """Locate a scenario by name, or by ``stem:name`` to pin a specific TOML file.
+
+    Many names live in several variant TOMLs (a ``highest`` file plus
+    ``-lowest`` / ``-lowest-direct`` siblings) with different decision counts.
+    A bare name scans the files in sorted order so the match is reproducible
+    across machines, and warns when the name is ambiguous so an exact-count run
+    can pin the variant with ``stem:name``.
+    """
+    if ":" in spec:
+        toml_stem, name = spec.split(":", 1)
+        toml_path = SCENARIOS_DIR / f"{toml_stem}.toml"
+        if not toml_path.is_file():
+            return None
+        with toml_path.open("rb") as f:
+            return tomllib.load(f).get(name)
+
+    matches: list[tuple[str, dict]] = []
+    for toml_file in sorted(SCENARIOS_DIR.glob("*.toml")):
         with toml_file.open("rb") as f:
             data = tomllib.load(f)
-        if scenario_name in data:
-            return data[scenario_name]
-    return None
+        if spec in data:
+            matches.append((toml_file.stem, data[spec]))
+    if not matches:
+        return None
+    if len(matches) > 1:
+        stems = ", ".join(stem for stem, _ in matches)
+        print(
+            f"  [ambiguous] {spec!r} is in {len(matches)} files ({stems}); "
+            f"using {matches[0][0]}. Pin one with '{matches[0][0]}:{spec}'.",
+            flush=True,
+        )
+    return matches[0][1]
 
 
 def median_run(scenario: dict, runs: int) -> tuple[list[dict], dict]:
@@ -328,14 +368,10 @@ def median_run(scenario: dict, runs: int) -> tuple[list[dict], dict]:
             IndexConfig(name=str(entry["name"]), url=str(entry["url"]))
             for entry in raw_indexes
         ]
-    raw_overrides = scenario.get("index_overrides", [])
-    index_overrides = [
-        IndexOverride(
-            name=str(entry["name"]),
-            index=str(entry["index"]),
-            marker=entry.get("marker"),
-        )
-        for entry in raw_overrides
+    raw_routes = scenario.get("index_routes", [])
+    index_routes = [
+        IndexRoute(name=str(entry["name"]), index=str(entry["index"]))
+        for entry in raw_routes
     ]
     raw_build_packages = scenario.get("build_packages", []) or []
     build_policy_overrides = {
@@ -382,7 +418,7 @@ def median_run(scenario: dict, runs: int) -> tuple[list[dict], dict]:
             constraints,
             marker_environment=marker_environment or None,
             indexes=indexes,
-            index_overrides=index_overrides or None,
+            index_routes=index_routes or None,
             build_policy_overrides=build_policy_overrides or None,
             trust_unverified_sdist_deps=trust_unverified_sdist_deps,
         )
@@ -397,6 +433,9 @@ def median_run(scenario: dict, runs: int) -> tuple[list[dict], dict]:
     summary = {
         "success_runs": f"{successes}/{len(runs_data)}",
         "median_decisions": int(med("decisions")),
+        "median_distributions_seen": int(med("distributions_seen")),
+        "median_metadata_fetched": int(med("metadata_fetched")),
+        "median_packages": int(med("packages")),
         "median_conflicts": int(med("conflicts")),
         "median_backjumps": int(med("backjumps")),
         "median_wall": round(med("wall_time_seconds"), 2),
@@ -435,29 +474,32 @@ def main() -> None:
         f"{'scenario':<45} "
         f"{'success':>9} "
         f"{'med_dec':>8} "
+        f"{'med_dist':>10} "
         f"{'med_wall':>10} "
         f"{'min_dec':>8} "
         f"{'max_dec':>8}"
     )
-    print("-" * 100)
+    print("-" * 110)
 
     summary_all: dict[str, dict] = {}
     for name in scenarios_to_run:
         scenario = find_scenario(name)
+        label = name.split(":", 1)[-1]
         if scenario is None:
-            print(f"{name:<45} NOT FOUND")
+            print(f"{label:<45} NOT FOUND")
             continue
         runs_data, summary = median_run(scenario, args.runs)
-        summary_all[name] = {"runs": runs_data, "summary": summary}
+        summary_all[label] = {"runs": runs_data, "summary": summary}
 
         if "skipped" in summary:
-            print(f"{name:<45} SKIPPED: {summary['skipped']}")
+            print(f"{label:<45} SKIPPED: {summary['skipped']}")
             continue
 
         print(
-            f"{name:<45} "
+            f"{label:<45} "
             f"{summary['success_runs']:>9} "
             f"{summary['median_decisions']:>8} "
+            f"{summary['median_distributions_seen']:>10} "
             f"{summary['median_wall']:>10} "
             f"{summary['min_decisions']:>8} "
             f"{summary['max_decisions']:>8}"

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/compare.py

@@ -38,7 +38,6 @@ STAT_LABELS = {
     "look_ahead_rejections": "Look-ahead rejections",
     "packages_resolved": "Packages resolved",
     "wall_time_seconds": "Wall time (s)",
-    # legacy keys (older results before stats rework):
     "listing_requests": "Listing requests (legacy)",
     "metadata_requests": "Metadata requests (legacy)",
 }

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios/pdm-lowest-direct.toml

@@ -329,7 +329,6 @@ resolution = "lowest-direct"
 python_version = "3.10"
 platform_system = "Linux"
 datetime = "2025-10-02 08:42:21"
-allow_prereleases = true
 requirements = [
     "pydantic>=2.10.6",
     "pydantic>=2.12.0a1",

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios/pdm-lowest.toml

@@ -329,7 +329,6 @@ resolution = "lowest"
 python_version = "3.10"
 platform_system = "Linux"
 datetime = "2025-10-02 08:42:21"
-allow_prereleases = true
 requirements = [
     "pydantic>=2.10.6",
     "pydantic>=2.12.0a1",

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios/pdm.toml

@@ -308,7 +308,6 @@ requirements = ["numpy"]
 python_version = "3.10"
 platform_system = "Linux"
 datetime = "2025-10-02 08:42:21"
-allow_prereleases = true
 requirements = [
     "pydantic>=2.10.6",
     "pydantic>=2.12.0a1",

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios/uv-lowest-direct.toml

@@ -1530,8 +1530,8 @@ requirements = [
 # Migrated from unsupported.toml (2026-04-27).  These were filed against
 # original tool-specific features (uv universal resolution, multi-index,
 # --pre flag, project install) but the requirement list itself is a valid
-# single-platform PyPI input that nab can resolve.  Scenarios marked with
-# allow_prereleases = true require pre-release pinning to find a candidate.
+# single-platform PyPI input that nab can resolve.  Some need a
+# pre-release pin to find a candidate.
 # ============================================================================
 
 [uv-pyspark-resolution]
@@ -1624,12 +1624,11 @@ requirements = ["playwright"]
 [uv-issue-11636-llvmlite-prerelease]
 # https://github.com/astral-sh/uv/issues/11636
 # llvmlite==0.44.0 only exists as a pre-release on PyPI at the chosen
-# date; needs allow_prereleases to find a candidate.
+# date; needs a pre-release pin to find a candidate.
 resolution = "lowest-direct"
 python_version = "3.13"
 platform_system = "Linux"
 datetime = "2025-02-19 20:01:16"
-allow_prereleases = true
 requirements = ["llvmlite==0.44.0"]
 
 [uv-tensorflow-macos]

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios/uv-lowest.toml

@@ -1530,8 +1530,8 @@ requirements = [
 # Migrated from unsupported.toml (2026-04-27).  These were filed against
 # original tool-specific features (uv universal resolution, multi-index,
 # --pre flag, project install) but the requirement list itself is a valid
-# single-platform PyPI input that nab can resolve.  Scenarios marked with
-# allow_prereleases = true require pre-release pinning to find a candidate.
+# single-platform PyPI input that nab can resolve.  Some need a
+# pre-release pin to find a candidate.
 # ============================================================================
 
 [uv-pyspark-resolution]
@@ -1624,12 +1624,11 @@ requirements = ["playwright"]
 [uv-issue-11636-llvmlite-prerelease]
 # https://github.com/astral-sh/uv/issues/11636
 # llvmlite==0.44.0 only exists as a pre-release on PyPI at the chosen
-# date; needs allow_prereleases to find a candidate.
+# date; needs a pre-release pin to find a candidate.
 resolution = "lowest"
 python_version = "3.13"
 platform_system = "Linux"
 datetime = "2025-02-19 20:01:16"
-allow_prereleases = true
 requirements = ["llvmlite==0.44.0"]
 
 [uv-tensorflow-macos]

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios/uv.toml

@@ -1422,8 +1422,8 @@ requirements = [
 # Migrated from unsupported.toml (2026-04-27).  These were filed against
 # original tool-specific features (uv universal resolution, multi-index,
 # --pre flag, project install) but the requirement list itself is a valid
-# single-platform PyPI input that nab can resolve.  Scenarios marked with
-# allow_prereleases = true require pre-release pinning to find a candidate.
+# single-platform PyPI input that nab can resolve.  Some need a
+# pre-release pin to find a candidate.
 # ============================================================================
 
 [uv-pyspark-resolution]
@@ -1509,11 +1509,10 @@ requirements = ["playwright"]
 [uv-issue-11636-llvmlite-prerelease]
 # https://github.com/astral-sh/uv/issues/11636
 # llvmlite==0.44.0 only exists as a pre-release on PyPI at the chosen
-# date; needs allow_prereleases to find a candidate.
+# date; needs a pre-release pin to find a candidate.
 python_version = "3.13"
 platform_system = "Linux"
 datetime = "2025-02-19 20:01:16"
-allow_prereleases = true
 requirements = ["llvmlite==0.44.0"]
 
 [uv-tensorflow-macos]

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/scenarios.py

@@ -35,11 +35,12 @@ from nab_python._vendor.packaging.markers import default_environment
 from nab_python._vendor.packaging.ranges import VersionRange
 from nab_python._vendor.packaging.requirements import Requirement
 from nab_python._vendor.packaging.utils import canonicalize_name
+from nab_python.config import PackageOverride
 from nab_python.fetch import (
     DEFAULT_INDEX_NAME,
     DEFAULT_INDEX_URL,
     FetchCoordinator,
-    IndexOverride,
+    IndexRoute,
 )
 from nab_python.provider import (
     BuildPolicy,
@@ -137,7 +138,7 @@ def parse_requirements(
             )
             raise NotImplementedError(msg)
         name = canonicalize_name(req.name)
-        reqs[name] = req.specifier.to_range()
+        reqs[name] = reqs.get(name, VersionRange.full()) & req.specifier.to_range()
         for extra in req.extras:
             reqs[f"{name}[{extra}]"] = VersionRange.full()
     return reqs
@@ -212,7 +213,7 @@ def resolve_scenario(  # noqa: PLR0913 - one wrapper per scenario knob
     constraints: dict[str, VersionRange] | None = None,
     marker_environment: dict[str, str] | None = None,
     indexes: list[IndexConfig] | None = None,
-    index_overrides: list[IndexOverride] | None = None,
+    index_routes: list[IndexRoute] | None = None,
     build_policy_overrides: Mapping[str, BuildPolicy] | None = None,
     resolution_strategy: ResolutionStrategy = ResolutionStrategy.HIGHEST,
     *,
@@ -222,12 +223,20 @@ def resolve_scenario(  # noqa: PLR0913 - one wrapper per scenario knob
     direct_packages = frozenset(
         name for name in requirements if split_extra(name)[1] is None
     )
+    package_overrides = tuple(
+        PackageOverride(
+            requirement=Requirement(name),
+            name=canonicalize_name(name),
+            version_range=VersionRange.full(),
+            build_policy=policy,
+        )
+        for name, policy in (build_policy_overrides or {}).items()
+    )
     with FetchCoordinator(
         HttpxAsyncTransport(),
         indexes=indexes,
         cache_dir=CACHE_DIR,
-        index_overrides=index_overrides,
-        marker_environment=marker_environment,
+        index_routes=index_routes,
     ) as coordinator:
         provider = Provider(
             coordinator,
@@ -236,7 +245,7 @@ def resolve_scenario(  # noqa: PLR0913 - one wrapper per scenario knob
             uploaded_prior_to=uploaded_prior_to,
             dist_policy=DistPolicy.WHEEL_OR_SDIST,
             build_policy=BuildPolicy.NEVER,
-            build_policy_overrides=build_policy_overrides,
+            package_overrides=package_overrides,
             trust_unverified_sdist_deps=trust_unverified_sdist_deps,
             marker_environment=marker_environment,
             resolution_strategy=resolution_strategy,
@@ -316,7 +325,7 @@ def _expected_input(  # noqa: PLR0913 - assembling the JSON dump key
     vcs_policy_str: str,
     marker_environment: dict[str, str],
     indexes: list[IndexConfig],
-    index_overrides: list[IndexOverride],
+    index_routes: list[IndexRoute],
     build_packages: list[str] | None = None,
     resolution_strategy: ResolutionStrategy = ResolutionStrategy.HIGHEST,
     *,
@@ -346,14 +355,9 @@ def _expected_input(  # noqa: PLR0913 - assembling the JSON dump key
         expected_input["indexes"] = [
             {"name": cfg.name, "url": cfg.url} for cfg in indexes
         ]
-    if index_overrides:
-        expected_input["index_overrides"] = [
-            {
-                "name": o.name,
-                "index": o.index,
-                **({"marker": o.marker} if o.marker else {}),
-            }
-            for o in index_overrides
+    if index_routes:
+        expected_input["index_routes"] = [
+            {"name": o.name, "index": o.index} for o in index_routes
         ]
     if build_packages:
         expected_input["build_packages"] = sorted(build_packages)
@@ -364,30 +368,30 @@ def _expected_input(  # noqa: PLR0913 - assembling the JSON dump key
     return expected_input
 
 
-def parse_index_overrides(
+def parse_index_routes(
     scenario_name: str,
     scenario: dict,
-) -> list[IndexOverride]:
-    """Read the ``index_overrides`` array of records from a scenario.
+) -> list[IndexRoute]:
+    """Read the ``index_routes`` array of records from a scenario.
 
     Each entry is a TOML inline table with keys ``name`` (the package
-    name) and ``index`` (the *name* of an entry in ``indexes``), plus
-    an optional ``marker``.  Entries are returned in declaration order
-    so :func:`nab_python.fetch._resolve_overrides` can apply
-    first-match-wins on duplicates.
+    name) and ``index`` (the *name* of an entry in ``indexes``).  A route
+    carries no version scope and no marker.  Entries are returned in
+    declaration order so :func:`nab_python.fetch._resolve_routes` can
+    apply last-match-wins on duplicates.
     """
-    raw = scenario.get("index_overrides", [])
+    raw = scenario.get("index_routes", [])
     if not isinstance(raw, list):
         msg = (
-            f"{scenario_name}: index_overrides must be a TOML array of"
+            f"{scenario_name}: index_routes must be a TOML array of"
             f" tables, got {type(raw).__name__}"
         )
         raise TypeError(msg)
-    out: list[IndexOverride] = []
+    out: list[IndexRoute] = []
     for entry in raw:
         if not isinstance(entry, dict):
             msg = (
-                f"{scenario_name}: index_overrides entries must be tables,"
+                f"{scenario_name}: index_routes entries must be tables,"
                 f" got {type(entry).__name__}"
             )
             raise TypeError(msg)
@@ -396,12 +400,10 @@ def parse_index_overrides(
             index = entry["index"]
         except KeyError as missing:
             msg = (
-                f"{scenario_name}: index_overrides entry missing required"
-                f" key {missing!s}"
+                f"{scenario_name}: index_routes entry missing required key {missing!s}"
             )
             raise ValueError(msg) from None
-        marker = entry.get("marker")
-        out.append(IndexOverride(name=str(name), index=str(index), marker=marker))
+        out.append(IndexRoute(name=str(name), index=str(index)))
     return out
 
 
@@ -513,14 +515,10 @@ def process_scenario(
     constraint_strings: list[str] = scenario.get("constraints", [])
     marker_environment = parse_marker_environment(scenario_name, scenario)
     indexes = parse_indexes(scenario_name, scenario)
-    index_overrides = parse_index_overrides(scenario_name, scenario)
+    index_routes = parse_index_routes(scenario_name, scenario)
     build_policy_overrides = parse_build_packages(scenario_name, scenario)
     if marker_environment and build_policy_overrides:
-        # BuildPolicy.BUILD_REMOTE + marker_environment is rejected at
-        # provider construction (host backend cannot reflect the
-        # impersonated target).  Drop the per-package builds so the
-        # scenario still runs; if resolution now fails the override
-        # was load-bearing and the scenario needs an audit.
+        # BUILD_REMOTE + marker_environment is rejected at provider construction.
         print(
             f"\n  [audit] {scenario_name}: dropping {len(build_policy_overrides)}"
             " build_packages override(s) because the scenario uses a"
@@ -585,7 +583,7 @@ def process_scenario(
         vcs_policy_str,
         marker_environment,
         indexes,
-        index_overrides,
+        index_routes,
         build_packages=sorted(build_policy_overrides),
         resolution_strategy=resolution_strategy,
         trust_unverified_sdist_deps=trust_unverified_sdist_deps,
@@ -620,7 +618,7 @@ def process_scenario(
         constraints,
         marker_environment=marker_environment or None,
         indexes=indexes,
-        index_overrides=index_overrides or None,
+        index_routes=index_routes or None,
         build_policy_overrides=build_policy_overrides or None,
         resolution_strategy=resolution_strategy,
         trust_unverified_sdist_deps=trust_unverified_sdist_deps,

{nab_python-0.0.5 → nab_python-0.0.6}/benchmarks/strategy_sweep.py

@@ -31,6 +31,9 @@ if TYPE_CHECKING:
 
 from nab_index.httpx_async_transport import HttpxAsyncTransport
 from nab_python._vendor.packaging.ranges import VersionRange
+from nab_python._vendor.packaging.requirements import Requirement
+from nab_python._vendor.packaging.utils import canonicalize_name
+from nab_python.config import PackageOverride
 from nab_python.fetch import FetchCoordinator
 from nab_python.provider import (
     BuildPolicy,
@@ -78,19 +81,27 @@ def _resolve_one(  # noqa: PLR0913 - one kwarg per knob; bundling hides the surf
     python_version: str,
     marker_environment: dict[str, str] | None,
     indexes: list,
-    index_overrides: list | None,
+    index_routes: list | None,
     uploaded_prior_to: datetime | None,
     strategy: ResolutionStrategy,
     direct_packages: frozenset[str],
     extras_mode: ExtrasMode,
     build_policy_overrides: Mapping[str, BuildPolicy] | None,
 ) -> dict:
+    package_overrides = tuple(
+        PackageOverride(
+            requirement=Requirement(name),
+            name=canonicalize_name(name),
+            version_range=VersionRange.full(),
+            build_policy=policy,
+        )
+        for name, policy in (build_policy_overrides or {}).items()
+    )
     with FetchCoordinator(
         HttpxAsyncTransport(),
         indexes=indexes,
         cache_dir=CACHE_DIR,
-        index_overrides=index_overrides,
-        marker_environment=marker_environment,
+        index_routes=index_routes,
     ) as coordinator:
         provider = Provider(
             coordinator,
@@ -99,7 +110,7 @@ def _resolve_one(  # noqa: PLR0913 - one kwarg per knob; bundling hides the surf
             uploaded_prior_to=uploaded_prior_to,
             dist_policy=DistPolicy.WHEEL_OR_SDIST,
             build_policy=BuildPolicy.NEVER,
-            build_policy_overrides=build_policy_overrides,
+            package_overrides=package_overrides,
             marker_environment=marker_environment,
             resolution_strategy=strategy,
             direct_packages=direct_packages,
@@ -164,7 +175,7 @@ def _scenario_inputs(scenario: dict) -> dict | None:
     constraint_strings: list[str] = scenario.get("constraints", [])
     marker_env = _scenarios.parse_marker_environment("sweep", scenario)
     indexes = _scenarios.parse_indexes("sweep", scenario)
-    index_overrides = _scenarios.parse_index_overrides("sweep", scenario)
+    index_routes = _scenarios.parse_index_routes("sweep", scenario)
     datetime_str = scenario.get("datetime")
     project_name = scenario.get("project_name")
     project_extras = scenario.get("project_extras", [])
@@ -205,10 +216,7 @@ def _scenario_inputs(scenario: dict) -> dict | None:
     )
     build_policy_overrides = _scenarios.parse_build_packages("sweep", scenario)
     if marker_env and build_policy_overrides:
-        # See ``scenarios.py``: BUILD_REMOTE + marker_environment is
-        # rejected at provider construction.  Drop the overrides so the
-        # sweep keeps running; a scenario that now fails was relying on
-        # the prior silent passthrough.
+        # BUILD_REMOTE + marker_environment is rejected at provider construction.
         build_policy_overrides = []
     return {
         "requirements": requirements,
@@ -216,7 +224,7 @@ def _scenario_inputs(scenario: dict) -> dict | None:
         "python_version": python_version,
         "marker_environment": marker_env or None,
         "indexes": indexes,
-        "index_overrides": index_overrides or None,
+        "index_routes": index_routes or None,
         "uploaded_prior_to": uploaded_prior_to,
         "direct_packages": _direct_set(requirements),
         "build_policy_overrides": build_policy_overrides or None,