Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,18 @@ public Optional<DatasetCase<INPUT, OUTPUT>> next() {
OUTPUT expected = (OUTPUT) event.getExpected();

var metadataObj = event.getMetadata();
Map<String, Object> metadata =
metadataObj != null ? metadataObj.getAdditionalProperties() : Map.of();
if (metadata == null) metadata = Map.of();
// InsertProjectLogsEventMetadata extends HashMap<String,Object>. Jackson stores
// unknown fields in the HashMap base (not in additionalProperties) for Map subclasses,
// so copy from both sources defensively.
Map<String, Object> metadata;
if (metadataObj != null) {
metadata = new HashMap<>(metadataObj);
if (metadataObj.getAdditionalProperties() != null) {
metadata.putAll(metadataObj.getAdditionalProperties());
}
} else {
metadata = Map.of();
}

List<String> tags = event.getTags() != null ? event.getTags() : List.of();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,50 @@ void testFetchWithPinnedVersion() {
.withRequestBody(matchingJsonPath("$.version", equalTo(pinnedVersion))));
}

@Test
void testMetadataPopulatedFromDatasetRow() {
wireMock.stubFor(
post(urlEqualTo("/v1/dataset/" + datasetId + "/fetch"))
.willReturn(
aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/json")
.withBody(
"""
{
"events": [
{
"object_type": "dataset",
"dataset_id": "%s",
"id": "meta-row-1",
"_xact_id": "1",
"created": "2024-01-01T00:00:00Z",
"input": "test input",
"expected": "test output",
"metadata": {
"performance_strategy": "TURBO",
"userId": "user123"
}
}
],
"cursor": null
}
"""
.formatted(datasetId))));

DatasetBrainstoreImpl<String, String> dataset =
new DatasetBrainstoreImpl<>(apiClient, datasetId, "test-version");

List<DatasetCase<String, String>> cases = new ArrayList<>();
dataset.forEach(cases::add);

assertEquals(1, cases.size());
Map<String, Object> metadata = cases.get(0).metadata();
assertFalse(metadata.isEmpty(), "metadata should not be empty");
assertEquals("TURBO", metadata.get("performance_strategy"));
assertEquals("user123", metadata.get("userId"));
}

@Test
void testFetchFromBraintrustNotFound() {
String projectName = "test-project";
Expand Down
Loading