From c9905fdaec863d4aab7d01f85ec7cc2c354c72c6 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Tue, 22 Aug 2023 16:42:28 -0700 Subject: [PATCH] add duration and boot config procoessor dep --- .../springframework/ai/parser/BeanOutputParser.java | 2 +- spring-ai-spring-boot-autoconfigure/pom.xml | 6 ++++++ .../openai/OpenAiAutoConfiguration.java | 2 +- .../ai/autoconfigure/openai/OpenAiProperties.java | 12 ++++++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/spring-ai-core/src/main/java/org/springframework/ai/parser/BeanOutputParser.java b/spring-ai-core/src/main/java/org/springframework/ai/parser/BeanOutputParser.java index a036c509d..1fbb176c8 100644 --- a/spring-ai-core/src/main/java/org/springframework/ai/parser/BeanOutputParser.java +++ b/spring-ai-core/src/main/java/org/springframework/ai/parser/BeanOutputParser.java @@ -19,7 +19,7 @@ public class BeanOutputParser implements OutputParser { private Class clazz; - public BeanOutputParser(Class clazz) { + public BeanOutputParser(Class clazz) { Objects.requireNonNull(clazz, "Java Class can not be null;"); this.clazz = clazz; generateSchema(); diff --git a/spring-ai-spring-boot-autoconfigure/pom.xml b/spring-ai-spring-boot-autoconfigure/pom.xml index cc1c0e92c..315e38d9d 100644 --- a/spring-ai-spring-boot-autoconfigure/pom.xml +++ b/spring-ai-spring-boot-autoconfigure/pom.xml @@ -41,6 +41,12 @@ true + + org.springframework.boot + spring-boot-configuration-processor + true + + org.springframework.boot diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java index 32d93de20..55d751b23 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java @@ -46,7 +46,7 @@ public class OpenAiAutoConfiguration { throw new IllegalArgumentException( "You must provide an API key with the property name " + CONFIG_PREFIX + ".api-key"); } - return new OpenAiService(openAiProperties.getApiKey()); + return new OpenAiService(openAiProperties.getApiKey(), openAiProperties.getDuration()); } @Bean diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiProperties.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiProperties.java index c88429e01..d4dd19d5d 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiProperties.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiProperties.java @@ -18,6 +18,8 @@ package org.springframework.ai.autoconfigure.openai; import org.springframework.boot.context.properties.ConfigurationProperties; +import java.time.Duration; + import static org.springframework.ai.autoconfigure.openai.OpenAiProperties.CONFIG_PREFIX; @ConfigurationProperties(CONFIG_PREFIX) @@ -29,6 +31,8 @@ public class OpenAiProperties { private Double temperature = 0.7; + private Duration duration = Duration.ofSeconds(60); + private String model = "gpt-3.5-turbo"; public String getApiKey() { @@ -55,4 +59,12 @@ public class OpenAiProperties { this.temperature = temperature; } + public Duration getDuration() { + return duration; + } + + public void setDuration(Duration duration) { + this.duration = duration; + } + }