@easynet/agent-tool-buildin 0.0.23 → 0.0.25
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedText.d.ts","sourceRoot":"","sources":["../../../src/analyze/embedText.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"embedText.d.ts","sourceRoot":"","sources":["../../../src/analyze/embedText.ts"],"names":[],"mappings":"AA0FA;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,4BAA4B;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;;;;;;;;;;;;GAqFA"}
|
|
@@ -2,6 +2,19 @@ import { getExtensionContext } from "../../index.js";
|
|
|
2
2
|
import { createTaggedError } from "@easynet/agent-tool";
|
|
3
3
|
import { overrideWithConfig } from "../util/overrideWithConfig.js";
|
|
4
4
|
import { DEFAULT_EMBEDDING_BASE_URL, DEFAULT_EMBEDDING_MODEL, DEFAULT_EMBEDDING_TIMEOUT_MS, } from "./defaults.js";
|
|
5
|
+
function getModelHub(config) {
|
|
6
|
+
if (config == null || typeof config !== "object" || Array.isArray(config))
|
|
7
|
+
return null;
|
|
8
|
+
const services = config.services;
|
|
9
|
+
if (services == null || typeof services !== "object" || Array.isArray(services))
|
|
10
|
+
return null;
|
|
11
|
+
const modelHub = services.modelHub;
|
|
12
|
+
if (modelHub == null || typeof modelHub !== "object")
|
|
13
|
+
return null;
|
|
14
|
+
if (typeof modelHub.embed !== "function")
|
|
15
|
+
return null;
|
|
16
|
+
return modelHub;
|
|
17
|
+
}
|
|
5
18
|
async function callEmbeddingApi(baseUrl, model, input, timeoutMs, apiKey) {
|
|
6
19
|
const url = `${baseUrl.replace(/\/$/, "")}/embeddings`;
|
|
7
20
|
const controller = new AbortController();
|
|
@@ -51,6 +64,7 @@ export async function embedText(args) {
|
|
|
51
64
|
};
|
|
52
65
|
const ctx = getExtensionContext();
|
|
53
66
|
const cfg = overrideWithConfig(defaults, ctx.config);
|
|
67
|
+
const modelHub = getModelHub(ctx.config);
|
|
54
68
|
const single = typeof args.text === "string" ? args.text.trim() : undefined;
|
|
55
69
|
const batch = Array.isArray(args.texts)
|
|
56
70
|
? args.texts.map((t) => (typeof t === "string" ? t.trim() : "")).filter(Boolean)
|
|
@@ -69,28 +83,47 @@ export async function embedText(args) {
|
|
|
69
83
|
const model = args.model ?? cfg.embeddingModel ?? DEFAULT_EMBEDDING_MODEL;
|
|
70
84
|
const timeoutMs = args.timeoutMs ?? cfg.embeddingTimeoutMs ?? DEFAULT_EMBEDDING_TIMEOUT_MS;
|
|
71
85
|
const apiKey = cfg.embeddingApiKey;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
86
|
+
let embeddings = [];
|
|
87
|
+
let dimensions;
|
|
88
|
+
let resolvedModel = model;
|
|
89
|
+
let source = "http";
|
|
90
|
+
if (modelHub) {
|
|
91
|
+
const out = await modelHub.embed({ input, model });
|
|
92
|
+
const vectors = Array.isArray(out.vectors) ? out.vectors.filter((v) => Array.isArray(v)) : [];
|
|
93
|
+
if (vectors.length === 0) {
|
|
94
|
+
throw createTaggedError("UPSTREAM_ERROR", "ModelHub returned no embeddings", {});
|
|
95
|
+
}
|
|
96
|
+
embeddings = vectors;
|
|
97
|
+
dimensions = out.dimensions ?? vectors[0]?.length;
|
|
98
|
+
resolvedModel = out.model ?? model;
|
|
99
|
+
source = "modelHub";
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
const data = await callEmbeddingApi(baseUrl, model, input, timeoutMs, apiKey);
|
|
103
|
+
const list = data?.data;
|
|
104
|
+
if (!Array.isArray(list) || list.length === 0) {
|
|
105
|
+
throw createTaggedError("UPSTREAM_ERROR", "Embedding API returned no embeddings", {});
|
|
106
|
+
}
|
|
107
|
+
const vectors = list
|
|
108
|
+
.slice(0, Array.isArray(input) ? input.length : 1)
|
|
109
|
+
.sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
|
|
110
|
+
.map((d) => d.embedding)
|
|
111
|
+
.filter((e) => Array.isArray(e));
|
|
112
|
+
embeddings = vectors;
|
|
113
|
+
dimensions = vectors[0]?.length;
|
|
114
|
+
resolvedModel = data.model ?? model;
|
|
76
115
|
}
|
|
77
|
-
const embeddings = list
|
|
78
|
-
.slice(0, Array.isArray(input) ? input.length : 1)
|
|
79
|
-
.sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
|
|
80
|
-
.map((d) => d.embedding)
|
|
81
|
-
.filter((e) => Array.isArray(e));
|
|
82
|
-
const dimensions = embeddings[0]?.length;
|
|
83
116
|
return {
|
|
84
117
|
result: {
|
|
85
118
|
embeddings,
|
|
86
|
-
model:
|
|
119
|
+
model: resolvedModel,
|
|
87
120
|
dimensions,
|
|
88
121
|
count: embeddings.length,
|
|
89
122
|
},
|
|
90
123
|
evidence: [
|
|
91
124
|
{
|
|
92
125
|
type: "embed",
|
|
93
|
-
summary: `embedText: ${embeddings.length} vector(s), dim=${dimensions ?? "?"} (${
|
|
126
|
+
summary: `embedText(${source}): ${embeddings.length} vector(s), dim=${dimensions ?? "?"} (${resolvedModel})`,
|
|
94
127
|
createdAt: new Date().toISOString(),
|
|
95
128
|
},
|
|
96
129
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedText.js","sourceRoot":"","sources":["../../../src/analyze/embedText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,4BAA4B,GAC7B,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"embedText.js","sourceRoot":"","sources":["../../../src/analyze/embedText.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easynet/agent-tool-buildin",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.25",
|
|
4
4
|
"description": "Tools extension for @easynet/agent-tool: FS, HTTP, util, security (sandbox, SSRF). Same contract as any other extension.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"node-html-parser": "^6.1.13"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
29
|
-
"@easynet/agent-tool": "
|
|
29
|
+
"@easynet/agent-tool": "latest"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@easynet/agent-tool": "latest",
|