Merge branch 'main' into feat/spring-ai-ga-release

Author: MatKuhr

docs/release_notes.md

@@ -25,6 +25,12 @@
   - The same applies to helper methods `DpiMasking#createConfig()` and `MaskingProvider#createConfig()`.
 - [Orchestration] `OrchestrationTemplate.withTemplate()` has been deprecated. Please use `OrchestrationTemplate.withTemplateMessages()` instead.
 - [Orchestration] The method `createConfig()` is removed from `ContentFilter`, `AzureContentFilter` and `LlamaGuardFilter` and is replaced by `createInputFilterConfig()` and `createOutputFilterConfig()`.
+- [Orchestration] Deprecated : `LLAMA3_1_70B_INSTRUCT`, `CLAUDE_3_SONNET`, `TITAN_TEXT_LITE`, `TITAN_TEXT_EXPRESS`, `GPT_4`, `GPT_4_0613`, `MIXTRAL_8X7B_INSTRUCT_V01`.
+    - `GPT_4` and `GPT_4_0613` are replaced by : `GPT_40`or `GPT_41`.
+    - `CLAUDE_3_SONNET` is replaced by `CLAUDE_4_SONNET`.
+    - `MIXTRAL_8X7B_INSTRUCT_V01` is replaced by `MISTRAL_SMALL_INSTRUCT`.
+- [OpenAI] Deprecated : `GPT_4`.
+  - `GPT_4`is replaced by : `GPT_40`or `GPT_41`.
 
 - [Prompt Registry] Resource group has been added as a optional parameter to all endpoints. Set it to `"default"` if it was not set before. Examples:
   - `client.importPromptTemplate(File)` --> `client.importPromptTemplate("default", File)`.
@@ -39,6 +45,7 @@
 
 - [Orchestration] Added support for [transforming a JSON output into an entity](https://sap.github.io/ai-sdk/docs/java/orchestration/chat-completion#json_schema)
 - [Orchestration] Added `AzureContentFilter#promptShield()` available for input filtering.
+- [Orchestration] Added new models for `OrchestrationAiModel`: `GEMINI_2_5_FLASH`, `GEMINI_2_5_PRO`, `ALEPHALPHA_PHARIA_1_7B_CONTROL`, `OPENAI_O4_MINI`, `CLAUDE_4_OPUS`, `CLAUDE_4_SONNET`, `OPENAI_O3`.
 
 ### 📈 Improvements
 

foundation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiModel.java

@@ -45,14 +45,18 @@ public record OpenAiModel(@Nonnull String name, @Nullable String version) implem
   @Deprecated
   public static final OpenAiModel GPT_35_TURBO_16K = new OpenAiModel("gpt-35-turbo-16k", null);
 
-  /** Azure OpenAI GPT-4 model */
-  public static final OpenAiModel GPT_4 = new OpenAiModel("gpt-4", null);
+  /**
+   * Azure OpenAI GPT-4 model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-09-01. The
+   *     suggested replacement model is {@link OpenAiModel#GPT_4O} or {@link OpenAiModel#GPT_41}.
+   */
+  @Deprecated public static final OpenAiModel GPT_4 = new OpenAiModel("gpt-4", null);
 
   /**
    * Azure OpenAI GPT-4 model
    *
-   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-05-13. The
-   *     suggested replacement model is {@link OpenAiModel#GPT_4O}.
+   * @deprecated This model is deprecated on AI Core.
    */
   @Deprecated public static final OpenAiModel GPT_4_32K = new OpenAiModel("gpt-4-32k", null);
 

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationAiModel.java

@@ -52,25 +52,45 @@ public class OrchestrationAiModel {
   public static final OrchestrationAiModel MISTRAL_LARGE_INSTRUCT =
       new OrchestrationAiModel("mistralai--mistral-large-instruct");
 
-  /** MistralAI Mixtral 8x7B Instruct v01 model */
+  /** MistralAI Mistral Small Instruct model */
+  public static final OrchestrationAiModel MISTRAL_SMALL_INSTRUCT =
+      new OrchestrationAiModel("mistralai--mistral-small-instruct");
+
+  /**
+   * MistralAI Mixtral 8x7B Instruct v01 model
+   *
+   * @deprecated This model is deprecated on AI Core. The suggested replacement model is {@link
+   *     OrchestrationAiModel#MISTRAL_SMALL_INSTRUCT}.
+   */
+  @Deprecated
   public static final OrchestrationAiModel MIXTRAL_8X7B_INSTRUCT_V01 =
       new OrchestrationAiModel("mistralai--mixtral-8x7b-instruct-v01");
 
   /**
    * Meta Llama3 70B Instruct model
    *
-   * @deprecated This model is deprecated on AI Core with a planned retirement on 2024-12-15. The
-   *     suggested replacement model is {@link OrchestrationAiModel#LLAMA3_1_70B_INSTRUCT}.
+   * @deprecated This model is deprecated on AI Core.
    */
   @Deprecated
   public static final OrchestrationAiModel LLAMA3_70B_INSTRUCT =
       new OrchestrationAiModel("meta--llama3-70b-instruct");
 
-  /** Meta Llama3.1 70B Instruct model */
+  /**
+   * Meta Llama3.1 70B Instruct model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-07-30.
+   */
+  @Deprecated
   public static final OrchestrationAiModel LLAMA3_1_70B_INSTRUCT =
       new OrchestrationAiModel("meta--llama3.1-70b-instruct");
 
-  /** Anthropic Claude 3 Sonnet model */
+  /**
+   * Anthropic Claude 3 Sonnet model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-07-21. The
+   *     suggested replacement model is {@link OrchestrationAiModel#CLAUDE_4_SONNET}.
+   */
+  @Deprecated
   public static final OrchestrationAiModel CLAUDE_3_SONNET =
       new OrchestrationAiModel("anthropic--claude-3-sonnet");
 
@@ -90,11 +110,29 @@ public class OrchestrationAiModel {
   public static final OrchestrationAiModel CLAUDE_3_7_SONNET =
       new OrchestrationAiModel("anthropic--claude-3.7-sonnet");
 
-  /** Amazon Titan Text Lite model */
+  /** Anthropic Claude 4 Opus model */
+  public static final OrchestrationAiModel CLAUDE_4_OPUS =
+      new OrchestrationAiModel("anthropic--claude-4-opus");
+
+  /** Anthropic Claude 4 Sonnet model */
+  public static final OrchestrationAiModel CLAUDE_4_SONNET =
+      new OrchestrationAiModel("anthropic--claude-4-sonnet");
+
+  /**
+   * Amazon Titan Text Lite model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-08-15.
+   */
+  @Deprecated
   public static final OrchestrationAiModel TITAN_TEXT_LITE =
       new OrchestrationAiModel("amazon--titan-text-lite");
 
-  /** Amazon Titan Text Express model */
+  /**
+   * Amazon Titan Text Express model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-08-15.
+   */
+  @Deprecated
   public static final OrchestrationAiModel TITAN_TEXT_EXPRESS =
       new OrchestrationAiModel("amazon--titan-text-express");
 
@@ -112,7 +150,7 @@ public class OrchestrationAiModel {
   /**
    * Azure OpenAI GPT-3.5 Turbo model
    *
-   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-13. The
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-09-01. The
    *     suggested replacement model is {@link OrchestrationAiModel#GPT_4O_MINI}.
    */
   @Deprecated
@@ -121,8 +159,7 @@ public class OrchestrationAiModel {
   /**
    * Azure OpenAI GPT-3.5 Turbo model
    *
-   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-13. The
-   *     suggested replacement model is {@link OrchestrationAiModel#GPT_4O_MINI}.
+   * @deprecated This model is deprecated on AI Core.
    */
   @Deprecated
   public static final OrchestrationAiModel GPT_35_TURBO_16K =
@@ -131,25 +168,48 @@ public class OrchestrationAiModel {
   /**
    * Azure OpenAI GPT-3.5 Turbo model
    *
-   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-22. The
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-09-01. The
    *     suggested replacement model is {@link OrchestrationAiModel#GPT_4O_MINI}.
    */
   @Deprecated
   public static final OrchestrationAiModel GPT_35_TURBO_0125 =
       new OrchestrationAiModel("gpt-35-turbo-0125");
 
-  /** Azure OpenAI GPT-4 model */
-  public static final OrchestrationAiModel GPT_4 = new OrchestrationAiModel("gpt-4");
+  /**
+   * Azure OpenAI GPT-4 model
+   *
+   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-09-01. The
+   *     suggested replacement model is {@link OrchestrationAiModel#GPT_4O} or {@link
+   *     OrchestrationAiModel#GPT_41}.
+   */
+  @Deprecated public static final OrchestrationAiModel GPT_4 = new OrchestrationAiModel("gpt-4");
+
+  /** Azure OpenAI GPT-4.1-mini model */
+  public static final OrchestrationAiModel GPT_41_MINI = new OrchestrationAiModel("gpt-4.1-mini");
+
+  /** Azure OpenAI GPT-4.1 model */
+  public static final OrchestrationAiModel GPT_41 = new OrchestrationAiModel("gpt-4.1");
+
+  /** Azure OpenAI GPT-4.1-nano model */
+  public static final OrchestrationAiModel GPT_41_NANO = new OrchestrationAiModel("gpt-4.1-nano");
 
   /**
    * Azure OpenAI GPT-4 model
    *
-   * @deprecated This model is deprecated on AI Core with a planned retirement on 2025-05-13. The
-   *     suggested replacement model is {@link OrchestrationAiModel#GPT_4O}.
+   * @deprecated This model is deprecated on AI Core.
    */
   @Deprecated
   public static final OrchestrationAiModel GPT_4_32K = new OrchestrationAiModel("gpt-4-32k");
 
+  /**
+   * Azure OpenAI GPT-4 version 0613 model
+   *
+   * @deprecated This model is deprecated on AI Core.The suggested replacement model is {@link
+   *     OrchestrationAiModel#GPT_4O} or {@link OrchestrationAiModel#GPT_41}.
+   */
+  @Deprecated
+  public static final OrchestrationAiModel GPT_4_0613 = new OrchestrationAiModel("gpt-4-0613");
+
   /** Azure OpenAI GPT-4o model */
   public static final OrchestrationAiModel GPT_4O = new OrchestrationAiModel("gpt-4o");
 
@@ -162,6 +222,12 @@ public class OrchestrationAiModel {
   /** Azure OpenAI o3-mini model */
   public static final OrchestrationAiModel OPENAI_O3_MINI = new OrchestrationAiModel("o3-mini");
 
+  /** Azure OpenAI o4-mini model */
+  public static final OrchestrationAiModel OPENAI_O4_MINI = new OrchestrationAiModel("o4-mini");
+
+  /** Azure OpenAI o3 model */
+  public static final OrchestrationAiModel OPENAI_O3 = new OrchestrationAiModel("o3");
+
   /**
    * Google Cloud Platform Gemini 1.0 Pro model
    *
@@ -189,6 +255,18 @@ public class OrchestrationAiModel {
   public static final OrchestrationAiModel GEMINI_2_0_FLASH_LITE =
       new OrchestrationAiModel("gemini-2.0-flash-lite");
 
+  /** Google Cloud Platform Gemini 2.5 Flash model */
+  public static final OrchestrationAiModel GEMINI_2_5_FLASH =
+      new OrchestrationAiModel("gemini-2.5-flash");
+
+  /** Google Cloud Platform Gemini 2.5 Pro model */
+  public static final OrchestrationAiModel GEMINI_2_5_PRO =
+      new OrchestrationAiModel("gemini-2.5-pro");
+
+  /** Alephalpha-pharia-1-7b-control model */
+  public static final OrchestrationAiModel ALEPHALPHA_PHARIA_1_7B_CONTROL =
+      new OrchestrationAiModel("alephalpha-pharia-1-7b-control");
+
   /** DeepSeek-R1 */
   public static final OrchestrationAiModel DEEPSEEK_R1 =
       new OrchestrationAiModel("deepseek-ai--deepseek-r1");

pom.xml

@@ -73,13 +73,13 @@
     <mockito.version>5.18.0</mockito.version>
     <javaparser.version>3.27.0</javaparser.version>
     <jsonschema-generator.version>4.38.0</jsonschema-generator.version>
-    <jackson.version>2.19.1</jackson.version>
+    <jackson.version>2.19.2</jackson.version>
     <!-- conflicts resolution -->
     <micrometer.version>1.14.2</micrometer.version>
     <json.version>20250517</json.version>
     <snakeyaml.version>2.4</snakeyaml.version>
     <!-- Formatting -->
-    <spotless.version>2.45.0</spotless.version>
+    <spotless.version>2.46.0</spotless.version>
     <spotless.skip>false</spotless.skip>
     <!--  Quality assurance  -->
     <enforcer.skip>false</enforcer.skip>
@@ -310,7 +310,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
         <configuration>
           <fail>true</fail>
           <skip>${enforcer.skip}</skip>