Merge pull request #264 from NOAA-GSL/staging

Author: Hackshaven

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zyra"
-version = "0.1.45"
+version = "0.1.46"
 description = "A tool to ingest data from various sources and formats, create imagery or video based on that data, and send the results to various locations for dissemination."
 authors = ["Eric Hackathorn <eric.j.hackathorn@noaa.gov>"]
 include = [

src/zyra/api/models/cli_request.py

@@ -23,6 +23,7 @@ class CLIRunRequest(BaseModel):
         "narrate",
         "verify",
         "run",
+        "search",
         "swarm",
     ]
     command: str = Field(..., description="Subcommand within the selected stage")

src/zyra/api/routers/cli.py

@@ -198,6 +198,29 @@ def ex(name: str, meta: dict[str, Any]) -> Any:
     canonical_groups.append(("decide", parsers_from_register(decide.register_cli)))
     canonical_groups.append(("narrate", parsers_from_register(narrate.register_cli)))
     canonical_groups.append(("verify", parsers_from_register(verify.register_cli)))
+    # search / discovery - register_cli takes a full ArgumentParser (like swarm)
+    import zyra.connectors.discovery as discovery
+
+    _search_parser = argparse.ArgumentParser(prog="zyra search")
+    discovery.register_cli(_search_parser)
+    _search_cmds: dict[str, argparse.ArgumentParser] = {}
+    _subparsers_action_type = getattr(argparse, "_SubParsersAction", None)
+    for _action in getattr(_search_parser, "_actions", []):
+        if _subparsers_action_type is not None and isinstance(
+            _action,
+            _subparsers_action_type,  # type: ignore[arg-type]
+        ):
+            _search_cmds = dict(getattr(_action, "choices", {}))
+            break
+    # NOTE:
+    # - discovery.register_cli registers a full ``zyra search`` CLI, including
+    #   a base command (no subcommand) and one or more subcommands (e.g., ``api``).
+    # - The API CLI matrix intentionally only exposes the subcommands via
+    #   ``_search_cmds``. As a result, /v1/cli/run with stage="search" supports
+    #   only these subcommands and cannot invoke the base ``zyra search`` form
+    #   (e.g., ``zyra search "tsunami" ...``) without a dedicated executor
+    #   special-case similar to the one used for the ``swarm`` stage.
+    canonical_groups.append(("search", _search_cmds))
     # swarm (single command; attach args directly)
     swarm_parser = argparse.ArgumentParser(prog="zyra swarm")
     swarm_cli.register_cli(swarm_parser)

src/zyra/api/workers/executor.py

@@ -271,11 +271,18 @@ def _args_dict_to_argv(stage: str, command: str, args: dict[str, Any]) -> list[s
                 argv.extend(["--input", str(input_val)])
             argv.append(str(path))
 
+    # Per-(stage, command) overrides where argparse dest differs from
+    # the canonical --flag name (e.g., dest="api_query" but flag is --query).
+    flag_overrides: dict[tuple[str, str], dict[str, str]] = {
+        ("search", "api"): {"api_query": "--query"},
+    }
+    overrides = flag_overrides.get((stage, command), {})
+
     # Remaining keys become long flags
     for key, value in norm_args.items():
         if value is None:
             continue
-        flag = f"--{_to_kebab(key)}"
+        flag = overrides.get(key, f"--{_to_kebab(key)}")
         if isinstance(value, bool):
             if value:
                 argv.append(flag)

tests/api/test_cli_run_search_stage.py

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: Apache-2.0
+"""Regression test: stage='search' must be accepted by POST /v1/cli/run."""
+
+from __future__ import annotations
+
+from unittest.mock import patch
+
+from fastapi.testclient import TestClient
+
+from zyra.api.server import app
+from zyra.api.workers.executor import RunResult
+
+
+def test_cli_run_accepts_search_stage():
+    """POST /v1/cli/run with stage='search' must not return 422 or 400."""
+    client = TestClient(app)
+    # Patch run_cli to avoid actually executing the CLI command
+    with patch(
+        "zyra.api.routers.cli.run_cli",
+        return_value=RunResult(stdout="ok", stderr="", exit_code=0),
+    ):
+        r = client.post(
+            "/v1/cli/run",
+            json={
+                "stage": "search",
+                "command": "api",
+                "args": {"url": "https://example.com/api", "api_query": "temperature"},
+            },
+        )
+    assert r.status_code == 200, f"unexpected status: {r.json()}"
+    body = r.json()
+    assert body.get("status") == "success"
+    assert body.get("stdout") == "ok"

tests/cli/test_api_args.py

@@ -56,3 +56,30 @@ def test_aliases_dest_target_and_src():
     assert argv[:2] == ["decimate", "local"]
     # path should be positional at the end
     assert argv[-1] == "./out.bin"
+
+
+def test_search_api_query_flag_override():
+    """api_query key must emit --query (not --api-query)."""
+    argv = _args_dict_to_argv(
+        "search",
+        "api",
+        {"url": "https://example.com/api", "api_query": "temperature"},
+    )
+    assert argv[:2] == ["search", "api"]
+    assert "--query" in argv
+    assert "--api-query" not in argv
+    i = argv.index("--query")
+    assert argv[i + 1] == "temperature"
+
+
+def test_search_api_natural_query_key():
+    """Client-friendly 'query' key must also produce --query."""
+    argv = _args_dict_to_argv(
+        "search",
+        "api",
+        {"url": "https://example.com/api", "query": "temperature"},
+    )
+    assert argv[:2] == ["search", "api"]
+    assert "--query" in argv
+    i = argv.index("--query")
+    assert argv[i + 1] == "temperature"

tests/snapshots/openapi_sha256.txt

@@ -1 +1 @@
-2017e2d2238d26852a86f50cd9640d02eb0c71f5ec138c537580cf268466535b
+afddec39bddbd2ec4340f6beddf77275ce324618d99b7ff3b9a765071983b569