Reject unsupported agentic query filters

Author: jioffe502

nemo_retriever/src/nemo_retriever/cli/query/app.py

@@ -22,6 +22,7 @@
     silence_noisy_libraries,
 )
 from nemo_retriever.common.vdb.records import RetrievalHit
+from nemo_retriever.query.filters import has_query_filters
 from nemo_retriever.query.options import (
     QueryAgenticOptions,
     QueryEmbedOptions,
@@ -226,8 +227,16 @@ def _local_command(
     try:
         reranker_api_key = _api_key_from_env_option(reranker_api_key_env) if reranker_invoke_url else None
         effective_retrieval_mode = _query_retrieval_mode(ctx, retrieval_mode, hybrid)
+        filters = _filter_options(
+            source_id=source_id,
+            source=source,
+            page_number=page_number,
+            where=where,
+        )
 
         if agentic:
+            if has_query_filters(filters):
+                raise ValueError("--source-id, --source, --page-number, and --where are not supported with --agentic.")
             request = QueryRequest(
                 query=query,
                 retrieval=_retrieval_options(
@@ -278,12 +287,7 @@ def _request() -> QueryRequest:
                     content_types=content_types,
                     retrieval_mode=effective_retrieval_mode,
                 ),
-                filters=_filter_options(
-                    source_id=source_id,
-                    source=source,
-                    page_number=page_number,
-                    where=where,
-                ),
+                filters=filters,
                 embed=QueryEmbedOptions(
                     embed_invoke_url=embed_invoke_url,
                     embed_model_name=embed_model_name,

nemo_retriever/src/nemo_retriever/query/filters.py

@@ -106,6 +106,11 @@ def build_query_where_clause(options: QueryFilterOptions) -> str | None:
     return " AND ".join(clauses)
 
 
+def has_query_filters(options: QueryFilterOptions) -> bool:
+    """Return whether any query filter option is set."""
+    return build_query_where_clause(options) is not None
+
+
 def query_filter_payload(options: QueryFilterOptions) -> dict[str, Any]:
     """Return the public service query filter payload for non-empty fields."""
     payload: dict[str, Any] = {}

nemo_retriever/tests/test_query_filters.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from nemo_retriever.query.filters import build_query_where_clause, query_filter_payload
+from nemo_retriever.query.filters import build_query_where_clause, has_query_filters, query_filter_payload
 from nemo_retriever.query.options import QueryFilterOptions
 
 
@@ -56,6 +56,12 @@ def test_advanced_where_is_pass_through_and_combines_with_structured_filters() -
     )
 
 
+def test_has_query_filters_reports_non_empty_options() -> None:
+    assert not has_query_filters(QueryFilterOptions())
+    assert has_query_filters(QueryFilterOptions(source_id="docs/a.pdf"))
+    assert has_query_filters(QueryFilterOptions(where="text = 'alpha'"))
+
+
 def test_negative_page_filter_is_rejected() -> None:
     with pytest.raises(ValueError, match="page_number must be greater than or equal to 0"):
         build_query_where_clause(QueryFilterOptions(page_number=-1))

nemo_retriever/tests/test_root_query_cli.py

@@ -470,6 +470,24 @@ def test_root_query_agentic_requires_llm_model() -> None:
     assert "requires --agentic-llm-model" in result.output
 
 
+def test_root_query_agentic_rejects_filter_flags() -> None:
+    result = RUNNER.invoke(
+        cli_main.app,
+        [
+            "query",
+            "hello",
+            "--agentic",
+            "--agentic-llm-model",
+            "nvidia/llama-3.3-nemotron-super-49b-v1.5",
+            "--source-id",
+            "docs/a.pdf",
+        ],
+    )
+
+    assert result.exit_code == 1
+    assert "not supported with --agentic" in result.output
+
+
 def test_root_query_agentic_plumbs_rerank_into_config(monkeypatch) -> None:
     """`--rerank` with `--agentic` wires the reranker config into AgenticRetrievalConfig
     (reranker model + endpoint + backend), so the agent's retrieval backend reranks."""