@holokai/holo-provider-ollama 1.4.5 → 1.5.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.pricing.d.ts +2 -2
- package/dist/ollama.pricing.d.ts.map +1 -1
- package/dist/ollama.pricing.js +32 -15
- package/dist/ollama.pricing.js.map +1 -1
- package/dist/ollama.provider.d.ts +0 -1
- package/dist/ollama.provider.d.ts.map +1 -1
- package/dist/ollama.provider.js +0 -3
- package/dist/ollama.provider.js.map +1 -1
- package/dist/ollama.translator.d.ts +10 -7
- package/dist/ollama.translator.d.ts.map +1 -1
- package/dist/ollama.translator.js +50 -14
- package/dist/ollama.translator.js.map +1 -1
- package/dist/ollama.wire.adapter.d.ts +13 -0
- package/dist/ollama.wire.adapter.d.ts.map +1 -1
- package/dist/ollama.wire.adapter.js +17 -0
- package/dist/ollama.wire.adapter.js.map +1 -1
- package/dist/plugin.d.ts +4 -1
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +41 -11
- package/dist/plugin.js.map +1 -1
- package/dist/translators/index.d.ts +3 -0
- package/dist/translators/index.d.ts.map +1 -1
- package/dist/translators/index.js +3 -0
- package/dist/translators/index.js.map +1 -1
- package/dist/translators/ollama.chat.request.translator.d.ts.map +1 -1
- package/dist/translators/ollama.chat.request.translator.js +5 -4
- package/dist/translators/ollama.chat.request.translator.js.map +1 -1
- package/dist/translators/ollama.chat.response.translator.d.ts +3 -3
- package/dist/translators/ollama.chat.response.translator.d.ts.map +1 -1
- package/dist/translators/ollama.chat.response.translator.js +14 -43
- package/dist/translators/ollama.chat.response.translator.js.map +1 -1
- package/dist/translators/ollama.embed.request.translator.d.ts +13 -0
- package/dist/translators/ollama.embed.request.translator.d.ts.map +1 -0
- package/dist/translators/ollama.embed.request.translator.js +56 -0
- package/dist/translators/ollama.embed.request.translator.js.map +1 -0
- package/dist/translators/ollama.embed.response.translator.d.ts +14 -0
- package/dist/translators/ollama.embed.response.translator.d.ts.map +1 -0
- package/dist/translators/ollama.embed.response.translator.js +51 -0
- package/dist/translators/ollama.embed.response.translator.js.map +1 -0
- package/dist/translators/ollama.generate.request.translator.d.ts.map +1 -1
- package/dist/translators/ollama.generate.request.translator.js +4 -3
- package/dist/translators/ollama.generate.request.translator.js.map +1 -1
- package/dist/translators/ollama.generate.response.translator.d.ts +6 -4
- package/dist/translators/ollama.generate.response.translator.d.ts.map +1 -1
- package/dist/translators/ollama.generate.response.translator.js +26 -39
- package/dist/translators/ollama.generate.response.translator.js.map +1 -1
- package/dist/translators/ollama.message.translators.d.ts.map +1 -1
- package/dist/translators/ollama.message.translators.js +5 -7
- package/dist/translators/ollama.message.translators.js.map +1 -1
- package/dist/translators/ollama.options.translators.d.ts.map +1 -1
- package/dist/translators/ollama.options.translators.js +12 -0
- package/dist/translators/ollama.options.translators.js.map +1 -1
- package/dist/translators/ollama.tool.translators.d.ts.map +1 -1
- package/dist/translators/ollama.tool.translators.js +3 -5
- package/dist/translators/ollama.tool.translators.js.map +1 -1
- package/dist/translators/ollama.usage.translator.d.ts +19 -0
- package/dist/translators/ollama.usage.translator.d.ts.map +1 -0
- package/dist/translators/ollama.usage.translator.js +53 -0
- package/dist/translators/ollama.usage.translator.js.map +1 -0
- package/dist/translators/streaming/ollama.content.delta.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.content.delta.translator.js +10 -0
- package/dist/translators/streaming/ollama.content.delta.translator.js.map +1 -1
- package/dist/translators/streaming/ollama.message.delta.translator.d.ts +6 -1
- package/dist/translators/streaming/ollama.message.delta.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.message.delta.translator.js +138 -58
- package/dist/translators/streaming/ollama.message.delta.translator.js.map +1 -1
- package/dist/translators/streaming/ollama.stream.translator.d.ts +15 -1
- package/dist/translators/streaming/ollama.stream.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.stream.translator.js +129 -23
- package/dist/translators/streaming/ollama.stream.translator.js.map +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +0 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/request.types.d.ts +2 -1
- package/dist/types/request.types.d.ts.map +1 -1
- package/dist/types/request.types.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/dist/ollama.pricing.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const
|
|
1
|
+
import type { PricingDataset } from '@holokai/holo-types/plugin';
|
|
2
|
+
export declare const OLLAMA_PRICING_DATASET: PricingDataset;
|
|
3
3
|
//# sourceMappingURL=ollama.pricing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.pricing.d.ts","sourceRoot":"","sources":["../src/ollama.pricing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"ollama.pricing.d.ts","sourceRoot":"","sources":["../src/ollama.pricing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAqB/D,eAAO,MAAM,sBAAsB,EAAE,cAmBpC,CAAC"}
|
package/dist/ollama.pricing.js
CHANGED
|
@@ -1,18 +1,35 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// Local-runtime caveat: this list is a known-good seed. The runtime model dictionary
|
|
2
|
+
// is authoritative — `OllamaProvider.discoverModels()` queries `client.list()` against
|
|
3
|
+
// the running ollama host, so a user pulling a model not listed here is fine.
|
|
4
|
+
// Pricing for unlisted models defaults to zero cost via the seed snapshot.
|
|
5
|
+
const LOCAL_MODELS = [
|
|
6
|
+
'llama3:latest', 'llama-3.3-70b-instruct', 'llama3.3:70b-instruct-q4_0',
|
|
7
|
+
'meta-llama-3.1-8b-instruct',
|
|
8
|
+
'gemma3:latest', 'gemma3:12b', 'gemma3:27b',
|
|
9
|
+
'gemma-3-1b-it', 'gemma-3-12b-it', 'gemma-3-27b-it',
|
|
10
|
+
'mistral:latest', 'mistral-7b-instruct-v0.3', 'mistral-nemo-instruct-2407',
|
|
11
|
+
'mistral-small-3.1-24b-instruct-2503', 'mistral-small:24b-instruct-2501-q8_0',
|
|
12
|
+
'qwq-32b', 'qwen3-coder-30b-a3b-instruct-mlx', 'qwen/qwen3-next-80b',
|
|
13
|
+
'nomic-embed-text:latest', 'text-embedding-nomic-embed-text-v1.5',
|
|
14
|
+
];
|
|
15
|
+
export const OLLAMA_PRICING_DATASET = {
|
|
16
|
+
name: 'Ollama Local',
|
|
3
17
|
version: '2026-03',
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
'
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
18
|
+
pricing_snapshots: [
|
|
19
|
+
{
|
|
20
|
+
name: 'ollama-2026-03',
|
|
21
|
+
version: '2026-03',
|
|
22
|
+
effective_from: '2026-03-01',
|
|
23
|
+
models: LOCAL_MODELS.map(m => ({ model_name: m, input_cost: 0, output_cost: 0 })),
|
|
24
|
+
},
|
|
25
|
+
],
|
|
26
|
+
model_ids: LOCAL_MODELS.map(model_id => ({
|
|
27
|
+
model_id,
|
|
28
|
+
family: 'ollama',
|
|
29
|
+
kind: model_id.includes('embed') ? 'embed' : 'chat',
|
|
30
|
+
release_date: '2026-03-01',
|
|
31
|
+
shutdown_date: null,
|
|
32
|
+
pricing_snapshot: 'ollama-2026-03',
|
|
33
|
+
})),
|
|
17
34
|
};
|
|
18
35
|
//# sourceMappingURL=ollama.pricing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.pricing.js","sourceRoot":"","sources":["../src/ollama.pricing.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"ollama.pricing.js","sourceRoot":"","sources":["../src/ollama.pricing.ts"],"names":[],"mappings":"AAEA,qFAAqF;AACrF,uFAAuF;AACvF,8EAA8E;AAC9E,2EAA2E;AAC3E,MAAM,YAAY,GAAG;IACjB,eAAe,EAAE,wBAAwB,EAAE,4BAA4B;IACvE,4BAA4B;IAE5B,eAAe,EAAE,YAAY,EAAE,YAAY;IAC3C,eAAe,EAAE,gBAAgB,EAAE,gBAAgB;IAEnD,gBAAgB,EAAE,0BAA0B,EAAE,4BAA4B;IAC1E,qCAAqC,EAAE,sCAAsC;IAE7E,SAAS,EAAE,kCAAkC,EAAE,qBAAqB;IAEpE,yBAAyB,EAAE,sCAAsC;CACpE,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAmB;IAClD,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,SAAS;IAClB,iBAAiB,EAAE;QACf;YACI,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,SAAS;YAClB,cAAc,EAAE,YAAY;YAC5B,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAC,CAAC,CAAC;SAClF;KACJ;IACD,SAAS,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrC,QAAQ;QACR,MAAM,EAAE,QAAQ;QAChB,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;QACnD,YAAY,EAAE,YAAY;QAC1B,aAAa,EAAE,IAAI;QACnB,gBAAgB,EAAE,gBAAgB;KACrC,CAAC,CAAC;CACN,CAAC"}
|
|
@@ -2,7 +2,6 @@ import { ChatRequest, EmbedRequest, ErrorResponse, GenerateRequest, ListResponse
|
|
|
2
2
|
import { BaseProvider } from '@holokai/holo-sdk/provider';
|
|
3
3
|
import type { DiscoveredModel, IAuditor, IProviderTranslator, IResponseFactory, ProviderContext, RunHandle } from '@holokai/holo-types/provider';
|
|
4
4
|
export declare class OllamaProvider extends BaseProvider<Ollama, EmbedRequest | GenerateRequest | ChatRequest> {
|
|
5
|
-
getModelNameFromRequest(payload: EmbedRequest | GenerateRequest | ChatRequest): Promise<string>;
|
|
6
5
|
discoverModels(): Promise<DiscoveredModel[]>;
|
|
7
6
|
getModels(allowedModels: string[] | true): Promise<ListResponse>;
|
|
8
7
|
ollamaEmbed(payload: EmbedRequest): Promise<{
|
|
@@ -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,4BAA4B,CAAC;AACxD,OAAO,KAAK,EACR,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EACZ,MAAM,8BAA8B,CAAC;AAMtC,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,eAAe,GAAG,WAAW,CAAC;IAE5F,
|
|
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,4BAA4B,CAAC;AACxD,OAAO,KAAK,EACR,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EACZ,MAAM,8BAA8B,CAAC;AAMtC,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,eAAe,GAAG,WAAW,CAAC;IAE5F,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAoB5C,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;IAchE,WAAW,CAAC,OAAO,EAAE,YAAY;;;IAQvC,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,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAY3H,cAAc;IA4B5B,OAAO,CAAC,mBAAmB;YAYb,UAAU;CA0C3B"}
|
package/dist/ollama.provider.js
CHANGED
|
@@ -5,9 +5,6 @@ import { OllamaTranslator } from './ollama.translator';
|
|
|
5
5
|
import { OllamaResponseFactory } from './ollama.response.factory';
|
|
6
6
|
import { OllamaProtocols } from "./plugin";
|
|
7
7
|
export class OllamaProvider extends BaseProvider {
|
|
8
|
-
async getModelNameFromRequest(payload) {
|
|
9
|
-
return payload.model;
|
|
10
|
-
}
|
|
11
8
|
async discoverModels() {
|
|
12
9
|
const response = await this.client.list();
|
|
13
10
|
return response.models.map(m => {
|
|
@@ -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,4BAA4B,CAAC;AASxD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzC,MAAM,OAAO,cAAe,SAAQ,YAAkE;IAElG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,29 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
2
|
import type { IProviderTranslator } from "@holokai/holo-types/provider";
|
|
3
3
|
import { HoloEmbedParams, HoloGenerateParams, HoloMessage, HoloRequest, HoloResponse, HoloStreamChunk } from "@holokai/holo-types/holo";
|
|
4
|
-
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageTranslator, OllamaStreamTranslator } from "./translators";
|
|
5
|
-
import { OllamaChatRequest, OllamaGenerateRequest, OllamaMessage, OllamaResponse } from "./types";
|
|
4
|
+
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaEmbedRequestTranslator, OllamaEmbedResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageTranslator, OllamaStreamTranslator } from "./translators";
|
|
5
|
+
import { OllamaChatRequest, OllamaChatResponse, OllamaEmbedRequest, OllamaGenerateRequest, OllamaGenerateResponse, OllamaMessage, OllamaResponse } from "./types";
|
|
6
6
|
export declare class OllamaTranslator implements IProviderTranslator {
|
|
7
7
|
private ollamaGenerateRequestTranslator;
|
|
8
8
|
private ollamaChatRequestTranslator;
|
|
9
|
+
private ollamaEmbedRequestTranslator;
|
|
9
10
|
private ollamaMessageTranslator;
|
|
10
11
|
private ollamaChatResponseTranslator;
|
|
11
12
|
private ollamaGenerateResponseTranslator;
|
|
13
|
+
private ollamaEmbedResponseTranslator;
|
|
12
14
|
private ollamaStreamTranslator;
|
|
13
|
-
constructor(ollamaGenerateRequestTranslator: OllamaGenerateRequestTranslator, ollamaChatRequestTranslator: OllamaChatRequestTranslator, ollamaMessageTranslator: OllamaMessageTranslator, ollamaChatResponseTranslator: OllamaChatResponseTranslator, ollamaGenerateResponseTranslator: OllamaGenerateResponseTranslator, ollamaStreamTranslator: OllamaStreamTranslator);
|
|
15
|
+
constructor(ollamaGenerateRequestTranslator: OllamaGenerateRequestTranslator, ollamaChatRequestTranslator: OllamaChatRequestTranslator, ollamaEmbedRequestTranslator: OllamaEmbedRequestTranslator, ollamaMessageTranslator: OllamaMessageTranslator, ollamaChatResponseTranslator: OllamaChatResponseTranslator, ollamaGenerateResponseTranslator: OllamaGenerateResponseTranslator, ollamaEmbedResponseTranslator: OllamaEmbedResponseTranslator, ollamaStreamTranslator: OllamaStreamTranslator);
|
|
14
16
|
static instance(): IProviderTranslator;
|
|
15
17
|
fromHoloResponse(response: HoloResponse): Promise<Partial<OllamaResponse>>;
|
|
16
18
|
toHoloResponse(response: OllamaResponse): Promise<Partial<HoloResponse>>;
|
|
17
|
-
fromHoloRequest(request: HoloRequest): Promise<Partial<OllamaChatRequest>>;
|
|
18
|
-
toHoloRequest(request: OllamaChatRequest | OllamaGenerateRequest): Promise<Partial<HoloRequest>>;
|
|
19
|
+
fromHoloRequest(request: HoloRequest): Promise<Partial<OllamaChatRequest | OllamaGenerateRequest | OllamaEmbedRequest>>;
|
|
20
|
+
toHoloRequest(request: OllamaChatRequest | OllamaGenerateRequest | OllamaEmbedRequest): Promise<Partial<HoloRequest>>;
|
|
19
21
|
fromHoloMessages(messages: HoloMessage[]): Promise<Partial<OllamaMessage>[]>;
|
|
20
22
|
toHoloMessages(messages: OllamaMessage[]): Promise<Partial<HoloMessage>[]>;
|
|
21
|
-
|
|
23
|
+
fromHoloStream(source: AsyncIterable<HoloStreamChunk>): AsyncIterable<unknown>;
|
|
24
|
+
toHoloStream(source: AsyncIterable<OllamaChatResponse | OllamaGenerateResponse>): AsyncIterable<HoloStreamChunk>;
|
|
22
25
|
fromHoloGenerateRequest(request: HoloGenerateParams): Promise<any>;
|
|
23
|
-
fromHoloEmbedRequest(request: HoloEmbedParams): Promise<
|
|
26
|
+
fromHoloEmbedRequest(request: HoloEmbedParams): Promise<Partial<OllamaEmbedRequest>>;
|
|
24
27
|
toHoloEmbedResponse(response: any): Promise<{
|
|
25
28
|
model: string;
|
|
26
29
|
embeddings: number[][];
|
|
@@ -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,8BAA8B,CAAC;AACtE,OAAO,EACH,eAAe,EACf,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,2BAA2B,EAC3B,4BAA4B,EAE5B,+BAA+B,EAC/B,gCAAgC,EAGhC,uBAAuB,EAEvB,sBAAsB,
|
|
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,8BAA8B,CAAC;AACtE,OAAO,EACH,eAAe,EACf,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,2BAA2B,EAC3B,4BAA4B,EAE5B,4BAA4B,EAC5B,6BAA6B,EAC7B,+BAA+B,EAC/B,gCAAgC,EAGhC,uBAAuB,EAEvB,sBAAsB,EAGzB,MAAM,eAAe,CAAC;AACvB,OAAO,EAGH,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAElB,qBAAqB,EACrB,sBAAsB,EACtB,aAAa,EACb,cAAc,EACjB,MAAM,SAAS,CAAC;AAEjB,qBACa,gBAAiB,YAAW,mBAAmB;IAEpD,OAAO,CAAC,+BAA+B;IACvC,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,4BAA4B;IACpC,OAAO,CAAC,uBAAuB;IAC/B,OAAO,CAAC,4BAA4B;IACpC,OAAO,CAAC,gCAAgC;IACxC,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,sBAAsB;gBAPtB,+BAA+B,EAAE,+BAA+B,EAChE,2BAA2B,EAAE,2BAA2B,EACxD,4BAA4B,EAAE,4BAA4B,EAC1D,uBAAuB,EAAE,uBAAuB,EAChD,4BAA4B,EAAE,4BAA4B,EAC1D,gCAAgC,EAAE,gCAAgC,EAClE,6BAA6B,EAAE,6BAA6B,EAC5D,sBAAsB,EAAE,sBAAsB;IAK1D,MAAM,CAAC,QAAQ,IAAI,mBAAmB;IAoChC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAU1E,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAUxE,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,GAAG,qBAAqB,GAAG,kBAAkB,CAAC,CAAC;IAUvH,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,qBAAqB,GAAG,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAUrH,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;IAIhF,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC;IAI9E,YAAY,CAAC,MAAM,EAAE,aAAa,CAAC,kBAAkB,GAAG,sBAAsB,CAAC,GAAG,aAAa,CAAC,eAAe,CAAC;IAI1G,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC;IAQlE,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAOpF,mBAAmB,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;CAQ5G"}
|
|
@@ -10,54 +10,75 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var OllamaTranslator_1;
|
|
11
11
|
import 'reflect-metadata';
|
|
12
12
|
import { injectable } from "tsyringe";
|
|
13
|
-
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaContentDeltaTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageDeltaTranslator, OllamaMessageStopTranslator, OllamaMessageTranslator, OllamaOptionsTranslator, OllamaStreamTranslator, OllamaToolTranslator } from "./translators";
|
|
13
|
+
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaContentDeltaTranslator, OllamaEmbedRequestTranslator, OllamaEmbedResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageDeltaTranslator, OllamaMessageStopTranslator, OllamaMessageTranslator, OllamaOptionsTranslator, OllamaStreamTranslator, OllamaToolTranslator, OllamaUsageTranslator } from "./translators";
|
|
14
14
|
import { isGenerateRequest, isGenerateResponse } from "./types";
|
|
15
15
|
let OllamaTranslator = OllamaTranslator_1 = class OllamaTranslator {
|
|
16
16
|
ollamaGenerateRequestTranslator;
|
|
17
17
|
ollamaChatRequestTranslator;
|
|
18
|
+
ollamaEmbedRequestTranslator;
|
|
18
19
|
ollamaMessageTranslator;
|
|
19
20
|
ollamaChatResponseTranslator;
|
|
20
21
|
ollamaGenerateResponseTranslator;
|
|
22
|
+
ollamaEmbedResponseTranslator;
|
|
21
23
|
ollamaStreamTranslator;
|
|
22
|
-
constructor(ollamaGenerateRequestTranslator, ollamaChatRequestTranslator, ollamaMessageTranslator, ollamaChatResponseTranslator, ollamaGenerateResponseTranslator, ollamaStreamTranslator) {
|
|
24
|
+
constructor(ollamaGenerateRequestTranslator, ollamaChatRequestTranslator, ollamaEmbedRequestTranslator, ollamaMessageTranslator, ollamaChatResponseTranslator, ollamaGenerateResponseTranslator, ollamaEmbedResponseTranslator, ollamaStreamTranslator) {
|
|
23
25
|
this.ollamaGenerateRequestTranslator = ollamaGenerateRequestTranslator;
|
|
24
26
|
this.ollamaChatRequestTranslator = ollamaChatRequestTranslator;
|
|
27
|
+
this.ollamaEmbedRequestTranslator = ollamaEmbedRequestTranslator;
|
|
25
28
|
this.ollamaMessageTranslator = ollamaMessageTranslator;
|
|
26
29
|
this.ollamaChatResponseTranslator = ollamaChatResponseTranslator;
|
|
27
30
|
this.ollamaGenerateResponseTranslator = ollamaGenerateResponseTranslator;
|
|
31
|
+
this.ollamaEmbedResponseTranslator = ollamaEmbedResponseTranslator;
|
|
28
32
|
this.ollamaStreamTranslator = ollamaStreamTranslator;
|
|
29
33
|
}
|
|
30
34
|
static instance() {
|
|
31
35
|
const messageTranslator = new OllamaMessageTranslator();
|
|
32
36
|
const toolTranslator = new OllamaToolTranslator();
|
|
33
37
|
const optionsTranslator = new OllamaOptionsTranslator();
|
|
38
|
+
const usageTranslator = new OllamaUsageTranslator();
|
|
34
39
|
const generateRequestTranslator = new OllamaGenerateRequestTranslator();
|
|
35
40
|
const chatRequestTranslator = new OllamaChatRequestTranslator(messageTranslator, toolTranslator, optionsTranslator);
|
|
36
|
-
const
|
|
37
|
-
const
|
|
41
|
+
const embedRequestTranslator = new OllamaEmbedRequestTranslator();
|
|
42
|
+
const generateResponseTranslator = new OllamaGenerateResponseTranslator(usageTranslator);
|
|
43
|
+
const chatResponseTranslator = new OllamaChatResponseTranslator(messageTranslator, usageTranslator);
|
|
44
|
+
const embedResponseTranslator = new OllamaEmbedResponseTranslator(usageTranslator);
|
|
38
45
|
const contentDeltaTranslator = new OllamaContentDeltaTranslator();
|
|
39
|
-
const messageDeltaTranslator = new OllamaMessageDeltaTranslator();
|
|
46
|
+
const messageDeltaTranslator = new OllamaMessageDeltaTranslator(usageTranslator);
|
|
40
47
|
const messageStopTranslator = new OllamaMessageStopTranslator();
|
|
41
48
|
const streamTranslator = new OllamaStreamTranslator(contentDeltaTranslator, messageDeltaTranslator, messageStopTranslator);
|
|
42
|
-
return new OllamaTranslator_1(generateRequestTranslator, chatRequestTranslator, messageTranslator, chatResponseTranslator, generateResponseTranslator, streamTranslator);
|
|
49
|
+
return new OllamaTranslator_1(generateRequestTranslator, chatRequestTranslator, embedRequestTranslator, messageTranslator, chatResponseTranslator, generateResponseTranslator, embedResponseTranslator, streamTranslator);
|
|
43
50
|
}
|
|
44
51
|
async fromHoloResponse(response) {
|
|
45
|
-
|
|
52
|
+
if (response.protocol === 'ollama.generate') {
|
|
53
|
+
return this.ollamaGenerateResponseTranslator.fromHolo(response);
|
|
54
|
+
}
|
|
55
|
+
if (response.protocol === 'ollama.embed') {
|
|
56
|
+
return this.ollamaEmbedResponseTranslator.fromHolo(response);
|
|
57
|
+
}
|
|
46
58
|
return this.ollamaChatResponseTranslator.fromHolo(response);
|
|
47
59
|
}
|
|
48
60
|
async toHoloResponse(response) {
|
|
49
|
-
|
|
61
|
+
if (isEmbedResponse(response)) {
|
|
62
|
+
return this.ollamaEmbedResponseTranslator.toHolo(response);
|
|
63
|
+
}
|
|
50
64
|
if (isGenerateResponse(response)) {
|
|
51
65
|
return this.ollamaGenerateResponseTranslator.toHolo(response);
|
|
52
66
|
}
|
|
53
|
-
|
|
54
|
-
return this.ollamaChatResponseTranslator.toHolo(response);
|
|
55
|
-
}
|
|
67
|
+
return this.ollamaChatResponseTranslator.toHolo(response);
|
|
56
68
|
}
|
|
57
69
|
async fromHoloRequest(request) {
|
|
70
|
+
if (request.protocol === 'ollama.generate') {
|
|
71
|
+
return this.ollamaGenerateRequestTranslator.fromHolo(request);
|
|
72
|
+
}
|
|
73
|
+
if (request.protocol === 'ollama.embed') {
|
|
74
|
+
return this.ollamaEmbedRequestTranslator.fromHolo(request);
|
|
75
|
+
}
|
|
58
76
|
return this.ollamaChatRequestTranslator.fromHolo(request);
|
|
59
77
|
}
|
|
60
78
|
async toHoloRequest(request) {
|
|
79
|
+
if (isEmbedRequest(request)) {
|
|
80
|
+
return this.ollamaEmbedRequestTranslator.toHolo(request);
|
|
81
|
+
}
|
|
61
82
|
if (isGenerateRequest(request)) {
|
|
62
83
|
return this.ollamaGenerateRequestTranslator.toHolo(request);
|
|
63
84
|
}
|
|
@@ -69,8 +90,11 @@ let OllamaTranslator = OllamaTranslator_1 = class OllamaTranslator {
|
|
|
69
90
|
async toHoloMessages(messages) {
|
|
70
91
|
return this.ollamaMessageTranslator.toHoloArray(messages);
|
|
71
92
|
}
|
|
72
|
-
|
|
73
|
-
return this.ollamaStreamTranslator.
|
|
93
|
+
fromHoloStream(source) {
|
|
94
|
+
return this.ollamaStreamTranslator.fromHoloStream(source);
|
|
95
|
+
}
|
|
96
|
+
toHoloStream(source) {
|
|
97
|
+
return this.ollamaStreamTranslator.toHoloStream(source);
|
|
74
98
|
}
|
|
75
99
|
async fromHoloGenerateRequest(request) {
|
|
76
100
|
return {
|
|
@@ -87,17 +111,29 @@ let OllamaTranslator = OllamaTranslator_1 = class OllamaTranslator {
|
|
|
87
111
|
}
|
|
88
112
|
async toHoloEmbedResponse(response) {
|
|
89
113
|
const model = response?.model ?? '';
|
|
90
|
-
|
|
114
|
+
const embeddings = (response?.embeddings ?? []);
|
|
115
|
+
const usage = response?.prompt_eval_count != null
|
|
116
|
+
? { input_tokens: response.prompt_eval_count, total_tokens: response.prompt_eval_count }
|
|
117
|
+
: undefined;
|
|
118
|
+
return usage ? { model, embeddings, usage } : { model, embeddings };
|
|
91
119
|
}
|
|
92
120
|
};
|
|
93
121
|
OllamaTranslator = OllamaTranslator_1 = __decorate([
|
|
94
122
|
injectable(),
|
|
95
123
|
__metadata("design:paramtypes", [OllamaGenerateRequestTranslator,
|
|
96
124
|
OllamaChatRequestTranslator,
|
|
125
|
+
OllamaEmbedRequestTranslator,
|
|
97
126
|
OllamaMessageTranslator,
|
|
98
127
|
OllamaChatResponseTranslator,
|
|
99
128
|
OllamaGenerateResponseTranslator,
|
|
129
|
+
OllamaEmbedResponseTranslator,
|
|
100
130
|
OllamaStreamTranslator])
|
|
101
131
|
], OllamaTranslator);
|
|
102
132
|
export { OllamaTranslator };
|
|
133
|
+
function isEmbedRequest(req) {
|
|
134
|
+
return !!req && typeof req === 'object' && 'input' in req && !('messages' in req) && !('prompt' in req);
|
|
135
|
+
}
|
|
136
|
+
function isEmbedResponse(res) {
|
|
137
|
+
return 'embeddings' in res && Array.isArray(res.embeddings);
|
|
138
|
+
}
|
|
103
139
|
//# sourceMappingURL=ollama.translator.js.map
|
|
@@ -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;AAUpC,OAAO,EACH,2BAA2B,EAC3B,4BAA4B,EAC5B,4BAA4B,EAC5B,+BAA+B,EAC/B,gCAAgC,EAChC,4BAA4B,EAC5B,2BAA2B,EAC3B,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"ollama.translator.js","sourceRoot":"","sources":["../src/ollama.translator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
import { BaseWireAdapter } from "@holokai/holo-sdk/provider";
|
|
2
|
+
import type { ProviderEvent } from "@holokai/holo-types/provider";
|
|
2
3
|
export declare class OllamaWireAdapter extends BaseWireAdapter {
|
|
3
4
|
formatWire(data: any): string;
|
|
4
5
|
protected streamingHeaders(): Record<string, string>;
|
|
6
|
+
/**
|
|
7
|
+
* Native Ollama streaming terminates with a `done:true` chunk whose
|
|
8
|
+
* `message.content` is empty (the content was already streamed via
|
|
9
|
+
* intermediate chunks), but with usage stats and `done_reason`. The
|
|
10
|
+
* non-streaming response, by contrast, carries the full accumulated
|
|
11
|
+
* `message.content`. When `fromHoloResponse` renders the trailing
|
|
12
|
+
* message for streaming we still get the full text — strip it here
|
|
13
|
+
* to match Ollama's wire convention.
|
|
14
|
+
*/
|
|
15
|
+
protected defaultDoneStreamFormatter(ev: Extract<ProviderEvent, {
|
|
16
|
+
type: 'done';
|
|
17
|
+
}>): Promise<string>;
|
|
5
18
|
}
|
|
6
19
|
//# sourceMappingURL=ollama.wire.adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.wire.adapter.d.ts","sourceRoot":"","sources":["../src/ollama.wire.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.wire.adapter.d.ts","sourceRoot":"","sources":["../src/ollama.wire.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAEhE,qBAAa,iBAAkB,SAAQ,eAAe;IAC3C,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM;IAIpC,SAAS,CAAC,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAKpD;;;;;;;;OAQG;cACa,0BAA0B,CAAC,EAAE,EAAE,OAAO,CAAC,aAAa,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAQ5G"}
|
|
@@ -7,5 +7,22 @@ export class OllamaWireAdapter extends BaseWireAdapter {
|
|
|
7
7
|
// Ollama streams NDJSON
|
|
8
8
|
return { "Content-Type": "application/x-ndjson" };
|
|
9
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* Native Ollama streaming terminates with a `done:true` chunk whose
|
|
12
|
+
* `message.content` is empty (the content was already streamed via
|
|
13
|
+
* intermediate chunks), but with usage stats and `done_reason`. The
|
|
14
|
+
* non-streaming response, by contrast, carries the full accumulated
|
|
15
|
+
* `message.content`. When `fromHoloResponse` renders the trailing
|
|
16
|
+
* message for streaming we still get the full text — strip it here
|
|
17
|
+
* to match Ollama's wire convention.
|
|
18
|
+
*/
|
|
19
|
+
async defaultDoneStreamFormatter(ev) {
|
|
20
|
+
const msg = ev.message;
|
|
21
|
+
if (msg && typeof msg === 'object' && 'message' in msg && msg.message && typeof msg.message === 'object') {
|
|
22
|
+
const cleaned = { ...msg, message: { ...msg.message, content: '' } };
|
|
23
|
+
return this.formatWire(cleaned);
|
|
24
|
+
}
|
|
25
|
+
return this.formatWire(msg);
|
|
26
|
+
}
|
|
10
27
|
}
|
|
11
28
|
//# sourceMappingURL=ollama.wire.adapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.wire.adapter.js","sourceRoot":"","sources":["../src/ollama.wire.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.wire.adapter.js","sourceRoot":"","sources":["../src/ollama.wire.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAC;AAG3D,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAC3C,UAAU,CAAC,IAAS;QACvB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;IACvC,CAAC;IAES,gBAAgB;QACtB,wBAAwB;QACxB,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,CAAC;IACpD,CAAC;IAED;;;;;;;;OAQG;IACO,KAAK,CAAC,0BAA0B,CAAC,EAA4C;QACnF,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC;QACvB,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAS,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACvG,MAAM,OAAO,GAAG,EAAC,GAAG,GAAG,EAAE,OAAO,EAAE,EAAC,GAAI,GAAG,CAAC,OAAmC,EAAE,OAAO,EAAE,EAAE,EAAC,EAAC,CAAC;YAC9F,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACJ"}
|
package/dist/plugin.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { BasePlugin } from '@holokai/holo-sdk/plugin';
|
|
7
7
|
import type { IProviderPlugin, PluginContext, PluginPricingSheet, PluginSchema } from '@holokai/holo-types/plugin';
|
|
8
|
-
import type { IProvider, IWireAdapter, ProviderCapabilities, WireAdapterParams } from "@holokai/holo-types/provider";
|
|
8
|
+
import type { DiscoveredModel, IProvider, IWireAdapter, ProviderCapabilities, WireAdapterParams } from "@holokai/holo-types/provider";
|
|
9
9
|
import type { RouteDefinition } from "@holokai/holo-types/routing";
|
|
10
10
|
import { ProtocolCapability } from "@holokai/holo-types/entities";
|
|
11
11
|
export declare const OllamaProtocols: {
|
|
@@ -29,10 +29,13 @@ export declare class OllamaProviderPlugin extends BasePlugin implements IProvide
|
|
|
29
29
|
createProvider(id: string, name: string, config: any): Promise<IProvider>;
|
|
30
30
|
createWireAdapter(params: WireAdapterParams): Promise<IWireAdapter>;
|
|
31
31
|
getProtocolByCapability(capability: ProtocolCapability): string | undefined;
|
|
32
|
+
getModelNameFromRequest(payload: any): string | undefined;
|
|
33
|
+
formatModelsResponse(models: DiscoveredModel[]): unknown;
|
|
32
34
|
getSchema(): PluginSchema;
|
|
33
35
|
getCapabilities(): ProviderCapabilities;
|
|
34
36
|
getRoutes(): RouteDefinition[];
|
|
35
37
|
getPricingSheets(): Map<string, PluginPricingSheet>;
|
|
38
|
+
getPricingModelIds(): import("@holokai/holo-types/plugin").PricingModelId[];
|
|
36
39
|
getDefaultPricing(): PluginPricingSheet;
|
|
37
40
|
protected calculateExtraCosts(_tokens: Record<string, number>, _pricing: any): {
|
|
38
41
|
total: number;
|
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,
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,UAAU,EAA0B,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAC,eAAe,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAGjH,OAAO,KAAK,EACR,eAAe,EACf,SAAS,EACT,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACpB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAGjE,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAEhE,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,sDAAY;IACpB,UAAU,6DAA+B;IACzC,mBAAmB,gBAA4B;IAC/C,SAAS;;;;;MAAmB;IAC5B,eAAe,gBAAwB;IAEjC,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,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;IAK3E,uBAAuB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAIzD,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO;IAoBxD,SAAS,IAAI,YAAY;IAqBzB,eAAe,IAAI,oBAAoB;IAUvC,SAAS,IAAI,eAAe,EAAE;IAkD9B,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAInD,kBAAkB;IAIlB,iBAAiB,IAAI,kBAAkB;IAQvC,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,GAAG;;;;IAI5E,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
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Implements IProviderPlugin contract for Ollama API
|
|
5
5
|
*/
|
|
6
|
-
import { BasePlugin } from '@holokai/holo-sdk/plugin';
|
|
7
|
-
import {
|
|
6
|
+
import { BasePlugin, normalizePricingDataset } from '@holokai/holo-sdk/plugin';
|
|
7
|
+
import { OLLAMA_PRICING_DATASET } from './ollama.pricing';
|
|
8
8
|
import { manifest } from "./manifest";
|
|
9
9
|
import { OllamaProvider } from "./ollama.provider";
|
|
10
10
|
import { OllamaWireAdapter } from "./ollama.wire.adapter";
|
|
@@ -33,6 +33,28 @@ export class OllamaProviderPlugin extends BasePlugin {
|
|
|
33
33
|
const route = this.getRoutes().find(r => r.protocol.capability === capability);
|
|
34
34
|
return route?.protocol.name;
|
|
35
35
|
}
|
|
36
|
+
getModelNameFromRequest(payload) {
|
|
37
|
+
return payload?.model;
|
|
38
|
+
}
|
|
39
|
+
formatModelsResponse(models) {
|
|
40
|
+
return {
|
|
41
|
+
models: models.map(m => ({
|
|
42
|
+
name: m.accessModel || m.name,
|
|
43
|
+
model: m.accessModel || m.name,
|
|
44
|
+
modified_at: new Date(0).toISOString(),
|
|
45
|
+
size: 0,
|
|
46
|
+
digest: '',
|
|
47
|
+
details: {
|
|
48
|
+
parent_model: '',
|
|
49
|
+
format: '',
|
|
50
|
+
family: '',
|
|
51
|
+
families: [],
|
|
52
|
+
parameter_size: '',
|
|
53
|
+
quantization_level: '',
|
|
54
|
+
},
|
|
55
|
+
})),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
36
58
|
getSchema() {
|
|
37
59
|
return {
|
|
38
60
|
connection: {
|
|
@@ -56,9 +78,9 @@ export class OllamaProviderPlugin extends BasePlugin {
|
|
|
56
78
|
getCapabilities() {
|
|
57
79
|
return {
|
|
58
80
|
streaming: true,
|
|
59
|
-
tools:
|
|
60
|
-
vision:
|
|
61
|
-
functionCalling:
|
|
81
|
+
tools: true,
|
|
82
|
+
vision: true,
|
|
83
|
+
functionCalling: true,
|
|
62
84
|
maxTokens: 128000
|
|
63
85
|
};
|
|
64
86
|
}
|
|
@@ -72,8 +94,8 @@ export class OllamaProviderPlugin extends BasePlugin {
|
|
|
72
94
|
name: OllamaProtocols.CHAT,
|
|
73
95
|
capability: ProtocolCapability.CHAT,
|
|
74
96
|
streamEventSequence: {
|
|
75
|
-
ordered: ['content_delta', 'message_delta', 'message_stop'],
|
|
76
|
-
repeatable: ['content_delta'],
|
|
97
|
+
ordered: ['message_start', 'content_delta', 'message_delta', 'message_stop'],
|
|
98
|
+
repeatable: ['content_delta', 'tool_arg_delta'],
|
|
77
99
|
}
|
|
78
100
|
}
|
|
79
101
|
},
|
|
@@ -83,7 +105,11 @@ export class OllamaProviderPlugin extends BasePlugin {
|
|
|
83
105
|
handler: RouteHandler.REQUEST,
|
|
84
106
|
protocol: {
|
|
85
107
|
name: OllamaProtocols.GENERATE,
|
|
86
|
-
capability: ProtocolCapability.GENERATE
|
|
108
|
+
capability: ProtocolCapability.GENERATE,
|
|
109
|
+
streamEventSequence: {
|
|
110
|
+
ordered: ['message_start', 'content_delta', 'message_delta', 'message_stop'],
|
|
111
|
+
repeatable: ['content_delta', 'tool_arg_delta'],
|
|
112
|
+
}
|
|
87
113
|
}
|
|
88
114
|
},
|
|
89
115
|
{
|
|
@@ -107,11 +133,15 @@ export class OllamaProviderPlugin extends BasePlugin {
|
|
|
107
133
|
];
|
|
108
134
|
}
|
|
109
135
|
getPricingSheets() {
|
|
110
|
-
|
|
111
|
-
|
|
136
|
+
return normalizePricingDataset(OLLAMA_PRICING_DATASET);
|
|
137
|
+
}
|
|
138
|
+
getPricingModelIds() {
|
|
139
|
+
return OLLAMA_PRICING_DATASET.model_ids;
|
|
112
140
|
}
|
|
113
141
|
getDefaultPricing() {
|
|
114
|
-
|
|
142
|
+
const sheets = this.getPricingSheets();
|
|
143
|
+
const sorted = Array.from(sheets.values()).sort((a, b) => b.effective_from.localeCompare(a.effective_from));
|
|
144
|
+
return sorted[0];
|
|
115
145
|
}
|
|
116
146
|
calculateExtraCosts(_tokens, _pricing) {
|
|
117
147
|
return { total: 0, detail: {} };
|
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,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
export * from './ollama.chat.request.translator';
|
|
2
2
|
export * from './ollama.generate.request.translator';
|
|
3
|
+
export * from './ollama.embed.request.translator';
|
|
3
4
|
export * from './ollama.message.translators';
|
|
4
5
|
export * from './ollama.chat.response.translator';
|
|
5
6
|
export * from './ollama.generate.response.translator';
|
|
7
|
+
export * from './ollama.embed.response.translator';
|
|
6
8
|
export * from './ollama.options.translators';
|
|
7
9
|
export * from './ollama.tool.translators';
|
|
10
|
+
export * from './ollama.usage.translator';
|
|
8
11
|
export * from './streaming';
|
|
9
12
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translators/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translators/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
export * from './ollama.chat.request.translator';
|
|
2
2
|
export * from './ollama.generate.request.translator';
|
|
3
|
+
export * from './ollama.embed.request.translator';
|
|
3
4
|
export * from './ollama.message.translators';
|
|
4
5
|
export * from './ollama.chat.response.translator';
|
|
5
6
|
export * from './ollama.generate.response.translator';
|
|
7
|
+
export * from './ollama.embed.response.translator';
|
|
6
8
|
export * from './ollama.options.translators';
|
|
7
9
|
export * from './ollama.tool.translators';
|
|
10
|
+
export * from './ollama.usage.translator';
|
|
8
11
|
export * from './streaming';
|
|
9
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/translators/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/translators/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.chat.request.translator.d.ts","sourceRoot":"","sources":["../../src/translators/ollama.chat.request.translator.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAC,iBAAiB,EAA2C,MAAM,UAAU,CAAC;AACrF,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE1D,OAAO,KAAK,EAAC,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAE9E,qBACa,2BAA4B,SAAQ,cAAc,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAKvF,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANtC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"ollama.chat.request.translator.d.ts","sourceRoot":"","sources":["../../src/translators/ollama.chat.request.translator.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAC,iBAAiB,EAA2C,MAAM,UAAU,CAAC;AACrF,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE1D,OAAO,KAAK,EAAC,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAE9E,qBACa,2BAA4B,SAAQ,cAAc,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAKvF,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANtC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAM;IAClD,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAA6B;gBAG9D,iBAAiB,EAAE,uBAAuB,EAC1C,cAAc,EAAE,oBAAoB,EACpC,iBAAiB,EAAE,uBAAuB;cAK/C,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;cAyBtE,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAkCpF,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,aAAa;CAMxB"}
|