@fllf/agent-sdk 0.1.2 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +169 -0
- package/README.md +824 -198
- package/dist/agent/Agent.d.ts +16 -5
- package/dist/agent/Agent.d.ts.map +1 -1
- package/dist/agent/Agent.js +283 -2
- package/dist/agent/Agent.js.map +1 -1
- package/dist/agent/index.d.ts +1 -1
- package/dist/agent/index.d.ts.map +1 -1
- package/dist/agent/types.d.ts +27 -3
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/config/config.d.ts +22 -3
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +194 -47
- package/dist/config/config.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/errors.d.ts +74 -0
- package/dist/errors.d.ts.map +1 -0
- package/dist/errors.js +186 -0
- package/dist/errors.js.map +1 -0
- package/dist/executors/base-executor.d.ts +14 -0
- package/dist/executors/base-executor.d.ts.map +1 -0
- package/dist/executors/base-executor.js +31 -0
- package/dist/executors/base-executor.js.map +1 -0
- package/dist/executors/base.d.ts +36 -5
- package/dist/executors/base.d.ts.map +1 -1
- package/dist/executors/chat-request-builder.d.ts +10 -0
- package/dist/executors/chat-request-builder.d.ts.map +1 -0
- package/dist/executors/chat-request-builder.js +96 -0
- package/dist/executors/chat-request-builder.js.map +1 -0
- package/dist/executors/index.d.ts +4 -1
- package/dist/executors/index.d.ts.map +1 -1
- package/dist/executors/index.js +6 -1
- package/dist/executors/index.js.map +1 -1
- package/dist/executors/rag-executor.js +1 -1
- package/dist/executors/rag-executor.js.map +1 -1
- package/dist/executors/simple-chat-executor.d.ts +4 -2
- package/dist/executors/simple-chat-executor.d.ts.map +1 -1
- package/dist/executors/simple-chat-executor.js +59 -57
- package/dist/executors/simple-chat-executor.js.map +1 -1
- package/dist/executors/tool-calling-executor.d.ts +20 -2
- package/dist/executors/tool-calling-executor.d.ts.map +1 -1
- package/dist/executors/tool-calling-executor.js +189 -91
- package/dist/executors/tool-calling-executor.js.map +1 -1
- package/dist/history/base.d.ts +55 -2
- package/dist/history/base.d.ts.map +1 -1
- package/dist/history/base.js +49 -0
- package/dist/history/base.js.map +1 -1
- package/dist/history/compression.d.ts +49 -0
- package/dist/history/compression.d.ts.map +1 -0
- package/dist/history/compression.js +53 -0
- package/dist/history/compression.js.map +1 -0
- package/dist/history/context-window.d.ts +33 -0
- package/dist/history/context-window.d.ts.map +1 -0
- package/dist/history/context-window.js +68 -0
- package/dist/history/context-window.js.map +1 -0
- package/dist/history/in-memory.d.ts +6 -4
- package/dist/history/in-memory.d.ts.map +1 -1
- package/dist/history/in-memory.js +25 -39
- package/dist/history/in-memory.js.map +1 -1
- package/dist/history/index.d.ts +9 -2
- package/dist/history/index.d.ts.map +1 -1
- package/dist/history/index.js +18 -1
- package/dist/history/index.js.map +1 -1
- package/dist/history/postgres/index.d.ts +4 -0
- package/dist/history/postgres/index.d.ts.map +1 -0
- package/dist/history/postgres/index.js +20 -0
- package/dist/history/postgres/index.js.map +1 -0
- package/dist/history/postgres/postgres-message-history-store.d.ts +35 -0
- package/dist/history/postgres/postgres-message-history-store.d.ts.map +1 -0
- package/dist/history/postgres/postgres-message-history-store.js +195 -0
- package/dist/history/postgres/postgres-message-history-store.js.map +1 -0
- package/dist/history/postgres/schema.d.ts +18 -0
- package/dist/history/postgres/schema.d.ts.map +1 -0
- package/dist/history/postgres/schema.js +46 -0
- package/dist/history/postgres/schema.js.map +1 -0
- package/dist/history/postgres/sql.d.ts +29 -0
- package/dist/history/postgres/sql.d.ts.map +1 -0
- package/dist/history/postgres/sql.js +102 -0
- package/dist/history/postgres/sql.js.map +1 -0
- package/dist/history/postgres/types.d.ts +20 -0
- package/dist/history/postgres/types.d.ts.map +1 -0
- package/dist/history/postgres/types.js +3 -0
- package/dist/history/postgres/types.js.map +1 -0
- package/dist/history/tool-pairing.d.ts +11 -0
- package/dist/history/tool-pairing.d.ts.map +1 -0
- package/dist/history/tool-pairing.js +52 -0
- package/dist/history/tool-pairing.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/llm/LLM.d.ts +1 -0
- package/dist/llm/LLM.d.ts.map +1 -1
- package/dist/llm/LLM.js +136 -26
- package/dist/llm/LLM.js.map +1 -1
- package/dist/llm/errors.d.ts +11 -1
- package/dist/llm/errors.d.ts.map +1 -1
- package/dist/llm/errors.js +50 -1
- package/dist/llm/errors.js.map +1 -1
- package/dist/llm/factory.d.ts +14 -2
- package/dist/llm/factory.d.ts.map +1 -1
- package/dist/llm/factory.js +48 -9
- package/dist/llm/factory.js.map +1 -1
- package/dist/llm/index.d.ts +8 -3
- package/dist/llm/index.d.ts.map +1 -1
- package/dist/llm/index.js +10 -1
- package/dist/llm/index.js.map +1 -1
- package/dist/llm/providers/anthropic.d.ts +14 -0
- package/dist/llm/providers/anthropic.d.ts.map +1 -0
- package/dist/llm/providers/anthropic.js +336 -0
- package/dist/llm/providers/anthropic.js.map +1 -0
- package/dist/llm/providers/openai-compatible.d.ts +7 -0
- package/dist/llm/providers/openai-compatible.d.ts.map +1 -1
- package/dist/llm/providers/openai-compatible.js +151 -47
- package/dist/llm/providers/openai-compatible.js.map +1 -1
- package/dist/llm/stream-accumulator.d.ts +17 -0
- package/dist/llm/stream-accumulator.d.ts.map +1 -0
- package/dist/llm/stream-accumulator.js +83 -0
- package/dist/llm/stream-accumulator.js.map +1 -0
- package/dist/llm/tool-arguments.d.ts +6 -0
- package/dist/llm/tool-arguments.d.ts.map +1 -0
- package/dist/llm/tool-arguments.js +20 -0
- package/dist/llm/tool-arguments.js.map +1 -0
- package/dist/llm/types.d.ts +76 -4
- package/dist/llm/types.d.ts.map +1 -1
- package/dist/messages/content.d.ts +36 -0
- package/dist/messages/content.d.ts.map +1 -0
- package/dist/messages/content.js +70 -0
- package/dist/messages/content.js.map +1 -0
- package/dist/messages/index.d.ts +4 -2
- package/dist/messages/index.d.ts.map +1 -1
- package/dist/messages/index.js +10 -1
- package/dist/messages/index.js.map +1 -1
- package/dist/messages/message.d.ts +11 -9
- package/dist/messages/message.d.ts.map +1 -1
- package/dist/messages/message.js +69 -4
- package/dist/messages/message.js.map +1 -1
- package/dist/messages/types.d.ts +12 -0
- package/dist/messages/types.d.ts.map +1 -1
- package/dist/observability/collecting-observer.d.ts +8 -0
- package/dist/observability/collecting-observer.d.ts.map +1 -0
- package/dist/observability/collecting-observer.js +15 -0
- package/dist/observability/collecting-observer.js.map +1 -0
- package/dist/observability/index.d.ts +1 -0
- package/dist/observability/index.d.ts.map +1 -1
- package/dist/observability/index.js +3 -1
- package/dist/observability/index.js.map +1 -1
- package/dist/observability/observer.d.ts.map +1 -1
- package/dist/observability/observer.js +14 -1
- package/dist/observability/observer.js.map +1 -1
- package/dist/observability/types.d.ts +16 -1
- package/dist/observability/types.d.ts.map +1 -1
- package/dist/rag/chunking/auto-chunker.d.ts +7 -0
- package/dist/rag/chunking/auto-chunker.d.ts.map +1 -1
- package/dist/rag/chunking/auto-chunker.js +13 -0
- package/dist/rag/chunking/auto-chunker.js.map +1 -1
- package/dist/rag/chunking/chunker.d.ts.map +1 -1
- package/dist/rag/chunking/chunker.js +29 -5
- package/dist/rag/chunking/chunker.js.map +1 -1
- package/dist/rag/chunking/index.d.ts +2 -0
- package/dist/rag/chunking/index.d.ts.map +1 -1
- package/dist/rag/chunking/index.js +2 -0
- package/dist/rag/chunking/index.js.map +1 -1
- package/dist/rag/chunking/markdown-chunker.d.ts.map +1 -1
- package/dist/rag/chunking/markdown-chunker.js.map +1 -1
- package/dist/rag/chunking/qa-pair-chunker.d.ts +23 -0
- package/dist/rag/chunking/qa-pair-chunker.d.ts.map +1 -0
- package/dist/rag/chunking/qa-pair-chunker.js +162 -0
- package/dist/rag/chunking/qa-pair-chunker.js.map +1 -0
- package/dist/rag/chunking/semantic-chunker.d.ts +19 -0
- package/dist/rag/chunking/semantic-chunker.d.ts.map +1 -0
- package/dist/rag/chunking/semantic-chunker.js +291 -0
- package/dist/rag/chunking/semantic-chunker.js.map +1 -0
- package/dist/rag/embeddings/embedder.d.ts.map +1 -1
- package/dist/rag/embeddings/embedder.js +6 -0
- package/dist/rag/embeddings/embedder.js.map +1 -1
- package/dist/rag/generation/context-builder.d.ts +7 -0
- package/dist/rag/generation/context-builder.d.ts.map +1 -1
- package/dist/rag/generation/context-builder.js +4 -1
- package/dist/rag/generation/context-builder.js.map +1 -1
- package/dist/rag/ingestion/metadata.d.ts +6 -1
- package/dist/rag/ingestion/metadata.d.ts.map +1 -1
- package/dist/rag/ingestion/metadata.js +6 -2
- package/dist/rag/ingestion/metadata.js.map +1 -1
- package/dist/rag/pipeline.d.ts.map +1 -1
- package/dist/rag/pipeline.js +34 -11
- package/dist/rag/pipeline.js.map +1 -1
- package/dist/rag/retrieval/index.d.ts +1 -0
- package/dist/rag/retrieval/index.d.ts.map +1 -1
- package/dist/rag/retrieval/index.js +1 -0
- package/dist/rag/retrieval/index.js.map +1 -1
- package/dist/rag/retrieval/parent-child-expanding-retriever.d.ts +31 -0
- package/dist/rag/retrieval/parent-child-expanding-retriever.d.ts.map +1 -0
- package/dist/rag/retrieval/parent-child-expanding-retriever.js +194 -0
- package/dist/rag/retrieval/parent-child-expanding-retriever.js.map +1 -0
- package/dist/rag/stores/in-memory-keyword-store.d.ts.map +1 -1
- package/dist/rag/stores/in-memory-keyword-store.js +3 -8
- package/dist/rag/stores/in-memory-keyword-store.js.map +1 -1
- package/dist/rag/stores/keyword-tokenizer.d.ts +4 -0
- package/dist/rag/stores/keyword-tokenizer.d.ts.map +1 -0
- package/dist/rag/stores/keyword-tokenizer.js +113 -0
- package/dist/rag/stores/keyword-tokenizer.js.map +1 -0
- package/dist/rag/stores/postgres/pg-vector-store.d.ts.map +1 -1
- package/dist/rag/stores/postgres/pg-vector-store.js +21 -8
- package/dist/rag/stores/postgres/pg-vector-store.js.map +1 -1
- package/dist/rag/stores/postgres/postgres-document-store.d.ts.map +1 -1
- package/dist/rag/stores/postgres/postgres-document-store.js +26 -13
- package/dist/rag/stores/postgres/postgres-document-store.js.map +1 -1
- package/dist/rag/stores/postgres/postgres-keyword-store.d.ts.map +1 -1
- package/dist/rag/stores/postgres/postgres-keyword-store.js +43 -43
- package/dist/rag/stores/postgres/postgres-keyword-store.js.map +1 -1
- package/dist/rag/stores/postgres/sql.d.ts +22 -0
- package/dist/rag/stores/postgres/sql.d.ts.map +1 -1
- package/dist/rag/stores/postgres/sql.js +42 -0
- package/dist/rag/stores/postgres/sql.js.map +1 -1
- package/dist/rag/stores/types.d.ts +5 -0
- package/dist/rag/stores/types.d.ts.map +1 -1
- package/dist/rag/types.d.ts +6 -0
- package/dist/rag/types.d.ts.map +1 -1
- package/dist/testing/agent.d.ts +11 -0
- package/dist/testing/agent.d.ts.map +1 -0
- package/dist/testing/agent.js +45 -0
- package/dist/testing/agent.js.map +1 -0
- package/dist/testing/history-contract.d.ts +12 -0
- package/dist/testing/history-contract.d.ts.map +1 -0
- package/dist/testing/history-contract.js +111 -0
- package/dist/testing/history-contract.js.map +1 -0
- package/dist/testing/index.d.ts +11 -0
- package/dist/testing/index.d.ts.map +1 -0
- package/dist/testing/index.js +16 -0
- package/dist/testing/index.js.map +1 -0
- package/dist/testing/models.d.ts +34 -0
- package/dist/testing/models.d.ts.map +1 -0
- package/dist/testing/models.js +74 -0
- package/dist/testing/models.js.map +1 -0
- package/dist/testing/tool-schema.d.ts +6 -0
- package/dist/testing/tool-schema.d.ts.map +1 -0
- package/dist/testing/tool-schema.js +29 -0
- package/dist/testing/tool-schema.js.map +1 -0
- package/dist/testing/tools.d.ts +21 -0
- package/dist/testing/tools.d.ts.map +1 -0
- package/dist/testing/tools.js +43 -0
- package/dist/testing/tools.js.map +1 -0
- package/dist/tools/base.d.ts +38 -7
- package/dist/tools/base.d.ts.map +1 -1
- package/dist/tools/base.js +238 -11
- package/dist/tools/base.js.map +1 -1
- package/dist/tools/builtin/advancedSearchTool.d.ts.map +1 -1
- package/dist/tools/builtin/advancedSearchTool.js +30 -4
- package/dist/tools/builtin/advancedSearchTool.js.map +1 -1
- package/dist/tools/builtin/ragSearchTool.d.ts +6 -3
- package/dist/tools/builtin/ragSearchTool.d.ts.map +1 -1
- package/dist/tools/builtin/ragSearchTool.js +8 -6
- package/dist/tools/builtin/ragSearchTool.js.map +1 -1
- package/dist/tools/executor.d.ts +30 -2
- package/dist/tools/executor.d.ts.map +1 -1
- package/dist/tools/executor.js +83 -15
- package/dist/tools/executor.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/registry.d.ts +15 -3
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +21 -2
- package/dist/tools/registry.js.map +1 -1
- package/package.json +58 -4
package/dist/tools/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/tools/base.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/tools/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"advancedSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"advancedSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,QAAA,MAAM,wBAAwB;;iBAE5B,CAAC;AAEH,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAkBxE,MAAM,WAAW,wBAAwB;IACrC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,yBAAyB;IACtC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACrC;AAED,qBAAa,kBAAmB,SAAQ,IAAI,CAAC,OAAO,wBAAwB,CAAC;IACzE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAElD,OAAO,GAAE,yBAA8B;IAWnD,OAAO,CAAC,kBAAkB;cAsBV,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;YA4B1D,gBAAgB;YAyChB,iBAAiB;CA4BlC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AdvancedSearchTool = void 0;
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
|
+
const errors_1 = require("../../errors");
|
|
5
6
|
const base_1 = require("../base");
|
|
6
7
|
const AdvancedSearchToolSchema = zod_1.z.object({
|
|
7
8
|
query: zod_1.z.string().trim().min(1).describe('需要搜索的关键词或问题'),
|
|
@@ -69,7 +70,7 @@ class AdvancedSearchTool extends base_1.Tool {
|
|
|
69
70
|
async searchWithTavily(query) {
|
|
70
71
|
const apiKey = process.env.TAVILY_API_KEY;
|
|
71
72
|
if (!apiKey) {
|
|
72
|
-
|
|
73
|
+
throwMissingApiKeyError(this.name, 'TAVILY_API_KEY', 'tavily');
|
|
73
74
|
}
|
|
74
75
|
const response = await fetch('https://api.tavily.com/search', {
|
|
75
76
|
method: 'POST',
|
|
@@ -83,7 +84,7 @@ class AdvancedSearchTool extends base_1.Tool {
|
|
|
83
84
|
}),
|
|
84
85
|
});
|
|
85
86
|
if (!response.ok) {
|
|
86
|
-
|
|
87
|
+
throwSearchRequestError(this.name, 'tavily', response.status);
|
|
87
88
|
}
|
|
88
89
|
const data = await response.json();
|
|
89
90
|
let result = '';
|
|
@@ -103,7 +104,7 @@ class AdvancedSearchTool extends base_1.Tool {
|
|
|
103
104
|
async searchWithSerpApi(query) {
|
|
104
105
|
const apiKey = process.env.SERPAPI_API_KEY;
|
|
105
106
|
if (!apiKey) {
|
|
106
|
-
|
|
107
|
+
throwMissingApiKeyError(this.name, 'SERPAPI_API_KEY', 'serpapi');
|
|
107
108
|
}
|
|
108
109
|
const url = new URL('https://serpapi.com/search.json');
|
|
109
110
|
url.searchParams.append('q', query);
|
|
@@ -111,7 +112,7 @@ class AdvancedSearchTool extends base_1.Tool {
|
|
|
111
112
|
url.searchParams.append('num', '3');
|
|
112
113
|
const response = await fetch(url.toString());
|
|
113
114
|
if (!response.ok) {
|
|
114
|
-
|
|
115
|
+
throwSearchRequestError(this.name, 'serpapi', response.status);
|
|
115
116
|
}
|
|
116
117
|
const data = await response.json();
|
|
117
118
|
const organicResults = Array.isArray(data.organic_results) ? data.organic_results : [];
|
|
@@ -131,4 +132,29 @@ function toText(value) {
|
|
|
131
132
|
function formatError(error) {
|
|
132
133
|
return error instanceof Error ? error.message : String(error);
|
|
133
134
|
}
|
|
135
|
+
function throwMissingApiKeyError(toolName, variable, source) {
|
|
136
|
+
throw new errors_1.ToolExecutionError(toolName, new errors_1.ConfigError(`${variable} is not configured.`, {
|
|
137
|
+
code: 'missing_tool_api_key',
|
|
138
|
+
metadata: {
|
|
139
|
+
source,
|
|
140
|
+
variable,
|
|
141
|
+
},
|
|
142
|
+
}), {
|
|
143
|
+
code: 'tool_search_config',
|
|
144
|
+
metadata: {
|
|
145
|
+
source,
|
|
146
|
+
variable,
|
|
147
|
+
},
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
function throwSearchRequestError(toolName, source, status) {
|
|
151
|
+
throw new errors_1.ToolExecutionError(toolName, `${source} request failed with status ${status}.`, {
|
|
152
|
+
code: 'tool_search_request_failed',
|
|
153
|
+
retryable: status >= 500 || status === 429,
|
|
154
|
+
metadata: {
|
|
155
|
+
source,
|
|
156
|
+
status,
|
|
157
|
+
},
|
|
158
|
+
});
|
|
159
|
+
}
|
|
134
160
|
//# sourceMappingURL=advancedSearchTool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"advancedSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"advancedSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/advancedSearchTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import type { RagPipeline, RetrievedChunk, RetrieveOptions } from '../../rag';
|
|
3
3
|
import { Tool } from '../base';
|
|
4
|
+
/**
|
|
5
|
+
* 安全边界:tenantId / knowledgeBaseId / acl 是服务端的权限配置,
|
|
6
|
+
* 绝不能出现在 LLM 可见的参数 schema 里——否则模型(或注入的提示词)
|
|
7
|
+
* 可以伪造任意租户身份越权检索。这些字段只能来自 defaultRetrieveOptions,
|
|
8
|
+
* LLM 传入的任何同名字段都会在 schema 校验阶段被丢弃。
|
|
9
|
+
*/
|
|
4
10
|
export declare const RagSearchToolSchema: z.ZodObject<{
|
|
5
11
|
query: z.ZodString;
|
|
6
12
|
topK: z.ZodOptional<z.ZodNumber>;
|
|
7
13
|
minScore: z.ZodOptional<z.ZodNumber>;
|
|
8
|
-
tenantId: z.ZodOptional<z.ZodString>;
|
|
9
|
-
knowledgeBaseId: z.ZodOptional<z.ZodString>;
|
|
10
|
-
acl: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
11
14
|
documentIds: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
12
15
|
sources: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
13
16
|
metadataFilter: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ragSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACR,WAAW,EACX,cAAc,EACd,eAAe,EAClB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"ragSearchTool.d.ts","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACR,WAAW,EACX,cAAc,EACd,eAAe,EAClB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB;;;;;;;iBAO9B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAErE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,WAAW,CAAC;IACtB,sBAAsB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,aAAc,SAAQ,IAAI,CAAC,OAAO,mBAAmB,EAAE,MAAM,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;IACvC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiC;IACxE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,OAAO,EAAE,oBAAoB;cAYzB,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;CAQlE;AAED,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,cAAc,EAAE,EACxB,YAAY,SAAgB,GAC7B,MAAM,CAQR"}
|
|
@@ -4,13 +4,16 @@ exports.RagSearchTool = exports.RagSearchToolSchema = void 0;
|
|
|
4
4
|
exports.formatRetrievedChunks = formatRetrievedChunks;
|
|
5
5
|
const zod_1 = require("zod");
|
|
6
6
|
const base_1 = require("../base");
|
|
7
|
+
/**
|
|
8
|
+
* 安全边界:tenantId / knowledgeBaseId / acl 是服务端的权限配置,
|
|
9
|
+
* 绝不能出现在 LLM 可见的参数 schema 里——否则模型(或注入的提示词)
|
|
10
|
+
* 可以伪造任意租户身份越权检索。这些字段只能来自 defaultRetrieveOptions,
|
|
11
|
+
* LLM 传入的任何同名字段都会在 schema 校验阶段被丢弃。
|
|
12
|
+
*/
|
|
7
13
|
exports.RagSearchToolSchema = zod_1.z.object({
|
|
8
14
|
query: zod_1.z.string().trim().min(1).describe('需要检索的知识库问题或关键词。'),
|
|
9
15
|
topK: zod_1.z.number().int().positive().optional().describe('最多返回的证据片段数量。'),
|
|
10
16
|
minScore: zod_1.z.number().optional().describe('最低相关性分数。'),
|
|
11
|
-
tenantId: zod_1.z.string().trim().min(1).optional().describe('租户 ID。'),
|
|
12
|
-
knowledgeBaseId: zod_1.z.string().trim().min(1).optional().describe('知识库 ID。'),
|
|
13
|
-
acl: zod_1.z.array(zod_1.z.string().trim().min(1)).optional().describe('调用者权限标签。'),
|
|
14
17
|
documentIds: zod_1.z.array(zod_1.z.string().trim().min(1)).optional().describe('限定检索的文档 ID。'),
|
|
15
18
|
sources: zod_1.z.array(zod_1.z.string().trim().min(1)).optional().describe('限定检索的来源路径或来源标识。'),
|
|
16
19
|
metadataFilter: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional().describe('元数据精确过滤条件。'),
|
|
@@ -64,11 +67,10 @@ function buildRetrieveOptions(defaults, input) {
|
|
|
64
67
|
const options = {
|
|
65
68
|
...defaults,
|
|
66
69
|
};
|
|
70
|
+
// 只允许 LLM 覆盖检索调优类字段;tenantId / knowledgeBaseId / acl
|
|
71
|
+
// 属于服务端权限配置,永远以 defaults 为准(schema 也不接收这些字段)。
|
|
67
72
|
assignIfDefined(options, 'topK', input.topK);
|
|
68
73
|
assignIfDefined(options, 'minScore', input.minScore);
|
|
69
|
-
assignIfDefined(options, 'tenantId', input.tenantId);
|
|
70
|
-
assignIfDefined(options, 'knowledgeBaseId', input.knowledgeBaseId);
|
|
71
|
-
assignIfDefined(options, 'acl', input.acl);
|
|
72
74
|
assignIfDefined(options, 'documentIds', input.documentIds);
|
|
73
75
|
assignIfDefined(options, 'sources', input.sources);
|
|
74
76
|
assignIfDefined(options, 'metadataFilter', input.metadataFilter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ragSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ragSearchTool.js","sourceRoot":"","sources":["../../../src/tools/builtin/ragSearchTool.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/executor.d.ts
CHANGED
|
@@ -1,10 +1,38 @@
|
|
|
1
1
|
import type { ChatToolCall } from '../llm/types';
|
|
2
|
+
import type { MessageContent } from '../messages/content';
|
|
2
3
|
import type { TraceContext } from '../observability';
|
|
4
|
+
import type { ToolErrorMode } from './base';
|
|
3
5
|
import type { ToolRegistry } from './registry';
|
|
6
|
+
export interface ToolExecutorOptions {
|
|
7
|
+
metadata?: Record<string, unknown>;
|
|
8
|
+
signal?: AbortSignal;
|
|
9
|
+
errorMode?: ToolErrorMode;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* 单个 tool call 的执行结果。
|
|
13
|
+
* isError 让上层(以及能表达 is_error 的 provider)区分正常输出与错误反馈,
|
|
14
|
+
* 而不必靠解析文本内容猜测。
|
|
15
|
+
*/
|
|
16
|
+
export interface ToolCallOutcome {
|
|
17
|
+
toolCallId: string;
|
|
18
|
+
toolName: string;
|
|
19
|
+
content: MessageContent;
|
|
20
|
+
isError: boolean;
|
|
21
|
+
}
|
|
4
22
|
export declare class ToolExecutor {
|
|
5
23
|
private readonly registry;
|
|
6
24
|
private readonly trace?;
|
|
7
|
-
|
|
8
|
-
|
|
25
|
+
private readonly options;
|
|
26
|
+
constructor(registry: ToolRegistry, trace?: TraceContext | undefined, options?: ToolExecutorOptions);
|
|
27
|
+
execute(toolCall: ChatToolCall): Promise<ToolCallOutcome>;
|
|
28
|
+
/**
|
|
29
|
+
* 并发执行一批 tool call,返回顺序与输入一致。
|
|
30
|
+
* errorMode 为 throw 时任何一个失败都会让整批 reject。
|
|
31
|
+
*/
|
|
32
|
+
executeMany(toolCalls: ChatToolCall[]): Promise<ToolCallOutcome[]>;
|
|
33
|
+
private toErrorOutcome;
|
|
34
|
+
private describeUnknownTool;
|
|
35
|
+
private createRunContext;
|
|
36
|
+
private resolveErrorMode;
|
|
9
37
|
}
|
|
10
38
|
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAOrD,OAAO,KAAK,EACR,aAAa,EAEhB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,cAAc,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFP,QAAQ,EAAE,YAAY,EACtB,KAAK,CAAC,EAAE,YAAY,YAAA,EACpB,OAAO,GAAE,mBAAwB;IAGhD,OAAO,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IA4F/D;;;OAGG;IACG,WAAW,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAIxE,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,gBAAgB;CAI3B"}
|
package/dist/tools/executor.js
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ToolExecutor = void 0;
|
|
4
|
+
const content_1 = require("../messages/content");
|
|
4
5
|
const observability_1 = require("../observability");
|
|
6
|
+
const errors_1 = require("../errors");
|
|
5
7
|
const base_1 = require("./base");
|
|
6
8
|
class ToolExecutor {
|
|
7
9
|
registry;
|
|
8
10
|
trace;
|
|
9
|
-
|
|
11
|
+
options;
|
|
12
|
+
constructor(registry, trace, options = {}) {
|
|
10
13
|
this.registry = registry;
|
|
11
14
|
this.trace = trace;
|
|
15
|
+
this.options = options;
|
|
12
16
|
}
|
|
13
17
|
async execute(toolCall) {
|
|
14
18
|
const startedAt = Date.now();
|
|
@@ -16,6 +20,8 @@ class ToolExecutor {
|
|
|
16
20
|
type: 'tool:start',
|
|
17
21
|
runId: this.trace?.runId ?? 'standalone',
|
|
18
22
|
timestamp: new Date(),
|
|
23
|
+
spanId: this.trace?.spanId,
|
|
24
|
+
parentSpanId: this.trace?.parentSpanId,
|
|
19
25
|
agentName: this.trace?.agentName,
|
|
20
26
|
sessionId: this.trace?.sessionId,
|
|
21
27
|
toolName: toolCall.name,
|
|
@@ -23,59 +29,121 @@ class ToolExecutor {
|
|
|
23
29
|
});
|
|
24
30
|
const tool = this.registry.get(toolCall.name);
|
|
25
31
|
if (!tool) {
|
|
32
|
+
const error = new errors_1.ToolNotFoundError(toolCall.name);
|
|
26
33
|
await (0, observability_1.emitRuntimeEvent)(this.trace?.observer, {
|
|
27
34
|
type: 'tool:error',
|
|
28
35
|
runId: this.trace?.runId ?? 'standalone',
|
|
29
36
|
timestamp: new Date(),
|
|
37
|
+
spanId: this.trace?.spanId,
|
|
38
|
+
parentSpanId: this.trace?.parentSpanId,
|
|
30
39
|
durationMs: Date.now() - startedAt,
|
|
31
40
|
agentName: this.trace?.agentName,
|
|
32
41
|
sessionId: this.trace?.sessionId,
|
|
33
42
|
toolName: toolCall.name,
|
|
34
43
|
toolCallId: toolCall.id,
|
|
35
|
-
error:
|
|
36
|
-
name: 'ToolNotFoundError',
|
|
37
|
-
message: `Tool "${toolCall.name}" is not registered.`,
|
|
38
|
-
},
|
|
44
|
+
error: (0, observability_1.toObservedError)(error),
|
|
39
45
|
});
|
|
40
|
-
|
|
46
|
+
if (this.options.errorMode === 'throw') {
|
|
47
|
+
throw error;
|
|
48
|
+
}
|
|
49
|
+
return this.toErrorOutcome(toolCall, this.describeUnknownTool(toolCall.name));
|
|
41
50
|
}
|
|
42
51
|
try {
|
|
43
|
-
const result = await tool.execute(toolCall.arguments);
|
|
44
|
-
const output =
|
|
52
|
+
const result = await tool.execute(toolCall.arguments, this.createRunContext());
|
|
53
|
+
const output = tool.serializeResult(result);
|
|
45
54
|
await (0, observability_1.emitRuntimeEvent)(this.trace?.observer, {
|
|
46
55
|
type: 'tool:end',
|
|
47
56
|
runId: this.trace?.runId ?? 'standalone',
|
|
48
57
|
timestamp: new Date(),
|
|
58
|
+
spanId: this.trace?.spanId,
|
|
59
|
+
parentSpanId: this.trace?.parentSpanId,
|
|
49
60
|
durationMs: Date.now() - startedAt,
|
|
50
61
|
agentName: this.trace?.agentName,
|
|
51
62
|
sessionId: this.trace?.sessionId,
|
|
52
63
|
toolName: toolCall.name,
|
|
53
64
|
toolCallId: toolCall.id,
|
|
54
|
-
outputLength: output.length,
|
|
65
|
+
outputLength: (0, content_1.contentToText)(output).length,
|
|
55
66
|
});
|
|
56
|
-
return
|
|
67
|
+
return {
|
|
68
|
+
toolCallId: toolCall.id,
|
|
69
|
+
toolName: toolCall.name,
|
|
70
|
+
content: output,
|
|
71
|
+
isError: false,
|
|
72
|
+
};
|
|
57
73
|
}
|
|
58
74
|
catch (error) {
|
|
75
|
+
const toolError = normalizeToolError(toolCall.name, error);
|
|
59
76
|
await (0, observability_1.emitRuntimeEvent)(this.trace?.observer, {
|
|
60
77
|
type: 'tool:error',
|
|
61
78
|
runId: this.trace?.runId ?? 'standalone',
|
|
62
79
|
timestamp: new Date(),
|
|
80
|
+
spanId: this.trace?.spanId,
|
|
81
|
+
parentSpanId: this.trace?.parentSpanId,
|
|
63
82
|
durationMs: Date.now() - startedAt,
|
|
64
83
|
agentName: this.trace?.agentName,
|
|
65
84
|
sessionId: this.trace?.sessionId,
|
|
66
85
|
toolName: toolCall.name,
|
|
67
86
|
toolCallId: toolCall.id,
|
|
68
|
-
error: (0, observability_1.toObservedError)(
|
|
87
|
+
error: (0, observability_1.toObservedError)(toolError),
|
|
69
88
|
});
|
|
70
|
-
if (
|
|
71
|
-
|
|
89
|
+
if (this.resolveErrorMode(toolError.toolName ?? toolCall.name) === 'throw') {
|
|
90
|
+
throw toolError;
|
|
72
91
|
}
|
|
73
|
-
|
|
74
|
-
|
|
92
|
+
if (toolError instanceof base_1.ToolValidationError) {
|
|
93
|
+
return this.toErrorOutcome(toolCall, formatValidationError(toolError));
|
|
94
|
+
}
|
|
95
|
+
return this.toErrorOutcome(toolCall, toolError.message);
|
|
75
96
|
}
|
|
76
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* 并发执行一批 tool call,返回顺序与输入一致。
|
|
100
|
+
* errorMode 为 throw 时任何一个失败都会让整批 reject。
|
|
101
|
+
*/
|
|
102
|
+
async executeMany(toolCalls) {
|
|
103
|
+
return Promise.all(toolCalls.map((toolCall) => this.execute(toolCall)));
|
|
104
|
+
}
|
|
105
|
+
toErrorOutcome(toolCall, message) {
|
|
106
|
+
return {
|
|
107
|
+
toolCallId: toolCall.id,
|
|
108
|
+
toolName: toolCall.name,
|
|
109
|
+
content: message,
|
|
110
|
+
isError: true,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
describeUnknownTool(toolName) {
|
|
114
|
+
const availableTools = this.registry.list().map((tool) => tool.name);
|
|
115
|
+
const availableHint = availableTools.length > 0
|
|
116
|
+
? `Available tools: ${availableTools.join(', ')}.`
|
|
117
|
+
: 'No tools are registered.';
|
|
118
|
+
return `Tool "${toolName}" is not registered. ${availableHint}`;
|
|
119
|
+
}
|
|
120
|
+
createRunContext() {
|
|
121
|
+
const context = {
|
|
122
|
+
runId: this.trace?.runId ?? 'standalone',
|
|
123
|
+
};
|
|
124
|
+
if (this.trace?.agentName !== undefined) {
|
|
125
|
+
context.agentName = this.trace.agentName;
|
|
126
|
+
}
|
|
127
|
+
if (this.trace?.sessionId !== undefined) {
|
|
128
|
+
context.sessionId = this.trace.sessionId;
|
|
129
|
+
}
|
|
130
|
+
if (this.options.metadata !== undefined) {
|
|
131
|
+
context.metadata = this.options.metadata;
|
|
132
|
+
}
|
|
133
|
+
if (this.options.signal !== undefined) {
|
|
134
|
+
context.signal = this.options.signal;
|
|
135
|
+
}
|
|
136
|
+
return context;
|
|
137
|
+
}
|
|
138
|
+
resolveErrorMode(toolName) {
|
|
139
|
+
const tool = toolName ? this.registry.get(toolName) : undefined;
|
|
140
|
+
return this.options.errorMode ?? tool?.errorMode ?? 'return_to_model';
|
|
141
|
+
}
|
|
77
142
|
}
|
|
78
143
|
exports.ToolExecutor = ToolExecutor;
|
|
144
|
+
function normalizeToolError(toolName, error) {
|
|
145
|
+
return error instanceof errors_1.ToolError ? error : new errors_1.ToolExecutionError(toolName, error);
|
|
146
|
+
}
|
|
79
147
|
function formatValidationError(error) {
|
|
80
148
|
const details = error.issues.map((issue) => {
|
|
81
149
|
const path = issue.path.length > 0 ? issue.path.join('.') : '<root>';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":";;;AACA,oDAG0B;AAE1B,iCAA6C;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/index.d.ts
CHANGED
|
@@ -5,5 +5,7 @@ export { AdvancedSearchTool } from './builtin/advancedSearchTool';
|
|
|
5
5
|
export { RagSearchTool, formatRetrievedChunks } from './builtin/ragSearchTool';
|
|
6
6
|
export type { AdvancedSearchToolLogger, AdvancedSearchToolOptions, } from './builtin/advancedSearchTool';
|
|
7
7
|
export type { RagSearchToolInput, RagSearchToolOptions, } from './builtin/ragSearchTool';
|
|
8
|
-
export type {
|
|
8
|
+
export type { ToolRegisterOptions, ToolRegistryDuplicatePolicy, ToolRegistryOptions, } from './registry';
|
|
9
|
+
export type { ToolErrorMode, ToolInput, ToolInputSchema, ToolOptions, ToolPermissionChecker, ToolRunContext, } from './base';
|
|
10
|
+
export type { ToolCallOutcome, ToolExecutorOptions } from './executor';
|
|
9
11
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,YAAY,EACR,wBAAwB,EACxB,yBAAyB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACR,kBAAkB,EAClB,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AACjC,YAAY,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,YAAY,EACR,wBAAwB,EACxB,yBAAyB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACR,kBAAkB,EAClB,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACR,mBAAmB,EACnB,2BAA2B,EAC3B,mBAAmB,GACtB,MAAM,YAAY,CAAC;AACpB,YAAY,EACR,aAAa,EACb,SAAS,EACT,eAAe,EACf,WAAW,EACX,qBAAqB,EACrB,cAAc,GACjB,MAAM,QAAQ,CAAC;AAChB,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/tools/registry.d.ts
CHANGED
|
@@ -1,12 +1,24 @@
|
|
|
1
|
-
import type { ChatToolSchema } from '../llm/types';
|
|
1
|
+
import type { ChatToolSchema, ToolDefinition } from '../llm/types';
|
|
2
2
|
import { Tool } from './base';
|
|
3
|
+
export type ToolRegistryDuplicatePolicy = 'throw' | 'replace';
|
|
4
|
+
export interface ToolRegistryOptions {
|
|
5
|
+
duplicatePolicy?: ToolRegistryDuplicatePolicy;
|
|
6
|
+
}
|
|
7
|
+
export interface ToolRegisterOptions {
|
|
8
|
+
replace?: boolean;
|
|
9
|
+
}
|
|
3
10
|
export declare class ToolRegistry {
|
|
4
11
|
private readonly tools;
|
|
5
|
-
|
|
6
|
-
|
|
12
|
+
private readonly duplicatePolicy;
|
|
13
|
+
constructor(initialTools?: Tool[], options?: ToolRegistryOptions);
|
|
14
|
+
register(tool: Tool, options?: ToolRegisterOptions): void;
|
|
7
15
|
get(name: string): Tool | undefined;
|
|
8
16
|
has(name: string): boolean;
|
|
9
17
|
list(): Tool[];
|
|
18
|
+
toToolSchemas(): ToolDefinition[];
|
|
19
|
+
/**
|
|
20
|
+
* @deprecated 请使用 toToolSchemas();此方法返回 OpenAI 专有形状。
|
|
21
|
+
*/
|
|
10
22
|
toOpenAISchemas(): ChatToolSchema[];
|
|
11
23
|
/**
|
|
12
24
|
* 这个描述主要用于非 function-calling 模型,或调试 prompt 时查看工具清单。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,MAAM,2BAA2B,GAAG,OAAO,GAAG,SAAS,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAChC,eAAe,CAAC,EAAE,2BAA2B,CAAC;CACjD;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;IACjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;gBAElD,YAAY,GAAE,IAAI,EAAO,EAAE,OAAO,GAAE,mBAAwB;IAQxE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,mBAAwB,GAAG,IAAI;IAe7D,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAInC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,IAAI,IAAI,IAAI,EAAE;IAId,aAAa,IAAI,cAAc,EAAE;IAIjC;;OAEG;IACH,eAAe,IAAI,cAAc,EAAE;IAInC;;OAEG;IACH,mBAAmB,IAAI,MAAM;CAOhC"}
|
package/dist/tools/registry.js
CHANGED
|
@@ -1,14 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ToolRegistry = void 0;
|
|
4
|
+
const errors_1 = require("../errors");
|
|
4
5
|
class ToolRegistry {
|
|
5
6
|
tools = new Map();
|
|
6
|
-
|
|
7
|
+
duplicatePolicy;
|
|
8
|
+
constructor(initialTools = [], options = {}) {
|
|
9
|
+
this.duplicatePolicy = options.duplicatePolicy ?? 'throw';
|
|
7
10
|
for (const tool of initialTools) {
|
|
8
11
|
this.register(tool);
|
|
9
12
|
}
|
|
10
13
|
}
|
|
11
|
-
register(tool) {
|
|
14
|
+
register(tool, options = {}) {
|
|
15
|
+
const shouldReplace = options.replace ?? this.duplicatePolicy === 'replace';
|
|
16
|
+
if (this.tools.has(tool.name) && !shouldReplace) {
|
|
17
|
+
throw new errors_1.ToolConfigurationError(`Tool "${tool.name}" is already registered.`, {
|
|
18
|
+
code: 'duplicate_tool_name',
|
|
19
|
+
toolName: tool.name,
|
|
20
|
+
metadata: {
|
|
21
|
+
toolName: tool.name,
|
|
22
|
+
},
|
|
23
|
+
});
|
|
24
|
+
}
|
|
12
25
|
this.tools.set(tool.name, tool);
|
|
13
26
|
}
|
|
14
27
|
get(name) {
|
|
@@ -20,6 +33,12 @@ class ToolRegistry {
|
|
|
20
33
|
list() {
|
|
21
34
|
return [...this.tools.values()];
|
|
22
35
|
}
|
|
36
|
+
toToolSchemas() {
|
|
37
|
+
return this.list().map((tool) => tool.toToolSchema());
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* @deprecated 请使用 toToolSchemas();此方法返回 OpenAI 专有形状。
|
|
41
|
+
*/
|
|
23
42
|
toOpenAISchemas() {
|
|
24
43
|
return this.list().map((tool) => tool.toOpenAISchema());
|
|
25
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":";;;AACA,sCAAmD;AAanD,MAAa,YAAY;IACJ,KAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IAChC,eAAe,CAA8B;IAE9D,YAAY,eAAuB,EAAE,EAAE,UAA+B,EAAE;QACpE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC;QAE1D,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,IAAU,EAAE,UAA+B,EAAE;QAClD,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC;QAC5E,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,MAAM,IAAI,+BAAsB,CAAC,SAAS,IAAI,CAAC,IAAI,0BAA0B,EAAE;gBAC3E,IAAI,EAAE,qBAAqB;gBAC3B,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,QAAQ,EAAE;oBACN,QAAQ,EAAE,IAAI,CAAC,IAAI;iBACtB;aACJ,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,GAAG,CAAC,IAAY;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,IAAY;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,IAAI;QACA,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,eAAe;QACX,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,mBAAmB;QACf,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,CAClD,CAAC;QAEF,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxE,CAAC;CACJ;AA5DD,oCA4DC"}
|