ndi-cli 0.16.0__tar.gz → 0.25.0__tar.gz

{ndi_cli-0.16.0 → ndi_cli-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndi-cli
-Version: 0.16.0
+Version: 0.25.0
 Summary: NDI platform CLI: document operations, jobs, workspaces, and the agent workspace tools
 Keywords: ndi,cli,document-intelligence,coding-agents
 Author: Nace AI
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: ndi-sdk>=0.31,<1
+Requires-Dist: ndi-sdk>=0.45,<1
 Requires-Dist: truststore>=0.10.4,<1
 Requires-Python: >=3.11
 Project-URL: Homepage, https://ndi-api.nace.ai
@@ -25,8 +25,9 @@ Description-Content-Type: text/markdown
 # ndi-cli
 
 `ndi` — the NDI platform CLI. Document operations, jobs, and workspace
-lifecycle wrap the same `/v1` methods as `ndi-sdk`. The six workspace tools
-also run inside an agent sandbox; every other verb is refused there.
+lifecycle wrap the same `/v1` methods as `ndi-sdk`. `ask-file` also runs
+inside an agent sandbox, next to the file commands only an agent run has; every
+other verb is refused there.
 
 ## Setup
 
@@ -56,12 +57,13 @@ config location. Workspace-scoped verbs also take `--workspace ID`.
 | `ndi workspace global-context [--set TEXT\|--file PATH\|--clear]` | Show, replace, or remove (`--clear`) the background every query without `--context` runs with; `--no-context` on a query runs with none |
 | `ndi files upload\|list\|get\|delete` | Workspace files (a directory walks nested files; `--ingest` then queues ingestion) |
 | `ndi ingest` | Queue ingestion |
-| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog; prints the route, the output job id, and the answer (plus the catalog table when there is one) |
-| `ndi deep-search QUERY` / `ndi fact-search QUERY` | Agentic / single-shot search; then `ndi job` on each printed `grounding_job_ids` entry |
-| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--cursor` pages an earlier run) |
+| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog (`--mode fact\|agent` skips the routing step, `--path` scopes it to files); prints the route, the output job id, and the answer (plus the catalog table when there is one) |
+| `ndi deep-search QUERY` / `ndi fact-search QUERY` | Agentic / single-shot search (`--path` on `deep-search` scopes it to files); then `ndi job` on each printed `grounding_job_ids` entry |
+| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--path` scopes it to files, `--cursor` pages an earlier run) |
 | `ndi je-testing QUERY` | Journal-entry testing over a ledger package (`--path` to scope it, `--reasoning-effort` for the thinking budget) |
 | `ndi ledger-understanding start\|get\|sources\|select\|selection` | Measure the ledger package, confirm sources, or read the latest report |
-| `ndi folder-metadata` / `file-metadata` / `read-file` / `ask-file` / `run-sql` / `hybrid-search` | Read-only workspace tools (the sandbox surface) |
+| `ndi ask-file PATH QUESTION` | Cited answer over one document, image or recording |
+| `ndi systemone --state TEXT --questions JSON` | Answer `noul`, `choice` and `score` questions about a state in one call, no workspace (`--state-json` for a JSON state; any value may be `@FILE` or `@-`) |
 
 ## Sources
 
@@ -100,8 +102,8 @@ The default (`auto`) prints the full JSON response. When that is over
 `$NDI_OUTPUT_LIMIT` characters (default 40,000), the compact text rendering
 prints instead and stderr carries `note: output shortened …` with the full
 size. `--json` always prints it whole, and `--save` / `--out-dir` always write
-it whole. Commands whose output is the content itself (`read-file`,
-`ws context`, parse markdown) print it as before. `--save PATH` / `--out-dir DIR` write files. `--async`
+it whole. Commands whose output is the content itself (`ws context`, parse
+markdown) print it as before. `--save PATH` / `--out-dir DIR` write files. `--async`
 submits and prints the job id.
 
 When a Parse result has external complete content, `-o auto` and `-o md` print
@@ -122,4 +124,4 @@ The server checks a bounded byte prefix, rejects conclusive filename/content
 conflicts, and treats the multipart `Content-Type` as advisory.
 
 See the [CLI guide](https://docs.ndi.nace.ai/guides/cli) for the full command
-reference. `SKILL.md` is the agent-facing guide to the six workspace tools.
+reference. `SKILL.md` is the agent-facing guide to reading a workspace with `ndi`.

{ndi_cli-0.16.0 → ndi_cli-0.25.0}/README.md

@@ -1,8 +1,9 @@
 # ndi-cli
 
 `ndi` — the NDI platform CLI. Document operations, jobs, and workspace
-lifecycle wrap the same `/v1` methods as `ndi-sdk`. The six workspace tools
-also run inside an agent sandbox; every other verb is refused there.
+lifecycle wrap the same `/v1` methods as `ndi-sdk`. `ask-file` also runs
+inside an agent sandbox, next to the file commands only an agent run has; every
+other verb is refused there.
 
 ## Setup
 
@@ -32,12 +33,13 @@ config location. Workspace-scoped verbs also take `--workspace ID`.
 | `ndi workspace global-context [--set TEXT\|--file PATH\|--clear]` | Show, replace, or remove (`--clear`) the background every query without `--context` runs with; `--no-context` on a query runs with none |
 | `ndi files upload\|list\|get\|delete` | Workspace files (a directory walks nested files; `--ingest` then queues ingestion) |
 | `ndi ingest` | Queue ingestion |
-| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog; prints the route, the output job id, and the answer (plus the catalog table when there is one) |
-| `ndi deep-search QUERY` / `ndi fact-search QUERY` | Agentic / single-shot search; then `ndi job` on each printed `grounding_job_ids` entry |
-| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--cursor` pages an earlier run) |
+| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog (`--mode fact\|agent` skips the routing step, `--path` scopes it to files); prints the route, the output job id, and the answer (plus the catalog table when there is one) |
+| `ndi deep-search QUERY` / `ndi fact-search QUERY` | Agentic / single-shot search (`--path` on `deep-search` scopes it to files); then `ndi job` on each printed `grounding_job_ids` entry |
+| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--path` scopes it to files, `--cursor` pages an earlier run) |
 | `ndi je-testing QUERY` | Journal-entry testing over a ledger package (`--path` to scope it, `--reasoning-effort` for the thinking budget) |
 | `ndi ledger-understanding start\|get\|sources\|select\|selection` | Measure the ledger package, confirm sources, or read the latest report |
-| `ndi folder-metadata` / `file-metadata` / `read-file` / `ask-file` / `run-sql` / `hybrid-search` | Read-only workspace tools (the sandbox surface) |
+| `ndi ask-file PATH QUESTION` | Cited answer over one document, image or recording |
+| `ndi systemone --state TEXT --questions JSON` | Answer `noul`, `choice` and `score` questions about a state in one call, no workspace (`--state-json` for a JSON state; any value may be `@FILE` or `@-`) |
 
 ## Sources
 
@@ -76,8 +78,8 @@ The default (`auto`) prints the full JSON response. When that is over
 `$NDI_OUTPUT_LIMIT` characters (default 40,000), the compact text rendering
 prints instead and stderr carries `note: output shortened …` with the full
 size. `--json` always prints it whole, and `--save` / `--out-dir` always write
-it whole. Commands whose output is the content itself (`read-file`,
-`ws context`, parse markdown) print it as before. `--save PATH` / `--out-dir DIR` write files. `--async`
+it whole. Commands whose output is the content itself (`ws context`, parse
+markdown) print it as before. `--save PATH` / `--out-dir DIR` write files. `--async`
 submits and prints the job id.
 
 When a Parse result has external complete content, `-o auto` and `-o md` print
@@ -98,4 +100,4 @@ The server checks a bounded byte prefix, rejects conclusive filename/content
 conflicts, and treats the multipart `Content-Type` as advisory.
 
 See the [CLI guide](https://docs.ndi.nace.ai/guides/cli) for the full command
-reference. `SKILL.md` is the agent-facing guide to the six workspace tools.
+reference. `SKILL.md` is the agent-facing guide to reading a workspace with `ndi`.

{ndi_cli-0.16.0 → ndi_cli-0.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ndi-cli"
-version = "0.16.0"
+version = "0.25.0"
 description = "NDI platform CLI: document operations, jobs, workspaces, and the agent workspace tools"
 readme = "README.md"
 license = "MIT"
@@ -24,7 +24,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "ndi-sdk>=0.31,<1",
+    "ndi-sdk>=0.45,<1",
     "truststore>=0.10.4,<1",
 ]
 

{ndi_cli-0.16.0 → ndi_cli-0.25.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "ndi-cli"
-version = "0.16.0"
+version = "0.25.0"
 description = "NDI platform CLI: document operations, jobs, workspaces, and the agent workspace tools"
 authors = [
     { name = "Nace AI", email = "engineering@nace.ai" }
@@ -27,7 +27,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "ndi-sdk>=0.31,<1",
+    "ndi-sdk>=0.45,<1",
     "truststore>=0.10.4,<1",
 ]
 

ndi_cli-0.25.0/src/ndi_cli/__init__.py

@@ -0,0 +1,9 @@
+"""``ndi`` — the NDI platform CLI.
+
+Document operations, jobs, and workspace lifecycle wrap ``ndi-sdk`` ``/v1``
+methods. Inside an agent sandbox the workspace tools (``folder-metadata``,
+``file-metadata``, ``read-file``, ``ask-file``, ``run-sql``, ``hybrid-search``)
+are the whole surface; outside one only ``ask-file`` is.
+"""
+
+__version__ = "0.25.0"

{ndi_cli-0.16.0 → ndi_cli-0.25.0}/src/ndi_cli/_cli.py

@@ -1,24 +1,27 @@
 """``ndi`` entry point: workspace tools plus the platform verbs.
 
-The six workspace tools stay available inside an agent sandbox. Every other
-verb is refused when ``$NDI_CLI_SOCKET`` is set, before any client is built.
+Inside an agent sandbox the workspace tools are the only verbs, and the file
+commands with no public route exist only there. Every other verb is refused
+when ``$NDI_CLI_SOCKET`` is set, before any client is built.
 """
 
 from __future__ import annotations
 
 import argparse
+import copy
 import os
 import sys
+from concurrent.futures import ThreadPoolExecutor
 
 from ndi_sdk.client import NdiClient
 from ndi_sdk.errors import NdiError, NdiStatusError
 from ndi_sdk.resources.tools import SyncTools
 
-from ndi_cli import _docops, _jobs, _login, _tools, _workspace
+from ndi_cli import _docops, _jobs, _login, _systemone, _tools, _workspace
 from ndi_cli._config import ConfigError, resolve_settings
-from ndi_cli._local import KG_ENV, SOCKET_ENV, TOKEN_ENV, LocalTransport
+from ndi_cli._local import SOCKET_ENV, TOKEN_ENV, LocalTransport
 from ndi_cli._output import full_json, output_limit, print_full_or_summary
-from ndi_cli._tools import GraphCommands, parse_pages
+from ndi_cli._tools import parse_pages
 
 # qa-file runs a durable workflow that legitimately takes minutes; the metadata,
 # read, and run-sql tools answer in seconds but share the generous bound.
@@ -32,10 +35,7 @@ def main(argv: list[str] | None = None) -> int:
     # Presence, not truthiness: an empty $NDI_CLI_SOCKET still means "inside an
     # agent run", and must not silently unlock the full platform CLI.
     in_agent_run = socket_path is not None
-    # An agent run gets kg-answer only when the worker granted it ("answer");
-    # a human CLI user gets all kg-* commands ("all").
-    graph: GraphCommands = ("answer" if os.environ.get(KG_ENV) else "none") if in_agent_run else "all"
-    parser = _build_parser(graph=graph)
+    parser = _build_parser(in_agent_run=in_agent_run)
     args = parser.parse_args(argv)
     if args.command is None:
         parser.print_help()
@@ -78,8 +78,7 @@ def main(argv: list[str] | None = None) -> int:
         if in_agent_run:
             workspace_id = os.environ.get("NDI_WORKSPACE_ID", "")
             transport = LocalTransport(socket_path, args.timeout, os.environ.get(TOKEN_ENV, ""))
-            response = args.run(SyncTools(transport), workspace_id, args)
-            return _print_tool(args, response)
+            return _run_tool(args, SyncTools(transport), workspace_id, _print_tool)
         settings = resolve_settings(
             workspace_override=workspace_flag,
             require_workspace=getattr(args, "needs_workspace", True),
@@ -87,25 +86,65 @@ def main(argv: list[str] | None = None) -> int:
         timeout = getattr(args, "timeout", DEFAULT_TIMEOUT_SECONDS)
         with NdiClient(api_key=settings.api_key, base_url=settings.base_url, timeout=timeout) as client:
             if family == "tool":
-                return _print_tool_full(args, args.run(client.tools, settings.workspace_id, args))
+                return _run_tool(args, client.tools, settings.workspace_id, _print_tool_full)
             return args.run(client, settings.workspace_id, args)
     except ConfigError as exc:
         print(f"error: {exc}", file=sys.stderr)
         return 2
-    except NdiStatusError as exc:
-        code = f" [{exc.code}]" if exc.code else ""
-        print(f"error: {exc.status_code}{code} {exc.message}", file=sys.stderr)
-        for line in _validation_error_lines(exc.body.detail if exc.body else None):
-            print(f"  - {line}", file=sys.stderr)
-        return 1
     except NdiError as exc:
-        print(f"error: {exc}", file=sys.stderr)
-        return 1
+        return _report_error(exc)
     except ValueError as exc:
         print(f"error: {exc}", file=sys.stderr)
         return 2
 
 
+def _run_tool(args: argparse.Namespace, tools: SyncTools, workspace_id: str, printer) -> int:
+    """Run a tool once per positional target (``file-metadata a b``), each printed as its own call would print it.
+
+    The targets are fetched concurrently and printed in the order given. With several
+    targets a failing one reports on stderr and the rest still run, so one bad path costs
+    the caller that path's error line, not every other path's answer.
+    """
+    targets = getattr(args, "targets", [None])
+    if len(targets) == 1:
+        args.target = targets[0]
+        return printer(args, args.run(tools, workspace_id, args))
+
+    def fetch(target: str) -> tuple[argparse.Namespace, object]:
+        per_target = copy.copy(args)
+        per_target.target = target
+        try:
+            return per_target, per_target.run(tools, workspace_id, per_target)
+        except NdiError as exc:
+            return per_target, exc
+
+    with ThreadPoolExecutor(max_workers=len(targets)) as pool:
+        fetched = list(pool.map(fetch, targets))
+    status = 0
+    for index, (per_target, response) in enumerate(fetched):
+        if index:
+            print()
+        if getattr(args, "label_targets", False):
+            print(f"==> {per_target.target} <==")
+        if isinstance(response, NdiError):
+            status = max(status, _report_error(response, target=per_target.target))
+        else:
+            status = max(status, printer(per_target, response))
+    return status
+
+
+def _report_error(exc: NdiError, *, target: str | None = None) -> int:
+    prefix = f"{target}: " if target is not None else ""
+    if not isinstance(exc, NdiStatusError):
+        print(f"error: {prefix}{exc}", file=sys.stderr)
+        return 1
+    code = f" [{exc.code}]" if exc.code else ""
+    print(f"error: {prefix}{exc.status_code}{code} {exc.message}", file=sys.stderr)
+    for line in _validation_error_lines(exc.body.detail if exc.body else None):
+        print(f"  - {line}", file=sys.stderr)
+    return 1
+
+
 def _print_tool(args: argparse.Namespace, response) -> int:
     """The text rendering. An agent run always gets it: the renderings are what its agents are evaluated against."""
     if args.json:
@@ -148,12 +187,12 @@ def _validation_error_lines(detail: object) -> list[str]:
     return lines
 
 
-def _build_parser(*, graph: GraphCommands = "all") -> argparse.ArgumentParser:
+def _build_parser(*, in_agent_run: bool = False) -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="ndi",
         description=(
             "NDI platform CLI. Login, document operations, jobs, and workspace lifecycle talk to /v1; "
-            "the six workspace tools also run inside an agent sandbox. Credentials come from "
+            "the workspace tools also run inside an agent sandbox. Credentials come from "
             "$NDI_API_KEY / $NDI_BASE_URL or ~/.ndi/config.toml."
         ),
     )
@@ -171,10 +210,11 @@ def _build_parser(*, graph: GraphCommands = "all") -> argparse.ArgumentParser:
     )
     sub = parser.add_subparsers(dest="command")
     _login.add_parsers(sub)
-    _tools.add_parsers(sub, common, graph=graph)
+    _tools.add_parsers(sub, common, in_agent_run=in_agent_run)
     _docops.add_parsers(sub, common)
     _jobs.add_parsers(sub, common)
     _workspace.add_parsers(sub, common)
+    _systemone.add_parsers(sub, common)
     return parser
 
 

{ndi_cli-0.16.0 → ndi_cli-0.25.0}/src/ndi_cli/_local.py

@@ -14,29 +14,60 @@ import socket
 from typing import Annotated, Literal, TypeVar
 
 from ndi_sdk.errors import ErrorBody, NdiConnectionError, NdiTimeoutError, error_class_for
-from ndi_sdk.models.tools import (
-    FileMetadataRequest,
-    FolderMetadataRequest,
-    KgSearchRequest,
-    KgWalkRequest,
-    QaFileRequest,
-    ReadFileRequest,
-    RunSqlRequest,
-    SearchRequest,
-)
+from ndi_sdk.models.tools import QaFileRequest
 from pydantic import BaseModel, Field, TypeAdapter
 
 from ndi_cli.commands import WorkspaceCommand
 
 SOCKET_ENV = "NDI_CLI_SOCKET"
 TOKEN_ENV = "NDI_CLI_TOKEN"
-#: Set (to any non-empty value) by the worker for an agent run that has the graph
-#: surface; inside an agent run the ``kg-*`` commands are registered only when it is.
-KG_ENV = "NDI_CLI_KG"
 MAX_MESSAGE_BYTES = 16 * 1024 * 1024
 ModelT = TypeVar("ModelT", bound=BaseModel)
 
 
+# The socket bodies of the agent-only commands. Their /v1 routes are unpublished,
+# so the SDK has no method or request model for them.
+
+
+class FolderMetadataRequest(BaseModel):
+    """Non-recursive by default; the server treats a narrow as recursive unless ``recursive`` is sent."""
+
+    directory: str = "/"
+    recursive: bool | None = None
+    category: str | None = None
+    ingestion_status: str | None = None
+    kind: str | None = None
+    name_contains: str | None = None
+    page_size: int = 100
+    start_after: str | None = None
+    include_tables: bool = False
+
+
+class FileMetadataRequest(BaseModel):
+    path: str
+    component: str | None = None
+
+
+class ReadFileRequest(BaseModel):
+    """``pages`` are absolute and one-based; spreadsheets have none, so scope those with ``component``."""
+
+    path: str
+    pages: list[int] | None = None
+    component: str | None = None
+    max_chars: int | None = None
+
+
+class RunSqlRequest(BaseModel):
+    sql: str
+
+
+class SearchRequest(BaseModel):
+    query: str
+    k: int = 10
+    path_prefix: str | None = None
+    categories: list[str] | None = None
+
+
 class FolderCommand(BaseModel):
     command: Literal[WorkspaceCommand.FOLDER_METADATA] = WorkspaceCommand.FOLDER_METADATA
     body: FolderMetadataRequest
@@ -67,95 +98,16 @@ class SearchCommand(BaseModel):
     body: SearchRequest
 
 
-class KgInfoRequest(BaseModel):
-    """``kg-info``'s scope as a socket body.
-
-    Defined here rather than imported from ``ndi_sdk.models.tools`` like its
-    siblings: on the wire ``kg-info`` is a GET carrying query parameters, so it has
-    no request model to reuse. Only the scope crosses — the drawable sample is for
-    a client that renders a graph, and ``_kg_info_command`` refuses it.
-    """
-
-    path_prefix: str | None = None
-    hub_node_type: str | None = None
-
-
-class KgInfoCommand(BaseModel):
-    command: Literal[WorkspaceCommand.KG_INFO] = WorkspaceCommand.KG_INFO
-    body: KgInfoRequest
-
-
-class KgSearchCommand(BaseModel):
-    command: Literal[WorkspaceCommand.KG_SEARCH] = WorkspaceCommand.KG_SEARCH
-    body: KgSearchRequest
-
-
-class KgWalkCommand(BaseModel):
-    command: Literal[WorkspaceCommand.KG_WALK] = WorkspaceCommand.KG_WALK
-    body: KgWalkRequest
-
-
-class KgAnswerRequest(BaseModel):
-    """``kg-answer``'s question as a socket body.
-
-    The agent passes its verbatim question; the server runs the graph pass and
-    returns the rendered outcome (answered text + citations, or evidence + gap).
-    """
-
-    query: str
-
-
-class KgAnswerResponse(BaseModel):
-    """The rendered outcome of one graph pass, ready to print or inject as a tool result."""
-
-    text: str
-
-
-class KgAnswerCommand(BaseModel):
-    command: Literal[WorkspaceCommand.KG_ANSWER] = WorkspaceCommand.KG_ANSWER
-    body: KgAnswerRequest
-
-
 Command = Annotated[
-    FolderCommand
-    | FileCommand
-    | ReadCommand
-    | AskCommand
-    | SqlCommand
-    | SearchCommand
-    | KgInfoCommand
-    | KgSearchCommand
-    | KgWalkCommand
-    | KgAnswerCommand,
+    FolderCommand | FileCommand | ReadCommand | AskCommand | SqlCommand | SearchCommand,
     Field(discriminator="command"),
 ]
 COMMAND = TypeAdapter(Command)
 
 
-def _kg_info_command(params: object) -> Command:
-    """Build the ``kg-info`` command from the SDK method's query parameters.
-
-    Refuses ``include_graph`` instead of dropping it: the sample is the whole point
-    of that flag, and answering without one would read as a graph with no structure.
-    """
-    if not isinstance(params, dict):
-        raise ValueError("The internal CLI accepts workspace commands only.")
-    if params.get("include_graph"):
-        raise ValueError("The internal CLI does not serve kg-info's drawable graph sample.")
-    prefix = params.get("path_prefix")
-    if prefix is not None and not isinstance(prefix, str):
-        raise ValueError("kg-info's path_prefix must be a string.")
-    hub_node_type = params.get("hub_node_type")
-    if hub_node_type is not None and not isinstance(hub_node_type, str):
-        raise ValueError("kg-info's hub_node_type must be a string.")
-    return KgInfoCommand(body=KgInfoRequest(path_prefix=prefix, hub_node_type=hub_node_type))
-
-
 def _command(method: str, path: str, kwargs: dict[str, object]) -> Command:
-    """One socket command per SDK call, named by the endpoint the method addresses."""
+    """One socket command per tool call, named by the endpoint the call addresses."""
     name = path.rsplit("/", 1)[-1]
-    if method == "GET" and name == WorkspaceCommand.KG_INFO:
-        return _kg_info_command(kwargs.get("params"))
     body = kwargs.get("body")
     if method != "POST" or not isinstance(body, BaseModel):
         raise ValueError("The internal CLI accepts workspace commands only.")