From 1ea8ac57a86fa4f03297459ec631b39da7e61c95 Mon Sep 17 00:00:00 2001
From: max-braintrust <max@braintrustdata.com>
Date: Thu, 23 Apr 2026 10:22:12 -0700
Subject: [PATCH 1/2] forward internal btql

---
 py/src/braintrust/logger.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/py/src/braintrust/logger.py b/py/src/braintrust/logger.py
index 32cd554b..6f475a77 100644
--- a/py/src/braintrust/logger.py
+++ b/py/src/braintrust/logger.py
@@ -1535,6 +1535,7 @@ def init(
     experiment: str | None = ...,
     description: str | None = ...,
     dataset: "Dataset | None" = ...,
+    _internal_btql: dict[str, Any] | None = ...,
     parameters: RemoteEvalParameters | ParametersRef | None = ...,
     open: Literal[False] = ...,
     base_experiment: str | None = ...,
@@ -1560,6 +1561,7 @@ def init(
     experiment: str | None = ...,
     description: str | None = ...,
     dataset: "Dataset | None" = ...,
+    _internal_btql: dict[str, Any] | None = ...,
     parameters: RemoteEvalParameters | ParametersRef | None = ...,
     open: Literal[True] = ...,
     base_experiment: str | None = ...,
@@ -1584,6 +1586,7 @@ def init(
     experiment: str | None = None,
     description: str | None = None,
     dataset: "Dataset | None | DatasetRef" = None,
+    _internal_btql: dict[str, Any] | None = None,
     parameters: RemoteEvalParameters | ParametersRef | None = None,
     open: bool = False,
     base_experiment: str | None = None,
@@ -1719,6 +1722,12 @@ def compute_metadata():
                 args["dataset_id"] = dataset.id
                 args["dataset_version"] = dataset.version
 
+        dataset_filter = _internal_btql
+        if dataset_filter is None and isinstance(dataset, Dataset):
+            dataset_filter = dataset._internal_btql
+        if dataset_filter is not None:
+            args["internal_metadata"] = {"dataset_filter": dataset_filter}
+
         parameters_ref = _get_parameters_ref(parameters)
         if parameters_ref is not None:
             args["parameters_id"] = parameters_ref["id"]

From 8a8a18c41e92f6b5906baf2594c355217f1d1870 Mon Sep 17 00:00:00 2001
From: max-braintrust <max@braintrustdata.com>
Date: Thu, 23 Apr 2026 11:58:33 -0700
Subject: [PATCH 2/2] normalize filters

---
 py/src/braintrust/logger.py | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/py/src/braintrust/logger.py b/py/src/braintrust/logger.py
index 6f475a77..8c523aae 100644
--- a/py/src/braintrust/logger.py
+++ b/py/src/braintrust/logger.py
@@ -2885,6 +2885,38 @@ def __next__(self) -> T:
 MAX_BTQL_ITERATIONS = 10000
 
 
+def _is_internal_btql_filter_clause(value: Any) -> bool:
+    return isinstance(value, dict) and isinstance(value.get("op"), str)
+
+
+def _normalize_internal_btql(
+    internal_btql: dict[str, Any] | None,
+) -> dict[str, Any] | None:
+    if internal_btql is None or "filters" not in internal_btql:
+        return internal_btql
+
+    normalized_internal_btql = {key: value for key, value in internal_btql.items() if key != "filters"}
+    if "filter" in normalized_internal_btql:
+        return normalized_internal_btql
+
+    filters = internal_btql.get("filters")
+    if not isinstance(filters, list) or not all(_is_internal_btql_filter_clause(value) for value in filters):
+        return internal_btql
+
+    if len(filters) == 1:
+        normalized_internal_btql["filter"] = filters[0]
+        return normalized_internal_btql
+
+    if len(filters) > 1:
+        normalized_internal_btql["filter"] = {
+            "op": "and",
+            "children": filters,
+        }
+        return normalized_internal_btql
+
+    return normalized_internal_btql
+
+
 class ObjectFetcher(ABC, Generic[TMapping]):
     def __init__(
         self,
@@ -2950,6 +2982,7 @@ def _refetch(self, batch_size: int | None = None) -> list[TMapping]:
             cursor = None
             data = None
             iterations = 0
+            normalized_internal_btql = _normalize_internal_btql(self._internal_btql)
             while True:
                 resp = state.api_conn().post(
                     f"btql",
@@ -2971,7 +3004,7 @@ def _refetch(self, batch_size: int | None = None) -> list[TMapping]:
                             },
                             "cursor": cursor,
                             "limit": limit,
-                            **(self._internal_btql or {}),
+                            **(normalized_internal_btql or {}),
                         },
                         "use_columnstore": False,
                         "brainstore_realtime": True,