@holokai/holo-provider-ollama 1.5.0 → 1.9.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/README.md +11 -11
- package/dist/index.d.ts +8 -8
- package/dist/index.js +8 -8
- package/dist/manifest.d.ts +1 -1
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +2 -2
- package/dist/manifest.js.map +1 -1
- package/dist/ollama.auditor.d.ts +8 -6
- package/dist/ollama.auditor.d.ts.map +1 -1
- package/dist/ollama.auditor.js +34 -18
- package/dist/ollama.auditor.js.map +1 -1
- package/dist/ollama.pricing.d.ts.map +1 -1
- package/dist/ollama.pricing.js +19 -7
- package/dist/ollama.pricing.js.map +1 -1
- package/dist/ollama.provider.d.ts +1 -1
- package/dist/ollama.provider.d.ts.map +1 -1
- package/dist/ollama.provider.js +14 -9
- package/dist/ollama.provider.js.map +1 -1
- package/dist/ollama.response.factory.d.ts +2 -2
- package/dist/ollama.response.factory.d.ts.map +1 -1
- package/dist/ollama.response.factory.js +1 -0
- package/dist/ollama.response.factory.js.map +1 -1
- package/dist/ollama.translator.d.ts +4 -4
- package/dist/ollama.translator.d.ts.map +1 -1
- package/dist/ollama.translator.js +4 -3
- package/dist/ollama.translator.js.map +1 -1
- package/dist/ollama.wire.adapter.d.ts +2 -2
- package/dist/ollama.wire.adapter.d.ts.map +1 -1
- package/dist/ollama.wire.adapter.js +2 -2
- package/dist/ollama.wire.adapter.js.map +1 -1
- package/dist/plugin.d.ts +13 -14
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +66 -26
- package/dist/plugin.js.map +1 -1
- package/dist/translators/index.d.ts +11 -11
- package/dist/translators/index.js +11 -11
- package/dist/translators/ollama.chat.request.translator.d.ts +6 -6
- package/dist/translators/ollama.chat.request.translator.d.ts.map +1 -1
- package/dist/translators/ollama.chat.request.translator.js +12 -12
- package/dist/translators/ollama.chat.request.translator.js.map +1 -1
- package/dist/translators/ollama.chat.response.translator.d.ts +5 -5
- package/dist/translators/ollama.chat.response.translator.d.ts.map +1 -1
- package/dist/translators/ollama.chat.response.translator.js +6 -7
- package/dist/translators/ollama.chat.response.translator.js.map +1 -1
- package/dist/translators/ollama.embed.request.translator.d.ts +3 -3
- package/dist/translators/ollama.embed.request.translator.d.ts.map +1 -1
- package/dist/translators/ollama.embed.request.translator.js +6 -7
- package/dist/translators/ollama.embed.request.translator.js.map +1 -1
- package/dist/translators/ollama.embed.response.translator.d.ts +4 -4
- package/dist/translators/ollama.embed.response.translator.d.ts.map +1 -1
- package/dist/translators/ollama.embed.response.translator.js +5 -6
- package/dist/translators/ollama.embed.response.translator.js.map +1 -1
- package/dist/translators/ollama.generate.request.translator.d.ts +3 -3
- package/dist/translators/ollama.generate.request.translator.d.ts.map +1 -1
- package/dist/translators/ollama.generate.request.translator.js +23 -14
- package/dist/translators/ollama.generate.request.translator.js.map +1 -1
- package/dist/translators/ollama.generate.response.translator.d.ts +4 -4
- package/dist/translators/ollama.generate.response.translator.d.ts.map +1 -1
- package/dist/translators/ollama.generate.response.translator.js +17 -11
- package/dist/translators/ollama.generate.response.translator.js.map +1 -1
- package/dist/translators/ollama.message.translators.d.ts +3 -3
- package/dist/translators/ollama.message.translators.d.ts.map +1 -1
- package/dist/translators/ollama.message.translators.js +42 -22
- package/dist/translators/ollama.message.translators.js.map +1 -1
- package/dist/translators/ollama.options.translators.d.ts +3 -3
- package/dist/translators/ollama.options.translators.d.ts.map +1 -1
- package/dist/translators/ollama.options.translators.js +5 -4
- package/dist/translators/ollama.options.translators.js.map +1 -1
- package/dist/translators/ollama.thinking.translators.d.ts +11 -0
- package/dist/translators/ollama.thinking.translators.d.ts.map +1 -0
- package/dist/translators/ollama.thinking.translators.js +27 -0
- package/dist/translators/ollama.thinking.translators.js.map +1 -0
- package/dist/translators/ollama.tool.translators.d.ts +3 -3
- package/dist/translators/ollama.tool.translators.d.ts.map +1 -1
- package/dist/translators/ollama.tool.translators.js +10 -9
- package/dist/translators/ollama.tool.translators.js.map +1 -1
- package/dist/translators/ollama.usage.translator.d.ts +2 -2
- package/dist/translators/ollama.usage.translator.js +2 -2
- package/dist/translators/streaming/index.d.ts +4 -4
- package/dist/translators/streaming/index.js +4 -4
- package/dist/translators/streaming/ollama.content.delta.translator.d.ts +3 -3
- package/dist/translators/streaming/ollama.content.delta.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.content.delta.translator.js +23 -20
- package/dist/translators/streaming/ollama.content.delta.translator.js.map +1 -1
- package/dist/translators/streaming/ollama.message.delta.translator.d.ts +4 -4
- package/dist/translators/streaming/ollama.message.delta.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.message.delta.translator.js +18 -11
- package/dist/translators/streaming/ollama.message.delta.translator.js.map +1 -1
- package/dist/translators/streaming/ollama.message.stop.translator.d.ts +3 -3
- package/dist/translators/streaming/ollama.message.stop.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.message.stop.translator.js +15 -10
- package/dist/translators/streaming/ollama.message.stop.translator.js.map +1 -1
- package/dist/translators/streaming/ollama.stream.translator.d.ts +6 -6
- package/dist/translators/streaming/ollama.stream.translator.d.ts.map +1 -1
- package/dist/translators/streaming/ollama.stream.translator.js +13 -12
- package/dist/translators/streaming/ollama.stream.translator.js.map +1 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +5 -4
- package/dist/types/index.js.map +1 -1
- package/dist/types/request.types.d.ts +1 -1
- package/dist/types/request.types.d.ts.map +1 -1
- package/dist/types/request.types.js +2 -0
- package/dist/types/request.types.js.map +1 -1
- package/dist/types/response.types.d.ts +1 -1
- package/dist/types/response.types.d.ts.map +1 -1
- package/dist/types/response.types.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +14 -15
package/README.md
CHANGED
|
@@ -29,7 +29,7 @@ providing complete bidirectional translation between Ollama's native API and the
|
|
|
29
29
|
## Installation
|
|
30
30
|
|
|
31
31
|
```bash
|
|
32
|
-
|
|
32
|
+
pnpm add @holokai/holo-provider-ollama
|
|
33
33
|
```
|
|
34
34
|
|
|
35
35
|
### Peer Dependencies
|
|
@@ -683,42 +683,42 @@ See [manifest.ts](./src/manifest.ts) for the complete schema.
|
|
|
683
683
|
|
|
684
684
|
```bash
|
|
685
685
|
# Install dependencies
|
|
686
|
-
|
|
686
|
+
pnpm install
|
|
687
687
|
|
|
688
688
|
# Build
|
|
689
|
-
|
|
689
|
+
pnpm run build
|
|
690
690
|
|
|
691
691
|
# Type checking
|
|
692
|
-
|
|
692
|
+
pnpm run type-check
|
|
693
693
|
|
|
694
694
|
# Run tests
|
|
695
|
-
|
|
695
|
+
pnpm test
|
|
696
696
|
```
|
|
697
697
|
|
|
698
698
|
### Testing
|
|
699
699
|
|
|
700
700
|
```bash
|
|
701
701
|
# Unit tests
|
|
702
|
-
|
|
702
|
+
pnpm test
|
|
703
703
|
|
|
704
704
|
# Integration tests (requires Ollama running)
|
|
705
|
-
|
|
705
|
+
pnpm run test:integration
|
|
706
706
|
|
|
707
707
|
# Watch mode
|
|
708
|
-
|
|
708
|
+
pnpm run test:watch
|
|
709
709
|
```
|
|
710
710
|
|
|
711
711
|
### Building
|
|
712
712
|
|
|
713
713
|
```bash
|
|
714
714
|
# Production build
|
|
715
|
-
|
|
715
|
+
pnpm run build
|
|
716
716
|
|
|
717
717
|
# Watch mode
|
|
718
|
-
|
|
718
|
+
pnpm run build:watch
|
|
719
719
|
|
|
720
720
|
# Clean
|
|
721
|
-
|
|
721
|
+
pnpm run clean
|
|
722
722
|
```
|
|
723
723
|
|
|
724
724
|
---
|
package/dist/index.d.ts
CHANGED
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
* Entry point for the Ollama provider plugin.
|
|
5
5
|
* Exports the plugin instance as default export per Holo plugin contract.
|
|
6
6
|
*/
|
|
7
|
-
import { OllamaProviderPlugin } from './plugin';
|
|
8
|
-
export * from './translators';
|
|
9
|
-
export * from './types';
|
|
10
|
-
export * from './manifest';
|
|
11
|
-
export * from './ollama.auditor';
|
|
12
|
-
export * from './ollama.provider';
|
|
13
|
-
export * from './ollama.translator';
|
|
14
|
-
export * from './plugin';
|
|
7
|
+
import { OllamaProviderPlugin } from './plugin.js';
|
|
8
|
+
export * from './translators/index.js';
|
|
9
|
+
export * from './types/index.js';
|
|
10
|
+
export * from './manifest.js';
|
|
11
|
+
export * from './ollama.auditor.js';
|
|
12
|
+
export * from './ollama.provider.js';
|
|
13
|
+
export * from './ollama.translator.js';
|
|
14
|
+
export * from './plugin.js';
|
|
15
15
|
declare const _default: OllamaProviderPlugin;
|
|
16
16
|
export default _default;
|
|
17
17
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.js
CHANGED
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
* Entry point for the Ollama provider plugin.
|
|
5
5
|
* Exports the plugin instance as default export per Holo plugin contract.
|
|
6
6
|
*/
|
|
7
|
-
import { OllamaProviderPlugin } from './plugin';
|
|
8
|
-
export * from './translators';
|
|
9
|
-
export * from './types';
|
|
10
|
-
export * from './manifest';
|
|
11
|
-
export * from './ollama.auditor';
|
|
12
|
-
export * from './ollama.provider';
|
|
13
|
-
export * from './ollama.translator';
|
|
14
|
-
export * from './plugin';
|
|
7
|
+
import { OllamaProviderPlugin } from './plugin.js';
|
|
8
|
+
export * from './translators/index.js';
|
|
9
|
+
export * from './types/index.js';
|
|
10
|
+
export * from './manifest.js';
|
|
11
|
+
export * from './ollama.auditor.js';
|
|
12
|
+
export * from './ollama.provider.js';
|
|
13
|
+
export * from './ollama.translator.js';
|
|
14
|
+
export * from './plugin.js';
|
|
15
15
|
// Export singleton instance as default for plugin loading
|
|
16
16
|
export default new OllamaProviderPlugin();
|
|
17
17
|
//# sourceMappingURL=index.js.map
|
package/dist/manifest.d.ts
CHANGED
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,EAAC,cAAc,EAAa,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,cAAc,EAAa,MAAM,4BAA4B,CAAC;AAG3E,eAAO,MAAM,QAAQ,EAAE,cAOtB,CAAC"}
|
package/dist/manifest.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PluginType } from
|
|
2
|
-
import { VERSION } from './version';
|
|
1
|
+
import { PluginType } from '@holokai/holo-types/plugin';
|
|
2
|
+
import { VERSION } from './version.js';
|
|
3
3
|
export const manifest = {
|
|
4
4
|
name: '@holokai/provider-ollama',
|
|
5
5
|
version: VERSION,
|
package/dist/manifest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAC,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,MAAM,CAAC,MAAM,QAAQ,GAAmB;IACpC,IAAI,EAAE,0BAA0B;IAChC,OAAO,EAAE,OAAO;IAChB,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,14 @@
|
|
|
1
|
-
import { BaseAuditor } from
|
|
2
|
-
import type {
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
5
|
-
import {
|
|
6
|
-
import
|
|
1
|
+
import { BaseAuditor } from '@holokai/holo-sdk/provider';
|
|
2
|
+
import type { TokenBreakdown } from '@holokai/holo-types/entities';
|
|
3
|
+
import type { HoloWorkerRequest, WorkerResponseEnvelope } from '@holokai/holo-types/worker';
|
|
4
|
+
import type { ProviderDoneEvent, ProviderEvent } from '@holokai/holo-types/provider';
|
|
5
|
+
import type { ProviderEnvelope, ProviderResponseMetrics } from '@holokai/holo-types/entities';
|
|
6
|
+
import { FinishReason } from '@holokai/holo-types/entities';
|
|
7
|
+
import type { HoloFinishReason, HoloUsage } from '@holokai/holo-types/holo';
|
|
7
8
|
export declare class OllamaAuditor extends BaseAuditor {
|
|
8
9
|
readonly provider = "ollama";
|
|
9
10
|
mapFinishReason(nativeResponse: any, _protocolName?: string): HoloFinishReason;
|
|
11
|
+
mapTokenBreakdown(usage: Record<string, any>): TokenBreakdown;
|
|
10
12
|
mapUsage(nativeResponse: any, _protocolName?: string): HoloUsage;
|
|
11
13
|
protected extractRequestOptions(workerRequest: HoloWorkerRequest): Promise<Record<string, any>>;
|
|
12
14
|
protected mapProviderResponseMetrics(providerEvent: ProviderDoneEvent): Promise<Partial<ProviderResponseMetrics>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.auditor.d.ts","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAyD,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.auditor.d.ts","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAyD,MAAM,4BAA4B,CAAC;AAC/G,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAEjE,OAAO,KAAK,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAC,gBAAgB,EAAE,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAU1E,qBACa,aAAc,SAAQ,WAAW;IAC1C,QAAQ,CAAC,QAAQ,YAAY;IAEpB,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,gBAAgB;IAiBvF,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,cAAc;IASpD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS;cAkBzD,qBAAqB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;cAMrF,0BAA0B,CAAC,aAAa,EAAE,iBAAiB;cA8B3D,mBAAmB,CAC/B,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,sBAAsB,GAClC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;cAMpB,sBAAsB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA0BtG"}
|
package/dist/ollama.auditor.js
CHANGED
|
@@ -5,10 +5,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
7
|
import { injectable } from 'tsyringe';
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
8
|
+
import {} from './types/index.js';
|
|
9
|
+
import { BaseAuditor, extractPromptByRole, extractTextContent, normalizeText } from '@holokai/holo-sdk/provider';
|
|
10
|
+
import { nsToMs, pickDefined } from '@holokai/holo-sdk';
|
|
11
|
+
import { FinishReason } from '@holokai/holo-types/entities';
|
|
12
|
+
import {} from 'ollama';
|
|
13
|
+
import { OllamaProtocols } from './plugin.js';
|
|
12
14
|
let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
|
|
13
15
|
provider = 'ollama';
|
|
14
16
|
mapFinishReason(nativeResponse, _protocolName) {
|
|
@@ -26,6 +28,16 @@ let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
|
|
|
26
28
|
return 'stop';
|
|
27
29
|
}
|
|
28
30
|
}
|
|
31
|
+
// Native chat/generate/embed report `prompt_eval_count`/`eval_count`; a holo-native embed is audited
|
|
32
|
+
// from the normalised body, whose usage is already in holo shape.
|
|
33
|
+
mapTokenBreakdown(usage) {
|
|
34
|
+
return {
|
|
35
|
+
input: usage.prompt_eval_count ?? usage.input_tokens ?? 0,
|
|
36
|
+
output: usage.eval_count ?? usage.output_tokens ?? 0,
|
|
37
|
+
cache_read: 0,
|
|
38
|
+
cache_write: 0,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
29
41
|
mapUsage(nativeResponse, _protocolName) {
|
|
30
42
|
if (!nativeResponse)
|
|
31
43
|
return {};
|
|
@@ -49,29 +61,33 @@ let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
|
|
|
49
61
|
}
|
|
50
62
|
async extractRequestOptions(workerRequest) {
|
|
51
63
|
return {
|
|
52
|
-
...workerRequest.payload.options
|
|
64
|
+
...workerRequest.payload.options,
|
|
53
65
|
};
|
|
54
66
|
}
|
|
55
67
|
async mapProviderResponseMetrics(providerEvent) {
|
|
56
68
|
const payload = providerEvent.message;
|
|
57
|
-
const { load_duration, eval_count,
|
|
69
|
+
const { load_duration, eval_count, prompt_eval_duration, total_duration } = payload;
|
|
70
|
+
const prompt_eval_count = payload.prompt_eval_count ?? payload.usage?.input_tokens;
|
|
71
|
+
const usageRaw = pickDefined({
|
|
72
|
+
load_duration,
|
|
73
|
+
prompt_eval_duration,
|
|
74
|
+
total_duration,
|
|
75
|
+
eval_count,
|
|
76
|
+
prompt_eval_count,
|
|
77
|
+
});
|
|
58
78
|
return pickDefined({
|
|
59
79
|
input_tokens: prompt_eval_count,
|
|
60
80
|
output_tokens: eval_count,
|
|
61
81
|
total_tokens: (eval_count ?? 0) + (prompt_eval_count ?? 0) || undefined,
|
|
62
|
-
time_to_first_token: load_duration != null && prompt_eval_duration != null
|
|
82
|
+
time_to_first_token: load_duration != null && prompt_eval_duration != null
|
|
83
|
+
? Math.round(nsToMs(load_duration + prompt_eval_duration))
|
|
84
|
+
: undefined,
|
|
63
85
|
total_processing_time: total_duration != null ? Math.round(nsToMs(total_duration)) : undefined,
|
|
64
|
-
usage_raw:
|
|
86
|
+
usage_raw: Object.keys(usageRaw).length ? usageRaw : undefined,
|
|
87
|
+
metadata: {
|
|
65
88
|
load_duration,
|
|
66
89
|
prompt_eval_duration,
|
|
67
|
-
total_duration,
|
|
68
|
-
eval_count,
|
|
69
|
-
prompt_eval_count
|
|
70
90
|
},
|
|
71
|
-
metadata: {
|
|
72
|
-
load_duration,
|
|
73
|
-
prompt_eval_duration
|
|
74
|
-
}
|
|
75
91
|
});
|
|
76
92
|
}
|
|
77
93
|
async extractFinishReason(providerEvent, _envelope) {
|
|
@@ -92,13 +108,13 @@ let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
|
|
|
92
108
|
}
|
|
93
109
|
else {
|
|
94
110
|
const chatPayload = payload;
|
|
95
|
-
last_user_prompt = extractPromptByRole(chatPayload.messages,
|
|
96
|
-
system_prompt = extractPromptByRole(chatPayload.messages,
|
|
111
|
+
last_user_prompt = extractPromptByRole(chatPayload.messages, 'user', 'last', msg => extractTextContent(msg.content));
|
|
112
|
+
system_prompt = extractPromptByRole(chatPayload.messages, 'system', 'first', msg => extractTextContent(msg.content));
|
|
97
113
|
}
|
|
98
114
|
return pickDefined({
|
|
99
115
|
access_model: payload.model,
|
|
100
116
|
last_user_prompt,
|
|
101
|
-
system_prompt
|
|
117
|
+
system_prompt,
|
|
102
118
|
});
|
|
103
119
|
}
|
|
104
120
|
};
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"ollama.auditor.js","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAiC/D,eAAO,MAAM,sBAAsB,EAAE,cAmBpC,CAAC"}
|
package/dist/ollama.pricing.js
CHANGED
|
@@ -3,14 +3,26 @@
|
|
|
3
3
|
// the running ollama host, so a user pulling a model not listed here is fine.
|
|
4
4
|
// Pricing for unlisted models defaults to zero cost via the seed snapshot.
|
|
5
5
|
const LOCAL_MODELS = [
|
|
6
|
-
'llama3:latest',
|
|
6
|
+
'llama3:latest',
|
|
7
|
+
'llama-3.3-70b-instruct',
|
|
8
|
+
'llama3.3:70b-instruct-q4_0',
|
|
7
9
|
'meta-llama-3.1-8b-instruct',
|
|
8
|
-
'gemma3:latest',
|
|
9
|
-
'
|
|
10
|
-
'
|
|
11
|
-
'
|
|
12
|
-
'
|
|
13
|
-
'
|
|
10
|
+
'gemma3:latest',
|
|
11
|
+
'gemma3:12b',
|
|
12
|
+
'gemma3:27b',
|
|
13
|
+
'gemma-3-1b-it',
|
|
14
|
+
'gemma-3-12b-it',
|
|
15
|
+
'gemma-3-27b-it',
|
|
16
|
+
'mistral:latest',
|
|
17
|
+
'mistral-7b-instruct-v0.3',
|
|
18
|
+
'mistral-nemo-instruct-2407',
|
|
19
|
+
'mistral-small-3.1-24b-instruct-2503',
|
|
20
|
+
'mistral-small:24b-instruct-2501-q8_0',
|
|
21
|
+
'qwq-32b',
|
|
22
|
+
'qwen3-coder-30b-a3b-instruct-mlx',
|
|
23
|
+
'qwen/qwen3-next-80b',
|
|
24
|
+
'nomic-embed-text:latest',
|
|
25
|
+
'text-embedding-nomic-embed-text-v1.5',
|
|
14
26
|
];
|
|
15
27
|
export const OLLAMA_PRICING_DATASET = {
|
|
16
28
|
name: 'Ollama Local',
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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;IACf,wBAAwB;IACxB,4BAA4B;IAC5B,4BAA4B;IAE5B,eAAe;IACf,YAAY;IACZ,YAAY;IACZ,eAAe;IACf,gBAAgB;IAChB,gBAAgB;IAEhB,gBAAgB;IAChB,0BAA0B;IAC1B,4BAA4B;IAC5B,qCAAqC;IACrC,sCAAsC;IAEtC,SAAS;IACT,kCAAkC;IAClC,qBAAqB;IAErB,yBAAyB;IACzB,sCAAsC;CACzC,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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChatRequest, EmbedRequest, ErrorResponse, GenerateRequest, ListResponse, Ollama } from 'ollama';
|
|
1
|
+
import { type ChatRequest, type EmbedRequest, type ErrorResponse, type GenerateRequest, type ListResponse, Ollama } from 'ollama';
|
|
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> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,MAAM,EACT,MAAM,QAAQ,CAAC;AAChB,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;IAC5F,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,CAC/B,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,YAAY,EACrD,GAAG,EAAE,eAAe,GACrB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAYZ,cAAc;IA+B5B,OAAO,CAAC,mBAAmB;YAeb,UAAU;CA6C3B"}
|
package/dist/ollama.provider.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Ollama } from 'ollama';
|
|
1
|
+
import { Ollama, } from 'ollama';
|
|
2
2
|
import { BaseProvider } from '@holokai/holo-sdk/provider';
|
|
3
|
-
import { OllamaAuditor } from './ollama.auditor';
|
|
4
|
-
import { OllamaTranslator } from './ollama.translator';
|
|
5
|
-
import { OllamaResponseFactory } from './ollama.response.factory';
|
|
6
|
-
import { OllamaProtocols } from
|
|
3
|
+
import { OllamaAuditor } from './ollama.auditor.js';
|
|
4
|
+
import { OllamaTranslator } from './ollama.translator.js';
|
|
5
|
+
import { OllamaResponseFactory } from './ollama.response.factory.js';
|
|
6
|
+
import { OllamaProtocols } from './plugin.js';
|
|
7
7
|
export class OllamaProvider extends BaseProvider {
|
|
8
8
|
async discoverModels() {
|
|
9
9
|
const response = await this.client.list();
|
|
@@ -32,14 +32,14 @@ export class OllamaProvider extends BaseProvider {
|
|
|
32
32
|
const models = response.models.filter(model => allowedModels.includes(model.name));
|
|
33
33
|
return {
|
|
34
34
|
...response,
|
|
35
|
-
models
|
|
35
|
+
models,
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
async ollamaEmbed(payload) {
|
|
39
39
|
return {
|
|
40
40
|
start: async () => {
|
|
41
41
|
return await this.client.embed(payload);
|
|
42
|
-
}
|
|
42
|
+
},
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
createAuditor() {
|
|
@@ -73,6 +73,7 @@ export class OllamaProvider extends BaseProvider {
|
|
|
73
73
|
return {
|
|
74
74
|
start: async () => {
|
|
75
75
|
const result = await this.client.generate({ ...request, stream: false /* ensure */ });
|
|
76
|
+
ctx.emitReasoningDelta(result.thinking);
|
|
76
77
|
ctx.emitTextDelta(result.response);
|
|
77
78
|
return result;
|
|
78
79
|
},
|
|
@@ -85,12 +86,13 @@ export class OllamaProvider extends BaseProvider {
|
|
|
85
86
|
if (chunk.done)
|
|
86
87
|
return chunk;
|
|
87
88
|
ctx.emitStreamEvent(chunk);
|
|
89
|
+
ctx.emitReasoningDelta(chunk.thinking);
|
|
88
90
|
const token = chunk.response ?? '';
|
|
89
91
|
if (token)
|
|
90
92
|
ctx.emitTextDelta(token);
|
|
91
93
|
}
|
|
92
94
|
return { done: true };
|
|
93
|
-
}
|
|
95
|
+
},
|
|
94
96
|
};
|
|
95
97
|
}
|
|
96
98
|
emitOllamaToolCalls(toolCalls, ctx) {
|
|
@@ -108,6 +110,7 @@ export class OllamaProvider extends BaseProvider {
|
|
|
108
110
|
return {
|
|
109
111
|
start: async () => {
|
|
110
112
|
const result = await this.client.chat({ ...request, stream: false });
|
|
113
|
+
ctx.emitReasoningDelta(result.message.thinking);
|
|
111
114
|
ctx.emitTextDelta(result.message.content);
|
|
112
115
|
if (result.message.tool_calls?.length) {
|
|
113
116
|
this.emitOllamaToolCalls(result.message.tool_calls, ctx);
|
|
@@ -133,12 +136,14 @@ export class OllamaProvider extends BaseProvider {
|
|
|
133
136
|
if (chunk.message?.tool_calls?.length) {
|
|
134
137
|
this.emitOllamaToolCalls(chunk.message.tool_calls, ctx);
|
|
135
138
|
}
|
|
139
|
+
// Ollama streams reasoning on its own field, never inside `content`.
|
|
140
|
+
ctx.emitReasoningDelta(chunk.message?.thinking);
|
|
136
141
|
const token = chunk.message.content ?? '';
|
|
137
142
|
if (token)
|
|
138
143
|
ctx.emitTextDelta(token);
|
|
139
144
|
}
|
|
140
145
|
return { done: true };
|
|
141
|
-
}
|
|
146
|
+
},
|
|
142
147
|
};
|
|
143
148
|
}
|
|
144
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { IResponseFactory } from
|
|
2
|
-
import { ErrorResponse } from
|
|
1
|
+
import type { IResponseFactory } from '@holokai/holo-types/provider';
|
|
2
|
+
import { type ErrorResponse } from 'ollama';
|
|
3
3
|
export declare class OllamaResponseFactory implements IResponseFactory {
|
|
4
4
|
static instance(): OllamaResponseFactory;
|
|
5
5
|
createError(message: string): ErrorResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.response.factory.d.ts","sourceRoot":"","sources":["../src/ollama.response.factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.response.factory.d.ts","sourceRoot":"","sources":["../src/ollama.response.factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAC,KAAK,aAAa,EAAC,MAAM,QAAQ,CAAC;AAE1C,qBAAa,qBAAsB,YAAW,gBAAgB;IAC1D,MAAM,CAAC,QAAQ,IAAI,qBAAqB;IAIxC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;CAG9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.response.factory.js","sourceRoot":"","sources":["../src/ollama.response.factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ollama.response.factory.js","sourceRoot":"","sources":["../src/ollama.response.factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,MAAM,QAAQ,CAAC;AAE1C,MAAM,OAAO,qBAAqB;IAC9B,MAAM,CAAC,QAAQ;QACX,OAAO,IAAI,qBAAqB,EAAE,CAAC;IACvC,CAAC;IAED,WAAW,CAAC,OAAe;QACvB,OAAO,EAAC,KAAK,EAAE,OAAO,EAAC,CAAC;IAC5B,CAAC;CACJ"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
|
-
import type { IProviderTranslator } from
|
|
3
|
-
import { HoloEmbedParams, HoloGenerateParams, HoloMessage, HoloRequest, HoloResponse, HoloStreamChunk } from
|
|
4
|
-
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaEmbedRequestTranslator, OllamaEmbedResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageTranslator, OllamaStreamTranslator } from
|
|
5
|
-
import { OllamaChatRequest, OllamaChatResponse, OllamaEmbedRequest, OllamaGenerateRequest, OllamaGenerateResponse, OllamaMessage, OllamaResponse } from
|
|
2
|
+
import type { IProviderTranslator } from '@holokai/holo-types/provider';
|
|
3
|
+
import { type HoloEmbedParams, type HoloGenerateParams, type HoloMessage, type HoloRequest, type HoloResponse, type HoloStreamChunk } from '@holokai/holo-types/holo';
|
|
4
|
+
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaEmbedRequestTranslator, OllamaEmbedResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageTranslator, OllamaStreamTranslator } from './translators/index.js';
|
|
5
|
+
import { type OllamaChatRequest, type OllamaChatResponse, type OllamaEmbedRequest, type OllamaGenerateRequest, type OllamaGenerateResponse, type OllamaMessage, type OllamaResponse } from './types/index.js';
|
|
6
6
|
export declare class OllamaTranslator implements IProviderTranslator {
|
|
7
7
|
private ollamaGenerateRequestTranslator;
|
|
8
8
|
private ollamaChatRequestTranslator;
|
|
@@ -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,
|
|
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,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,eAAe,EACvB,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,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAEvB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,cAAc,EACtB,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;IAG1D,MAAM,CAAC,QAAQ,IAAI,mBAAmB;IAwChC,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,CACjB,OAAO,EAAE,WAAW,GACrB,OAAO,CAAC,OAAO,CAAC,iBAAiB,GAAG,qBAAqB,GAAG,kBAAkB,CAAC,CAAC;IAU7E,aAAa,CACf,OAAO,EAAE,iBAAiB,GAAG,qBAAqB,GAAG,kBAAkB,GACxE,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAU1B,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;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAC,CAAC;CAS1G"}
|
|
@@ -9,9 +9,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
var OllamaTranslator_1;
|
|
11
11
|
import 'reflect-metadata';
|
|
12
|
-
import { injectable } from
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
12
|
+
import { injectable } from 'tsyringe';
|
|
13
|
+
import {} from '@holokai/holo-types/holo';
|
|
14
|
+
import { OllamaChatRequestTranslator, OllamaChatResponseTranslator, OllamaContentDeltaTranslator, OllamaEmbedRequestTranslator, OllamaEmbedResponseTranslator, OllamaGenerateRequestTranslator, OllamaGenerateResponseTranslator, OllamaMessageDeltaTranslator, OllamaMessageStopTranslator, OllamaMessageTranslator, OllamaOptionsTranslator, OllamaStreamTranslator, OllamaToolTranslator, OllamaUsageTranslator, } from './translators/index.js';
|
|
15
|
+
import { isGenerateRequest, isGenerateResponse, } from './types/index.js';
|
|
15
16
|
let OllamaTranslator = OllamaTranslator_1 = class OllamaTranslator {
|
|
16
17
|
ollamaGenerateRequestTranslator;
|
|
17
18
|
ollamaChatRequestTranslator;
|
|
@@ -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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BaseWireAdapter } from
|
|
2
|
-
import type { ProviderEvent } from
|
|
1
|
+
import { BaseWireAdapter } from '@holokai/holo-sdk/provider';
|
|
2
|
+
import type { ProviderEvent } from '@holokai/holo-types/provider';
|
|
3
3
|
export declare class OllamaWireAdapter extends BaseWireAdapter {
|
|
4
4
|
formatWire(data: any): string;
|
|
5
5
|
protected streamingHeaders(): Record<string, string>;
|
|
@@ -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;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;
|
|
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;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAQ1G"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { BaseWireAdapter } from
|
|
1
|
+
import { BaseWireAdapter } from '@holokai/holo-sdk/provider';
|
|
2
2
|
export class OllamaWireAdapter extends BaseWireAdapter {
|
|
3
3
|
formatWire(data) {
|
|
4
4
|
return `${JSON.stringify(data)}\n`;
|
|
5
5
|
}
|
|
6
6
|
streamingHeaders() {
|
|
7
7
|
// Ollama streams NDJSON
|
|
8
|
-
return {
|
|
8
|
+
return { 'Content-Type': 'application/x-ndjson' };
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
11
11
|
* Native Ollama streaming terminates with a `done:true` chunk whose
|
|
@@ -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;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,
|
|
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,EAA0C;QACjF,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"}
|