Generate new model classes for float[]

rpanackal · rpanackal · commit a64a3c174931 · 2025-10-14T13:43:51.000+02:00
diff --git a/orchestration/pom.xml b/orchestration/pom.xml
@@ -203,6 +203,7 @@
                     <useOneOfInterfaces>true</useOneOfInterfaces>
                     <removeEnumValuePrefix>true</removeEnumValuePrefix>
                     <useOneOfCreators>true</useOneOfCreators>
+                    <useFloatArrays>true</useFloatArrays>
                   </additionalProperties>
                 </configuration>
               </execution>
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/AssistantMessage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/AssistantMessage.java
@@ -105,7 +105,7 @@ public ChatMessage createChatMessage() {
               .map(item -> (TextItem) item)
               .map(item -> TextContent.create().type(TextContent.TypeEnum.TEXT).text(item.text()))
               .toList();
-      text = ChatMessageContent.create(texts);
+      text = ChatMessageContent.createListOfTextContents(texts);
     }
     return assistantChatMessage.content(text);
   }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/MessageContent.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/MessageContent.java
@@ -20,7 +20,7 @@ static MessageContent fromChatMessageContent(final ChatMessageContent chatMessag
     if (chatMessageContent instanceof ChatMessageContent.InnerString innerString) {
       return new MessageContent(List.of(new TextItem(innerString.value())));
     } else if (chatMessageContent
-        instanceof ChatMessageContent.InnerTextContents innerTextContents) {
+        instanceof ChatMessageContent.ListOfTextContents innerTextContents) {
       val texts =
           innerTextContents.values().stream()
               .map(textContent -> ((ContentItem) new TextItem(textContent.getText())))
@@ -37,7 +37,7 @@ static MessageContent fromUserChatMessageContent(
       return new MessageContent(List.of(new TextItem(innerString.value())));
     } else if (chatMessageContent
         instanceof
-        final UserChatMessageContent.InnerUserChatMessageContentItems innerContentItems) {
+        final UserChatMessageContent.ListOfUserChatMessageContentItems innerContentItems) {
       val items = new ArrayList<ContentItem>();
       for (val value : innerContentItems.values()) {
         if (value.getType().equals(UserChatMessageContentItem.TypeEnum.TEXT)) {
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationEmbeddingRequest.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationEmbeddingRequest.java
@@ -140,7 +140,9 @@ public OrchestrationEmbeddingRequest asQuery() {
   EmbeddingsPostRequest createEmbeddingsPostRequest() {
 
     final var input =
-        EmbeddingsInput.create().text(EmbeddingsInputText.create(inputs)).type(inputType);
+        EmbeddingsInput.create()
+            .text(EmbeddingsInputText.createListOfStrings(inputs))
+            .type(inputType);
     final var embeddingsModelConfig =
         EmbeddingsModelConfig.create().model(model.createEmbeddingsModelDetails());
     final var modules =
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationEmbeddingResponse.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationEmbeddingResponse.java
@@ -3,9 +3,9 @@
 import static lombok.AccessLevel.PACKAGE;
 
 import com.google.common.annotations.Beta;
-import com.sap.ai.sdk.orchestration.model.Embedding;
+import com.sap.ai.sdk.orchestration.model.Embedding.ArrayOfFloats;
+import com.sap.ai.sdk.orchestration.model.EmbeddingResult;
 import com.sap.ai.sdk.orchestration.model.EmbeddingsPostResponse;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nonnull;
 import lombok.AllArgsConstructor;
@@ -33,16 +33,11 @@ public class OrchestrationEmbeddingResponse {
    */
   @Nonnull
   public List<float[]> getEmbeddingVectors() {
-    final var embeddings = new ArrayList<float[]>();
-    for (final var container : originalResponse.getFinalResult().getData()) {
-      final var bigDecimals = (Embedding.InnerBigDecimals) container.getEmbedding();
-      final var values = bigDecimals.values();
-      final float[] arr = new float[values.size()];
-      for (int i = 0; i < values.size(); i++) {
-        arr[i] = values.get(i).floatValue();
-      }
-      embeddings.add(arr);
-    }
-    return embeddings;
+    return originalResponse.getFinalResult().getData().stream()
+        .map(EmbeddingResult::getEmbedding)
+        .filter(ArrayOfFloats.class::isInstance)
+        .map(ArrayOfFloats.class::cast)
+        .map(ArrayOfFloats::values)
+        .toList();
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/SystemMessage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/SystemMessage.java
@@ -70,6 +70,8 @@ public ChatMessage createChatMessage() {
             .map(item -> (TextItem) item)
             .map(item -> TextContent.create().type(TextContent.TypeEnum.TEXT).text(item.text()))
             .toList();
-    return SystemChatMessage.create().role(SYSTEM).content(ChatMessageContent.create(texts));
+    return SystemChatMessage.create()
+        .role(SYSTEM)
+        .content(ChatMessageContent.createListOfTextContents(texts));
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/UserMessage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/UserMessage.java
@@ -107,6 +107,8 @@ public ChatMessage createChatMessage() {
         contentList.add(UserChatMessageContentItem.create().type(IMAGE_URL).imageUrl(img));
       }
     }
-    return UserChatMessage.create().content(UserChatMessageContent.create(contentList)).role(USER);
+    return UserChatMessage.create()
+        .content(UserChatMessageContent.createListOfUserChatMessageContentItems(contentList))
+        .role(USER);
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/ChatMessageContent.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/ChatMessageContent.java
@@ -16,36 +16,38 @@
 
 /** ChatMessageContent */
 public interface ChatMessageContent {
-  /** Helper class to create a String that implements {@link ChatMessageContent}. */
-  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
+  /**
+   * Helper class to create {@code List<TextContent> } that implements {@link ChatMessageContent}.
+   */
+  record ListOfTextContents(
+      @com.fasterxml.jackson.annotation.JsonValue @Nonnull List<TextContent> values)
       implements ChatMessageContent {}
 
   /**
-   * Creator to enable deserialization of a String.
+   * Creator to enable deserialization of {@code List<TextContent> }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerString}.
+   * @return a new instance of {@link ListOfTextContents}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerString create(@Nonnull final String val) {
-    return new InnerString(val);
+  static ListOfTextContents createListOfTextContents(@Nonnull final List<TextContent> val) {
+    return new ListOfTextContents(val);
   }
 
-  /** Helper class to create a list of TextContent that implements {@link ChatMessageContent}. */
-  record InnerTextContents(
-      @com.fasterxml.jackson.annotation.JsonValue @Nonnull List<TextContent> values)
+  /** Helper class to create {@code String } that implements {@link ChatMessageContent}. */
+  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
       implements ChatMessageContent {}
 
   /**
-   * Creator to enable deserialization of a list of TextContent.
+   * Creator to enable deserialization of {@code String }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerTextContents}.
+   * @return a new instance of {@link InnerString}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerTextContents create(@Nonnull final List<TextContent> val) {
-    return new InnerTextContents(val);
+  static InnerString create(@Nonnull final String val) {
+    return new InnerString(val);
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/Embedding.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/Embedding.java
@@ -11,42 +11,39 @@
 
 package com.sap.ai.sdk.orchestration.model;
 
-import java.math.BigDecimal;
-import java.util.List;
 import javax.annotation.Nonnull;
 
 /** Embedding */
 public interface Embedding {
-  /** Helper class to create a String that implements {@link Embedding}. */
-  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
+  /** Helper class to create {@code float[] } that implements {@link Embedding}. */
+  record ArrayOfFloats(@com.fasterxml.jackson.annotation.JsonValue @Nonnull float[] values)
       implements Embedding {}
 
   /**
-   * Creator to enable deserialization of a String.
+   * Creator to enable deserialization of {@code float[] }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerString}.
+   * @return a new instance of {@link ArrayOfFloats}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerString create(@Nonnull final String val) {
-    return new InnerString(val);
+  static ArrayOfFloats createArrayOfFloats(@Nonnull final float[] val) {
+    return new ArrayOfFloats(val);
   }
 
-  /** Helper class to create a list of BigDecimal that implements {@link Embedding}. */
-  record InnerBigDecimals(
-      @com.fasterxml.jackson.annotation.JsonValue @Nonnull List<BigDecimal> values)
+  /** Helper class to create {@code String } that implements {@link Embedding}. */
+  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
       implements Embedding {}
 
   /**
-   * Creator to enable deserialization of a list of BigDecimal.
+   * Creator to enable deserialization of {@code String }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerBigDecimals}.
+   * @return a new instance of {@link InnerString}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerBigDecimals create(@Nonnull final List<BigDecimal> val) {
-    return new InnerBigDecimals(val);
+  static InnerString create(@Nonnull final String val) {
+    return new InnerString(val);
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/EmbeddingsInputText.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/EmbeddingsInputText.java
@@ -16,35 +16,35 @@
 
 /** Text input for which embeddings need to be generated */
 public interface EmbeddingsInputText {
-  /** Helper class to create a String that implements {@link EmbeddingsInputText}. */
-  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
+  /** Helper class to create {@code List<String> } that implements {@link EmbeddingsInputText}. */
+  record ListOfStrings(@com.fasterxml.jackson.annotation.JsonValue @Nonnull List<String> values)
       implements EmbeddingsInputText {}
 
   /**
-   * Creator to enable deserialization of a String.
+   * Creator to enable deserialization of {@code List<String> }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerString}.
+   * @return a new instance of {@link ListOfStrings}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerString create(@Nonnull final String val) {
-    return new InnerString(val);
+  static ListOfStrings createListOfStrings(@Nonnull final List<String> val) {
+    return new ListOfStrings(val);
   }
 
-  /** Helper class to create a list of String that implements {@link EmbeddingsInputText}. */
-  record InnerStrings(@com.fasterxml.jackson.annotation.JsonValue @Nonnull List<String> values)
+  /** Helper class to create {@code String } that implements {@link EmbeddingsInputText}. */
+  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
       implements EmbeddingsInputText {}
 
   /**
-   * Creator to enable deserialization of a list of String.
+   * Creator to enable deserialization of {@code String }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerStrings}.
+   * @return a new instance of {@link InnerString}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerStrings create(@Nonnull final List<String> val) {
-    return new InnerStrings(val);
+  static InnerString create(@Nonnull final String val) {
+    return new InnerString(val);
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/SAPDocumentTranslationOutputTargetLanguage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/SAPDocumentTranslationOutputTargetLanguage.java
@@ -16,43 +16,44 @@
 /** SAPDocumentTranslationOutputTargetLanguage */
 public interface SAPDocumentTranslationOutputTargetLanguage {
   /**
-   * Helper class to create a SAPDocumentTranslationApplyToSelector that implements {@link
+   * Helper class to create {@code String } that implements {@link
    * SAPDocumentTranslationOutputTargetLanguage}.
    */
-  record InnerSAPDocumentTranslationApplyToSelector(
-      @com.fasterxml.jackson.annotation.JsonValue @Nonnull
-          SAPDocumentTranslationApplyToSelector value)
+  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
       implements SAPDocumentTranslationOutputTargetLanguage {}
 
   /**
-   * Creator to enable deserialization of a SAPDocumentTranslationApplyToSelector.
+   * Creator to enable deserialization of {@code String }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerSAPDocumentTranslationApplyToSelector}.
+   * @return a new instance of {@link InnerString}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerSAPDocumentTranslationApplyToSelector create(
-      @Nonnull final SAPDocumentTranslationApplyToSelector val) {
-    return new InnerSAPDocumentTranslationApplyToSelector(val);
+  static InnerString create(@Nonnull final String val) {
+    return new InnerString(val);
   }
 
   /**
-   * Helper class to create a String that implements {@link
+   * Helper class to create {@code SAPDocumentTranslationApplyToSelector } that implements {@link
    * SAPDocumentTranslationOutputTargetLanguage}.
    */
-  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
+  record InnerSAPDocumentTranslationApplyToSelector(
+      @com.fasterxml.jackson.annotation.JsonValue @Nonnull
+          SAPDocumentTranslationApplyToSelector value)
       implements SAPDocumentTranslationOutputTargetLanguage {}
 
   /**
-   * Creator to enable deserialization of a String.
+   * Creator to enable deserialization of {@code SAPDocumentTranslationApplyToSelector }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerString}.
+   * @return a new instance of {@link InnerSAPDocumentTranslationApplyToSelector}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerString create(@Nonnull final String val) {
-    return new InnerString(val);
+  static InnerSAPDocumentTranslationApplyToSelector
+      createInnerSAPDocumentTranslationApplyToSelector(
+          @Nonnull final SAPDocumentTranslationApplyToSelector val) {
+    return new InnerSAPDocumentTranslationApplyToSelector(val);
   }
 }
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/UserChatMessageContent.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/model/UserChatMessageContent.java
@@ -16,40 +16,40 @@
 
 /** UserChatMessageContent */
 public interface UserChatMessageContent {
-  /** Helper class to create a String that implements {@link UserChatMessageContent}. */
-  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
+  /**
+   * Helper class to create {@code List<UserChatMessageContentItem> } that implements {@link
+   * UserChatMessageContent}.
+   */
+  record ListOfUserChatMessageContentItems(
+      @com.fasterxml.jackson.annotation.JsonValue @Nonnull List<UserChatMessageContentItem> values)
       implements UserChatMessageContent {}
 
   /**
-   * Creator to enable deserialization of a String.
+   * Creator to enable deserialization of {@code List<UserChatMessageContentItem> }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerString}.
+   * @return a new instance of {@link ListOfUserChatMessageContentItems}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerString create(@Nonnull final String val) {
-    return new InnerString(val);
+  static ListOfUserChatMessageContentItems createListOfUserChatMessageContentItems(
+      @Nonnull final List<UserChatMessageContentItem> val) {
+    return new ListOfUserChatMessageContentItems(val);
   }
 
-  /**
-   * Helper class to create a list of UserChatMessageContentItem that implements {@link
-   * UserChatMessageContent}.
-   */
-  record InnerUserChatMessageContentItems(
-      @com.fasterxml.jackson.annotation.JsonValue @Nonnull List<UserChatMessageContentItem> values)
+  /** Helper class to create {@code String } that implements {@link UserChatMessageContent}. */
+  record InnerString(@com.fasterxml.jackson.annotation.JsonValue @Nonnull String value)
       implements UserChatMessageContent {}
 
   /**
-   * Creator to enable deserialization of a list of UserChatMessageContentItem.
+   * Creator to enable deserialization of {@code String }.
    *
    * @param val the value to use
-   * @return a new instance of {@link InnerUserChatMessageContentItems}.
+   * @return a new instance of {@link InnerString}.
    */
   @com.fasterxml.jackson.annotation.JsonCreator
   @Nonnull
-  static InnerUserChatMessageContentItems create(
-      @Nonnull final List<UserChatMessageContentItem> val) {
-    return new InnerUserChatMessageContentItems(val);
+  static InnerString create(@Nonnull final String val) {
+    return new InnerString(val);
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
     <maven.compiler.proc>full</maven.compiler.proc>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.outputTimestamp>2025-04-03T13:23:00Z</project.build.outputTimestamp>
-    <cloud-sdk.version>5.22.0</cloud-sdk.version>
+    <cloud-sdk.version>5.23.0</cloud-sdk.version>
     <junit-jupiter.version>6.0.0</junit-jupiter.version>
     <wiremock.version>3.13.1</wiremock.version>
     <assertj-core.version>3.27.6</assertj-core.version>

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public ChatMessage createChatMessage() {`
`105`	`105`	`.map(item -> (TextItem) item)`
`106`	`106`	`.map(item -> TextContent.create().type(TextContent.TypeEnum.TEXT).text(item.text()))`
`107`	`107`	`.toList();`
`108`		`- text = ChatMessageContent.create(texts);`
	`108`	`+ text = ChatMessageContent.createListOfTextContents(texts);`
`109`	`109`	`}`
`110`	`110`	`return assistantChatMessage.content(text);`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,8 @@ public ChatMessage createChatMessage() {`
`70`	`70`	`.map(item -> (TextItem) item)`
`71`	`71`	`.map(item -> TextContent.create().type(TextContent.TypeEnum.TEXT).text(item.text()))`
`72`	`72`	`.toList();`
`73`		`- return SystemChatMessage.create().role(SYSTEM).content(ChatMessageContent.create(texts));`
	`73`	`+ return SystemChatMessage.create()`
	`74`	`+ .role(SYSTEM)`
	`75`	`+ .content(ChatMessageContent.createListOfTextContents(texts));`
`74`	`76`	`}`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ public ChatMessage createChatMessage() {`
`107`	`107`	`contentList.add(UserChatMessageContentItem.create().type(IMAGE_URL).imageUrl(img));`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`- return UserChatMessage.create().content(UserChatMessageContent.create(contentList)).role(USER);`
	`110`	`+ return UserChatMessage.create()`
	`111`	`+ .content(UserChatMessageContent.createListOfUserChatMessageContentItems(contentList))`
	`112`	`+ .role(USER);`
`111`	`113`	`}`
`112`	`114`	`}`