nab-python 0.0.7__tar.gz → 0.0.9__tar.gz

{nab_python-0.0.7 → nab_python-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nab-python
-Version: 0.0.7
+Version: 0.0.9
 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.7
-Requires-Dist: nab-resolver==0.0.7
+Requires-Dist: nab-index==0.0.9
+Requires-Dist: nab-resolver==0.0.9
 Requires-Dist: pyproject-hooks>=1.2
 Requires-Dist: tomli-w>=1.2
 Requires-Dist: tomli>=2.0

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/README.md

@@ -1,7 +1,7 @@
 # Benchmarks
 
-nab ships two benchmark suites that exercise the single-environment
-and the universal resolver against real-world scenarios.
+nab ships two benchmark suites that exercise single-environment and
+universal resolves against real-world scenarios.
 
 ## Single-environment scenarios
 

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/canary.py

@@ -53,6 +53,7 @@ from nab_python.provider import (
     VcsPolicy,
     split_extra,
 )
+from nab_python.target import ResolveTarget
 from nab_resolver.resolver import Resolver
 
 BENCHMARKS_DIR = Path(__file__).parent
@@ -155,9 +156,14 @@ def parse_requirements(
             )
             raise NotImplementedError(msg)
         name = canonicalize_name(req.name)
-        reqs[name] = reqs.get(name, VersionRange.full()) & req.specifier.to_range()
+        term = (
+            req.specifier.to_range()
+            if req.specifier
+            else VersionRange.full(admit_arbitrary=False)
+        )
+        reqs[name] = reqs.get(name, VersionRange.full()) & term
         for extra in req.extras:
-            reqs[f"{name}[{extra}]"] = VersionRange.full()
+            reqs[f"{name}[{extra}]"] = VersionRange.full(admit_arbitrary=False)
     return reqs
 
 
@@ -173,6 +179,14 @@ def _full_marker_environment(
 _PYTHON_VERSION_PARTS = 2
 
 
+def _resolve_target(
+    python_version: str,
+    marker_environment: dict[str, str] | None,
+) -> ResolveTarget:
+    target = ResolveTarget.for_host_python(python_version)
+    return target.with_marker_overrides(marker_environment or {})
+
+
 def _scenario_marker_env(
     python_version: str,
     overlay: dict[str, str],
@@ -235,14 +249,13 @@ def run_one(  # noqa: PLR0913 - one wrapper per scenario knob
     ) as coordinator:
         provider = Provider(
             coordinator,
-            python_version=python_version,
+            target=_resolve_target(python_version, marker_environment),
             root_requirements=requirements,
             uploaded_prior_to=uploaded_prior_to,
             dist_policy=DistPolicy.WHEEL_OR_SDIST,
             build_policy=BuildPolicy.NEVER,
             package_overrides=package_overrides,
             trust_unverified_sdist_deps=trust_unverified_sdist_deps,
-            marker_environment=marker_environment,
         )
         resolver = Resolver(
             provider,

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/ai-stack-lowest-direct.toml

@@ -463,6 +463,8 @@ requirements = ["llama-index-readers-confluence>=0.3,<0.4"]
 # https://github.com/run-llama/llama_index/issues/19167
 # docling 1.20 pins deepsearch-glm<0.23, not on PyPI, -> backtrack.
 resolution = "lowest-direct"
+# Impossible by design: deepsearch-glm 0.21.1, the only version docling's
+# range admits, ships cp39 to cp312 and no sdist, so 3.13 cannot install it.
 python_version = "3.13"
 platform_system = "Linux"
 datetime = "2025-06-21 10:33:57"

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/ai-stack-lowest.toml

@@ -463,6 +463,8 @@ requirements = ["llama-index-readers-confluence>=0.3,<0.4"]
 # https://github.com/run-llama/llama_index/issues/19167
 # docling 1.20 pins deepsearch-glm<0.23, not on PyPI, -> backtrack.
 resolution = "lowest"
+# Impossible by design: deepsearch-glm 0.21.1, the only version docling's
+# range admits, ships cp39 to cp312 and no sdist, so 3.13 cannot install it.
 python_version = "3.13"
 platform_system = "Linux"
 datetime = "2025-06-21 10:33:57"

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/ai-stack.toml

@@ -436,6 +436,8 @@ requirements = ["llama-index-readers-confluence>=0.3,<0.4"]
 [llama-index-docling]
 # https://github.com/run-llama/llama_index/issues/19167
 # docling 1.20 pins deepsearch-glm<0.23, not on PyPI, -> backtrack.
+# Impossible by design: deepsearch-glm 0.21.1, the only version docling's
+# range admits, ships cp39 to cp312 and no sdist, so 3.13 cannot install it.
 python_version = "3.13"
 platform_system = "Linux"
 datetime = "2025-06-21 10:33:57"

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/forums-lowest-direct.toml

@@ -370,6 +370,9 @@ requirements = ["jupyter-server", "jupyter-core"]
 # https://stackoverflow.com/q/77664987
 # teachable-machine pulls tensorflow with no upper bound on Python 3.12.
 resolution = "lowest-direct"
+# Impossible by design: tensorflow's first cp312 wheel is 2.16 (March 2024),
+# after this cutoff, so every teachable-machine version is walked and none
+# can be installed.  That walk is the pip report this reproduces.
 python_version = "3.12"
 platform_system = "Linux"
 datetime = "2023-12-15 08:09:01"
@@ -1020,6 +1023,8 @@ requirements = ["django-mailgun"]
 # https://stackoverflow.com/q/77252186
 # Paddle stack (without git dep): paddlepaddle + paddleocr + paddlenlp
 resolution = "lowest-direct"
+# Impossible by design: paddlepaddle ships no cp310 wheel and no sdist
+# before this cutoff, which is the install failure the question reports.
 python_version = "3.10"
 platform_system = "Linux"
 datetime = "2023-10-08 14:00:00"

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/forums-lowest.toml

@@ -370,6 +370,9 @@ requirements = ["jupyter-server", "jupyter-core"]
 # https://stackoverflow.com/q/77664987
 # teachable-machine pulls tensorflow with no upper bound on Python 3.12.
 resolution = "lowest"
+# Impossible by design: tensorflow's first cp312 wheel is 2.16 (March 2024),
+# after this cutoff, so every teachable-machine version is walked and none
+# can be installed.  That walk is the pip report this reproduces.
 python_version = "3.12"
 platform_system = "Linux"
 datetime = "2023-12-15 08:09:01"
@@ -1020,6 +1023,8 @@ requirements = ["django-mailgun"]
 # https://stackoverflow.com/q/77252186
 # Paddle stack (without git dep): paddlepaddle + paddleocr + paddlenlp
 resolution = "lowest"
+# Impossible by design: paddlepaddle ships no cp310 wheel and no sdist
+# before this cutoff, which is the install failure the question reports.
 python_version = "3.10"
 platform_system = "Linux"
 datetime = "2023-10-08 14:00:00"

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/forums.toml

@@ -343,6 +343,9 @@ requirements = ["jupyter-server", "jupyter-core"]
 [so-teachable-machine-77664987]
 # https://stackoverflow.com/q/77664987
 # teachable-machine pulls tensorflow with no upper bound on Python 3.12.
+# Impossible by design: tensorflow's first cp312 wheel is 2.16 (March 2024),
+# after this cutoff, so every teachable-machine version is walked and none
+# can be installed.  That walk is the pip report this reproduces.
 python_version = "3.12"
 platform_system = "Linux"
 datetime = "2023-12-15 08:09:01"
@@ -946,6 +949,8 @@ requirements = ["django-mailgun"]
 [so-paddleocr-cli-77252186-clone]
 # https://stackoverflow.com/q/77252186
 # Paddle stack (without git dep): paddlepaddle + paddleocr + paddlenlp
+# Impossible by design: paddlepaddle ships no cp310 wheel and no sdist
+# before this cutoff, which is the install failure the question reports.
 python_version = "3.10"
 platform_system = "Linux"
 datetime = "2023-10-08 14:00:00"

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/pip-lowest-direct.toml

@@ -186,6 +186,8 @@ requirements = ["trustllm"]
 [metagpt]
 # https://github.com/FoundationAgents/MetaGPT/issues/1825
 # ResolutionImpossible (not too-deep), kept as a regression check.
+# Impossible by design: metagpt pins faiss-cpu==1.7.4, whose newest wheel is
+# cp311, and it publishes no sdist, so 3.12 cannot install it.
 resolution = "lowest-direct"
 python_version = "3.12"
 platform_system = "Linux"
@@ -203,8 +205,14 @@ requirements = ["mem0ai[graph,extras]"]
 
 [langchain-ml-course]
 # https://github.com/pypa/pip/issues/13281#issuecomment-3813389543
+# Reported on 3.14, but no solution exists there at this cutoff:
+# langchain-chroma pulls chromadb, which requires onnxruntime, and
+# onnxruntime publishes no sdist and no cp314 wheel until 2026-02-05.
+# pip refuses it too.  Targeted at 3.13, where onnxruntime does ship
+# wheels, so the scenario still exercises the backtracking it was added
+# for instead of measuring an impossible resolve.
 resolution = "lowest-direct"
-python_version = "3.14"
+python_version = "3.13"
 platform_system = "Linux"
 datetime = "2026-01-28 19:21:17"
 requirements = [
@@ -786,8 +794,10 @@ requirements = ["trustllm"]
 # https://github.com/pypa/pip/issues/13281#issuecomment-3813389543
 # Near-duplicate of [langchain-ml-course] but on Darwin with a slightly different
 # datetime, capturing the repeated report from a different user environment.
+# Targeted at 3.13 for the same reason: onnxruntime ships no cp314 wheel before
+# the cutoff and no sdist, so 3.14 has no solution here.
 resolution = "lowest-direct"
-python_version = "3.14"
+python_version = "3.13"
 platform_system = "Darwin"
 datetime = "2026-01-28 19:21:17"
 requirements = [
@@ -1656,7 +1666,9 @@ requirements = [
 # Re-run of pip-12275-old-pypi-date but in 2023. Useful as a historical
 # point: even in 2023 a 2019 PyPI cutoff sees heavy backtracking.
 resolution = "lowest-direct"
-python_version = "3.9"
+# Python 3.9 did not exist at this cutoff (released 2020-10-05), so no
+# cp39 wheel could: 3.8 is the interpreter of the day.
+python_version = "3.8"
 platform_system = "Linux"
 datetime = "2020-06-01 00:00:00"
 requirements = [

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/pip-lowest.toml

@@ -186,6 +186,8 @@ requirements = ["trustllm"]
 [metagpt]
 # https://github.com/FoundationAgents/MetaGPT/issues/1825
 # ResolutionImpossible (not too-deep), kept as a regression check.
+# Impossible by design: metagpt pins faiss-cpu==1.7.4, whose newest wheel is
+# cp311, and it publishes no sdist, so 3.12 cannot install it.
 resolution = "lowest"
 python_version = "3.12"
 platform_system = "Linux"
@@ -203,8 +205,14 @@ requirements = ["mem0ai[graph,extras]"]
 
 [langchain-ml-course]
 # https://github.com/pypa/pip/issues/13281#issuecomment-3813389543
+# Reported on 3.14, but no solution exists there at this cutoff:
+# langchain-chroma pulls chromadb, which requires onnxruntime, and
+# onnxruntime publishes no sdist and no cp314 wheel until 2026-02-05.
+# pip refuses it too.  Targeted at 3.13, where onnxruntime does ship
+# wheels, so the scenario still exercises the backtracking it was added
+# for instead of measuring an impossible resolve.
 resolution = "lowest"
-python_version = "3.14"
+python_version = "3.13"
 platform_system = "Linux"
 datetime = "2026-01-28 19:21:17"
 requirements = [
@@ -784,10 +792,16 @@ requirements = ["trustllm"]
 
 [langchain-ml-course-macos]
 # https://github.com/pypa/pip/issues/13281#issuecomment-3813389543
+# Reported on 3.14, but no solution exists there at this cutoff:
+# langchain-chroma pulls chromadb, which requires onnxruntime, and
+# onnxruntime publishes no sdist and no cp314 wheel until 2026-02-05.
+# pip refuses it too.  Targeted at 3.13, where onnxruntime does ship
+# wheels, so the scenario still exercises the backtracking it was added
+# for instead of measuring an impossible resolve.
 # Near-duplicate of [langchain-ml-course] but on Darwin with a slightly different
 # datetime, capturing the repeated report from a different user environment.
 resolution = "lowest"
-python_version = "3.14"
+python_version = "3.13"
 platform_system = "Darwin"
 datetime = "2026-01-28 19:21:17"
 requirements = [
@@ -1656,7 +1670,9 @@ requirements = [
 # Re-run of pip-12275-old-pypi-date but in 2023. Useful as a historical
 # point: even in 2023 a 2019 PyPI cutoff sees heavy backtracking.
 resolution = "lowest"
-python_version = "3.9"
+# Python 3.9 did not exist at this cutoff (released 2020-10-05), so no
+# cp39 wheel could: 3.8 is the interpreter of the day.
+python_version = "3.8"
 platform_system = "Linux"
 datetime = "2020-06-01 00:00:00"
 requirements = [

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios/pip.toml

@@ -170,6 +170,8 @@ requirements = ["trustllm"]
 [metagpt]
 # https://github.com/FoundationAgents/MetaGPT/issues/1825
 # ResolutionImpossible (not too-deep), kept as a regression check.
+# Impossible by design: metagpt pins faiss-cpu==1.7.4, whose newest wheel is
+# cp311, and it publishes no sdist, so 3.12 cannot install it.
 python_version = "3.12"
 platform_system = "Linux"
 datetime = "2025-05-11 06:38:41"
@@ -185,7 +187,13 @@ requirements = ["mem0ai[graph,extras]"]
 
 [langchain-ml-course]
 # https://github.com/pypa/pip/issues/13281#issuecomment-3813389543
-python_version = "3.14"
+# Reported on 3.14, but no solution exists there at this cutoff:
+# langchain-chroma pulls chromadb, which requires onnxruntime, and
+# onnxruntime publishes no sdist and no cp314 wheel until 2026-02-05.
+# pip refuses it too.  Targeted at 3.13, where onnxruntime does ship
+# wheels, so the scenario still exercises the backtracking it was added
+# for instead of measuring an impossible resolve.
+python_version = "3.13"
 platform_system = "Linux"
 datetime = "2026-01-28 19:21:17"
 requirements = [
@@ -743,9 +751,15 @@ requirements = ["trustllm"]
 
 [langchain-ml-course-macos]
 # https://github.com/pypa/pip/issues/13281#issuecomment-3813389543
+# Reported on 3.14, but no solution exists there at this cutoff:
+# langchain-chroma pulls chromadb, which requires onnxruntime, and
+# onnxruntime publishes no sdist and no cp314 wheel until 2026-02-05.
+# pip refuses it too.  Targeted at 3.13, where onnxruntime does ship
+# wheels, so the scenario still exercises the backtracking it was added
+# for instead of measuring an impossible resolve.
 # Near-duplicate of [langchain-ml-course] but on Darwin with a slightly different
 # datetime, capturing the repeated report from a different user environment.
-python_version = "3.14"
+python_version = "3.13"
 platform_system = "Darwin"
 datetime = "2026-01-28 19:21:17"
 requirements = [
@@ -1579,7 +1593,9 @@ requirements = [
 # https://github.com/pypa/pip/issues/12275
 # Re-run of pip-12275-old-pypi-date but in 2023. Useful as a historical
 # point: even in 2023 a 2019 PyPI cutoff sees heavy backtracking.
-python_version = "3.9"
+# Python 3.9 did not exist at this cutoff (released 2020-10-05), so no
+# cp39 wheel could: 3.8 is the interpreter of the day.
+python_version = "3.8"
 platform_system = "Linux"
 datetime = "2020-06-01 00:00:00"
 requirements = [

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/scenarios.py

@@ -51,6 +51,7 @@ from nab_python.provider import (
     VcsPolicy,
     split_extra,
 )
+from nab_python.target import ResolveTarget
 from nab_resolver.resolver import Resolver
 
 BENCHMARKS_DIR = Path(__file__).parent
@@ -138,9 +139,14 @@ def parse_requirements(
             )
             raise NotImplementedError(msg)
         name = canonicalize_name(req.name)
-        reqs[name] = reqs.get(name, VersionRange.full()) & req.specifier.to_range()
+        term = (
+            req.specifier.to_range()
+            if req.specifier
+            else VersionRange.full(admit_arbitrary=False)
+        )
+        reqs[name] = reqs.get(name, VersionRange.full()) & term
         for extra in req.extras:
-            reqs[f"{name}[{extra}]"] = VersionRange.full()
+            reqs[f"{name}[{extra}]"] = VersionRange.full(admit_arbitrary=False)
     return reqs
 
 
@@ -179,6 +185,15 @@ def scenario_marker_env(
     return env
 
 
+def resolve_target(
+    python_version: str,
+    marker_environment: dict[str, str] | None,
+) -> ResolveTarget:
+    """Build the scenario's resolve target: host machine, scenario Python."""
+    target = ResolveTarget.for_host_python(python_version)
+    return target.with_marker_overrides(marker_environment or {})
+
+
 def parse_datetime(value: str) -> datetime:
     """Parse an ISO 8601 datetime string to a timezone-aware datetime."""
     dt = datetime.fromisoformat(value)
@@ -240,14 +255,13 @@ def resolve_scenario(  # noqa: PLR0913 - one wrapper per scenario knob
     ) as coordinator:
         provider = Provider(
             coordinator,
-            python_version=python_version,
+            target=resolve_target(python_version, marker_environment),
             root_requirements=requirements,
             uploaded_prior_to=uploaded_prior_to,
             dist_policy=DistPolicy.WHEEL_OR_SDIST,
             build_policy=BuildPolicy.NEVER,
             package_overrides=package_overrides,
             trust_unverified_sdist_deps=trust_unverified_sdist_deps,
-            marker_environment=marker_environment,
             resolution_strategy=resolution_strategy,
             direct_packages=direct_packages,
         )

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/strategy_sweep.py

@@ -105,13 +105,12 @@ def _resolve_one(  # noqa: PLR0913 - one kwarg per knob; bundling hides the surf
     ) as coordinator:
         provider = Provider(
             coordinator,
-            python_version=python_version,
+            target=_scenarios.resolve_target(python_version, marker_environment),
             root_requirements=requirements,
             uploaded_prior_to=uploaded_prior_to,
             dist_policy=DistPolicy.WHEEL_OR_SDIST,
             build_policy=BuildPolicy.NEVER,
             package_overrides=package_overrides,
-            marker_environment=marker_environment,
             resolution_strategy=strategy,
             direct_packages=direct_packages,
             extras_mode=extras_mode,

{nab_python-0.0.7 → nab_python-0.0.9}/benchmarks/universal_scenarios.py

@@ -1,7 +1,7 @@
-"""Run universal-resolution benchmark scenarios against nab_python.universal.
+"""Run universal-resolution benchmark scenarios against nab_python.
 
 Reads scenarios from ``scenarios/universal.toml`` and resolves each
-via ``nab_python.universal.resolve_universal``, sharing a single
+via ``nab_python.resolve.resolve_with_coordinator``, sharing a single
 ``FetchCoordinator`` per scenario for metadata reuse across tuples.
 
 Output mirrors ``scenarios.py`` but with a ``per_tuple`` array so the
@@ -31,14 +31,20 @@ else:
     # nab pins py>=3.10 but the import fallback matches scenarios.py
     import tomli as tomllib  # type: ignore[no-redef] # pragma: no cover
 
+from nab_index.urllib3_async_transport import Urllib3AsyncTransport
 from nab_python._lockfile.pylock import build_pylock
+from nab_python._vendor.packaging.requirements import Requirement
 from nab_python._vendor.packaging.utils import canonicalize_name
-from nab_python.universal.matrix import Matrix
-from nab_python.universal.resolve import (
-    UniversalResult,
-    merge_universal_lock_inputs,
-    resolve_universal,
+from nab_python.config import NabProjectConfig
+from nab_python.fetch import FetchCoordinator
+from nab_python.provider import ResolutionStrategy
+from nab_python.resolve import (
+    ResolveResult,
+    build_lock_input,
+    resolve_with_coordinator,
 )
+from nab_python.tags import PlatformSpec
+from nab_python.target import Matrix
 
 BENCHMARKS_DIR = Path(__file__).parent
 SCENARIOS_DIR = BENCHMARKS_DIR / "scenarios"
@@ -86,7 +92,7 @@ def parse_datetime(value: str) -> datetime:
     return dt
 
 
-def check_lock_consistency(result: UniversalResult) -> tuple[bool, list[str]]:
+def check_lock_consistency(result: ResolveResult) -> tuple[bool, list[str]]:
     """Verify the marker-gated lock reproduces each tuple's solution.
 
     Builds the real PEP 751 lock and, for each tuple, projects every
@@ -99,20 +105,20 @@ def check_lock_consistency(result: UniversalResult) -> tuple[bool, list[str]]:
 
     Call only when ``result.success`` so the lock covers every tuple.
     """
-    lock_input = merge_universal_lock_inputs(result)
+    lock_input = build_lock_input(result)
     try:
         pylock = build_pylock(lock_input)
     except Exception as exc:
         return False, [f"build_pylock raised {type(exc).__name__}: {exc}"[:200]]
 
     problems: list[str] = []
-    for tr in result.tuple_results:
+    for tr in result.target_results:
         expected = {canonicalize_name(n): str(v) for n, v in tr.pins.items()}
         selected: dict[str, str | None] = {}
         duplicates: set[str] = set()
         for pkg in pylock.packages:
             marker = pkg.marker
-            if marker is not None and not marker.evaluate(tr.tuple_.environment):
+            if marker is not None and not marker.evaluate(tr.target.marker_env):
                 continue
             name = canonicalize_name(str(pkg.name))
             if name in selected:
@@ -127,7 +133,7 @@ def check_lock_consistency(result: UniversalResult) -> tuple[bool, list[str]]:
                 if expected[k] != selected[k]
             )
             problems.append(
-                f"{tr.tuple_.label}: missing={missing} extra={extra} "
+                f"{tr.target.label}: missing={missing} extra={extra} "
                 f"mismatch={mismatch} duplicate={sorted(duplicates)}"
             )
     return not problems, problems
@@ -177,30 +183,43 @@ def process_scenario(
             return
 
     print(f"  {scenario_name} ", end="", flush=True)
-    matrix = Matrix(python=python_spec, platforms=platforms, python_order=python_order)
+    matrix = Matrix(
+        python=python_spec,
+        platforms=tuple(PlatformSpec(p) for p in platforms),
+        python_order=python_order,
+    )
 
     previous_handler = signal.signal(signal.SIGALRM, _alarm_handler)
     signal.alarm(SCENARIO_WALL_TIMEOUT_SECONDS)
     start = time.monotonic()
     timed_out = False
     try:
-        result = resolve_universal(
-            matrix=matrix,
-            requirements=requirement_strings,
-            constraints=constraint_strings or None,
-            cache_dir=CACHE_DIR,
+        config = NabProjectConfig(
+            constraints=tuple(constraint_strings),
             uploaded_prior_to=uploaded_prior_to,
-            resolution_strategy=resolution_strategy,
-            align_across_tuples=align,
         )
+        with FetchCoordinator(
+            Urllib3AsyncTransport(),
+            indexes=list(config.indexes),
+            cache_dir=CACHE_DIR,
+        ) as coordinator:
+            result = resolve_with_coordinator(
+                coordinator,
+                matrix.expand(),
+                [Requirement(text) for text in requirement_strings],
+                config=config,
+                cache_dir=CACHE_DIR,
+                resolution_strategy=ResolutionStrategy(resolution_strategy),
+                align_across_targets=align,
+            )
         elapsed = time.monotonic() - start
         per_tuple = [
             {
-                "label": tr.tuple_.label,
-                "python_version": tr.tuple_.python_version,
-                "platform_id": tr.tuple_.platform_id,
+                "label": tr.target.label,
+                "python_version": tr.target.python_version,
+                "platform_id": tr.target.platform_id,
                 "success": tr.success,
-                "error": tr.error,
+                "error": str(tr.error) if tr.error is not None else None,
                 "decisions": tr.decisions,
                 "rounds": tr.rounds,
                 "conflicts": tr.conflicts,
@@ -210,9 +229,9 @@ def process_scenario(
                 "wall_time_seconds": round(tr.wall_time, 3),
                 "package_count": len(tr.pins),
             }
-            for tr in result.tuple_results
+            for tr in result.target_results
         ]
-        merged = result.merged_lock()
+        merged = result.merged_pins()
         diverging_packages = sum(
             1 for pins in merged.values() if len({version for version, _ in pins}) > 1
         )

{nab_python-0.0.7 → nab_python-0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nab-python"
-version = "0.0.7"
+version = "0.0.9"
 description = "Index-backed provider, lockfile emitter, and downloader for nab"
 readme = "README.md"
 license = "MIT"
@@ -19,8 +19,8 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "nab-resolver==0.0.7",
-    "nab-index==0.0.7",
+    "nab-resolver==0.0.9",
+    "nab-index==0.0.9",
     "tomli>=2.0",
     "tomli_w>=1.2",
     "build>=1.2",