Skip to content

Commit d575a29

Browse files
committed
fix: improve MCP tool parameter handling and upgrade agentscope
- Fix required parameter handling in MCP tool schema conversion - Fix DashScope image model client constructor compatibility - Upgrade agentscope from 1.0.6 to 1.0.10 🤖 Generated with [Qoder][https://qoder.com]
1 parent ee51a9b commit d575a29

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

himarket-server/src/main/java/com/alibaba/himarket/service/hichat/manager/ChatBotManager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,12 @@ private Map<String, ToolMeta> buildToolMetas(Toolkit toolkit) {
294294
*/
295295
private void registerTool(Toolkit toolkit, McpClientWrapper client, McpSchema.Tool tool) {
296296
try {
297+
java.util.Set<String> required =
298+
tool.inputSchema() != null && tool.inputSchema().required() != null
299+
? new java.util.HashSet<>(tool.inputSchema().required())
300+
: java.util.Collections.emptySet();
297301
Map<String, Object> parameters =
298-
McpTool.convertMcpSchemaToParameters(tool.inputSchema());
302+
McpTool.convertMcpSchemaToParameters(tool.inputSchema(), required);
299303
McpTool mcpTool =
300304
new McpTool(
301305
tool.name(),

himarket-server/src/main/java/com/alibaba/himarket/service/hichat/service/dashscope/DashScopeImageChatModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public Set<String> getSupportedModels() {
206206
public static class DashScopeImageHttpClient extends DashScopeHttpClient {
207207

208208
public DashScopeImageHttpClient(HttpTransport transport, String apiKey, String baseUrl) {
209-
super(transport, apiKey, baseUrl);
209+
super(transport, apiKey, baseUrl, null, null);
210210
}
211211

212212
/**

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<caffeine.version>3.2.3</caffeine.version>
6969
<guava-retrying.version>2.0.0</guava-retrying.version>
7070
<snakeyaml.version>2.0</snakeyaml.version>
71-
<agentscope.version>1.0.6</agentscope.version>
71+
<agentscope.version>1.0.10</agentscope.version>
7272
<jackson-databind.version>2.17.2</jackson-databind.version>
7373
<openai.java.version>4.6.1</openai.java.version>
7474
<dashscope.java.version>2.22.4</dashscope.java.version>

0 commit comments

Comments
 (0)