fix default type

comet-ml · Jan 30, 2025 · 7b954c8 · 7b954c8
1 parent b4f2139
commit 7b954c8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/PromptType.java b/apps/opik-backend/src/main/java/com/comet/opik/api/PromptType.java
@@ -19,7 +19,6 @@ public enum PromptType {
 
     @JsonCreator
     public static PromptType fromString(String value) {
-        if (value == null) return MUSTACHE;
         return Arrays.stream(values())
                 .filter(promptType -> promptType.value.equals(value))
                 .findFirst()

diff --git a/apps/opik-backend/src/main/java/com/comet/opik/api/PromptVersion.java b/apps/opik-backend/src/main/java/com/comet/opik/api/PromptVersion.java
@@ -18,6 +18,8 @@
 import java.util.Set;
 import java.util.UUID;
 
+import static com.comet.opik.api.PromptType.MUSTACHE;
+
 @Builder(toBuilder = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
@@ -70,4 +72,9 @@ public static PromptVersion.PromptVersionPage empty(int page) {
             return new PromptVersion.PromptVersionPage(page, 0, 0, List.of());
         }
     }
+
+    @Override
+    public PromptType type() {
+        return type == null ? MUSTACHE : type;
+    }
 }
diff --git a/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/PromptResourceTest.java b/apps/opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/PromptResourceTest.java
@@ -3,6 +3,7 @@
 import com.comet.opik.api.BatchDelete;
 import com.comet.opik.api.CreatePromptVersion;
 import com.comet.opik.api.Prompt;
+import com.comet.opik.api.PromptType;
 import com.comet.opik.api.PromptVersion;
 import com.comet.opik.api.PromptVersionRetrieve;
 import com.comet.opik.api.error.ErrorMessage;
@@ -41,7 +42,9 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullSource;
 import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.lifecycle.Startables;
@@ -1827,9 +1830,11 @@ void when__promptHasNotVersions__thenReturnEmptyPage() {
     @TestInstance(TestInstance.Lifecycle.PER_CLASS)
     class GetPromptVersionById {
 
-        @Test
+        @ParameterizedTest
+        @NullSource
+        @EnumSource(PromptType.class)
         @DisplayName("Success: should get prompt version by id")
-        void shouldGetPromptVersionById() {
+        void shouldGetPromptVersionById(PromptType type) {
 
             var prompt = factory.manufacturePojo(Prompt.class).toBuilder()
                     .lastUpdatedBy(USER)
@@ -1842,6 +1847,7 @@ void shouldGetPromptVersionById() {
             var promptVersion = factory.manufacturePojo(PromptVersion.class).toBuilder()
                     .createdBy(USER)
                     .promptId(promptId)
+                    .type(type)
                     .build();
 
             var request = new CreatePromptVersion(prompt.name(), promptVersion);
@@ -1895,13 +1901,15 @@ void shouldRetrievePromptVersion(
 
             var promptVersion = factory.manufacturePojo(PromptVersion.class).toBuilder()
                     .createdBy(USER)
+                    .type(null)
                     .promptId(promptId)
                     .build();
 
             var request = new CreatePromptVersion(prompt.name(), promptVersion);
 
             var promptVersion2 = factory.manufacturePojo(PromptVersion.class).toBuilder()
                     .createdBy(USER)
+                    .type(null)
                     .promptId(promptId)
                     .build();