Changed abstract methods in OpenAiClient to default unimplemented ones

Author: singularity-sg

src/main/java/dev/ai4j/openai4j/OpenAiClient.java

@@ -1,12 +1,6 @@
 package dev.ai4j.openai4j;
 
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.List;
+import static dev.ai4j.openai4j.LogLevel.DEBUG;
 
 import dev.ai4j.openai4j.chat.ChatCompletionRequest;
 import dev.ai4j.openai4j.chat.ChatCompletionResponse;
@@ -21,78 +15,101 @@
 import dev.ai4j.openai4j.moderation.ModerationResult;
 import dev.ai4j.openai4j.spi.OpenAiClientBuilderFactory;
 import dev.ai4j.openai4j.spi.ServiceHelper;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-import static dev.ai4j.openai4j.LogLevel.DEBUG;
-
 public abstract class OpenAiClient {
 
- public abstract SyncOrAsyncOrStreaming<CompletionResponse> completion(
- OpenAiClientContext clientContext, CompletionRequest request);
-
- public abstract SyncOrAsyncOrStreaming<String> completion(OpenAiClientContext clientContext,
- String prompt);
-
  public SyncOrAsyncOrStreaming<CompletionResponse> completion(CompletionRequest request) {
  return completion(new OpenAiClientContext(), request);
  }
 
+ public SyncOrAsyncOrStreaming<CompletionResponse> completion(
+ OpenAiClientContext clientContext, CompletionRequest request) {
+ throw new UnsupportedOperationException();
+ }
+
  public SyncOrAsyncOrStreaming<String> completion(String prompt) {
  return completion(new OpenAiClientContext(), prompt);
  }
 
+ public SyncOrAsyncOrStreaming<String> completion(OpenAiClientContext clientContext,
+ String prompt) {
+ throw new UnsupportedOperationException();
+ }
+
  public SyncOrAsyncOrStreaming<ChatCompletionResponse> chatCompletion(
  ChatCompletionRequest request) {
  return chatCompletion(new OpenAiClientContext(), request);
  }
 
- public abstract SyncOrAsyncOrStreaming<ChatCompletionResponse> chatCompletion(
+ public SyncOrAsyncOrStreaming<ChatCompletionResponse> chatCompletion(
  OpenAiClientContext clientContext,
- ChatCompletionRequest request);
+ ChatCompletionRequest request) {
+ throw new UnsupportedOperationException();
+ }
 
  public SyncOrAsyncOrStreaming<String> chatCompletion(String userMessage) {
  return chatCompletion(new OpenAiClientContext(), userMessage);
  }
 
- public abstract SyncOrAsyncOrStreaming<String> chatCompletion(
+ public SyncOrAsyncOrStreaming<String> chatCompletion(
  OpenAiClientContext clientContext,
- String userMessage);
+ String userMessage) {
+ throw new UnsupportedOperationException();
+ }
 
  public SyncOrAsync<EmbeddingResponse> embedding(EmbeddingRequest request) {
  return embedding(new OpenAiClientContext(), request);
  }
 
- public abstract SyncOrAsync<EmbeddingResponse> embedding(OpenAiClientContext clientContext,
- EmbeddingRequest request);
+ public SyncOrAsync<EmbeddingResponse> embedding(OpenAiClientContext clientContext,
+ EmbeddingRequest request) {
+ throw new UnsupportedOperationException();
+ }
 
  public SyncOrAsync<List<Float>> embedding(String input) {
  return embedding(new OpenAiClientContext(), input);
  }
 
- public abstract SyncOrAsync<List<Float>> embedding(OpenAiClientContext clientContext,
- String input);
+ public SyncOrAsync<List<Float>> embedding(OpenAiClientContext clientContext,
+ String input) {
+ throw new UnsupportedOperationException();
+ }
 
  public SyncOrAsync<ModerationResponse> moderation(ModerationRequest request) {
  return moderation(new OpenAiClientContext(), request);
  }
 
- public abstract SyncOrAsync<ModerationResponse> moderation(OpenAiClientContext clientContext,
- ModerationRequest request);
+ public SyncOrAsync<ModerationResponse> moderation(OpenAiClientContext clientContext,
+ ModerationRequest request) {
+ throw new UnsupportedOperationException();
+ }
 
  public SyncOrAsync<ModerationResult> moderation(String input) {
  return moderation(new OpenAiClientContext(), input);
  }
 
- public abstract SyncOrAsync<ModerationResult> moderation(OpenAiClientContext clientContext,
- String input);
+ public SyncOrAsync<ModerationResult> moderation(OpenAiClientContext clientContext,
+ String input) {
+ throw new UnsupportedOperationException();
+ }
 
  public SyncOrAsync<GenerateImagesResponse> imagesGeneration(GenerateImagesRequest request) {
  return imagesGeneration(new OpenAiClientContext(), request);
  }
 
- public abstract SyncOrAsync<GenerateImagesResponse> imagesGeneration(
+ public SyncOrAsync<GenerateImagesResponse> imagesGeneration(
  OpenAiClientContext clientContext,
- GenerateImagesRequest request);
+ GenerateImagesRequest request) {
+ throw new UnsupportedOperationException();
+ }
 
  public abstract void shutdown();
 

src/main/java/dev/ai4j/openai4j/chat/ChatCompletionModel.java

@@ -20,6 +20,8 @@ public enum ChatCompletionModel {
  GPT_4_32K_0314("gpt-4-32k-0314"),
  GPT_4_32K_0613("gpt-4-32k-0613"),
 
+ @Deprecated
+ GPT_4_VISION_PREVIEW("gpt-4-vision-preview"),
  GPT_4O("gpt-4o"),
  GPT_4O_2024_05_13("gpt-4o-2024-05-13");
 

src/test/java/dev/ai4j/openai4j/chat/ChatCompletionAsyncTest.java

@@ -52,6 +52,7 @@ void testSimpleApi() throws Exception {
  @EnumSource(value = ChatCompletionModel.class, mode = EXCLUDE, names = {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testCustomizableApi(ChatCompletionModel model) throws Exception {
 
@@ -96,6 +97,7 @@ void testCustomizableApi(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including tools
  })
  void testTools(ChatCompletionModel model) throws Exception {
 
@@ -160,6 +162,7 @@ void testTools(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including functions
  })
  void testFunctions(ChatCompletionModel model) throws Exception {
 
@@ -218,6 +221,7 @@ void testFunctions(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // does not support many things now, including tools
  })
  void testToolChoice(ChatCompletionModel model) throws Exception {
 
@@ -282,6 +286,7 @@ void testToolChoice(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW"
  })
  void testFunctionChoice(ChatCompletionModel model) throws Exception {
 

src/test/java/dev/ai4j/openai4j/chat/ChatCompletionStreamingTest.java

@@ -58,6 +58,7 @@ void testSimpleApi() throws Exception {
  @EnumSource(value = ChatCompletionModel.class, mode = EXCLUDE, names = {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testCustomizableApi(ChatCompletionModel model) throws Exception {
 
@@ -106,6 +107,7 @@ void testCustomizableApi(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testTools(ChatCompletionModel model) throws Exception {
 
@@ -223,6 +225,7 @@ void testTools(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testFunctions(ChatCompletionModel model) throws Exception {
 
@@ -320,6 +323,7 @@ void testFunctions(ChatCompletionModel model) throws Exception {
  "GPT_4_TURBO_PREVIEW", // keeps returning "felsius" as temp unit
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testToolChoice(ChatCompletionModel model) throws Exception {
 
@@ -437,6 +441,7 @@ void testToolChoice(ChatCompletionModel model) throws Exception {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW"
  })
  void testFunctionChoice(ChatCompletionModel model) throws Exception {
 

src/test/java/dev/ai4j/openai4j/chat/ChatCompletionTest.java

@@ -54,6 +54,7 @@ void testSimpleApi() {
  @EnumSource(value = ChatCompletionModel.class, mode = EXCLUDE, names = {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testCustomizableApi(ChatCompletionModel model) {
 
@@ -91,6 +92,7 @@ void testCustomizableApi(ChatCompletionModel model) {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testTools(ChatCompletionModel model) {
 
@@ -148,6 +150,7 @@ void testTools(ChatCompletionModel model) {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testFunctions(ChatCompletionModel model) {
 
@@ -199,6 +202,7 @@ void testFunctions(ChatCompletionModel model) {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testToolChoice(ChatCompletionModel model) {
 
@@ -256,6 +260,7 @@ void testToolChoice(ChatCompletionModel model) {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
  "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
  "GPT_4_0314", // Does not support tools/functions
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testFunctionChoice(ChatCompletionModel model) {
 
@@ -311,7 +316,8 @@ void testFunctionChoice(ChatCompletionModel model) {
 
  "GPT_4_TURBO_PREVIEW",
  "GPT_4_1106_PREVIEW",
- "GPT_4_0125_PREVIEW"
+ "GPT_4_0125_PREVIEW",
+ "GPT_4O"
  })
  void testParallelTools(ChatCompletionModel model) {
 
@@ -449,7 +455,8 @@ void testGpt4Vision() {
  @ParameterizedTest
  @EnumSource(value = ChatCompletionModel.class, mode = EXCLUDE, names = {
  "GPT_3_5_TURBO_0125", // don't have access to it yet
- "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613" // I don't have access to these models
+ "GPT_4_32K", "GPT_4_32K_0314", "GPT_4_32K_0613", // I don't have access to these models
+ "GPT_4_VISION_PREVIEW" // Does not support many things now, including logit_bias and response_format
  })
  void testUserMessageWithStringContent(ChatCompletionModel model) {