feat(intake): add canonical experiment_id filter to evaluations list [ASE-716]

services/intake/src/nmp/intake/api/v2/experiments/endpoints.py

@@ -391,7 +391,8 @@ async def create_evaluation(
     openapi_extra=generate_openapi_extra_params(
         filter_schema=EvaluationFilter,
         filter_description=(
-            "Filter evaluations by name, experiment_group_id, "
+            "Filter evaluations by name, experiment_id (experiment group membership; "
+            "experiment_group_id is a deprecated alias), "
             "dataset_name, dataset_version, created_by, created_at, or updated_at. "
             "Pass is_deleted=true to return only soft-deleted evaluations; omit to see only live ones. "
             "Pass is_pinned=true (or false) to filter by pinned state; omit to return both. "
@@ -1044,15 +1045,19 @@ def _group_membership_filter(group_id: str) -> LogicalOperation:
 
 
 def _rewrite_group_filter(operation: FilterOperation | None) -> FilterOperation | None:
-    """Rewrite an ``experiment_group_id`` equality in a parsed filter into a membership match.
+    """Rewrite a group-membership equality in a parsed filter into a membership match.
 
-    The API still exposes an ``experiment_group_id`` filter param; with many-to-many membership it
-    means "belongs to this group", which spans the ``experiment_ids`` list and the legacy scalar.
+    Both the canonical ``experiment_id`` filter param and its deprecated ``experiment_group_id`` alias
+    mean "belongs to this group"; with many-to-many membership that spans the ``experiment_ids`` list
+    and the legacy scalar, so both route through the same ``_group_membership_filter``.
     """
     if operation is None:
         return None
     if isinstance(operation, ComparisonOperation):
-        if operation.field == "data.experiment_group_id" and operation.operator == FilterOperator.EQ:
+        if (
+            operation.field in ("data.experiment_id", "data.experiment_group_id")
+            and operation.operator == FilterOperator.EQ
+        ):
             return _group_membership_filter(operation.value)
         return operation
     if isinstance(operation, LogicalOperation):

services/intake/src/nmp/intake/api/v2/experiments/schemas.py

@@ -354,7 +354,19 @@ class EvaluationFilter(Filter):
     """Filter for listing Evaluations."""
 
     name: str | None = Field(default=None, description="Filter evaluations by name.")
-    experiment_group_id: str | None = Field(default=None, description="Filter evaluations by owning group id.")
+    experiment_id: str | None = Field(
+        default=None,
+        description=(
+            "Filter evaluations by experiment group membership: matches evaluations whose "
+            "`experiment_ids` include this group id (legacy rows still on `experiment_group_id` also "
+            "match). This is the canonical membership filter — it mirrors the write-side `experiment_ids`."
+        ),
+    )
+    experiment_group_id: str | None = Field(
+        default=None,
+        deprecated=True,
+        description="Deprecated alias for `experiment_id`; filter evaluations by experiment group membership.",
+    )
     dataset_name: str | None = Field(default=None, description="Filter evaluations by dataset name.")
     dataset_version: str | None = Field(default=None, description="Filter evaluations by dataset version.")
     created_by: str | None = Field(default=None, description="Filter evaluations by the principal that created them.")

services/intake/tests/integration/test_experiments_crud.py

@@ -284,6 +284,28 @@ def test_evaluation_list_and_scope_to_group(client: TestClient) -> None:
     assert missing.status_code == 404
 
 
+def test_evaluation_filter_experiment_id_matches_deprecated_alias(client: TestClient) -> None:
+    """The canonical `experiment_id` filter returns the same set as the deprecated `experiment_group_id`,
+    both resolving membership over the evaluation's `experiment_ids` list."""
+    group = client.post(GROUPS, json={"name": "grp-canon"}).json()
+    other = client.post(GROUPS, json={"name": "grp-other"}).json()
+    # Membership is set via the canonical `experiment_ids` write field (no legacy scalar).
+    client.post(EVALUATIONS, json={"name": "in-group", "experiment_ids": [group["id"]], "dataset_name": "ds"})
+    client.post(EVALUATIONS, json={"name": "in-other", "experiment_ids": [other["id"]], "dataset_name": "ds"})
+
+    by_canonical = client.get(EVALUATIONS, params={"filter[experiment_id]": group["id"]})
+    assert by_canonical.status_code == 200, by_canonical.text
+    canonical_names = {e["name"] for e in by_canonical.json()["data"]}
+    assert canonical_names == {"in-group"}
+
+    by_deprecated = client.get(EVALUATIONS, params={"filter[experiment_group_id]": group["id"]})
+    assert by_deprecated.status_code == 200, by_deprecated.text
+    deprecated_names = {e["name"] for e in by_deprecated.json()["data"]}
+
+    # The canonical key and the deprecated alias resolve to the same membership set.
+    assert canonical_names == deprecated_names
+
+
 def test_evaluation_filter_by_dataset_version(client: TestClient) -> None:
     group = _create_group(client)
     client.post(