add duration and boot config procoessor dep

spring-projects · Aug 22, 2023 · c9905fd · c9905fd
1 parent 635a621
commit c9905fd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 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
@@ -19,7 +19,7 @@ public class BeanOutputParser<T> implements OutputParser<T> {
 
 	private Class clazz;
 
-	public BeanOutputParser(Class clazz) {
+	public BeanOutputParser(Class<T> 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
@@ -41,6 +41,12 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/...re/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java b/...re/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiAutoConfiguration.java
@@ -46,7 +46,7 @@ public OpenAiService theoOpenAiService(OpenAiProperties openAiProperties) {
 			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/...configure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiProperties.java b/...configure/src/main/java/org/springframework/ai/autoconfigure/openai/OpenAiProperties.java
@@ -18,6 +18,8 @@
 
 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 void setTemperature(Double temperature) {
 		this.temperature = temperature;
 	}
 
+	public Duration getDuration() {
+		return duration;
+	}
+
+	public void setDuration(Duration duration) {
+		this.duration = duration;
+	}
+
 }