Skip to content

Commit 1591b6f

Browse files
committed
address review suggestions
1 parent 30af292 commit 1591b6f

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

spring-ai-core/src/main/java/org/springframework/ai/chat/model/AbstractToolCallSupport.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ protected List<FunctionCallback> resolveFunctionCallbacks(Set<String> functionNa
184184
if (!this.functionCallbackRegister.containsKey(functionName)) {
185185

186186
if (this.functionCallbackResolver != null) {
187-
FunctionCallback functionCallback = this.functionCallbackResolver.getFunctionCallback(functionName,
188-
null);
187+
FunctionCallback functionCallback = this.functionCallbackResolver.resolve(functionName);
189188
if (functionCallback != null) {
190189
this.functionCallbackRegister.put(functionName, functionCallback);
191190
}

spring-ai-core/src/main/java/org/springframework/ai/model/function/DefaultFunctionCallbackResolver.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,19 @@ public void setApplicationContext(@NonNull ApplicationContext applicationContext
7373
}
7474

7575
@Override
76-
public FunctionCallback getFunctionCallback(@NonNull String beanName, @Nullable String defaultDescription) {
76+
public FunctionCallback resolve(@NonNull String beanName) {
7777
ResolvableType functionType = TypeResolverHelper.resolveBeanType(this.applicationContext, beanName);
7878
ResolvableType functionInputType = (ResolvableType.forType(Supplier.class).isAssignableFrom(functionType))
7979
? ResolvableType.forType(Void.class) : TypeResolverHelper.getFunctionArgumentType(functionType, 0);
8080

81-
String functionDescription = resolveFunctionDescription(beanName, defaultDescription,
82-
functionInputType.toClass());
81+
String functionDescription = resolveFunctionDescription(beanName, functionInputType.toClass());
8382
Object bean = this.applicationContext.getBean(beanName);
8483

8584
return buildFunctionCallback(beanName, functionType, functionInputType, functionDescription, bean);
8685
}
8786

88-
private String resolveFunctionDescription(String beanName, String defaultDescription, Class<?> functionInputClass) {
89-
String functionDescription = defaultDescription;
87+
private String resolveFunctionDescription(String beanName, Class<?> functionInputClass) {
88+
String functionDescription = "";
9089

9190
if (!StringUtils.hasText(functionDescription)) {
9291
Description descriptionAnnotation = this.applicationContext.findAnnotationOnBean(beanName,

spring-ai-core/src/main/java/org/springframework/ai/model/function/FunctionCallbackResolver.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
package org.springframework.ai.model.function;
1717

1818
import org.springframework.lang.NonNull;
19-
import org.springframework.lang.Nullable;
2019

2120
/**
22-
* Strategy interface for resolving {@link FunctionCallback} instances as bean from the
23-
* application context.
21+
* Strategy interface for resolving {@link FunctionCallback} instances.
2422
*
2523
* @author Christian Tzolov
2624
* @since 1.0.0
@@ -29,9 +27,9 @@ public interface FunctionCallbackResolver {
2927

3028
/**
3129
* Resolve the {@link FunctionCallback} instance by its bean name.
32-
* @param beanName the name of the bean to resolve
30+
* @param name the name of the function to resolve
3331
* @return the {@link FunctionCallback} instance
3432
*/
35-
FunctionCallback getFunctionCallback(@NonNull String beanName, @Nullable String defaultDescription);
33+
FunctionCallback resolve(@NonNull String name);
3634

3735
}

0 commit comments

Comments
 (0)