@holokai/holo-provider-ollama 1.0.0 → 1.2.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/manifest.d.ts +2 -2
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +6 -2
- package/dist/manifest.js.map +1 -1
- package/dist/ollama.auditor.d.ts +3 -3
- package/dist/ollama.auditor.d.ts.map +1 -1
- package/dist/ollama.auditor.js +10 -13
- package/dist/ollama.auditor.js.map +1 -1
- package/dist/ollama.provider.d.ts.map +1 -1
- package/dist/ollama.provider.js +11 -11
- package/dist/ollama.provider.js.map +1 -1
- package/dist/ollama.translator.d.ts +1 -1
- package/dist/ollama.translator.d.ts.map +1 -1
- package/dist/ollama.translator.js.map +1 -1
- package/dist/plugin.d.ts +22 -7
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +72 -24
- package/dist/plugin.js.map +1 -1
- package/package.json +2 -2
package/dist/manifest.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import
|
|
2
|
-
export declare const manifest:
|
|
1
|
+
import { PluginManifest } from "@holokai/types/plugin";
|
|
2
|
+
export declare const manifest: PluginManifest;
|
|
3
3
|
//# sourceMappingURL=manifest.d.ts.map
|
package/dist/manifest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAa,MAAM,uBAAuB,CAAC;AAMjE,eAAO,MAAM,QAAQ,EAAE,cAOtB,CAAC"}
|
package/dist/manifest.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
|
+
import { PluginType } from "@holokai/types/plugin";
|
|
2
|
+
import { createRequire } from 'module';
|
|
3
|
+
const require = createRequire(import.meta.url);
|
|
4
|
+
const { version } = require('../package.json');
|
|
1
5
|
export const manifest = {
|
|
2
6
|
name: '@holokai/provider-ollama',
|
|
3
|
-
version
|
|
4
|
-
pluginType:
|
|
7
|
+
version,
|
|
8
|
+
pluginType: PluginType.PROVIDER,
|
|
5
9
|
family: 'ollama',
|
|
6
10
|
displayName: 'Ollama Provider',
|
|
7
11
|
description: 'Ollama provider plugin for Holo.',
|
package/dist/manifest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AAErC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAmB;IACpC,IAAI,EAAE,0BAA0B;IAChC,OAAO;IACP,UAAU,EAAE,UAAU,CAAC,QAAQ;IAC/B,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,kCAAkC;CAClD,CAAC"}
|
package/dist/ollama.auditor.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { BaseAuditor } from "@holokai/sdk/provider";
|
|
2
2
|
import type { HoloWorkerRequest } from "@holokai/types/worker";
|
|
3
3
|
import type { ProviderEnvelope, ProviderEvent } from "@holokai/types/provider";
|
|
4
|
-
import type {
|
|
4
|
+
import type { ProviderRequest } from "@holokai/types/entities";
|
|
5
5
|
import { ChatRequest, GenerateRequest } from "ollama";
|
|
6
6
|
export declare class OllamaAuditor extends BaseAuditor {
|
|
7
7
|
readonly provider = "ollama";
|
|
8
|
-
protected toHoloRequest(workerRequest: HoloWorkerRequest, llmRequest: Omit<
|
|
9
|
-
protected mapProviderPayload(workerRequest: HoloWorkerRequest, llmRequest: Omit<
|
|
8
|
+
protected toHoloRequest(workerRequest: HoloWorkerRequest, llmRequest: Omit<ProviderRequest, 'id'>): void;
|
|
9
|
+
protected mapProviderPayload(workerRequest: HoloWorkerRequest, llmRequest: Omit<ProviderRequest, 'id'>): void;
|
|
10
10
|
protected mapResponseMetrics(providerEvent: Extract<ProviderEvent, {
|
|
11
11
|
type: 'done' | 'error';
|
|
12
12
|
}>): Promise<Partial<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.auditor.d.ts","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.auditor.d.ts","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAgB,eAAe,EAAmB,MAAM,QAAQ,CAAC;AAGpF,qBACa,aAAc,SAAQ,WAAW;IAC1C,QAAQ,CAAC,QAAQ,YAAY;IAE7B,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,IAAI;IA0BxG,SAAS,CAAC,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,IAAI;cAO7F,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE;QAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;;;;;;;cAoBpF,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAMzG,OAAO,CAAC,6BAA6B;IAWrC,OAAO,CAAC,+BAA+B;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,yBAAyB;CAWpC"}
|
package/dist/ollama.auditor.js
CHANGED
|
@@ -7,40 +7,37 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { injectable } from 'tsyringe';
|
|
8
8
|
import { BaseAuditor } from "@holokai/sdk/provider";
|
|
9
9
|
import { pickDefined } from "@holokai/sdk";
|
|
10
|
-
import {
|
|
10
|
+
import { OllamaProtocols } from "./plugin";
|
|
11
11
|
let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
|
|
12
12
|
provider = 'ollama';
|
|
13
13
|
toHoloRequest(workerRequest, llmRequest) {
|
|
14
14
|
const payload = workerRequest.payload;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
// Set prompt/message content based on request type
|
|
18
|
-
if (workerRequest.type === RequestType.CHAT) {
|
|
15
|
+
llmRequest.access_model = payload.model;
|
|
16
|
+
if (workerRequest.protocol.name === OllamaProtocols.CHAT) {
|
|
19
17
|
const chatPayload = payload;
|
|
20
18
|
const userPrompt = this.extractUserPromptFromMessages(chatPayload.messages);
|
|
21
19
|
const systemPrompt = this.extractSystemPromptFromMessages(chatPayload.messages);
|
|
22
20
|
if (userPrompt !== undefined) {
|
|
23
|
-
llmRequest.user_prompt = userPrompt;
|
|
21
|
+
llmRequest.metadata.user_prompt = userPrompt;
|
|
24
22
|
}
|
|
25
23
|
if (systemPrompt !== undefined) {
|
|
26
|
-
llmRequest.system_prompt = systemPrompt;
|
|
24
|
+
llmRequest.metadata.system_prompt = systemPrompt;
|
|
27
25
|
}
|
|
28
26
|
}
|
|
29
|
-
else if (workerRequest.
|
|
27
|
+
else if (workerRequest.protocol.name === OllamaProtocols.GENERATE) {
|
|
30
28
|
const generatePayload = payload;
|
|
31
29
|
if (generatePayload.prompt !== undefined) {
|
|
32
|
-
llmRequest.user_prompt = generatePayload.prompt;
|
|
30
|
+
llmRequest.metadata.user_prompt = generatePayload.prompt;
|
|
33
31
|
}
|
|
34
32
|
if (generatePayload.system !== undefined) {
|
|
35
|
-
llmRequest.system_prompt = generatePayload.system;
|
|
33
|
+
llmRequest.metadata.system_prompt = generatePayload.system;
|
|
36
34
|
}
|
|
37
35
|
}
|
|
38
36
|
}
|
|
39
37
|
mapProviderPayload(workerRequest, llmRequest) {
|
|
40
38
|
const payload = workerRequest.payload;
|
|
41
|
-
// Set options
|
|
42
39
|
if (payload.options !== undefined) {
|
|
43
|
-
llmRequest.options = payload.options;
|
|
40
|
+
llmRequest.metadata.options = payload.options;
|
|
44
41
|
}
|
|
45
42
|
}
|
|
46
43
|
async mapResponseMetrics(providerEvent) {
|
|
@@ -62,7 +59,7 @@ let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
|
|
|
62
59
|
}
|
|
63
60
|
async createProviderEnvelope(payload) {
|
|
64
61
|
return pickDefined({
|
|
65
|
-
|
|
62
|
+
access_model: payload.model
|
|
66
63
|
});
|
|
67
64
|
}
|
|
68
65
|
extractUserPromptFromMessages(messages) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.auditor.js","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.auditor.js","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAKzC,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAGlC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,WAAW;IACjC,QAAQ,GAAG,QAAQ,CAAC;IAEnB,aAAa,CAAC,aAAgC,EAAE,UAAuC;QAC7F,MAAM,OAAO,GAAG,aAAa,CAAC,OAAoD,CAAC;QAEnF,UAAU,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC;QAExC,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,EAAE,CAAC;YACvD,MAAM,WAAW,GAAG,OAA4B,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,+BAA+B,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAChF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC3B,UAAU,CAAC,QAAQ,CAAC,WAAW,GAAG,UAAU,CAAC;YACjD,CAAC;YACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC7B,UAAU,CAAC,QAAQ,CAAC,aAAa,GAAG,YAAY,CAAC;YACrD,CAAC;QACL,CAAC;aAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;YAClE,MAAM,eAAe,GAAG,OAAgC,CAAC;YACzD,IAAI,eAAe,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvC,UAAU,CAAC,QAAQ,CAAC,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC;YAC7D,CAAC;YACD,IAAI,eAAe,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvC,UAAU,CAAC,QAAQ,CAAC,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC;YAC/D,CAAC;QACL,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,aAAgC,EAAE,UAAuC;QAClG,MAAM,OAAO,GAAG,aAAa,CAAC,OAAoD,CAAC;QACnF,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,UAAU,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAClD,CAAC;IACL,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,aAAiE;QAChG,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAC9D,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,aAAa,CAAC,OAA0C,CAAC;QACzE,MAAM,KAAK,GAAG;YACV,YAAY,EAAE,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,YAAY;YAC/D,aAAa,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,aAAa;YAC1D,mBAAmB,EAAE,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,mBAAmB;YAC3F,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB;SAC/H,CAAA;QAED,OAAO,WAAW,CAAC;YACf,SAAS,EAAE,KAAK;YAChB,GAAG,KAAK;SACX,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,OAAsC;QACzE,OAAO,WAAW,CAAC;YACf,YAAY,EAAE,OAAO,CAAC,KAAK;SAC9B,CAAqB,CAAC;IAC3B,CAAC;IAEO,6BAA6B,CAAC,QAAgB;QAClD,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,SAAS,CAAC;QAE5D,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QACjE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAEhD,uCAAuC;QACvC,MAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC9D,OAAO,OAAO,eAAe,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7F,CAAC;IAEO,+BAA+B,CAAC,QAAgB;QACpD,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,SAAS,CAAC;QAE5D,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAClE,OAAO,aAAa,IAAI,OAAO,aAAa,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1G,CAAC;IAED;;;;;;OAMG;IACK,yBAAyB,CAAC,OAAY;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,MAAM,kBAAkB,GAAG,OAAO,CAAC,oBAAoB,CAAC;QAExD,IAAI,YAAY,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACjE,4DAA4D;YAC5D,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,CAAC;YAC7D,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,OAAO,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AAlGY,aAAa;IADzB,UAAU,EAAE;GACA,aAAa,CAkGzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,QAAQ,CAAC;AACvG,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EACR,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EACZ,MAAM,yBAAyB,CAAC;AAMjC,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,WAAW,CAAC;IAE7E,uBAAuB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;IAchE,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe;;;IAa9D,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;cAInC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAIjD,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAYrH,cAAc;
|
|
1
|
+
{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,QAAQ,CAAC;AACvG,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EACR,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EACZ,MAAM,yBAAyB,CAAC;AAMjC,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,WAAW,CAAC;IAE7E,uBAAuB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;IAchE,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe;;;IAa9D,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;cAInC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAIjD,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAYrH,cAAc;YAmCd,UAAU;CAkC3B"}
|
package/dist/ollama.provider.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Ollama } from 'ollama';
|
|
2
2
|
import { BaseProvider } from '@holokai/sdk/provider';
|
|
3
|
-
import { RequestType } from '@holokai/types/holo';
|
|
4
3
|
import { OllamaAuditor } from './ollama.auditor';
|
|
5
4
|
import { OllamaTranslator } from './ollama.translator';
|
|
6
5
|
import { OllamaResponseFactory } from './ollama.response.factory';
|
|
6
|
+
import { OllamaProtocols } from "./plugin";
|
|
7
7
|
export class OllamaProvider extends BaseProvider {
|
|
8
8
|
async getModelNameFromRequest(payload) {
|
|
9
9
|
return payload.model;
|
|
@@ -48,12 +48,12 @@ export class OllamaProvider extends BaseProvider {
|
|
|
48
48
|
return { error: error.message };
|
|
49
49
|
}
|
|
50
50
|
async handleRequest(payload, ctx) {
|
|
51
|
-
switch (ctx.
|
|
52
|
-
case
|
|
51
|
+
switch (ctx.protocol.name) {
|
|
52
|
+
case OllamaProtocols.GENERATE:
|
|
53
53
|
return this.ollamaGenerate(payload, ctx);
|
|
54
|
-
case
|
|
54
|
+
case OllamaProtocols.CHAT:
|
|
55
55
|
return this.ollamaChat(payload, ctx);
|
|
56
|
-
case
|
|
56
|
+
case OllamaProtocols.EMBED:
|
|
57
57
|
return this.ollamaEmbed(payload, ctx);
|
|
58
58
|
}
|
|
59
59
|
throw new Error(`Unsupported requestType: ${JSON.stringify(ctx)}`);
|
|
@@ -78,12 +78,12 @@ export class OllamaProvider extends BaseProvider {
|
|
|
78
78
|
const finalPromise = (async () => {
|
|
79
79
|
const streamResp = await this.client.generate({ ...request, stream: true });
|
|
80
80
|
for await (const chunk of streamResp) {
|
|
81
|
+
if (chunk.done)
|
|
82
|
+
return chunk;
|
|
81
83
|
ctx.emitStreamEvent(chunk);
|
|
82
|
-
const token = chunk
|
|
84
|
+
const token = chunk.response ?? '';
|
|
83
85
|
if (token)
|
|
84
86
|
ctx.emitTextDelta(token);
|
|
85
|
-
if (chunk?.done)
|
|
86
|
-
return chunk; // authoritative completion value
|
|
87
87
|
}
|
|
88
88
|
// If Ollama ends without a done flag
|
|
89
89
|
return { done: true };
|
|
@@ -110,12 +110,12 @@ export class OllamaProvider extends BaseProvider {
|
|
|
110
110
|
const finalPromise = (async () => {
|
|
111
111
|
const streamResp = await this.client.chat({ ...request, stream: true });
|
|
112
112
|
for await (const chunk of streamResp) {
|
|
113
|
+
if (chunk.done)
|
|
114
|
+
return chunk;
|
|
113
115
|
ctx.emitStreamEvent(chunk);
|
|
114
|
-
const token = chunk
|
|
116
|
+
const token = chunk.message.content ?? '';
|
|
115
117
|
if (token)
|
|
116
118
|
ctx.emitTextDelta(token);
|
|
117
|
-
if (chunk?.done)
|
|
118
|
-
return chunk;
|
|
119
119
|
}
|
|
120
120
|
return { done: true };
|
|
121
121
|
})();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0E,MAAM,EAAC,MAAM,QAAQ,CAAC;AACvG,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAQnD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
2
|
import type { IProviderTranslator } from "@holokai/types/provider";
|
|
3
|
-
import
|
|
3
|
+
import { HoloMessage, HoloRequest, HoloResponse, HoloStreamChunk } from "@holokai/types/holo";
|
|
4
4
|
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageTranslator, OllamaStreamTranslator } from "./translators";
|
|
5
5
|
import { OllamaChatRequest, OllamaGenerateRequest, OllamaMessage, OllamaResponse } from "./types";
|
|
6
6
|
export declare class OllamaTranslator implements IProviderTranslator {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.translator.d.ts","sourceRoot":"","sources":["../src/ollama.translator.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"ollama.translator.d.ts","sourceRoot":"","sources":["../src/ollama.translator.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAc,MAAM,qBAAqB,CAAC;AACzG,OAAO,EACH,2BAA2B,EAC3B,4BAA4B,EAE5B,+BAA+B,EAC/B,gCAAgC,EAGhC,uBAAuB,EAEvB,sBAAsB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,EAGH,iBAAiB,EAEjB,qBAAqB,EAErB,aAAa,EACb,cAAc,EACjB,MAAM,SAAS,CAAC;AAEjB,qBACa,gBAAiB,YAAW,mBAAmB;IAEpD,OAAO,CAAC,+BAA+B;IACvC,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,4BAA4B;IACpC,OAAO,CAAC,gCAAgC;IACxC,OAAO,CAAC,sBAAsB;gBALtB,+BAA+B,EAAE,+BAA+B,EAChE,2BAA2B,EAAE,2BAA2B,EACxD,uBAAuB,EAAE,uBAAuB,EAChD,4BAA4B,EAAE,4BAA4B,EAC1D,gCAAgC,EAAE,gCAAgC,EAClE,sBAAsB,EAAE,sBAAsB;IAK1D,MAAM,CAAC,QAAQ,IAAI,mBAAmB;IA+BhC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAK1E,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IASxE,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAO1E,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAOhG,gBAAgB,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;IAI5E,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;IAI1E,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAG1E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.translator.js","sourceRoot":"","sources":["../src/ollama.translator.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.translator.js","sourceRoot":"","sources":["../src/ollama.translator.ts"],"names":[],"mappings":"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"}
|
package/dist/plugin.d.ts
CHANGED
|
@@ -4,18 +4,33 @@
|
|
|
4
4
|
* Implements IProviderPlugin contract for Ollama API
|
|
5
5
|
*/
|
|
6
6
|
import { BasePlugin } from '@holokai/sdk/plugin';
|
|
7
|
-
import type {
|
|
7
|
+
import type { IProviderPlugin, PluginContext, PluginPricingSheet } from '@holokai/types/plugin';
|
|
8
8
|
import type { IProvider, IWireAdapter, ProviderCapabilities, WireAdapterParams } from "@holokai/types/provider";
|
|
9
|
-
import type {
|
|
9
|
+
import type { RouteDefinition } from "@holokai/types/routing";
|
|
10
|
+
export declare const OllamaProtocols: {
|
|
11
|
+
readonly EMBED: "ollama.embed";
|
|
12
|
+
readonly CHAT: "ollama.chat";
|
|
13
|
+
readonly GENERATE: "ollama.generate";
|
|
14
|
+
readonly MODELS: "ollama.models";
|
|
15
|
+
};
|
|
16
|
+
export type OllamaProtocols = typeof OllamaProtocols[keyof typeof OllamaProtocols];
|
|
10
17
|
export declare class OllamaProviderPlugin extends BasePlugin implements IProviderPlugin {
|
|
11
|
-
manifest: import("@holokai/types/plugin").
|
|
18
|
+
manifest: import("@holokai/types/plugin").PluginManifest;
|
|
12
19
|
translator: import("@holokai/types/provider").IProviderTranslator;
|
|
13
20
|
defaultRouteHandler: "passthrough";
|
|
14
|
-
|
|
15
|
-
|
|
21
|
+
protocols: {
|
|
22
|
+
readonly EMBED: "ollama.embed";
|
|
23
|
+
readonly CHAT: "ollama.chat";
|
|
24
|
+
readonly GENERATE: "ollama.generate";
|
|
25
|
+
readonly MODELS: "ollama.models";
|
|
26
|
+
};
|
|
27
|
+
defaultProtocol: "ollama.generate";
|
|
28
|
+
createProvider(id: string, name: string, config: any): Promise<IProvider>;
|
|
29
|
+
createWireAdapter(params: WireAdapterParams): Promise<IWireAdapter>;
|
|
16
30
|
getCapabilities(): ProviderCapabilities;
|
|
17
|
-
getRoutes():
|
|
18
|
-
|
|
31
|
+
getRoutes(): RouteDefinition[];
|
|
32
|
+
getDefaultPricing(): PluginPricingSheet;
|
|
33
|
+
protected onInitialize(_context: PluginContext): Promise<void>;
|
|
19
34
|
protected onDestroy(): Promise<void>;
|
|
20
35
|
}
|
|
21
36
|
//# sourceMappingURL=plugin.d.ts.map
|
package/dist/plugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,EAAC,eAAe,EAAE,aAAa,EAAE,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,OAAO,KAAK,EAAC,SAAS,EAAE,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAG9G,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAK5D,eAAO,MAAM,eAAe;;;;;CAKlB,CAAC;AAEX,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,MAAM,OAAO,eAAe,CAAC,CAAC;AAGnF,qBAAa,oBAAqB,SAAQ,UAAW,YAAW,eAAe;IAC3E,QAAQ,iDAAY;IACpB,UAAU,wDAA+B;IACzC,mBAAmB,gBAA4B;IAC/C,SAAS;;;;;MAAmB;IAC5B,eAAe,oBAA4B;IAErC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC;IASzE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;IAIzE,eAAe,IAAI,oBAAoB;IAUvC,SAAS,IAAI,eAAe,EAAE;IA0C9B,iBAAiB,IAAI,kBAAkB;IA8BvC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIvC"}
|
package/dist/plugin.js
CHANGED
|
@@ -7,17 +7,25 @@ import { BasePlugin } from '@holokai/sdk/plugin';
|
|
|
7
7
|
import { manifest } from "./manifest.js";
|
|
8
8
|
import { OllamaProvider } from "./ollama.provider";
|
|
9
9
|
import { OllamaWireAdapter } from "./ollama.wire.adapter";
|
|
10
|
-
import { RequestType } from "@holokai/types/holo";
|
|
11
10
|
import { RouteHandler } from "@holokai/types/routing";
|
|
12
11
|
import { OllamaTranslator } from "./ollama.translator";
|
|
12
|
+
import { ProtocolCapability } from "@holokai/types/entities";
|
|
13
|
+
export const OllamaProtocols = {
|
|
14
|
+
EMBED: 'ollama.embed',
|
|
15
|
+
CHAT: 'ollama.chat',
|
|
16
|
+
GENERATE: 'ollama.generate',
|
|
17
|
+
MODELS: 'ollama.models'
|
|
18
|
+
};
|
|
13
19
|
export class OllamaProviderPlugin extends BasePlugin {
|
|
14
20
|
manifest = manifest;
|
|
15
21
|
translator = OllamaTranslator.instance();
|
|
16
22
|
defaultRouteHandler = RouteHandler.PASSTHROUGH;
|
|
17
|
-
|
|
18
|
-
|
|
23
|
+
protocols = OllamaProtocols;
|
|
24
|
+
defaultProtocol = OllamaProtocols.GENERATE;
|
|
25
|
+
async createProvider(id, name, config) {
|
|
26
|
+
return new OllamaProvider(id, name, this, config);
|
|
19
27
|
}
|
|
20
|
-
createWireAdapter(params) {
|
|
28
|
+
async createWireAdapter(params) {
|
|
21
29
|
return new OllamaWireAdapter(params.requestId, params.isStreaming);
|
|
22
30
|
}
|
|
23
31
|
getCapabilities() {
|
|
@@ -30,28 +38,68 @@ export class OllamaProviderPlugin extends BasePlugin {
|
|
|
30
38
|
};
|
|
31
39
|
}
|
|
32
40
|
getRoutes() {
|
|
33
|
-
return
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
41
|
+
return [
|
|
42
|
+
{
|
|
43
|
+
paths: ['/api/chat'],
|
|
44
|
+
method: 'POST',
|
|
45
|
+
handler: RouteHandler.REQUEST,
|
|
46
|
+
protocol: {
|
|
47
|
+
name: OllamaProtocols.CHAT,
|
|
48
|
+
capability: ProtocolCapability.CHAT
|
|
49
|
+
}
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
paths: ['/api/generate'],
|
|
53
|
+
method: 'POST',
|
|
54
|
+
handler: RouteHandler.REQUEST,
|
|
55
|
+
protocol: {
|
|
56
|
+
name: OllamaProtocols.GENERATE,
|
|
57
|
+
capability: ProtocolCapability.GENERATE
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
paths: ['/api/tags'],
|
|
62
|
+
method: 'GET',
|
|
63
|
+
handler: RouteHandler.MODELS,
|
|
64
|
+
protocol: {
|
|
65
|
+
name: OllamaProtocols.MODELS,
|
|
66
|
+
capability: ProtocolCapability.MODELS
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
paths: ['/api/embed'],
|
|
71
|
+
method: 'POST',
|
|
72
|
+
handler: RouteHandler.REQUEST,
|
|
73
|
+
protocol: {
|
|
74
|
+
name: OllamaProtocols.EMBED,
|
|
75
|
+
capability: ProtocolCapability.EMBED
|
|
53
76
|
}
|
|
54
77
|
}
|
|
78
|
+
];
|
|
79
|
+
}
|
|
80
|
+
getDefaultPricing() {
|
|
81
|
+
return {
|
|
82
|
+
name: 'Ollama Local 2026-03',
|
|
83
|
+
version: '2026-03',
|
|
84
|
+
effective_from: '2026-03-01',
|
|
85
|
+
models: [
|
|
86
|
+
// All local models are $0 — no API costs
|
|
87
|
+
...[
|
|
88
|
+
// Llama
|
|
89
|
+
'llama3:latest', 'llama-3.3-70b-instruct', 'llama3.3:70b-instruct-q4_0',
|
|
90
|
+
'meta-llama-3.1-8b-instruct',
|
|
91
|
+
// Gemma
|
|
92
|
+
'gemma3:latest', 'gemma3:12b', 'gemma3:27b',
|
|
93
|
+
'gemma-3-1b-it', 'gemma-3-12b-it', 'gemma-3-27b-it',
|
|
94
|
+
// Mistral
|
|
95
|
+
'mistral:latest', 'mistral-7b-instruct-v0.3', 'mistral-nemo-instruct-2407',
|
|
96
|
+
'mistral-small-3.1-24b-instruct-2503', 'mistral-small:24b-instruct-2501-q8_0',
|
|
97
|
+
// Qwen
|
|
98
|
+
'qwq-32b', 'qwen3-coder-30b-a3b-instruct-mlx', 'qwen/qwen3-next-80b',
|
|
99
|
+
// Embeddings
|
|
100
|
+
'nomic-embed-text:latest', 'text-embedding-nomic-embed-text-v1.5',
|
|
101
|
+
].map(m => ({ model_name: m, input_cost: 0, output_cost: 0 })),
|
|
102
|
+
]
|
|
55
103
|
};
|
|
56
104
|
}
|
|
57
105
|
onInitialize(_context) {
|
package/dist/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@holokai/holo-provider-ollama",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Ollama provider plugin for Holo LLM Gateway",
|
|
6
6
|
"author": "Holokai",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"prepublishOnly": "npm run clean && npm run build"
|
|
59
59
|
},
|
|
60
60
|
"peerDependencies": {
|
|
61
|
-
"@holokai/sdk": "^1.
|
|
61
|
+
"@holokai/sdk": "^1.1.0"
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
64
|
"ollama": "^0.6.3"
|