Skip to content

chore: Update available modellist #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CharlesDuboisSAP merged 9 commits into from
Mar 13, 2025
Merged

chore: Update available modellist #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74c0dc2
update of OpenAiModel.java
Mar 12, 2025
40df53f
update of OrchestrationAiModel.java
Mar 12, 2025
28bb427
renaming o-series to OPENAI_O...
Mar 12, 2025
2f7a92b
applying deprecation to OpenAiModel
Mar 12, 2025
e175153
applying deprecation to OrchestrationAiModel
Mar 12, 2025
1caa3a3
Formatting
bot-sdk-js Mar 12, 2025
7dc87cf
Merge branch 'main' into update-available-modellist
TillK17 Mar 12, 2025
50620a5
aligning javadoc
Mar 13, 2025
97e4639
marked DALL_E as internal
Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions ...ation-models/openai/src/main/java/com/sap/ai/sdk/foundationmodels/openai/OpenAiModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,57 @@
*/
public record OpenAiModel(@Nonnull String name, @Nullable String version) implements AiModel {

/** Azure OpenAI dall-e-3 image generate model */
/** internal [Azure OpenAI dall-e-3 model] */
public static final OpenAiModel DALL_E_3 = new OpenAiModel("dall-e-3", null);

/**
* Azure OpenAI GPT-3.5 Turbo chat completions model
* Azure OpenAI GPT-3.5 Turbo model
*
* @deprecated This model is not usable anymore. It is retired on AI Core since 2024-11-17.
* @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-13. The
* suggested replacement model is {@link OpenAiModel#GPT_4O_MINI}.
*/
@Deprecated public static final OpenAiModel GPT_35_TURBO = new OpenAiModel("gpt-35-turbo", null);

/**
* Azure OpenAI GPT-3.5 Turbo chat completions model
* Azure OpenAI GPT-3.5 Turbo model
*
* @deprecated This model is not usable anymore. It is retired on AI Core since 2025-02-22.
* @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-22. The
* suggested replacement model is {@link OpenAiModel#GPT_4O_MINI}.
*/
@Deprecated
public static final OpenAiModel GPT_35_TURBO_1025 = new OpenAiModel("gpt-35-turbo-0125", null);

/**
* Azure OpenAI GPT-3.5 Turbo chat completions model
* Azure OpenAI GPT-3.5 Turbo model
*
* @deprecated This model is not usable anymore. It is retired on AI Core since 2025-02-13.
* @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-13. The
* suggested replacement model is {@link OpenAiModel#GPT_4O_MINI}.
*/
@Deprecated
public static final OpenAiModel GPT_35_TURBO_16K = new OpenAiModel("gpt-35-turbo-16k", null);

/** Azure OpenAI GPT-4 chat completions model */
/** Azure OpenAI GPT-4 model */
public static final OpenAiModel GPT_4 = new OpenAiModel("gpt-4", null);

/**
* Azure OpenAI GPT-4-32k chat completions model
* Azure OpenAI GPT-4 model
*
* @deprecated This model will not be usable anymore on 2025-05-30.
* @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 public static final OpenAiModel GPT_4_32K = new OpenAiModel("gpt-4-32k", null);

/** Azure OpenAI GPT-4o chat completions model */
/** Azure OpenAI GPT-4o model */
public static final OpenAiModel GPT_4O = new OpenAiModel("gpt-4o", null);

/** Azure OpenAI GPT-4o Mini chat completions model */
/** Azure OpenAI GPT-4o Mini model */
public static final OpenAiModel GPT_4O_MINI = new OpenAiModel("gpt-4o-mini", null);

/** Azure OpenAI GPT-o3 Mini chat completions model */
public static final OpenAiModel GPT_O3_MINI = new OpenAiModel("o3-mini", null);
/** Azure OpenAI GPT-o3 Mini model */
public static final OpenAiModel O3_MINI = new OpenAiModel("o3-mini", null);

/** Azure OpenAI GPT-o1 chat completions model */
public static final OpenAiModel GPT_O1 = new OpenAiModel("o1", null);
/** Azure OpenAI GPT-o1 model */
public static final OpenAiModel O1 = new OpenAiModel("o1", null);

/** Azure OpenAI Text Embedding 3 Large model */
public static final OpenAiModel TEXT_EMBEDDING_3_LARGE =
Expand All @@ -75,7 +79,9 @@ public record OpenAiModel(@Nonnull String name, @Nullable String version) implem
/**
* Azure OpenAI Text Embedding ADA 002 model
*
* @deprecated This model is deprecated on AI Core.
* @deprecated This model is deprecated on AI Core with a planned retirement on 2025-10-03. The
* suggested replacement models are {@link OpenAiModel#TEXT_EMBEDDING_3_SMALL} and {@link
* OpenAiModel#TEXT_EMBEDDING_3_LARGE}.
*/
@Deprecated
public static final OpenAiModel TEXT_EMBEDDING_ADA_002 =
Expand Down
51 changes: 41 additions & 10 deletions orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationAiModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class OrchestrationAiModel {
/** The version of the model, defaults to "latest". */
String version;

/** IBM Granite 13B chat completions model */
/** IBM Granite 13B Chat model */
public static final OrchestrationAiModel IBM_GRANITE_13B_CHAT =
new OrchestrationAiModel("ibm--granite-13b-chat");

Expand All @@ -56,7 +56,13 @@ public class OrchestrationAiModel {
public static final OrchestrationAiModel MIXTRAL_8X7B_INSTRUCT_V01 =
new OrchestrationAiModel("mistralai--mixtral-8x7b-instruct-v01");

/** Meta Llama3 70B Instruct model */
/**
* 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
public static final OrchestrationAiModel LLAMA3_70B_INSTRUCT =
new OrchestrationAiModel("meta--llama3-70b-instruct");

Expand Down Expand Up @@ -99,34 +105,59 @@ public class OrchestrationAiModel {
public static final OrchestrationAiModel NOVA_MICRO =
new OrchestrationAiModel("amazon--nova-micro");

/** Azure OpenAI GPT-3.5 Turbo chat completions model */
/**
* 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
public static final OrchestrationAiModel GPT_35_TURBO = new OrchestrationAiModel("gpt-35-turbo");

/**
* Azure OpenAI GPT-3.5 Turbo chat completions model
* Azure OpenAI GPT-3.5 Turbo model
*
* @deprecated This model is not usable anymore. It is retired on AI Core since 2025-02-13.
* @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
public static final OrchestrationAiModel GPT_35_TURBO_16K =
new OrchestrationAiModel("gpt-35-turbo-16k");

/** Azure OpenAI GPT-3.5 Turbo chat completions model */
/**
* Azure OpenAI GPT-3.5 Turbo model
*
* @deprecated This model is deprecated on AI Core with a planned retirement on 2025-02-22. 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 chat completions model */
/** Azure OpenAI GPT-4 model */
public static final OrchestrationAiModel GPT_4 = new OrchestrationAiModel("gpt-4");

/** Azure OpenAI GPT-4-32k chat completions model */
/**
* 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}.
Comment on lines +143 to +144
Copy link
Contributor

@newtork newtork Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Question)

Just to confirm, we want to expose this dynamic information (deprecation date and replacement), rather than suggesting SAP Note directly? @jjtang1985?

Copy link
Contributor

@jjtang1985 jjtang1985 Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was initially proposed by Till.
From consumer perspective, it's convenient to have this information as Java annotation.
If it does not cost too much time, I would like to have them.

*/
@Deprecated
public static final OrchestrationAiModel GPT_4_32K = new OrchestrationAiModel("gpt-4-32k");

/** Azure OpenAI GPT-4o chat completions model */
/** Azure OpenAI GPT-4o model */
public static final OrchestrationAiModel GPT_4O = new OrchestrationAiModel("gpt-4o");

/** Azure OpenAI GPT-4o-mini chat completions model */
/** Azure OpenAI GPT-4o-mini model */
public static final OrchestrationAiModel GPT_4O_MINI = new OrchestrationAiModel("gpt-4o-mini");

/** Azure OpenAI o1 model */
public static final OrchestrationAiModel OPENAI_O1 = new OrchestrationAiModel("o1");

/** Azure OpenAI o3-mini model */
public static final OrchestrationAiModel OPENAI_O3_MINI = new OrchestrationAiModel("o3-mini");

/** Google Cloud Platform Gemini 1.0 Pro model */
public static final OrchestrationAiModel GEMINI_1_0_PRO =
new OrchestrationAiModel("gemini-1.0-pro");
Expand Down