use Spring AI for chat completions

Author: sudo-may

e2e-tests/serverConfigs/backend_application.properties

@@ -82,5 +82,5 @@ skills.config.ui.disableEncouragementsConfetti=true
 skills.config.ui.contactSupportEnabled=true
 skills.config.ui.daysToRollOff = 2
 
-skills.openai.host: http://localhost:8280
-skills.openai.model: model1
+spring.ai.model.chat=openai
+spring.ai.openai.base-url=http://localhost:8280

e2e-tests/serverConfigs/backend_oauth_application.properties

@@ -51,6 +51,6 @@ skills.config.ui.disableEncouragementsConfetti=true
 skills.config.ui.contactSupportEnabled=true
 skills.config.ui.daysToRollOff = 2
 
-skills.openai.host: http://localhost:8280
-skills.openai.model: model1
+spring.ai.model.chat=openai
+spring.ai.openai.base-url=http://localhost:8280
 

pom.xml

@@ -37,6 +37,7 @@
         <springboot.version>3.5.7</springboot.version>
 
         <springcloud.version>3.4.0</springcloud.version>
+        <spring-ai.version>1.1.0</spring-ai.version>
 
         <logback-access.version>2.0.6</logback-access.version>
 

service/pom.xml

@@ -30,6 +30,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.ai</groupId>
+                <artifactId>spring-ai-bom</artifactId>
+                <version>${spring-ai.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -85,6 +92,10 @@
             <version>10.0.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-starter-model-openai</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
@@ -704,6 +715,7 @@
                                 <licenseMerge>Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0</licenseMerge>
                                 <licenseMerge>The BSD License|BSD</licenseMerge>
                                 <licenseMerge>The BSD License|BSD License</licenseMerge>
+                                <licenseMerge>The BSD License|BSD licence</licenseMerge>
                                 <licenseMerge>MPL 2.0|Mozilla Public License, version 2.0</licenseMerge>
                                 <licenseMerge>Common Development and Distribution License / The GNU General Public License (GPL) Version 2 with the Classpath Exception|CDDL/GPLv2+CE</licenseMerge>
                                 <licenseMerge>Dual license: Common Development and Distribution License 1.1 (CDDL-1.1) and The GNU General Public License (GPL) Version 2|Dual license consisting of the CDDL v1.1 and GPL v2</licenseMerge>

service/src/main/java/skills/auth/openai/OpenAIService.groovy

@@ -19,6 +19,10 @@ import groovy.json.JsonSlurper
 import groovy.transform.Canonical
 import groovy.transform.ToString
 import groovy.util.logging.Slf4j
+import org.springframework.ai.chat.model.ChatResponse
+import org.springframework.ai.chat.prompt.Prompt
+import org.springframework.ai.openai.OpenAiChatModel
+import org.springframework.ai.openai.OpenAiChatOptions
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
@@ -37,6 +41,9 @@ class OpenAIService {
     @Value('#{"${skills.openai.host:null}"}')
     String openAiHost
 
+    @Value('#{"${spring.ai.openai.base-url:null}"}')
+    String openAiBaseUrl
+
     @Value('#{"${skills.openai.completionsEndpoint:/v1/chat/completions}"}')
     String completionsEndpoint
 
@@ -58,6 +65,13 @@ class OpenAIService {
     @Autowired
     SslWebClientConfig sslWebClientConfig
 
+    @Autowired(required = false)
+    OpenAiChatModel chatModel;
+
+    boolean isChatEnabled() {
+        return chatModel != null
+    }
+
     CompletionsResponse callCompletions(String message) {
         if (!openAiHost) {
             log.debug("skills.openai.host is not configured")
@@ -107,7 +121,7 @@ class OpenAIService {
             return null
         }
 
-        String url = String.join("/", openAiHost, modelsEndpoint)
+        String url = String.join("/", openAiBaseUrl, modelsEndpoint)
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -135,6 +149,26 @@ class OpenAIService {
         }
     }
 
+    Flux<String> streamCompletions1(GenDescRequest genDescRequest) {
+        if (!isChatEnabled()) {
+            return Flux.error(new IllegalStateException("Chat model is not enabled. Set spring.ai.model.chat to enable."))
+        }
+
+        Prompt prompt = new Prompt(
+                genDescRequest.instructions,
+                OpenAiChatOptions.builder()
+                        .model(genDescRequest.model)
+                        .temperature(genDescRequest.modelTemperature)
+                        .build()
+        )
+        Flux<ChatResponse> response = chatModel.stream(prompt)
+        return response.mapNotNull { ChatResponse chatResponse ->
+            String res = (String) chatResponse.getResults().get(0).getOutput().getText()
+            res = res?.replaceAll('\\n', '<<newline>>')
+            log.debug("Response: [{}]", res)
+            return res
+        }
+    }
 
     Flux<String> streamCompletions(GenDescRequest genDescRequest) {
         String message = genDescRequest.instructions

service/src/main/java/skills/controller/OpenAiController.groovy

@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import reactor.core.publisher.Flux
 import skills.auth.openai.GenDescRequest
-import skills.auth.openai.LearningContentGenerator
 import skills.auth.openai.OpenAIService
 import skills.controller.exceptions.SkillsValidator
 
@@ -44,7 +43,7 @@ class OpenAiController {
         SkillsValidator.isNotBlank(genDescRequest.model, "genDescRequest.model")
         SkillsValidator.isNotNull(genDescRequest.modelTemperature, "genDescRequest.modelTemperature")
         SkillsValidator.isTrue(genDescRequest.modelTemperature >= 0 && genDescRequest.modelTemperature <= 2, "genDescRequest.modelTemperature must be >= 0 and <= 2")
-        return openAIService.streamCompletions(genDescRequest)
+        return openAIService.streamCompletions1(genDescRequest)
     }
 
     @GetMapping("/models")

service/src/main/resources/application.yml

@@ -209,6 +209,11 @@ db-scheduler:
   threads: 3
 ---
 spring:
+  ai:
+    model:
+      chat: none
+    openai:
+      api-key: none
   cloud:
     aws:
       s3: