Skip to content

Commit c4a667a

Browse files
committed
feat(jmanus): move tool parameter and description to resources
1 parent d4d785e commit c4a667a

File tree

9 files changed

+31
-49
lines changed

9 files changed

+31
-49
lines changed

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/TerminateTool.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
package com.alibaba.cloud.ai.example.manus.tool;
1717

1818
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
19-
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
2019
import org.slf4j.Logger;
2120
import org.slf4j.LoggerFactory;
22-
2321
import org.springframework.ai.openai.api.OpenAiApi;
2422

2523
import java.util.List;

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/ToolPromptManager.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
import org.slf4j.Logger;
2020
import org.slf4j.LoggerFactory;
2121
import org.springframework.stereotype.Component;
22-
import org.springframework.util.StringUtils;
23-
24-
import java.util.Locale;
25-
import java.util.Map;
26-
import java.util.concurrent.ConcurrentHashMap;
2722

2823
/**
2924
* Tool Prompt Manager that manages tool descriptions and parameters using PromptService

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/bash/Bash.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@
1616
package com.alibaba.cloud.ai.example.manus.tool.bash;
1717

1818
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
19+
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
1920
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2021
import com.alibaba.cloud.ai.example.manus.tool.filesystem.UnifiedDirectoryManager;
21-
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
2222
import com.fasterxml.jackson.databind.ObjectMapper;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525

2626
import java.util.ArrayList;
2727
import java.util.List;
2828

29-
import org.springframework.ai.openai.api.OpenAiApi;
30-
3129
public class Bash extends AbstractBaseTool<Bash.BashInput> {
3230

3331
private final ObjectMapper objectMapper;

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/browser/BrowserUseTool.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,28 @@
2222
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.ClickByElementAction;
2323
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.CloseTabAction;
2424
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.ExecuteJsAction;
25+
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.GetElementPositionByNameAction;
2526
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.GetHtmlAction;
2627
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.GetTextAction;
2728
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.InputTextAction;
2829
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.KeyEnterAction;
30+
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.MoveToAndClickAction;
2931
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.NavigateAction;
3032
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.NewTabAction;
3133
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.RefreshAction;
3234
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.ScreenShotAction;
3335
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.ScrollAction;
3436
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.SwitchTabAction;
35-
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.GetElementPositionByNameAction;
36-
import com.alibaba.cloud.ai.example.manus.tool.browser.actions.MoveToAndClickAction;
3737
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
3838
import com.alibaba.cloud.ai.example.manus.tool.innerStorage.SmartContentSavingService;
3939
import com.fasterxml.jackson.databind.ObjectMapper;
4040
import com.microsoft.playwright.Page;
4141
import org.slf4j.Logger;
4242
import org.slf4j.LoggerFactory;
4343

44+
import java.util.HashMap;
4445
import java.util.List;
4546
import java.util.Map;
46-
import java.util.HashMap;
47-
48-
import org.springframework.ai.openai.api.OpenAiApi;
4947

5048
public class BrowserUseTool extends AbstractBaseTool<BrowserRequestVO> {
5149

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/code/PythonExecute.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515
*/
1616
package com.alibaba.cloud.ai.example.manus.tool.code;
1717

18-
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import com.fasterxml.jackson.core.type.TypeReference;
2018
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
2119
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
22-
20+
import com.fasterxml.jackson.core.type.TypeReference;
21+
import com.fasterxml.jackson.databind.ObjectMapper;
2322
import org.slf4j.Logger;
2423
import org.slf4j.LoggerFactory;
2524

2625
import java.util.HashMap;
2726
import java.util.Map;
28-
import org.springframework.ai.openai.api.OpenAiApi;
2927

3028
public class PythonExecute extends AbstractBaseTool<PythonExecute.PythonInput> {
3129

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/cron/CronTool.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616
package com.alibaba.cloud.ai.example.manus.tool.cron;
1717

18-
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
19-
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
20-
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
2118
import com.alibaba.cloud.ai.example.manus.dynamic.cron.service.CronService;
2219
import com.alibaba.cloud.ai.example.manus.dynamic.cron.vo.CronConfig;
20+
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
21+
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
22+
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2323
import com.fasterxml.jackson.databind.ObjectMapper;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
26-
import org.springframework.ai.openai.api.OpenAiApi;
2726

2827
public class CronTool extends AbstractBaseTool<CronTool.CronToolInput> {
2928

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/database/DatabaseUseTool.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@
1515
*/
1616
package com.alibaba.cloud.ai.example.manus.tool.database;
1717

18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
20-
import org.springframework.ai.openai.api.OpenAiApi;
21-
2218
import com.alibaba.cloud.ai.example.manus.config.ManusProperties;
2319
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
24-
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2520
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
21+
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2622
import com.alibaba.cloud.ai.example.manus.tool.database.action.ExecuteSqlAction;
27-
import com.alibaba.cloud.ai.example.manus.tool.database.action.GetTableNameAction;
28-
import com.fasterxml.jackson.databind.ObjectMapper;
23+
import com.alibaba.cloud.ai.example.manus.tool.database.action.GetDatasourceInfoAction;
2924
import com.alibaba.cloud.ai.example.manus.tool.database.action.GetTableIndexAction;
3025
import com.alibaba.cloud.ai.example.manus.tool.database.action.GetTableMetaAction;
31-
import com.alibaba.cloud.ai.example.manus.tool.database.action.GetDatasourceInfoAction;
26+
import com.alibaba.cloud.ai.example.manus.tool.database.action.GetTableNameAction;
27+
import com.fasterxml.jackson.databind.ObjectMapper;
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
3230

3331
import java.util.Map;
3432

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/innerStorage/FileMergeTool.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@
1515
*/
1616
package com.alibaba.cloud.ai.example.manus.tool.innerStorage;
1717

18-
import java.io.IOException;
19-
import java.nio.file.Files;
20-
import java.nio.file.Path;
21-
import java.nio.file.StandardCopyOption;
22-
import java.util.List;
23-
2418
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
25-
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2619
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
20+
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2721
import com.alibaba.cloud.ai.example.manus.tool.filesystem.UnifiedDirectoryManager;
28-
2922
import org.slf4j.Logger;
3023
import org.slf4j.LoggerFactory;
31-
import org.springframework.ai.openai.api.OpenAiApi;
24+
25+
import java.io.IOException;
26+
import java.nio.file.Files;
27+
import java.nio.file.Path;
28+
import java.nio.file.StandardCopyOption;
29+
import java.util.List;
3230

3331
/**
3432
* File merge tool for merging single files into specified target folders, merging one

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/textOperator/TextFileOperator.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*/
1616
package com.alibaba.cloud.ai.example.manus.tool.textOperator;
1717

18-
import java.io.*;
19-
import java.nio.channels.FileChannel;
20-
import java.nio.file.*;
21-
import java.util.Map;
22-
2318
import com.alibaba.cloud.ai.example.manus.tool.AbstractBaseTool;
19+
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
2420
import com.alibaba.cloud.ai.example.manus.tool.code.ToolExecuteResult;
2521
import com.alibaba.cloud.ai.example.manus.tool.innerStorage.SmartContentSavingService;
26-
import com.alibaba.cloud.ai.example.manus.tool.ToolPromptManager;
27-
import com.fasterxml.jackson.databind.ObjectMapper;
2822
import com.fasterxml.jackson.core.type.TypeReference;
29-
23+
import com.fasterxml.jackson.databind.ObjectMapper;
3024
import org.slf4j.Logger;
3125
import org.slf4j.LoggerFactory;
32-
import org.springframework.ai.openai.api.OpenAiApi;
26+
27+
import java.io.IOException;
28+
import java.nio.channels.FileChannel;
29+
import java.nio.file.Files;
30+
import java.nio.file.Path;
31+
import java.nio.file.StandardOpenOption;
32+
import java.util.Map;
3333

3434
public class TextFileOperator extends AbstractBaseTool<TextFileOperator.TextFileInput> {
3535

0 commit comments

Comments
 (0)