GH-1540: Remove Spring Boot dependency in core modules #1553

sobychacko · 2024-10-17T16:22:06Z

No description provided.

…ules Resolves spring-projects#1540 - Remove @NestedConfigurationProperty and @ConstructorBinding annotations from model options classes - Remove spring-boot dependency from spring-ai-openai module - Add exclusion for spring-boot-autoconfigure in spring-cloud-function-context dependency - Move configuration metadata to spring-ai-spring-boot-autoconfigure module This change decouples the core AI model implementations from Spring Boot, making the core modules more lightweight and allowing them to be used in non-Spring Boot applications. Configuration properties are now handled by the spring-ai-spring-boot-autoconfigure module instead.

markpollack · 2024-10-30T15:49:11Z

...i-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java

@@ -145,7 +144,6 @@ public class AzureOpenAiChatOptions implements FunctionCallingOptions, ChatOptio
 	 * default. Use the enableFunctions to set the functions from the registry to be used
 	 * by the ChatModel chat completion requests.
 	 */
-	@NestedConfigurationProperty


I'm not even sure if this should work even if we kept the annotation as how does boot know what class that implements FunctionCallback to create?

I tried the following in application.yaml

spring: ai: azure: openai: chat: options: function-callbacks: - name: "functionName1" description: "Description of what function1 does" input-type-schema: | { "type": "object", "properties": { "param1": { "type": "string" } } } - name: "functionName2" description: "Description of what function2 does" input-type-schema: | { "type": "object", "properties": { "param2": { "type": "integer" } } }

and got the following error

Error starting ApplicationContext. To display the condition evaluation report re-run your application with 'debug' enabled. 2024-10-30T11:41:55.878-04:00 ERROR 11409 --- [ main] o.s.b.d.LoggingFailureAnalysisReporter : *************************** APPLICATION FAILED TO START *************************** Description: Binding to target [Bindable@7b6141f0 type = java.util.List<org.springframework.ai.model.function.FunctionCallback>, value = 'provided', annotations = array<Annotation>[@com.fasterxml.jackson.annotation.JsonIgnore(true)], bindMethod = [null]] failed: Property: spring.ai.azure.openai.chat.options.function-callbacks[0].description Value: "Description of what function1 does" Origin: class path resource [application.yaml] - 9:30 Reason: The elements [spring.ai.azure.openai.chat.options.function-callbacks[0].description,spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[0].name,spring.ai.azure.openai.chat.options.function-callbacks[1].description,spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[1].name] were left unbound. Property: spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema Value: "{ "type": "object", "properties": { "param1": { "type": "string" } } } " Origin: class path resource [application.yaml] - 10:36 Reason: The elements [spring.ai.azure.openai.chat.options.function-callbacks[0].description,spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[0].name,spring.ai.azure.openai.chat.options.function-callbacks[1].description,spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[1].name] were left unbound. Property: spring.ai.azure.openai.chat.options.function-callbacks[0].name Value: "functionName1" Origin: class path resource [application.yaml] - 8:23 Reason: The elements [spring.ai.azure.openai.chat.options.function-callbacks[0].description,spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[0].name,spring.ai.azure.openai.chat.options.function-callbacks[1].description,spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[1].name] were left unbound. Property: spring.ai.azure.openai.chat.options.function-callbacks[1].description Value: "Description of what function2 does" Origin: class path resource [application.yaml] - 20:30 Reason: The elements [spring.ai.azure.openai.chat.options.function-callbacks[0].description,spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[0].name,spring.ai.azure.openai.chat.options.function-callbacks[1].description,spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[1].name] were left unbound. Property: spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema Value: "{ "type": "object", "properties": { "param2": { "type": "integer" } } }" Origin: class path resource [application.yaml] - 21:36 Reason: The elements [spring.ai.azure.openai.chat.options.function-callbacks[0].description,spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[0].name,spring.ai.azure.openai.chat.options.function-callbacks[1].description,spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[1].name] were left unbound. Property: spring.ai.azure.openai.chat.options.function-callbacks[1].name Value: "functionName2" Origin: class path resource [application.yaml] - 19:23 Reason: The elements [spring.ai.azure.openai.chat.options.function-callbacks[0].description,spring.ai.azure.openai.chat.options.function-callbacks[0].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[0].name,spring.ai.azure.openai.chat.options.function-callbacks[1].description,spring.ai.azure.openai.chat.options.function-callbacks[1].input-type-schema,spring.ai.azure.openai.chat.options.function-callbacks[1].name] were left unbound. Action: Update your application's configuration

This can be researched in a separate issue as it is more important to remove the boot dependency in core than wait for solution to these sort of infrequently used options.

markpollack · 2024-10-30T15:49:43Z

models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatOptions.java

@@ -112,7 +110,6 @@ public class MiniMaxChatOptions implements FunctionCallingOptions, ChatOptions {
 	 * A list of tools the model may call. Currently, only functions are supported as a tool. Use this to
 	 * provide a list of functions the model may generate JSON inputs for.
 	 */
-	@NestedConfigurationProperty


Similar comment to above with FunctionCallback in Azure options.

markpollack · 2024-10-30T15:50:56Z

...pring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatOptions.java

 	private @JsonProperty("stop") List<String> stop;

 	/**
 	 * A list of tools the model may call. Currently, only functions are supported as a
 	 * tool. Use this to provide a list of functions the model may generate JSON inputs
 	 * for.
 	 */
-	@NestedConfigurationProperty


I don't see an entry for this in the metadata.json file.

markpollack · 2024-10-30T15:51:53Z

...ls/spring-ai-moonshot/src/main/java/org/springframework/ai/moonshot/MoonshotChatOptions.java

@@ -115,7 +112,6 @@ public class MoonshotChatOptions implements FunctionCallingOptions, ChatOptions
 	 * default. Use the enableFunctions to set the functions from the registry to be used
 	 * by the ChatModel chat completion requests.
 	 */
-	@NestedConfigurationProperty
 	@JsonIgnore
 	private List<FunctionCallback> functionCallbacks = new ArrayList<>();


similar situation to other List< Rich Data Type> comments.

markpollack · 2024-10-30T15:53:31Z

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaOptions.java

@@ -280,7 +279,6 @@ public class OllamaOptions implements FunctionCallingOptions, ChatOptions, Embed
 	 * For Default Options the functionCallbacks are registered but disabled by default. Use the enableFunctions to set the functions
 	 * from the registry to be used by the ChatModel chat completion requests.
 	 */
-	@NestedConfigurationProperty


same comment as before

markpollack · 2024-10-30T15:54:03Z

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java

@@ -135,7 +133,6 @@ public class OpenAiChatOptions implements FunctionCallingOptions, ChatOptions {
 	 * A list of tools the model may call. Currently, only functions are supported as a tool. Use this to
 	 * provide a list of functions the model may generate JSON inputs for.
 	 */
-	@NestedConfigurationProperty


same comment as before

markpollack · 2024-10-30T15:54:41Z

...i-gemini/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatOptions.java

@@ -96,7 +95,6 @@ public class VertexAiGeminiChatOptions implements FunctionCallingOptions, ChatOp
 	 * For Default Options the functionCallbacks are registered but disabled by default. Use the enableFunctions to set the functions
 	 * from the registry to be used by the ChatModel chat completion requests.
 	 */
-	@NestedConfigurationProperty


same comment as before

markpollack · 2024-10-30T15:58:08Z

We should create an issue to investigate the impact of the following usages of tools

@NestedConfigurationProperty
@JsonIgnore
private List<FunctionCallback> functionCallbacks = new ArrayList<>();

@NestedConfigurationProperty
private @JsonProperty("tools") List<FunctionTool> tools;

as well as the following

@ConstructorBinding
public FunctionTool(Function function) {
    this(Type.FUNCTION, function);
}

@ConstructorBinding
public Function(String description, String name, String jsonSchema) {
    this(description, name, ModelOptionsUtils.jsonToMap(jsonSchema));
}

Probably need to create some sample projects that use this declarative functionality. A bit of detective work on the commit history for @ConstructorBinding may provide a clue.

markpollack · 2024-10-30T17:02:25Z

merged in 94ddefc

ogbozoyan approved these changes Oct 19, 2024

View reviewed changes

markpollack added design code cleanup and removed design labels Oct 23, 2024

sobychacko force-pushed the gh-1540 branch from 7651929 to 79efa7f Compare October 25, 2024 21:46

markpollack self-assigned this Oct 30, 2024

markpollack added this to the 1.0.0-M4 milestone Oct 30, 2024

markpollack reviewed Oct 30, 2024

View reviewed changes

markpollack closed this Oct 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

GH-1540: Remove Spring Boot dependency in core modules #1553

GH-1540: Remove Spring Boot dependency in core modules #1553

Uh oh!

sobychacko commented Oct 17, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack Oct 30, 2024

Uh oh!

markpollack commented Oct 30, 2024

Uh oh!

markpollack commented Oct 30, 2024

Uh oh!

Uh oh!

GH-1540: Remove Spring Boot dependency in core modules #1553

GH-1540: Remove Spring Boot dependency in core modules #1553

Uh oh!

Conversation

sobychacko commented Oct 17, 2024

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

markpollack commented Oct 30, 2024

Uh oh!

markpollack commented Oct 30, 2024

Uh oh!

Uh oh!