@holokai/holo-provider-ollama 0.1.3 → 0.1.4
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.
|
@@ -5,6 +5,7 @@ export declare class OllamaProvider extends BaseProvider<Ollama, GenerateRequest
|
|
|
5
5
|
protected createClient(): Ollama;
|
|
6
6
|
protected createTranslator(): IProviderTranslator;
|
|
7
7
|
protected createResponseFactory(): IResponseFactory;
|
|
8
|
+
getModelNameFromRequest(payload: GenerateRequest | ChatRequest): Promise<string>;
|
|
8
9
|
getModels(allowedModels: string[] | true): Promise<ListResponse>;
|
|
9
10
|
protected handleError(error: Error): Promise<ErrorResponse>;
|
|
10
11
|
protected handleRequest(payload: GenerateRequest | ChatRequest, ctx: ProviderContext): Promise<RunHandle<any>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,QAAQ,CAAC;AACzF,OAAO,EACH,YAAY,EACZ,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EAEf,SAAS,EACZ,MAAM,cAAc,CAAC;AAKtB,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,WAAW,CAAC;IAEnF,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;IAI7C,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;cActD,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAIjD,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAUtG,cAAc;
|
|
1
|
+
{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,QAAQ,CAAC;AACzF,OAAO,EACH,YAAY,EACZ,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EAEf,SAAS,EACZ,MAAM,cAAc,CAAC;AAKtB,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,WAAW,CAAC;IAEnF,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;IAI7C,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;cActD,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAIjD,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAUtG,cAAc;YAqCd,UAAU;CAoC3B"}
|
package/dist/ollama.provider.js
CHANGED
|
@@ -16,6 +16,9 @@ export class OllamaProvider extends BaseProvider {
|
|
|
16
16
|
createResponseFactory() {
|
|
17
17
|
return OllamaResponseFactory.instance();
|
|
18
18
|
}
|
|
19
|
+
async getModelNameFromRequest(payload) {
|
|
20
|
+
return payload.model;
|
|
21
|
+
}
|
|
19
22
|
async getModels(allowedModels) {
|
|
20
23
|
const response = await this.client.list();
|
|
21
24
|
if (allowedModels === true) {
|
|
@@ -43,7 +46,17 @@ export class OllamaProvider extends BaseProvider {
|
|
|
43
46
|
if (!request.stream) {
|
|
44
47
|
return {
|
|
45
48
|
final: async () => {
|
|
46
|
-
|
|
49
|
+
try {
|
|
50
|
+
const response = await this.client.generate({ ...request, stream: false /* ensure */ });
|
|
51
|
+
return response;
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
this.log.error(`Ollama generate error: ${error instanceof Error ? error.message : String(error)}`, {
|
|
55
|
+
config: JSON.stringify(this._config),
|
|
56
|
+
request: JSON.stringify(request)
|
|
57
|
+
});
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
47
60
|
},
|
|
48
61
|
};
|
|
49
62
|
}
|
|
@@ -66,7 +79,17 @@ export class OllamaProvider extends BaseProvider {
|
|
|
66
79
|
if (!request.stream) {
|
|
67
80
|
return {
|
|
68
81
|
final: async () => {
|
|
69
|
-
|
|
82
|
+
try {
|
|
83
|
+
const response = await this.client.chat({ ...request, stream: false });
|
|
84
|
+
return response;
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
this.log.error(`Ollama chat error: ${error instanceof Error ? error.message : String(error)}`, {
|
|
88
|
+
config: JSON.stringify(this._config),
|
|
89
|
+
request: JSON.stringify(request)
|
|
90
|
+
});
|
|
91
|
+
throw error;
|
|
92
|
+
}
|
|
70
93
|
},
|
|
71
94
|
};
|
|
72
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4D,MAAM,EAAC,MAAM,QAAQ,CAAC;AACzF,OAAO,EACH,YAAY,EAKZ,WAAW,EAEd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AAEhE,MAAM,OAAO,cAAe,SAAQ,YAAmD;IAEzE,aAAa;QACnB,OAAO,IAAI,aAAa,EAAE,CAAC;IAC/B,CAAC;IAES,YAAY;QAClB,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAES,gBAAgB;QACtB,OAAO,gBAAgB,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;IAES,qBAAqB;QAC3B,OAAO,qBAAqB,CAAC,QAAQ,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,aAA8B;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAE1C,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnF,OAAO;YACH,GAAG,QAAQ;YACX,MAAM;SACT,CAAA;IACL,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,KAAY;QACpC,OAAO,EAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAC,CAAA;IACjC,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,OAAsC,EAAE,GAAoB;QACtF,QAAQ,GAAG,CAAC,WAAW,EAAE,CAAC;YACtB,KAAK,WAAW,CAAC,QAAQ;gBACrB,OAAO,IAAI,CAAC,cAAc,CAAC,OAA0B,EAAE,GAAG,CAAC,CAAC;YAChE,KAAK,WAAW,CAAC,IAAI;gBACjB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAwB,EAAE,GAAoB;QACvE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO;gBACH,KAAK,EAAE,KAAK,IAAI,EAAE;oBACd,
|
|
1
|
+
{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.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": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
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": "^0.1.
|
|
61
|
+
"@holokai/sdk": "^0.1.4"
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
64
|
"ollama": "^0.6.3"
|