Skip to content

Commit ae589de

Browse files
committed
Fixes google#482 -s Correct high priority code review items
1 parent 517e52b commit ae589de

7 files changed

Lines changed: 373 additions & 110 deletions

File tree

‎contrib/spring-ai/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@
9595
<artifactId>spring-boot-configuration-processor</artifactId>
9696
<optional>true</optional>
9797
</dependency>
98+
99+
<!-- Micrometer for observability -->
100+
<dependency>
101+
<groupId>io.micrometer</groupId>
102+
<artifactId>micrometer-core</artifactId>
103+
<optional>true</optional>
104+
</dependency>
98105
<dependency>
99106
<groupId>jakarta.validation</groupId>
100107
<artifactId>jakarta.validation-api</artifactId>

‎contrib/spring-ai/src/main/java/com/google/adk/models/springai/MessageConverter.java‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,39 @@ public Prompt toLlmPrompt(LlmRequest llmRequest) {
115115
// Create new ChatOptions with tools included
116116
ToolCallingChatOptions.Builder optionsBuilder = ToolCallingChatOptions.builder();
117117

118-
// Copy existing chat options if present
118+
// Always set tool callbacks
119+
optionsBuilder.toolCallbacks(toolCallbacks);
120+
121+
// Copy existing chat options properties if present
119122
if (chatOptions != null) {
120-
// Copy relevant properties from existing ChatOptions
121-
// Note: We can't directly pass ChatOptions to builder, so we need to copy manually
122-
optionsBuilder.toolCallbacks(toolCallbacks);
123-
// TODO: Add other properties as needed when they're available in the API
124-
} else {
125-
optionsBuilder.toolCallbacks(toolCallbacks);
123+
// Copy all relevant properties from existing ChatOptions
124+
if (chatOptions.getTemperature() != null) {
125+
optionsBuilder.temperature(chatOptions.getTemperature());
126+
}
127+
if (chatOptions.getMaxTokens() != null) {
128+
optionsBuilder.maxTokens(chatOptions.getMaxTokens());
129+
}
130+
if (chatOptions.getTopP() != null) {
131+
optionsBuilder.topP(chatOptions.getTopP());
132+
}
133+
if (chatOptions.getTopK() != null) {
134+
optionsBuilder.topK(chatOptions.getTopK());
135+
}
136+
if (chatOptions.getStopSequences() != null) {
137+
optionsBuilder.stopSequences(chatOptions.getStopSequences());
138+
}
139+
// Copy model name if present
140+
if (chatOptions.getModel() != null) {
141+
optionsBuilder.model(chatOptions.getModel());
142+
}
143+
// Copy frequency penalty if present
144+
if (chatOptions.getFrequencyPenalty() != null) {
145+
optionsBuilder.frequencyPenalty(chatOptions.getFrequencyPenalty());
146+
}
147+
// Copy presence penalty if present
148+
if (chatOptions.getPresencePenalty() != null) {
149+
optionsBuilder.presencePenalty(chatOptions.getPresencePenalty());
150+
}
126151
}
127152

128153
chatOptions = optionsBuilder.build();

‎contrib/spring-ai/src/main/java/com/google/adk/models/springai/ToolConverter.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import java.util.HashMap;
2424
import java.util.List;
2525
import java.util.Map;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
2628
import org.springframework.ai.tool.ToolCallback;
2729
import org.springframework.ai.tool.function.FunctionToolCallback;
2830

@@ -35,6 +37,8 @@
3537
*/
3638
public class ToolConverter {
3739

40+
private static final Logger logger = LoggerFactory.getLogger(ToolConverter.class);
41+
3842
/**
3943
* Creates a tool registry from ADK tools for internal tracking.
4044
*
@@ -120,24 +124,21 @@ public List<ToolCallback> convertToSpringAiTools(Map<String, BaseTool> tools) {
120124
java.util.function.Function<Map<String, Object>, String> toolFunction =
121125
args -> {
122126
try {
123-
System.out.println("=== DEBUG: Spring AI calling tool '" + tool.name() + "' ===");
124-
System.out.println("Raw args from Spring AI: " + args);
125-
System.out.println("Args type: " + args.getClass().getName());
126-
System.out.println("Args keys: " + args.keySet());
127+
logger.debug("Spring AI calling tool '{}'", tool.name());
128+
logger.debug("Raw args from Spring AI: {}", args);
129+
logger.debug("Args type: {}", args.getClass().getName());
130+
logger.debug("Args keys: {}", args.keySet());
127131
for (Map.Entry<String, Object> entry : args.entrySet()) {
128-
System.out.println(
129-
" "
130-
+ entry.getKey()
131-
+ " -> "
132-
+ entry.getValue()
133-
+ " ("
134-
+ entry.getValue().getClass().getName()
135-
+ ")");
132+
logger.debug(
133+
" {} -> {} ({})",
134+
entry.getKey(),
135+
entry.getValue(),
136+
entry.getValue().getClass().getName());
136137
}
137138

138139
// Handle different argument formats that Spring AI might pass
139140
Map<String, Object> processedArgs = processArguments(args, declaration);
140-
System.out.println("Processed args for ADK: " + processedArgs);
141+
logger.debug("Processed args for ADK: {}", processedArgs);
141142

142143
// Call the ADK tool and wait for the result
143144
Map<String, Object> result = tool.runAsync(processedArgs, null).blockingGet();
@@ -159,18 +160,17 @@ public List<ToolCallback> convertToSpringAiTools(Map<String, BaseTool> tools) {
159160
// Convert ADK schema to Spring AI JSON schema format
160161
Map<String, Object> springAiSchema =
161162
convertSchemaToSpringAi(declaration.parameters().get());
162-
System.out.println("=== DEBUG: Generated Spring AI schema for " + tool.name() + " ===");
163-
System.out.println("Schema: " + springAiSchema);
163+
logger.debug("Generated Spring AI schema for {}: {}", tool.name(), springAiSchema);
164164

165165
// Provide the schema as JSON string using inputSchema method
166166
try {
167167
String schemaJson =
168168
new com.fasterxml.jackson.databind.ObjectMapper()
169169
.writeValueAsString(springAiSchema);
170170
callbackBuilder.inputSchema(schemaJson);
171-
System.out.println("=== DEBUG: Set input schema JSON: " + schemaJson + " ===");
171+
logger.debug("Set input schema JSON: {}", schemaJson);
172172
} catch (Exception e) {
173-
System.err.println("Error serializing schema to JSON: " + e.getMessage());
173+
logger.error("Error serializing schema to JSON: {}", e.getMessage(), e);
174174
}
175175
}
176176

0 commit comments

Comments
 (0)