dirsql 0.4.9__tar.gz → 0.4.10__tar.gz

{dirsql-0.4.9 → dirsql-0.4.10}/Cargo.lock

@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.9"
+version = "0.4.10"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.9 → dirsql-0.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.9
+Version: 0.4.10
 Requires-Dist: tomli>=2 ; python_full_version < '3.11'
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

dirsql-0.4.10/dirsql/cli/resolve_config_extensions.py

@@ -0,0 +1,70 @@
+"""Launcher-side resolution of the TOML configs' ``[[dirsql.extension]]`` entries.
+
+The compiled ``dirsql`` binary loads a config's extensions literally -- it
+has no ``importlib``, so it cannot resolve a bare **package name**. When any
+TOML config in argv names an extension by package name, the shared SDK
+resolver (:mod:`dirsql.resolve_config_extensions`) resolves every config's
+extensions and this launcher passes the resolved literal paths to the binary
+via repeatable ``--extension`` flags; the binary then loads those and ignores
+the configs' own extension entries.
+
+Every config flag occurrence counts -- ``-c``/``--config`` are repeatable,
+and plugin discovery injects fragments as additional ``-c`` flags -- so the
+scan collects them all, in argv order.
+
+Native-language configs (``.py`` / ``.js`` / ``.mjs`` / ``.cjs``) are untouched:
+the binary dispatches those to ``dirsql interpret``, whose handshake already
+carries resolved paths.
+"""
+
+from __future__ import annotations
+
+from ..resolve_config_extensions import resolve_configs_extension_specs
+
+# Config extensions the binary dispatches to `dirsql interpret`; never
+# pre-resolved here (that path resolves via the handshake).
+_NATIVE_SUFFIXES = (".py", ".js", ".mjs", ".cjs")
+
+
+def _config_paths_from_argv(argv: list[str]) -> list[str]:
+    """Every config value in argv, in order (``--config X``, ``--config=X``,
+    ``-c X``, ``-c=X``, ``-cX``), or the default when none are given."""
+    paths: list[str] = []
+    i = 0
+    while i < len(argv):
+        a = argv[i]
+        if a == "--config" or a == "-c":
+            # A bare trailing flag (no following value) yields "".
+            paths.append(next(iter(argv[i + 1 :]), ""))
+            i += 2
+            continue
+        if a.startswith("--config="):
+            paths.append(a[len("--config=") :])
+        elif a.startswith("-c"):
+            paths.append(a[len("-c") :].removeprefix("="))
+        i += 1
+    return paths or ["./.dirsql.toml"]
+
+
+def with_resolved_extensions(argv: list[str]) -> list[str]:
+    """Return ``argv`` plus ``--extension`` flags when a TOML config names an
+    extension by package name; otherwise return ``argv`` unchanged. Raises if a
+    package name cannot be resolved (the launcher surfaces a clean error)."""
+    if argv and argv[0] == "init":
+        return argv
+    config_paths = [
+        p for p in _config_paths_from_argv(argv) if not p.endswith(_NATIVE_SUFFIXES)
+    ]
+    if not config_paths:
+        return argv
+    specs = resolve_configs_extension_specs(config_paths)
+    if specs is None:
+        return argv
+    flags: list[str] = []
+    for spec in specs:
+        entrypoint = spec["entrypoint"]
+        flags.append("--extension")
+        flags.append(
+            f"{spec['path']}::{entrypoint}" if entrypoint is not None else spec["path"]
+        )
+    return [*argv, *flags]

{dirsql-0.4.9 → dirsql-0.4.10}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.4.9"
+version = "0.4.10"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.10/packages/python/changelog.d/2026-08-03-discovery-ext-resolution.md

@@ -0,0 +1,8 @@
+**Fixed** The CLI launcher now resolves package-name `[[dirsql.extension]]`
+entries for **every** config flag in argv — `-c X`, `-c=X`, `-cX`,
+`--config X`, `--config=X`, repeated flags included — instead of only the
+first `--config`. In particular, config fragments injected by plugin
+discovery (which arrive as `-c` flags) get their package-name extensions
+resolved to literal paths, so a plugin declaring e.g. `path = "sqlite_vec"`
+loads on the pure discovery path instead of failing with
+`failed to load extension` (#754).

dirsql-0.4.10/packages/python/e2e-attestations/fix-754-discovery-ext-resolution.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1785779409,
+  "exit_code": 0,
+  "commit": "610d8ff41538de6e3d5f19b4abea3ec1b351986a",
+  "branch": "fix/754-discovery-ext-resolution"
+}

dirsql-0.4.9/dirsql/cli/resolve_config_extensions.py

@@ -1,55 +0,0 @@
-"""Launcher-side resolution of a TOML config's ``[[dirsql.extension]]`` entries.
-
-The compiled ``dirsql`` binary loads a config's extensions literally -- it
-has no ``importlib``, so it cannot resolve a bare **package name**. When a
-TOML config names an extension by package name, the shared SDK resolver
-(:mod:`dirsql.resolve_config_extensions`) resolves every one of its
-extensions and this launcher passes the resolved literal paths to the binary
-via repeatable ``--extension`` flags; the binary then loads those and ignores
-the config's own extension entries.
-
-Native-language configs (``.py`` / ``.js`` / ``.mjs`` / ``.cjs``) are untouched:
-the binary dispatches those to ``dirsql interpret``, whose handshake already
-carries resolved paths.
-"""
-
-from __future__ import annotations
-
-from ..resolve_config_extensions import resolve_config_extension_specs
-
-# Config extensions the binary dispatches to `dirsql interpret`; never
-# pre-resolved here (that path resolves via the handshake).
-_NATIVE_SUFFIXES = (".py", ".js", ".mjs", ".cjs")
-
-
-def _config_path_from_argv(argv: list[str]) -> str:
-    """The ``--config`` value (``--config X`` or ``--config=X``), or the default."""
-    for i, a in enumerate(argv):
-        if a == "--config":
-            # A bare trailing `--config` (no following value) yields "".
-            return next(iter(argv[i + 1 :]), "")
-        if a.startswith("--config="):
-            return a[len("--config=") :]
-    return "./.dirsql.toml"
-
-
-def with_resolved_extensions(argv: list[str]) -> list[str]:
-    """Return ``argv`` plus ``--extension`` flags when the TOML config names an
-    extension by package name; otherwise return ``argv`` unchanged. Raises if a
-    package name cannot be resolved (the launcher surfaces a clean error)."""
-    if argv and argv[0] == "init":
-        return argv
-    config_path = _config_path_from_argv(argv)
-    if config_path.endswith(_NATIVE_SUFFIXES):
-        return argv
-    specs = resolve_config_extension_specs(config_path)
-    if specs is None:
-        return argv
-    flags: list[str] = []
-    for spec in specs:
-        entrypoint = spec["entrypoint"]
-        flags.append("--extension")
-        flags.append(
-            f"{spec['path']}::{entrypoint}" if entrypoint is not None else spec["path"]
-        )
-    return [*argv, *flags]