Merge pull request #159 from dsgrieve/generic-client-type

Generic client type for OpenAiService

Author: David Grieve

aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/OpenAiService.java

@@ -1,23 +1,22 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.aiservices.openai;
 
-import com.azure.ai.openai.OpenAIAsyncClient;
 import com.microsoft.semantickernel.services.AIService;
 import javax.annotation.Nullable;
 
 /**
  * Provides OpenAI service.
  */
-public abstract class OpenAiService implements AIService {
+public abstract class OpenAiService<Client> implements AIService {
 
-    private final OpenAIAsyncClient client;
+    private final Client client;
     @Nullable
     private final String serviceId;
     private final String modelId;
     private final String deploymentName;
 
     protected OpenAiService(
-        OpenAIAsyncClient client,
+        Client client,
         @Nullable String serviceId,
         String modelId,
         String deploymentName) {
@@ -39,7 +38,7 @@ public String getServiceId() {
         return serviceId;
     }
 
-    protected OpenAIAsyncClient getClient() {
+    protected Client getClient() {
         return client;
     }
 

aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/audio/OpenAiAudioToTextService.java

@@ -18,7 +18,7 @@
 /**
  * Provides OpenAi implementation of audio to text service.
  */
-public class OpenAiAudioToTextService extends OpenAiService implements AudioToTextService {
+public class OpenAiAudioToTextService extends OpenAiService<OpenAIAsyncClient> implements AudioToTextService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenAiAudioToTextService.class);
 

aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/audio/OpenAiTextToAudioService.java

@@ -17,7 +17,7 @@
 /**
  * Provides OpenAi implementation of text to audio service.
  */
-public class OpenAiTextToAudioService extends OpenAiService implements TextToAudioService {
+public class OpenAiTextToAudioService extends OpenAiService<OpenAIAsyncClient> implements TextToAudioService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenAiTextToAudioService.class);
 

aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/chatcompletion/OpenAIChatCompletion.java

@@ -79,7 +79,7 @@
 /**
  * OpenAI chat completion service.
  */
-public class OpenAIChatCompletion extends OpenAiService implements ChatCompletionService {
+public class OpenAIChatCompletion extends OpenAiService<OpenAIAsyncClient> implements ChatCompletionService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenAIChatCompletion.class);
 
@@ -1055,7 +1055,7 @@ static ChatRequestMessage getChatRequestMessage(
     /**
      * Builder for creating a new instance of {@link OpenAIChatCompletion}.
      */
-    public static class Builder extends OpenAiServiceBuilder<OpenAIChatCompletion, Builder> {
+    public static class Builder extends OpenAiServiceBuilder<OpenAIAsyncClient, OpenAIChatCompletion, Builder> {
 
         @Override
         public OpenAIChatCompletion build() {

aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/textcompletion/OpenAITextGenerationService.java

@@ -30,7 +30,7 @@
 /**
  * An OpenAI implementation of a {@link TextGenerationService}.
  */
-public class OpenAITextGenerationService extends OpenAiService implements TextGenerationService {
+public class OpenAITextGenerationService extends OpenAiService<OpenAIAsyncClient> implements TextGenerationService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenAITextGenerationService.class);
 

aiservices/openai/src/main/java/com/microsoft/semantickernel/aiservices/openai/textembedding/OpenAITextEmbeddingGenerationService.java

@@ -23,7 +23,7 @@
  * An OpenAI implementation of a {@link TextEmbeddingGenerationService}.
  *
  */
-public class OpenAITextEmbeddingGenerationService extends OpenAiService
+public class OpenAITextEmbeddingGenerationService extends OpenAiService<OpenAIAsyncClient>
     implements TextEmbeddingGenerationService {
     private static final Logger LOGGER = LoggerFactory
         .getLogger(OpenAITextEmbeddingGenerationService.class);
@@ -87,7 +87,7 @@ protected Mono<List<Embedding>> internalGenerateTextEmbeddingsAsync(List<String>
      * A builder for creating a {@link OpenAITextEmbeddingGenerationService}.
      */
     public static class Builder extends
-        OpenAiServiceBuilder<OpenAITextEmbeddingGenerationService, OpenAITextEmbeddingGenerationService.Builder> {
+        OpenAiServiceBuilder<OpenAIAsyncClient, OpenAITextEmbeddingGenerationService, OpenAITextEmbeddingGenerationService.Builder> {
         private int dimensions = DEFAULT_DIMENSIONS;
 
         /**

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/audio/AudioToTextService.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.services.audio;
 
+import com.azure.ai.openai.OpenAIAsyncClient;
 import com.microsoft.semantickernel.implementation.ServiceLoadUtil;
 import com.microsoft.semantickernel.services.AIService;
 import com.microsoft.semantickernel.services.openai.OpenAiServiceBuilder;
@@ -32,7 +33,7 @@ static Builder builder() {
     /**
      * Builder for the AudioToTextService.
      */
-    abstract class Builder extends OpenAiServiceBuilder<AudioToTextService, Builder> {
+    abstract class Builder extends OpenAiServiceBuilder<OpenAIAsyncClient, AudioToTextService, Builder> {
 
     }
 }

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/audio/TextToAudioService.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.services.audio;
 
+import com.azure.ai.openai.OpenAIAsyncClient;
 import com.microsoft.semantickernel.implementation.ServiceLoadUtil;
 import com.microsoft.semantickernel.services.AIService;
 import com.microsoft.semantickernel.services.openai.OpenAiServiceBuilder;
@@ -36,7 +37,7 @@ static Builder builder() {
      * Builder for the TextToAudioService.
      */
     abstract class Builder extends
-        OpenAiServiceBuilder<TextToAudioService, Builder> {
+        OpenAiServiceBuilder<OpenAIAsyncClient, TextToAudioService, Builder> {
 
     }
 }

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/openai/OpenAiServiceBuilder.java

@@ -1,20 +1,24 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.services.openai;
 
-import com.azure.ai.openai.OpenAIAsyncClient;
+import com.microsoft.semantickernel.services.AIService;
 import com.microsoft.semantickernel.builders.SemanticKernelBuilder;
 import javax.annotation.Nullable;
 
 /**
  * Builder for an OpenAI service.
- */
-public abstract class OpenAiServiceBuilder<T, U extends OpenAiServiceBuilder<T, U>> implements
+ * @param <C> The client type
+ * @param <T> The service type
+ * @param <U> The builder type
+*/
+public abstract class OpenAiServiceBuilder<C, T extends AIService, U extends OpenAiServiceBuilder<C, T, U>> implements
+ 
     SemanticKernelBuilder<T> {
 
     @Nullable
     protected String modelId;
     @Nullable
-    protected OpenAIAsyncClient client;
+    protected C client;
     @Nullable
     protected String serviceId;
     @Nullable
@@ -51,7 +55,7 @@ public U withDeploymentName(String deploymentName) {
      * @param client The OpenAI client
      * @return The builder
      */
-    public U withOpenAIAsyncClient(OpenAIAsyncClient client) {
+    public U withOpenAIAsyncClient(C client) {
         this.client = client;
         return (U) this;
     }

semantickernel-api/src/main/java/com/microsoft/semantickernel/services/textcompletion/TextGenerationService.java

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 package com.microsoft.semantickernel.services.textcompletion;
 
+import com.azure.ai.openai.OpenAIAsyncClient;
 import com.microsoft.semantickernel.Kernel;
 import com.microsoft.semantickernel.implementation.ServiceLoadUtil;
 import com.microsoft.semantickernel.orchestration.PromptExecutionSettings;
@@ -60,6 +61,6 @@ Flux<StreamingTextContent> getStreamingTextContentsAsync(
     /**
      * Builder for a TextGenerationService
      */
-    abstract class Builder extends OpenAiServiceBuilder<TextGenerationService, Builder> {
+    abstract class Builder extends OpenAiServiceBuilder<OpenAIAsyncClient, TextGenerationService, Builder> {
     }
 }