OPIK-495 Don't return model and provider in payload instead of empty …

…sting if missing (#764)
comet-ml · Nov 29, 2024 · f1ffe14 · f1ffe14
1 parent ead9eee
commit f1ffe14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java b/apps/opik-backend/src/main/java/com/comet/opik/domain/SpanDAO.java
@@ -1038,8 +1038,12 @@ private Publisher<Span> mapToDto(Result result) {
                             .filter(str -> !str.isBlank())
                             .map(JsonUtils::getJsonNodeFromString)
                             .orElse(null))
-                    .model(row.get("model", String.class))
-                    .provider(row.get("provider", String.class))
+                    .model(StringUtils.isBlank(row.get("model", String.class))
+                            ? null
+                            : row.get("model", String.class))
+                    .provider(StringUtils.isBlank(row.get("provider", String.class))
+                            ? null
+                            : row.get("provider", String.class))
                     .totalEstimatedCost(
                             row.get("total_estimated_cost", BigDecimal.class).compareTo(BigDecimal.ZERO) == 0
                                     ? null

diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/SpansResourceTest.java
@@ -3321,10 +3321,10 @@ Stream<Arguments> createAndGetCost() {
                 Arguments.of(Map.of("completion_tokens", Math.abs(podamFactory.manufacturePojo(Integer.class)),
                         "prompt_tokens", Math.abs(podamFactory.manufacturePojo(Integer.class))), "gpt-3.5-turbo-1106", metadata),
                 Arguments.of(Map.of("completion_tokens", Math.abs(podamFactory.manufacturePojo(Integer.class)),
-                        "prompt_tokens", Math.abs(podamFactory.manufacturePojo(Integer.class))), "", metadata),
+                        "prompt_tokens", Math.abs(podamFactory.manufacturePojo(Integer.class))), null, metadata),
                 Arguments.of(null, "gpt-3.5-turbo-1106", null),
                 Arguments.of(null, "unknown-model", null),
-                Arguments.of(null, "", null));
+                Arguments.of(null, null, null));
     }
 
     @Test