upscaler-cli 0.2.3.dev6635__tar.gz → 0.2.3.dev6646__tar.gz

{upscaler_cli-0.2.3.dev6635 → upscaler_cli-0.2.3.dev6646}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upscaler-cli
-Version: 0.2.3.dev6635
+Version: 0.2.3.dev6646
 Summary: Upscaler CLI - search, retrieve, and manage documents, records, and workflows
 Requires-Python: >=3.10
 Requires-Dist: click>=8.0

{upscaler_cli-0.2.3.dev6635 → upscaler_cli-0.2.3.dev6646}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "upscaler-cli"
-version = "0.2.3.dev6635"
+version = "0.2.3.dev6646"
 description = "Upscaler CLI - search, retrieve, and manage documents, records, and workflows"
 requires-python = ">=3.10"
 dependencies = [

{upscaler_cli-0.2.3.dev6635 → upscaler_cli-0.2.3.dev6646}/src/cli/entry.py

@@ -567,8 +567,29 @@ def _resolve_field_descriptors(ctx, schema_fields, files):
     return resolved
 
 
+def _bare_col_key(col_key):
+    """Reduce a possibly-dotted form-table column key to its bare column id.
+
+    The backend schema endpoint surfaces a table column's key as the dotted
+    composite ``ff_table.ff_col`` (the flattened form-field key), with a null
+    ``dataIndex``. The persisted row and every UI renderer, however, key the
+    cell by the BARE column id ``ff_col`` (``column.dataIndex``/``column.key``),
+    and the store writes values verbatim. Splicing under the dotted key
+    therefore produces a row that persists but never renders. We always reduce
+    to the bare last segment. Field ids never contain a literal dot, so the last
+    dot-segment is the column's own id; idempotent for already-bare keys. See B9
+    in the agent-skills alignment proposal for the upstream schema fix.
+    """
+    return col_key.rsplit(".", 1)[-1] if col_key else col_key
+
+
 def _resolve_nested(ctx, descriptor, raw_stripped, table_fields):
-    """Resolve `Table.Column` into a {table_key, col_key} descriptor."""
+    """Resolve `Table.Column` into a {table_key, col_key} descriptor.
+
+    ``col_key`` is always returned BARE (see ``_bare_col_key``) so the splice
+    writes the row shape the store and UI expect, regardless of whether the
+    schema reported the column key as bare or dotted.
+    """
     table_raw, col_raw = (part.strip() for part in raw_stripped.split(".", 1))
     if not table_raw or not col_raw:
         click.echo(
@@ -586,13 +607,28 @@ def _resolve_nested(ctx, descriptor, raw_stripped, table_fields):
         c for c in columns if c.get("type") == AGENT_SCHEMA_FILE_UPLOAD_TYPE
     ]
 
-    # Exact ff_* match against columns first, then case-insensitive label.
-    col_by_key = {c["key"]: c for c in columns if c.get("key")}
+    # Match the column by its full schema key OR its bare last segment: the
+    # backend reports table columns as the dotted `ff_table.ff_col`, but a user
+    # (or the skill) may pass either the dotted path or the bare `ff_col`.
+    col_by_key = {}
+    for c in columns:
+        k = c.get("key")
+        if not k:
+            continue
+        col_by_key.setdefault(k, c)
+        col_by_key.setdefault(_bare_col_key(k), c)
+
     if col_raw in col_by_key:
         col = col_by_key[col_raw]
         if col.get("type") != AGENT_SCHEMA_FILE_UPLOAD_TYPE:
-            _fail_loud_non_file_column(ctx, table, col_raw, file_columns)
-        return {**descriptor, "table_key": table["key"], "col_key": col_raw}
+            _fail_loud_non_file_column(
+                ctx, table, _bare_col_key(col.get("key")), file_columns
+            )
+        return {
+            **descriptor,
+            "table_key": table["key"],
+            "col_key": _bare_col_key(col["key"]),
+        }
 
     norm = col_raw.lower()
     candidates = [
@@ -601,11 +637,16 @@ def _resolve_nested(ctx, descriptor, raw_stripped, table_fields):
         if (c.get("label") or "").strip().lower() == norm and c.get("key")
     ]
     if len(candidates) == 1:
-        return {**descriptor, "table_key": table["key"], "col_key": candidates[0]}
+        return {
+            **descriptor,
+            "table_key": table["key"],
+            "col_key": _bare_col_key(candidates[0]),
+        }
     if len(candidates) > 1:
         click.echo(
             f'Column "{col_raw}" in table "{table.get("label") or table["key"]}" '
-            f'matches multiple file columns: {", ".join(candidates)}. '
+            f'matches multiple file columns: '
+            f'{", ".join(_bare_col_key(k) for k in candidates)}. '
             f"Pass the ff_* key to disambiguate.",
             err=True,
         )
@@ -641,8 +682,8 @@ def _fail_loud_unknown(ctx, field_name, file_fields, table_fields=()):
                 if isinstance(c, dict) and c.get("type") == AGENT_SCHEMA_FILE_UPLOAD_TYPE:
                     nested.append(
                         f'"{t.get("label") or t.get("key")}.'
-                        f'{c.get("label") or c.get("key")}" → '
-                        f'{t.get("key")}.{c.get("key")}'
+                        f'{c.get("label") or _bare_col_key(c.get("key"))}" → '
+                        f'{t.get("key")}.{_bare_col_key(c.get("key"))}'
                     )
         if nested:
             extra = (
@@ -686,7 +727,7 @@ def _fail_loud_unknown_table(ctx, table_raw, table_fields):
 
 def _fail_loud_unknown_column(ctx, table, col_raw, file_columns):
     available = ", ".join(
-        f'"{c.get("label")}" → {c.get("key")}' for c in file_columns
+        f'"{c.get("label")}" → {_bare_col_key(c.get("key"))}' for c in file_columns
     ) or "(none)"
     click.echo(
         f'No file column "{col_raw}" in table '
@@ -698,7 +739,9 @@ def _fail_loud_unknown_column(ctx, table, col_raw, file_columns):
 
 
 def _fail_loud_non_file_column(ctx, table, col_key, file_columns):
-    available = ", ".join(c.get("key") for c in file_columns) or "(none)"
+    available = ", ".join(
+        _bare_col_key(c.get("key")) for c in file_columns
+    ) or "(none)"
     click.echo(
         f'Column "{col_key}" in table '
         f'"{table.get("label") or table.get("key")}" is not a file-upload column. '

{upscaler_cli-0.2.3.dev6635 → upscaler_cli-0.2.3.dev6646}/src/cli/framework.py

@@ -16,17 +16,21 @@ from src.cli.helpers import execute_rest_action
 def framework_group():
     """Manage installed compliance frameworks (ISO 27001 etc.).
 
+    The installed-framework id is the catalog id (a colon, e.g. ``iso27001:2022``),
+    NOT an ``if_*`` value and NOT the hyphen form. A hyphen form (``iso27001-2022``)
+    is normalized to the colon form for convenience.
+
     Examples:
         upscaler framework list-installed
-        upscaler framework get-installed iso27001-2022
+        upscaler framework get-installed iso27001:2022
         upscaler framework list-contributions --asset-id d_xyz
         upscaler framework list-test-bindings --asset-id d_xyz
         upscaler framework list-requirement-contributions \\
-            --framework-id iso27001-2022 --requirement-id A.5.1
-        upscaler framework bind --framework-id iso27001-2022 --data @binding.json
-        upscaler framework set-test-binding --framework-id iso27001-2022 \\
+            --framework-id iso27001:2022 --requirement-id A.5.1
+        upscaler framework bind --framework-id iso27001:2022 --data @binding.json
+        upscaler framework set-test-binding --framework-id iso27001:2022 \\
             --requirement-id A.5.1 --test-id t-exists --asset-id d_xyz
-        upscaler framework evaluate --framework-id iso27001-2022 --requirement-id A.5.1
+        upscaler framework evaluate --framework-id iso27001:2022 --requirement-id A.5.1
     """
     pass
 
@@ -76,11 +80,60 @@ def list_requirement_contributions(ctx, framework_id, requirement_id):
 
 
 @framework_group.command("list-test-bindings")
-@click.option("--asset-id", required=True)
+@click.option("--asset-id", default=None, help="Per-asset: Tests bound to this asset.")
+@click.option(
+    "--framework-id",
+    default=None,
+    help="Framework-wide: every Test/binding row for this installed framework.",
+)
+@click.option(
+    "--source",
+    default=None,
+    type=click.Choice(["autoBind", "override", "ambiguous"]),
+    help="Framework-wide filter: only bindings with this source.",
+)
+@click.option(
+    "--unbound-only",
+    is_flag=True,
+    help="Framework-wide filter: only Tests with no bound asset.",
+)
+@click.option(
+    "--coverage-state",
+    default=None,
+    help="Framework-wide filter: only requirements in this coverage state.",
+)
 @pass_context
-def list_test_bindings(ctx, asset_id):
-    """List framework Tests bound to an asset."""
-    _execute(ctx, {"action": "list_asset_test_bindings", "asset_id": asset_id})
+def list_test_bindings(ctx, asset_id, framework_id, source, unbound_only, coverage_state):
+    """List framework Tests bound to an asset, or framework-wide.
+
+    Pass --asset-id for the per-asset inverse (Tests bound to one asset), or
+    --framework-id to get every Test/binding row across the framework in one
+    call (optionally filtered by --source / --unbound-only / --coverage-state)
+    to answer "which bindings are ambiguous / how many untested?".
+    """
+    if framework_id:
+        data = {}
+        if source:
+            data["source"] = source
+        if unbound_only:
+            data["unbound_only"] = True
+        if coverage_state:
+            data["coverage_state"] = coverage_state
+        payload = {
+            "action": "list_framework_test_bindings",
+            "framework_id": framework_id,
+        }
+        if data:
+            payload["data"] = data
+        _execute(ctx, payload)
+    elif asset_id:
+        _execute(ctx, {"action": "list_asset_test_bindings", "asset_id": asset_id})
+    else:
+        click.echo(
+            "Provide either --asset-id (per-asset) or --framework-id (framework-wide).",
+            err=True,
+        )
+        sys.exit(1)
 
 
 # ---------------------------------------------------------------------------
@@ -330,6 +383,19 @@ def evaluate(ctx, framework_id, requirement_id, test_id):
     _execute(ctx, payload)
 
 
+@framework_group.command("sweep")
+@click.option("--framework-id", required=True)
+@pass_context
+def sweep(ctx, framework_id):
+    """Re-evaluate every Test on every Requirement in one call (framework-wide).
+
+    One call replaces a per-Requirement ``evaluate`` loop after a batch of
+    binding/Test changes. Respects the SoA "Included = No" gate. Returns the
+    full installed-framework projection with refreshed coverageState.
+    """
+    _execute(ctx, {"action": "sweep_installed", "framework_id": framework_id})
+
+
 # ---------------------------------------------------------------------------
 # Helpers
 # ---------------------------------------------------------------------------

{upscaler_cli-0.2.3.dev6635 → upscaler_cli-0.2.3.dev6646}/src/cli/list_cmd.py

@@ -357,12 +357,51 @@ def _do_list(
         click.echo(format_table(data))
 
 
-def _rewrite_values_to_labels(result, schema_fields):
-    """Rewrite each item's `values` dict keys from ff_* IDs to human labels.
+def _relabel_nested(value, subid_to_label):
+    """Recurse into table rows / composite (date-range) sub-values.
+
+    Table/composite values are dicts (or lists of dicts) keyed by the column's
+    trailing sub-id; rewrite those sub-ids to their column labels. Scalars pass
+    through unchanged.
+    """
+    if isinstance(value, dict):
+        return {
+            subid_to_label.get(sub_k, sub_k): _relabel_nested(sub_v, subid_to_label)
+            for sub_k, sub_v in value.items()
+        }
+    if isinstance(value, list):
+        return [_relabel_nested(item, subid_to_label) for item in value]
+    return value
 
-    Unmapped keys are left as-is to tolerate schema drift mid-paginate.
+
+def _rewrite_values_to_labels(result, schema_fields):
+    """Rewrite each item's `values` keys from ff_* IDs to human labels.
+
+    Handles three field shapes:
+    - scalar fields: schema `key` is a bare `ff_...` matching the values key.
+    - table / composite fields: schema `key` is prefixed `values.ff_...` (the
+      values dict uses the bare `ff_...`), and the value is a dict or list of
+      dicts keyed by a column sub-id; `columns[].key` is `values.ff_....<subid>`.
+    Both the field key and nested column sub-ids are resolved. Unmapped keys
+    are left as-is to tolerate schema drift mid-paginate.
     """
-    key_to_label = {f["key"]: f["label"] for f in schema_fields if f.get("key") and f.get("label")}
+    key_to_label = {}
+    subid_to_label = {}
+    for field in schema_fields:
+        key = field.get("key")
+        label = field.get("label")
+        if key and label:
+            key_to_label[key] = label
+            # Table/composite field keys carry a `values.` prefix that the
+            # item's values dict does not; map the bare form too.
+            if key.startswith("values."):
+                key_to_label[key[len("values."):]] = label
+        for col in field.get("columns") or []:
+            col_key = col.get("key")
+            col_label = col.get("label")
+            if col_key and col_label:
+                subid_to_label[col_key.rsplit(".", 1)[-1]] = col_label
+
     data = result.get("data") if isinstance(result, dict) else None
     items = data.get("items") if isinstance(data, dict) else None
     if not isinstance(items, list):
@@ -371,4 +410,7 @@ def _rewrite_values_to_labels(result, schema_fields):
         values = item.get("values") if isinstance(item, dict) else None
         if not isinstance(values, dict):
             continue
-        item["values"] = {key_to_label.get(k, k): v for k, v in values.items()}
+        item["values"] = {
+            key_to_label.get(k, k): _relabel_nested(v, subid_to_label)
+            for k, v in values.items()
+        }

upscaler_cli-0.2.3.dev6646/src/cli/search.py

@@ -0,0 +1,129 @@
+"""Search command for document search."""
+
+import asyncio
+
+import click
+
+from src.cli.context import pass_context
+from src.cli.helpers import handle_error
+
+
+@click.command()
+@click.argument("query")
+@click.option("--limit", default=10, help="Number of results to return.")
+@click.option(
+    "--type",
+    "asset_type",
+    default=None,
+    help="Filter by asset type (raw enum, e.g. document_definition, item).",
+)
+@click.option(
+    "--parent-id",
+    "parent_id",
+    default=None,
+    help="Restrict the search to descendants of this asset (e.g. the ISMS root d_*).",
+)
+@click.option(
+    "--published-after",
+    "published_after",
+    default=None,
+    help="Only results published on/after this ISO 8601 date (e.g. 2025-01-01).",
+)
+@click.option(
+    "--published-before",
+    "published_before",
+    default=None,
+    help="Only results published on/before this ISO 8601 date.",
+)
+@click.option("--tag", "tags", multiple=True, help="Filter by tag id (repeatable).")
+@click.option(
+    "--sort-by",
+    "sort_by",
+    default=None,
+    type=click.Choice(["relevance", "date", "title"]),
+    help="Sort order (default: relevance).",
+)
+@click.option(
+    "--score-threshold",
+    "score_threshold",
+    default=None,
+    type=float,
+    help="Minimum relevance score (0.0-1.0).",
+)
+@click.option(
+    "--include-metadata/--no-include-metadata",
+    "include_metadata",
+    default=False,
+    help=(
+        "Include the per-result raw chunk metadata block. Off by default "
+        "(lean response); turn on only when you need raw chunk metadata."
+    ),
+)
+@pass_context
+def search(
+    ctx,
+    query,
+    limit,
+    asset_type,
+    parent_id,
+    published_after,
+    published_before,
+    tags,
+    sort_by,
+    score_threshold,
+    include_metadata,
+):
+    """Search Upscaler documents.
+
+    Hybrid semantic + keyword search over document AND register-entry content.
+    Results are embedding chunks: cite by ``asset_id`` (not the top-level ``id``)
+    and de-duplicate by ``asset_id``.
+
+    Examples:
+        upscaler search "safety procedures"
+        upscaler search "compliance" --limit 5 --type document_definition
+        upscaler search "access control" --parent-id d_isms --published-after 2025-01-01
+        upscaler --json search "audit"
+    """
+    from src.cli.helpers import make_client
+    from src.formatters.json_fmt import format_json
+    from src.formatters.table import format_table
+
+    client = make_client(ctx)
+
+    # Build the request body. Send only the params the caller set so the
+    # server's defaults apply to everything else. The REST /api/v1/search
+    # model accepts all of these (SearchBase).
+    body = {"query": query, "limit": limit, "include_metadata": include_metadata}
+    if asset_type is not None:
+        body["asset_type"] = asset_type
+    if parent_id is not None:
+        body["parent_id"] = parent_id
+    if published_after is not None:
+        body["published_after"] = published_after
+    if published_before is not None:
+        body["published_before"] = published_before
+    if tags:
+        body["tags"] = list(tags)
+    if sort_by is not None:
+        body["sort_by"] = sort_by
+    if score_threshold is not None:
+        body["score_threshold"] = score_threshold
+
+    try:
+        result = asyncio.run(client.request("POST", "/api/v1/search", json=body))
+    except Exception as e:
+        handle_error(ctx, e)
+        return
+
+    if ctx.json_mode:
+        click.echo(format_json(result, compact=True))
+    else:
+        data = result.get("data", [])
+        if not data:
+            click.echo("No results found.")
+            return
+        click.echo(format_table(
+            data,
+            columns=["score", "asset_id", "asset_title", "asset_type"],
+        ))

{upscaler_cli-0.2.3.dev6635 → upscaler_cli-0.2.3.dev6646}/upscaler_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upscaler-cli
-Version: 0.2.3.dev6635
+Version: 0.2.3.dev6646
 Summary: Upscaler CLI - search, retrieve, and manage documents, records, and workflows
 Requires-Python: >=3.10
 Requires-Dist: click>=8.0

upscaler_cli-0.2.3.dev6635/src/cli/search.py

@@ -1,49 +0,0 @@
-"""Search command for document search."""
-
-import asyncio
-
-import click
-
-from src.cli.context import pass_context
-from src.cli.helpers import handle_error
-
-
-@click.command()
-@click.argument("query")
-@click.option("--limit", default=10, help="Number of results to return.")
-@click.option("--type", "asset_type", default=None, help="Filter by asset type.")
-@pass_context
-def search(ctx, query, limit, asset_type):
-    """Search Upscaler documents.
-
-    Examples:
-        upscaler search "safety procedures"
-        upscaler search "compliance" --limit 5 --type policy
-        upscaler --json search "audit"
-    """
-    from src.cli.helpers import make_client
-    from src.formatters.json_fmt import format_json
-    from src.formatters.table import format_table
-
-    client = make_client(ctx)
-
-    try:
-        result = asyncio.run(client.request(
-            "POST", "/api/v1/search",
-            json={"query": query, "limit": limit, "asset_type": asset_type},
-        ))
-    except Exception as e:
-        handle_error(ctx, e)
-        return
-
-    if ctx.json_mode:
-        click.echo(format_json(result, compact=True))
-    else:
-        data = result.get("data", [])
-        if not data:
-            click.echo("No results found.")
-            return
-        click.echo(format_table(
-            data,
-            columns=["score", "asset_id", "asset_title", "asset_type"],
-        ))