@mcp-abap-adt/ollama-embedder 24.1.0 → 25.0.0
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/dist/ollama.d.ts +0 -3
- package/dist/ollama.d.ts.map +1 -1
- package/dist/ollama.js +10 -12
- package/dist/ollama.js.map +1 -1
- package/package.json +2 -2
package/dist/ollama.d.ts
CHANGED
|
@@ -5,13 +5,10 @@ export interface OllamaEmbedderConfig {
|
|
|
5
5
|
ollamaUrl?: string;
|
|
6
6
|
/** Required: embedding model name (e.g. 'bge-m3'). No default — must be set explicitly. */
|
|
7
7
|
model: string;
|
|
8
|
-
/** Per-request timeout in milliseconds. Default: 30 000 */
|
|
9
|
-
timeoutMs?: number;
|
|
10
8
|
}
|
|
11
9
|
export declare class OllamaEmbedder implements IEmbedderBatch {
|
|
12
10
|
private readonly ollamaUrl;
|
|
13
11
|
readonly model: string;
|
|
14
|
-
private readonly timeoutMs;
|
|
15
12
|
constructor(config: OllamaEmbedderConfig);
|
|
16
13
|
embed(text: string, options?: CallOptions): Promise<IEmbedResult>;
|
|
17
14
|
embedBatch(texts: string[], options?: CallOptions): Promise<IEmbedResult[]>;
|
package/dist/ollama.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../src/ollama.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EACL,KAAK,WAAW,EAEhB,SAAS,EACT,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,oBAAoB;IACnC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2FAA2F;IAC3F,KAAK,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../src/ollama.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EACL,KAAK,WAAW,EAEhB,SAAS,EACT,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,oBAAoB;IACnC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2FAA2F;IAC3F,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,cAAe,YAAW,cAAc;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAEX,MAAM,EAAE,oBAAoB;IAQlC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA6CjE,UAAU,CACd,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC;CA2C3B;AAED;;GAEG;AACH,qBAAa,SAAU,SAAQ,SAAS;gBAC1B,MAAM,EAAE,oBAAoB,GAAG,eAAe;CAI3D"}
|
package/dist/ollama.js
CHANGED
|
@@ -2,14 +2,12 @@ import { RagError, VectorRag, } from '@mcp-abap-adt/llm-agent';
|
|
|
2
2
|
export class OllamaEmbedder {
|
|
3
3
|
ollamaUrl;
|
|
4
4
|
model;
|
|
5
|
-
timeoutMs;
|
|
6
5
|
constructor(config) {
|
|
7
6
|
if (!config?.model) {
|
|
8
7
|
throw new Error("OllamaEmbedder requires a 'model' (e.g. 'bge-m3')");
|
|
9
8
|
}
|
|
10
9
|
this.ollamaUrl = config.ollamaUrl ?? 'http://localhost:11434';
|
|
11
10
|
this.model = config.model;
|
|
12
|
-
this.timeoutMs = config.timeoutMs ?? 30_000;
|
|
13
11
|
}
|
|
14
12
|
async embed(text, options) {
|
|
15
13
|
const url = `${this.ollamaUrl}/api/embeddings`;
|
|
@@ -17,15 +15,15 @@ export class OllamaEmbedder {
|
|
|
17
15
|
const maxRetries = 3;
|
|
18
16
|
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
|
19
17
|
try {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
// The caller's signal and nothing else. A ceiling of our own would run
|
|
19
|
+
// on every request and fire instead of whatever decided above us — a
|
|
20
|
+
// caller waiting out a server's Retry-After, cut before the interval
|
|
21
|
+
// is up. A consumer that wants one passes AbortSignal.timeout().
|
|
24
22
|
const res = await fetch(url, {
|
|
25
23
|
method: 'POST',
|
|
26
24
|
headers: { 'Content-Type': 'application/json' },
|
|
27
25
|
body: JSON.stringify({ model: this.model, prompt: text }),
|
|
28
|
-
signal,
|
|
26
|
+
signal: options?.signal,
|
|
29
27
|
});
|
|
30
28
|
if (!res.ok) {
|
|
31
29
|
const errorText = await res.text();
|
|
@@ -54,15 +52,15 @@ export class OllamaEmbedder {
|
|
|
54
52
|
const maxRetries = 3;
|
|
55
53
|
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
|
56
54
|
try {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
55
|
+
// The caller's signal and nothing else. A ceiling of our own would run
|
|
56
|
+
// on every request and fire instead of whatever decided above us — a
|
|
57
|
+
// caller waiting out a server's Retry-After, cut before the interval
|
|
58
|
+
// is up. A consumer that wants one passes AbortSignal.timeout().
|
|
61
59
|
const res = await fetch(url, {
|
|
62
60
|
method: 'POST',
|
|
63
61
|
headers: { 'Content-Type': 'application/json' },
|
|
64
62
|
body: JSON.stringify({ model: this.model, input: texts }),
|
|
65
|
-
signal,
|
|
63
|
+
signal: options?.signal,
|
|
66
64
|
});
|
|
67
65
|
if (!res.ok) {
|
|
68
66
|
const errorText = await res.text();
|
package/dist/ollama.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../src/ollama.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,QAAQ,EACR,SAAS,GAEV,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../src/ollama.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mcp-abap-adt/ollama-embedder",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "25.0.0",
|
|
4
4
|
"description": "Ollama embedding provider and OllamaRag convenience class for @mcp-abap-adt/llm-agent.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"test": "node --import tsx/esm --test --test-reporter=spec 'src/**/*.test.ts'"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@mcp-abap-adt/llm-agent": "^
|
|
27
|
+
"@mcp-abap-adt/llm-agent": "^25.0.0"
|
|
28
28
|
},
|
|
29
29
|
"license": "LGPL-3.0-only",
|
|
30
30
|
"repository": {
|