Update ObjectType annotation

sashirestela · sashirestela · commit feaddaecb470 · 2025-07-10T04:00:29.000Z
diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
     <!-- Library Versions -->
     <cleverclient.version>2.2.3</cleverclient.version>
     <okhttp.version>4.12.0</okhttp.version>
-    <slimvalidator.version>1.3.0</slimvalidator.version>
+    <slimvalidator.version>1.4.1</slimvalidator.version>
     <lombok.version>1.18.38</lombok.version>
     <jackson.version>2.19.1</jackson.version>
     <json.schema.version>4.38.0</json.schema.version>
diff --git a/src/main/java/io/github/sashirestela/openai/domain/assistant/AssistantModifyRequest.java b/src/main/java/io/github/sashirestela/openai/domain/assistant/AssistantModifyRequest.java
@@ -48,8 +48,7 @@ public class AssistantModifyRequest {
     @Range(min = 0.0, max = 1.0)
     private Double topP;
 
-    @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ResponseFormat.class)
+    @ObjectType(baseClass = { String.class, ResponseFormat.class })
     private Object responseFormat;
 
 }
diff --git a/src/main/java/io/github/sashirestela/openai/domain/assistant/AssistantRequest.java b/src/main/java/io/github/sashirestela/openai/domain/assistant/AssistantRequest.java
@@ -50,8 +50,7 @@ public class AssistantRequest {
     @Range(min = 0.0, max = 1.0)
     private Double topP;
 
-    @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ResponseFormat.class)
+    @ObjectType(baseClass = { String.class, ResponseFormat.class })
     private Object responseFormat;
 
 }
diff --git a/src/main/java/io/github/sashirestela/openai/domain/assistant/RankingOption.java b/src/main/java/io/github/sashirestela/openai/domain/assistant/RankingOption.java
@@ -21,8 +21,7 @@
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class RankingOption {
 
-    @ObjectType(baseClass = RankerType.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { RankerType.class, String.class })
     private Object ranker;
 
     @Range(min = 0.0, max = 1.0)
diff --git a/src/main/java/io/github/sashirestela/openai/domain/assistant/ThreadCreateAndRunRequest.java b/src/main/java/io/github/sashirestela/openai/domain/assistant/ThreadCreateAndRunRequest.java
@@ -59,14 +59,12 @@ public class ThreadCreateAndRunRequest {
 
     private TruncationStrategy truncationStrategy;
 
-    @ObjectType(baseClass = ToolChoiceOption.class)
-    @ObjectType(baseClass = ToolChoice.class)
+    @ObjectType(baseClass = { ToolChoiceOption.class, ToolChoice.class })
     private Object toolChoice;
 
     private Boolean parallelToolCalls;
 
-    @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ResponseFormat.class)
+    @ObjectType(baseClass = { String.class, ResponseFormat.class })
     private Object responseFormat;
 
 }
diff --git a/src/main/java/io/github/sashirestela/openai/domain/assistant/ThreadMessageRequest.java b/src/main/java/io/github/sashirestela/openai/domain/assistant/ThreadMessageRequest.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.github.sashirestela.openai.common.content.ContentPart;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import io.github.sashirestela.slimvalidator.constraints.Size;
 import lombok.Builder;
@@ -25,7 +26,7 @@ public class ThreadMessageRequest {
 
     @Required
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ContentPart.class, firstGroup = true)
+    @ObjectType(schema = Schema.COLL, baseClass = ContentPart.class)
     private Object content;
 
     @Singular
diff --git a/src/main/java/io/github/sashirestela/openai/domain/assistant/ThreadRunRequest.java b/src/main/java/io/github/sashirestela/openai/domain/assistant/ThreadRunRequest.java
@@ -61,14 +61,12 @@ public class ThreadRunRequest {
 
     private TruncationStrategy truncationStrategy;
 
-    @ObjectType(baseClass = ToolChoiceOption.class)
-    @ObjectType(baseClass = ToolChoice.class)
+    @ObjectType(baseClass = { ToolChoiceOption.class, ToolChoice.class })
     private Object toolChoice;
 
     private Boolean parallelToolCalls;
 
-    @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ResponseFormat.class)
+    @ObjectType(baseClass = { String.class, ResponseFormat.class })
     private Object responseFormat;
 
 }
diff --git a/src/main/java/io/github/sashirestela/openai/domain/chat/ChatMessage.java b/src/main/java/io/github/sashirestela/openai/domain/chat/ChatMessage.java
@@ -9,6 +9,7 @@
 import io.github.sashirestela.openai.common.content.ContentPart.ChatContentPart;
 import io.github.sashirestela.openai.common.tool.ToolCall;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.Builder;
 import lombok.Getter;
@@ -105,7 +106,7 @@ public static class UserMessage extends ChatMessage {
 
         @Required
         @ObjectType(baseClass = String.class)
-        @ObjectType(baseClass = ChatContentPart.class, firstGroup = true)
+        @ObjectType(schema = Schema.COLL, baseClass = ChatContentPart.class)
         private Object content;
 
         private String name;
@@ -134,7 +135,7 @@ public static class AssistantMessage extends ChatMessage {
 
         @JsonInclude
         @ObjectType(baseClass = String.class)
-        @ObjectType(baseClass = ChatContentPart.class, firstGroup = true)
+        @ObjectType(schema = Schema.COLL, baseClass = ChatContentPart.class)
         private Object content;
 
         private String refusal;
diff --git a/src/main/java/io/github/sashirestela/openai/domain/chat/ChatRequest.java b/src/main/java/io/github/sashirestela/openai/domain/chat/ChatRequest.java
@@ -13,6 +13,7 @@
 import io.github.sashirestela.openai.common.tool.ToolChoice;
 import io.github.sashirestela.openai.common.tool.ToolChoiceOption;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Range;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.AllArgsConstructor;
@@ -81,7 +82,7 @@ public class ChatRequest {
     private ServiceTier serviceTier;
 
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = String.class, firstGroup = true, maxSize = 4)
+    @ObjectType(schema = Schema.COLL, baseClass = String.class, maxSize = 4)
     private Object stop;
 
     @With
@@ -100,8 +101,7 @@ public class ChatRequest {
     private List<Tool> tools;
 
     @With
-    @ObjectType(baseClass = ToolChoiceOption.class)
-    @ObjectType(baseClass = ToolChoice.class)
+    @ObjectType(baseClass = { ToolChoiceOption.class, ToolChoice.class })
     private Object toolChoice;
 
     private Boolean parallelToolCalls;
diff --git a/src/main/java/io/github/sashirestela/openai/domain/completion/CompletionRequest.java b/src/main/java/io/github/sashirestela/openai/domain/completion/CompletionRequest.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.github.sashirestela.openai.common.StreamOptions;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Range;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.Builder;
@@ -25,9 +26,8 @@ public class CompletionRequest {
 
     @Required
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = String.class, firstGroup = true)
-    @ObjectType(baseClass = Integer.class, firstGroup = true)
-    @ObjectType(baseClass = Integer.class, firstGroup = true, secondGroup = true)
+    @ObjectType(schema = Schema.COLL, baseClass = { String.class, Integer.class })
+    @ObjectType(schema = Schema.COLL_COLL, baseClass = Integer.class)
     private Object prompt;
 
     @Range(min = 0, max = 20)
@@ -54,7 +54,7 @@ public class CompletionRequest {
     private Integer seed;
 
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = String.class, firstGroup = true, maxSize = 4)
+    @ObjectType(schema = Schema.COLL, baseClass = String.class, maxSize = 4)
     private Object stop;
 
     @With
diff --git a/src/main/java/io/github/sashirestela/openai/domain/embedding/EmbeddingRequest.java b/src/main/java/io/github/sashirestela/openai/domain/embedding/EmbeddingRequest.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Range;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.Builder;
@@ -20,9 +21,8 @@ public class EmbeddingRequest {
 
     @Required
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = String.class, firstGroup = true)
-    @ObjectType(baseClass = Integer.class, firstGroup = true)
-    @ObjectType(baseClass = Integer.class, firstGroup = true, secondGroup = true)
+    @ObjectType(schema = Schema.COLL, baseClass = { String.class, Integer.class })
+    @ObjectType(schema = Schema.COLL_COLL, baseClass = Integer.class)
     private Object input;
 
     @Required
diff --git a/src/main/java/io/github/sashirestela/openai/domain/finetuning/HyperParams.java b/src/main/java/io/github/sashirestela/openai/domain/finetuning/HyperParams.java
@@ -21,20 +21,16 @@
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class HyperParams {
 
-    @ObjectType(baseClass = Integer.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { Integer.class, String.class })
     private Object beta;
 
-    @ObjectType(baseClass = Integer.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { Integer.class, String.class })
     private Object batchSize;
 
-    @ObjectType(baseClass = Double.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { Double.class, String.class })
     private Object learningRateMultiplier;
 
-    @ObjectType(baseClass = Integer.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { Integer.class, String.class })
     private Object nEpochs;
 
     public Object getnEpochs() {
diff --git a/src/main/java/io/github/sashirestela/openai/domain/image/ImageEditsRequest.java b/src/main/java/io/github/sashirestela/openai/domain/image/ImageEditsRequest.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import io.github.sashirestela.slimvalidator.constraints.Extension;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
@@ -17,7 +18,7 @@ public class ImageEditsRequest extends AbstractImageRequest {
 
     @Required
     @ObjectType(baseClass = Path.class)
-    @ObjectType(baseClass = Path.class, firstGroup = true)
+    @ObjectType(schema = Schema.COLL, baseClass = Path.class)
     private Object image;
 
     @Required
diff --git a/src/main/java/io/github/sashirestela/openai/domain/moderation/ModerationRequest.java b/src/main/java/io/github/sashirestela/openai/domain/moderation/ModerationRequest.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.Builder;
 import lombok.Getter;
@@ -19,8 +20,7 @@ public class ModerationRequest {
 
     @Required
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = String.class, firstGroup = true)
-    @ObjectType(baseClass = MultiModalInput.class, firstGroup = true)
+    @ObjectType(schema = Schema.COLL, baseClass = { String.class, MultiModalInput.class })
     private Object input;
 
     private String model;
diff --git a/src/main/java/io/github/sashirestela/openai/domain/realtime/RealtimeResponse.java b/src/main/java/io/github/sashirestela/openai/domain/realtime/RealtimeResponse.java
@@ -41,16 +41,14 @@ public class RealtimeResponse {
     @Singular
     private List<RealtimeSession.ToolRealtime> tools;
 
-    @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ToolChoiceOption.class)
+    @ObjectType(baseClass = { String.class, ToolChoiceOption.class })
     private Object toolChoice;
 
     @Range(min = 0.6, max = 1.2)
     private Double temperature;
 
     @Range(min = 1, max = 4096)
-    @ObjectType(baseClass = Integer.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { Integer.class, String.class })
     private Object maxResponseOutputTokens;
 
     private ConversationType conversation;
diff --git a/src/main/java/io/github/sashirestela/openai/domain/realtime/RealtimeSession.java b/src/main/java/io/github/sashirestela/openai/domain/realtime/RealtimeSession.java
@@ -56,16 +56,14 @@ public class RealtimeSession {
     @Singular
     protected List<ToolRealtime> tools;
 
-    @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = ToolChoiceOption.class)
+    @ObjectType(baseClass = { String.class, ToolChoiceOption.class })
     protected Object toolChoice;
 
     @Range(min = 0.6, max = 1.2)
     protected Double temperature;
 
     @Range(min = 1, max = 4096)
-    @ObjectType(baseClass = Integer.class)
-    @ObjectType(baseClass = String.class)
+    @ObjectType(baseClass = { Integer.class, String.class })
     protected Object maxResponseOutputTokens;
 
     public enum VoiceRealtime {
diff --git a/src/main/java/io/github/sashirestela/openai/domain/response/Input.java b/src/main/java/io/github/sashirestela/openai/domain/response/Input.java
@@ -13,6 +13,7 @@
 import io.github.sashirestela.openai.domain.response.ResponseTool.ImageFormat;
 import io.github.sashirestela.openai.domain.response.ResponseTool.ImageQuality;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Range;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import io.github.sashirestela.slimvalidator.constraints.Size;
@@ -39,7 +40,7 @@ public static class InputMessage extends Input {
 
         @Required
         @ObjectType(baseClass = String.class)
-        @ObjectType(baseClass = Content.class, firstGroup = true)
+        @ObjectType(schema = Schema.COLL, baseClass = Content.class)
         private Object content;
 
         @Required
diff --git a/src/main/java/io/github/sashirestela/openai/domain/response/ResponseRequest.java b/src/main/java/io/github/sashirestela/openai/domain/response/ResponseRequest.java
@@ -8,6 +8,7 @@
 import io.github.sashirestela.openai.common.tool.ToolChoiceOption;
 import io.github.sashirestela.openai.domain.chat.ChatRequest.ServiceTier;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Range;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import io.github.sashirestela.slimvalidator.constraints.Size;
@@ -29,7 +30,7 @@ public class ResponseRequest {
 
     @Required
     @ObjectType(baseClass = String.class)
-    @ObjectType(baseClass = Input.class, firstGroup = true)
+    @ObjectType(schema = Schema.COLL, baseClass = Input.class)
     private Object input;
 
     @Required
@@ -64,9 +65,8 @@ public class ResponseRequest {
 
     private ResponseText text;
 
-    @ObjectType(baseClass = ToolChoiceOption.class)
-    @ObjectType(baseClass = ResponseToolChoice.HostedTool.class)
-    @ObjectType(baseClass = ResponseToolChoice.FunctionTool.class)
+    @ObjectType(baseClass = { ToolChoiceOption.class, ResponseToolChoice.HostedTool.class,
+            ResponseToolChoice.FunctionTool.class })
     private Object toolChoice;
 
     @Singular
diff --git a/src/main/java/io/github/sashirestela/openai/domain/response/ResponseTool.java b/src/main/java/io/github/sashirestela/openai/domain/response/ResponseTool.java
@@ -17,6 +17,7 @@
 import io.github.sashirestela.openai.common.function.FunctionDef;
 import io.github.sashirestela.openai.domain.assistant.RankingOption;
 import io.github.sashirestela.slimvalidator.constraints.ObjectType;
+import io.github.sashirestela.slimvalidator.constraints.ObjectType.Schema;
 import io.github.sashirestela.slimvalidator.constraints.Range;
 import io.github.sashirestela.slimvalidator.constraints.Required;
 import lombok.AllArgsConstructor;
@@ -184,15 +185,14 @@ public static class McpResponseTool extends ResponseTool {
         @Required
         private String serverUrl;
 
-        @ObjectType(baseClass = String.class, firstGroup = true)
+        @ObjectType(schema = Schema.COLL, baseClass = String.class)
         @ObjectType(baseClass = McpListTools.class)
         @JsonDeserialize(using = AllowedToolsDeserializer.class)
         private Object allowedTools;
 
         private Map<String, String> headers;
 
-        @ObjectType(baseClass = McpToolApprovalSetting.class)
-        @ObjectType(baseClass = McpToolApprovalFilter.class)
+        @ObjectType(baseClass = { McpToolApprovalSetting.class, McpToolApprovalFilter.class })
         @JsonDeserialize(using = RequireApprovalDeserializer.class)
         private Object requireApproval;
 
@@ -217,8 +217,7 @@ public McpResponseTool(String serverLabel, String serverUrl, Object allowedTools
     public static class CodeInterpreterResponseTool extends ResponseTool {
 
         @Required
-        @ObjectType(baseClass = String.class)
-        @ObjectType(baseClass = ContainerAuto.class)
+        @ObjectType(baseClass = { String.class, ContainerAuto.class })
         @JsonDeserialize(using = ContainerDeserializer.class)
         private Object container;
 
@@ -301,9 +300,7 @@ class ComparisonFilter implements Filter {
             private ComparisonOperator type;
 
             @Required
-            @ObjectType(baseClass = String.class)
-            @ObjectType(baseClass = Double.class)
-            @ObjectType(baseClass = Boolean.class)
+            @ObjectType(baseClass = { String.class, Double.class, Boolean.class })
             private Object value;
 
         }
diff --git a/src/test/java/io/github/sashirestela/openai/SimpleOpenAITest.java b/src/test/java/io/github/sashirestela/openai/SimpleOpenAITest.java
@@ -179,9 +179,10 @@ void shouldThrownExceptionWhenBodyRequestFailsValidations() {
                 .stop(List.of("one", "two", "three", "four", "five"))
                 .build();
         var exception = assertThrows(ConstraintViolationException.class, () -> chatService.create(chatRequest));
-        var expectedErrorMessage = "messages must have a value.\n"
-                + "stop type must be or String or Collection<String> (max 4 items).\n"
-                + "toolChoice type must be or ToolChoiceOption or ToolChoice.";
+        var expectedErrorMessage = ""
+                + "messages must have a value.\n"
+                + "stop type must be one of String or Collection<String> and size at most 4.\n"
+                + "toolChoice type must be one of ToolChoiceOption|ToolChoice.";
         assertEquals(expectedErrorMessage, exception.getMessage());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ public class AssistantModifyRequest {`
`48`	`48`	`@Range(min = 0.0, max = 1.0)`
`49`	`49`	`private Double topP;`
`50`	`50`
`51`		`- @ObjectType(baseClass = String.class)`
`52`		`- @ObjectType(baseClass = ResponseFormat.class)`
	`51`	`+ @ObjectType(baseClass = { String.class, ResponseFormat.class })`
`53`	`52`	`private Object responseFormat;`
`54`	`53`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ public class AssistantRequest {`
`50`	`50`	`@Range(min = 0.0, max = 1.0)`
`51`	`51`	`private Double topP;`
`52`	`52`
`53`		`- @ObjectType(baseClass = String.class)`
`54`		`- @ObjectType(baseClass = ResponseFormat.class)`
	`53`	`+ @ObjectType(baseClass = { String.class, ResponseFormat.class })`
`55`	`54`	`private Object responseFormat;`
`56`	`55`
`57`	`56`	`}`