promptfoo 0.21.0 → 0.21.2
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 +1 -1
- package/dist/package.json +1 -1
- package/dist/src/assertions.js +3 -3
- package/dist/src/assertions.js.map +1 -1
- package/dist/src/feedback.d.ts +3 -0
- package/dist/src/feedback.d.ts.map +1 -0
- package/dist/src/feedback.js +49 -0
- package/dist/src/feedback.js.map +1 -0
- package/dist/src/index.d.ts +2 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +40 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/main.js +9 -1
- package/dist/src/main.js.map +1 -1
- package/dist/src/matchers.js +1 -1
- package/dist/src/matchers.js.map +1 -1
- package/dist/src/providers/anthropic.d.ts +6 -2
- package/dist/src/providers/anthropic.d.ts.map +1 -1
- package/dist/src/providers/anthropic.js +4 -2
- package/dist/src/providers/anthropic.js.map +1 -1
- package/dist/src/providers/azureopenai.d.ts +6 -4
- package/dist/src/providers/azureopenai.d.ts.map +1 -1
- package/dist/src/providers/azureopenai.js +5 -11
- package/dist/src/providers/azureopenai.js.map +1 -1
- package/dist/src/providers/llama.d.ts +5 -2
- package/dist/src/providers/llama.d.ts.map +1 -1
- package/dist/src/providers/llama.js +5 -3
- package/dist/src/providers/llama.js.map +1 -1
- package/dist/src/providers/localai.d.ts +11 -2
- package/dist/src/providers/localai.d.ts.map +1 -1
- package/dist/src/providers/localai.js +11 -4
- package/dist/src/providers/localai.js.map +1 -1
- package/dist/src/providers/ollama.d.ts +3 -1
- package/dist/src/providers/ollama.d.ts.map +1 -1
- package/dist/src/providers/ollama.js +3 -1
- package/dist/src/providers/ollama.js.map +1 -1
- package/dist/src/providers/openai.d.ts +17 -4
- package/dist/src/providers/openai.d.ts.map +1 -1
- package/dist/src/providers/openai.js +13 -8
- package/dist/src/providers/openai.js.map +1 -1
- package/dist/src/providers/replicate.d.ts +6 -2
- package/dist/src/providers/replicate.d.ts.map +1 -1
- package/dist/src/providers/replicate.js +8 -2
- package/dist/src/providers/replicate.js.map +1 -1
- package/dist/src/providers/webhook.d.ts +3 -1
- package/dist/src/providers/webhook.d.ts.map +1 -1
- package/dist/src/providers/webhook.js +3 -1
- package/dist/src/providers/webhook.js.map +1 -1
- package/dist/src/providers.d.ts +10 -3
- package/dist/src/providers.d.ts.map +1 -1
- package/dist/src/providers.js +37 -23
- package/dist/src/providers.js.map +1 -1
- package/dist/src/types.d.ts +13 -0
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/util.d.ts.map +1 -1
- package/dist/src/util.js +17 -6
- package/dist/src/util.js.map +1 -1
- package/dist/src/web/nextui/404/index.html +1 -1
- package/dist/src/web/nextui/404.html +1 -1
- package/dist/src/web/nextui/_next/static/chunks/{613-572c22424de64659.js → 613-b8dbbee738eefa17.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/706-be905c29f0baf0b7.js +9 -0
- package/dist/src/web/nextui/_next/static/chunks/753-f62bfa32dbd9ff14.js +8 -0
- package/dist/src/web/nextui/_next/static/chunks/{891-7035926a62c1c4e0.js → 891-edb1eb13e9d8fd36.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/layout-19c92c911a7607b5.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/setup/page-4b0585deaf7eff9e.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/{webpack-55c264ce2fd85eb7.js → webpack-c173e301236a84c2.js} +1 -1
- package/dist/src/web/nextui/_next/static/css/408b930062eabefb.css +1 -0
- package/dist/src/web/nextui/eval/index.html +1 -1
- package/dist/src/web/nextui/eval/index.txt +6 -6
- package/dist/src/web/nextui/index.html +1 -1
- package/dist/src/web/nextui/index.txt +5 -5
- package/dist/src/web/nextui/setup/index.html +2 -2
- package/dist/src/web/nextui/setup/index.txt +7 -7
- package/package.json +1 -1
- package/dist/src/web/nextui/_next/static/chunks/365-e426ea5bc7e815fc.js +0 -8
- package/dist/src/web/nextui/_next/static/chunks/706-ae1d3352d28419e9.js +0 -9
- package/dist/src/web/nextui/_next/static/chunks/app/layout-024c4adc71c9feb0.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/setup/page-6ef16148040bf4f4.js +0 -1
- package/dist/src/web/nextui/_next/static/css/e388dd377baf25ec.css +0 -1
- /package/dist/src/web/nextui/_next/static/{Bl3o5lF4ON7Fjki46lPhr → EQq9K6neWhoDPP00wg8hQ}/_buildManifest.js +0 -0
- /package/dist/src/web/nextui/_next/static/{Bl3o5lF4ON7Fjki46lPhr → EQq9K6neWhoDPP00wg8hQ}/_ssgManifest.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llama.d.ts","sourceRoot":"","sources":["../../../src/providers/llama.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEjE,UAAU,sBAAsB;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,qBAAa,aAAc,YAAW,WAAW;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"llama.d.ts","sourceRoot":"","sources":["../../../src/providers/llama.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEjE,UAAU,sBAAsB;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,qBAAa,aAAc,YAAW,WAAW;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,sBAAsB,CAAC;gBAEpB,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,sBAAsB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAO;IAO7F,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAoD3F"}
|
|
@@ -4,9 +4,11 @@ exports.LlamaProvider = void 0;
|
|
|
4
4
|
const cache_1 = require("../cache");
|
|
5
5
|
const shared_1 = require("./shared");
|
|
6
6
|
class LlamaProvider {
|
|
7
|
-
constructor(modelName, options) {
|
|
7
|
+
constructor(modelName, options = {}) {
|
|
8
|
+
const { config, id } = options;
|
|
8
9
|
this.modelName = modelName;
|
|
9
|
-
this.
|
|
10
|
+
this.config = config;
|
|
11
|
+
this.id = id ? () => id : this.id;
|
|
10
12
|
}
|
|
11
13
|
id() {
|
|
12
14
|
return `llama:${this.modelName}`;
|
|
@@ -15,7 +17,7 @@ class LlamaProvider {
|
|
|
15
17
|
return `[Llama Provider ${this.modelName}]`;
|
|
16
18
|
}
|
|
17
19
|
async callApi(prompt, options) {
|
|
18
|
-
options = Object.assign({}, this.
|
|
20
|
+
options = Object.assign({}, this.config, options);
|
|
19
21
|
const body = {
|
|
20
22
|
prompt,
|
|
21
23
|
n_predict: options?.n_predict || 512,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llama.js","sourceRoot":"","sources":["../../../src/providers/llama.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAC1C,qCAA8C;AAwB9C,MAAa,aAAa;IAIxB,YAAY,SAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"llama.js","sourceRoot":"","sources":["../../../src/providers/llama.ts"],"names":[],"mappings":";;;AAAA,oCAA0C;AAC1C,qCAA8C;AAwB9C,MAAa,aAAa;IAIxB,YAAY,SAAiB,EAAE,UAA4D,EAAE;QAC3F,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,EAAE;QACA,OAAO,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;IACnC,CAAC;IAED,QAAQ;QACN,OAAO,mBAAmB,IAAI,CAAC,SAAS,GAAG,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,OAAgC;QAC5D,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG;YACX,MAAM;YACN,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,GAAG;YACpC,WAAW,EAAE,OAAO,EAAE,WAAW;YACjC,KAAK,EAAE,OAAO,EAAE,KAAK;YACrB,KAAK,EAAE,OAAO,EAAE,KAAK;YACrB,MAAM,EAAE,OAAO,EAAE,MAAM;YACvB,IAAI,EAAE,OAAO,EAAE,IAAI;YACnB,cAAc,EAAE,OAAO,EAAE,cAAc;YACvC,aAAa,EAAE,OAAO,EAAE,aAAa;YACrC,WAAW,EAAE,OAAO,EAAE,WAAW;YACjC,gBAAgB,EAAE,OAAO,EAAE,gBAAgB;YAC3C,iBAAiB,EAAE,OAAO,EAAE,iBAAiB;YAC7C,QAAQ,EAAE,OAAO,EAAE,QAAQ;YAC3B,YAAY,EAAE,OAAO,EAAE,YAAY;YACnC,YAAY,EAAE,OAAO,EAAE,YAAY;YACnC,IAAI,EAAE,OAAO,EAAE,IAAI;YACnB,UAAU,EAAE,OAAO,EAAE,UAAU;YAC/B,UAAU,EAAE,OAAO,EAAE,UAAU;SAChC,CAAC;QAEF,IAAI,QAAQ,CAAC;QACb,IAAI;YACF,QAAQ,GAAG,MAAM,IAAA,sBAAc,EAC7B,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,uBAAuB,aAAa,EACrE;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,EACD,2BAAkB,CACnB,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;SACH;QAED,IAAI;YACF,OAAO;gBACL,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO;aAC9B,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;aAC9E,CAAC;SACH;IACH,CAAC;CACF;AAvED,sCAuEC"}
|
|
@@ -1,8 +1,17 @@
|
|
|
1
|
-
import type { ApiProvider, ProviderResponse } from '../types.js';
|
|
1
|
+
import type { ApiProvider, EnvOverrides, ProviderResponse } from '../types.js';
|
|
2
|
+
interface LocalAiCompletionOptions {
|
|
3
|
+
apiBaseUrl?: string;
|
|
4
|
+
temperature?: number;
|
|
5
|
+
}
|
|
2
6
|
declare class LocalAiGenericProvider implements ApiProvider {
|
|
3
7
|
modelName: string;
|
|
4
8
|
apiBaseUrl: string;
|
|
5
|
-
|
|
9
|
+
config: LocalAiCompletionOptions;
|
|
10
|
+
constructor(modelName: string, options?: {
|
|
11
|
+
config?: LocalAiCompletionOptions;
|
|
12
|
+
id?: string;
|
|
13
|
+
env?: EnvOverrides;
|
|
14
|
+
});
|
|
6
15
|
id(): string;
|
|
7
16
|
toString(): string;
|
|
8
17
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localai.d.ts","sourceRoot":"","sources":["../../../src/providers/localai.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"localai.d.ts","sourceRoot":"","sources":["../../../src/providers/localai.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/E,UAAU,wBAAwB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,cAAM,sBAAuB,YAAW,WAAW;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,wBAAwB,CAAC;gBAG/B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,wBAAwB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAatF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAKZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGzD;AAED,qBAAa,mBAAoB,SAAQ,sBAAsB;IACvD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAuCzD;AAED,qBAAa,yBAA0B,SAAQ,sBAAsB;IAC7D,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAsCzD"}
|
|
@@ -8,9 +8,16 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
8
8
|
const cache_1 = require("../cache");
|
|
9
9
|
const shared_1 = require("./shared");
|
|
10
10
|
class LocalAiGenericProvider {
|
|
11
|
-
constructor(modelName) {
|
|
11
|
+
constructor(modelName, options = {}) {
|
|
12
|
+
const { id, config, env } = options;
|
|
12
13
|
this.modelName = modelName;
|
|
13
|
-
this.apiBaseUrl =
|
|
14
|
+
this.apiBaseUrl =
|
|
15
|
+
config?.apiBaseUrl ||
|
|
16
|
+
env?.LOCALAI_BASE_URL ||
|
|
17
|
+
process.env.LOCALAI_BASE_URL ||
|
|
18
|
+
'http://localhost:8080/v1';
|
|
19
|
+
this.config = config || {};
|
|
20
|
+
this.id = id ? () => id : this.id;
|
|
14
21
|
}
|
|
15
22
|
id() {
|
|
16
23
|
return `localai:${this.modelName}`;
|
|
@@ -29,7 +36,7 @@ class LocalAiChatProvider extends LocalAiGenericProvider {
|
|
|
29
36
|
const body = {
|
|
30
37
|
model: this.modelName,
|
|
31
38
|
messages: messages,
|
|
32
|
-
temperature: process.env.LOCALAI_TEMPERATURE || 0.7,
|
|
39
|
+
temperature: this.config.temperature || process.env.LOCALAI_TEMPERATURE || 0.7,
|
|
33
40
|
};
|
|
34
41
|
logger_1.default.debug(`Calling LocalAI API: ${JSON.stringify(body)}`);
|
|
35
42
|
let data, cached = false;
|
|
@@ -66,7 +73,7 @@ class LocalAiCompletionProvider extends LocalAiGenericProvider {
|
|
|
66
73
|
const body = {
|
|
67
74
|
model: this.modelName,
|
|
68
75
|
prompt,
|
|
69
|
-
temperature: process.env.LOCALAI_TEMPERATURE || 0.7,
|
|
76
|
+
temperature: this.config.temperature || process.env.LOCALAI_TEMPERATURE || 0.7,
|
|
70
77
|
};
|
|
71
78
|
logger_1.default.debug(`Calling LocalAI API: ${JSON.stringify(body)}`);
|
|
72
79
|
let data, cached = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localai.js","sourceRoot":"","sources":["../../../src/providers/localai.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAC1C,qCAA+D;
|
|
1
|
+
{"version":3,"file":"localai.js","sourceRoot":"","sources":["../../../src/providers/localai.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { ApiProvider, ProviderResponse } from '../types.js';
|
|
2
2
|
export declare class OllamaProvider implements ApiProvider {
|
|
3
3
|
modelName: string;
|
|
4
|
-
constructor(modelName: string
|
|
4
|
+
constructor(modelName: string, options?: {
|
|
5
|
+
id?: string;
|
|
6
|
+
});
|
|
5
7
|
id(): string;
|
|
6
8
|
toString(): string;
|
|
7
9
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/providers/ollama.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/providers/ollama.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAkBjE,qBAAa,cAAe,YAAW,WAAW;IAChD,SAAS,EAAE,MAAM,CAAC;gBAEN,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAO;IAM5D,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmDzD"}
|
|
@@ -8,8 +8,10 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
8
8
|
const cache_1 = require("../cache");
|
|
9
9
|
const shared_1 = require("./shared");
|
|
10
10
|
class OllamaProvider {
|
|
11
|
-
constructor(modelName) {
|
|
11
|
+
constructor(modelName, options = {}) {
|
|
12
|
+
const { id } = options;
|
|
12
13
|
this.modelName = modelName;
|
|
14
|
+
this.id = id ? () => id : this.id;
|
|
13
15
|
}
|
|
14
16
|
id() {
|
|
15
17
|
return `ollama:${this.modelName}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../src/providers/ollama.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../src/providers/ollama.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAC1C,qCAA8C;AAoB9C,MAAa,cAAc;IAGzB,YAAY,SAAiB,EAAE,UAA2B,EAAE;QAC1D,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,EAAE;QACA,OAAO,UAAU,IAAI,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,QAAQ;QACN,OAAO,oBAAoB,IAAI,CAAC,SAAS,GAAG,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,MAAM,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM;SACP,CAAC;QAEF,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,QAAQ,CAAC;QACb,IAAI;YACF,QAAQ,GAAG,MAAM,IAAA,sBAAc,EAC7B,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,wBAAwB,eAAe,EACzE;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aAC7B,EACD,2BAAkB,EAClB,MAAM,CACP,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;SACH;QACD,gBAAM,CAAC,KAAK,CAAC,0BAA0B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAExD,IAAI;YACF,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI;iBACzB,KAAK,CAAC,IAAI,CAAC;iBACX,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;iBAC5C,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;gBACpB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAgB,CAAC;gBAC/C,IAAI,MAAM,CAAC,QAAQ,EAAE;oBACnB,OAAO,MAAM,CAAC,QAAQ,CAAC;iBACxB;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;iBACxC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEZ,OAAO;gBACL,MAAM;aACP,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;aAC9E,CAAC;SACH;IACH,CAAC;CACF;AApED,wCAoEC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ApiProvider, ProviderEmbeddingResponse, ProviderResponse } from '../types.js';
|
|
1
|
+
import type { ApiProvider, EnvOverrides, ProviderEmbeddingResponse, ProviderResponse } from '../types.js';
|
|
2
2
|
interface OpenAiCompletionOptions {
|
|
3
3
|
temperature?: number;
|
|
4
4
|
max_tokens?: number;
|
|
@@ -20,7 +20,12 @@ interface OpenAiCompletionOptions {
|
|
|
20
20
|
declare class OpenAiGenericProvider implements ApiProvider {
|
|
21
21
|
modelName: string;
|
|
22
22
|
config: OpenAiCompletionOptions;
|
|
23
|
-
|
|
23
|
+
env?: EnvOverrides;
|
|
24
|
+
constructor(modelName: string, options?: {
|
|
25
|
+
config?: OpenAiCompletionOptions;
|
|
26
|
+
id?: string;
|
|
27
|
+
env?: EnvOverrides;
|
|
28
|
+
});
|
|
24
29
|
id(): string;
|
|
25
30
|
toString(): string;
|
|
26
31
|
getOrganization(): string | undefined;
|
|
@@ -33,12 +38,20 @@ export declare class OpenAiEmbeddingProvider extends OpenAiGenericProvider {
|
|
|
33
38
|
}
|
|
34
39
|
export declare class OpenAiCompletionProvider extends OpenAiGenericProvider {
|
|
35
40
|
static OPENAI_COMPLETION_MODELS: string[];
|
|
36
|
-
constructor(modelName: string,
|
|
41
|
+
constructor(modelName: string, options?: {
|
|
42
|
+
config?: OpenAiCompletionOptions;
|
|
43
|
+
id?: string;
|
|
44
|
+
env?: EnvOverrides;
|
|
45
|
+
});
|
|
37
46
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
38
47
|
}
|
|
39
48
|
export declare class OpenAiChatCompletionProvider extends OpenAiGenericProvider {
|
|
40
49
|
static OPENAI_CHAT_MODELS: string[];
|
|
41
|
-
constructor(modelName: string,
|
|
50
|
+
constructor(modelName: string, options?: {
|
|
51
|
+
config?: OpenAiCompletionOptions;
|
|
52
|
+
id?: string;
|
|
53
|
+
env?: EnvOverrides;
|
|
54
|
+
});
|
|
42
55
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
43
56
|
}
|
|
44
57
|
export declare const DefaultEmbeddingProvider: OpenAiEmbeddingProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/providers/openai.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/providers/openai.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,yBAAyB,EACzB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAIrB,UAAU,uBAAuB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,GAAG,CAAC;KACjB,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,cAAM,qBAAsB,YAAW,WAAW;IAChD,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,uBAAuB,CAAC;IAChC,GAAG,CAAC,EAAE,YAAY,CAAC;gBAGjB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,uBAAuB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IASrF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIlB,eAAe,IAAI,MAAM,GAAG,SAAS;IAMrC,UAAU,IAAI,MAAM,GAAG,SAAS;IAShC,SAAS,IAAI,MAAM,GAAG,SAAS;IAKzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGzD;AAED,qBAAa,uBAAwB,SAAQ,qBAAqB;IAC1D,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAgEzE;AAED,qBAAa,wBAAyB,SAAQ,qBAAqB;IACjE,MAAM,CAAC,wBAAwB,WAM7B;gBAGA,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,uBAAuB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAQ/E,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAoEzD;AAED,qBAAa,4BAA6B,SAAQ,qBAAqB;IACrE,MAAM,CAAC,kBAAkB,WAWvB;gBAGA,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,uBAAuB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAQ/E,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA2EzD;AAED,eAAO,MAAM,wBAAwB,yBAAwD,CAAC;AAC9F,eAAO,MAAM,sBAAsB,8BAAiD,CAAC;AACrF,eAAO,MAAM,0BAA0B,8BAAiD,CAAC"}
|
|
@@ -9,7 +9,9 @@ const cache_1 = require("../cache");
|
|
|
9
9
|
const shared_1 = require("./shared");
|
|
10
10
|
const DEFAULT_OPENAI_HOST = 'api.openai.com';
|
|
11
11
|
class OpenAiGenericProvider {
|
|
12
|
-
constructor(modelName,
|
|
12
|
+
constructor(modelName, options = {}) {
|
|
13
|
+
const { config, id, env } = options;
|
|
14
|
+
this.env = env;
|
|
13
15
|
this.modelName = modelName;
|
|
14
16
|
this.config = config || {};
|
|
15
17
|
this.id = id ? () => id : this.id;
|
|
@@ -21,13 +23,16 @@ class OpenAiGenericProvider {
|
|
|
21
23
|
return `[OpenAI Provider ${this.modelName}]`;
|
|
22
24
|
}
|
|
23
25
|
getOrganization() {
|
|
24
|
-
return this.config.organization || process.env.OPENAI_ORGANIZATION;
|
|
26
|
+
return (this.config.organization || this.env?.OPENAI_ORGANIZATION || process.env.OPENAI_ORGANIZATION);
|
|
25
27
|
}
|
|
26
28
|
getApiHost() {
|
|
27
|
-
return this.config.apiHost ||
|
|
29
|
+
return (this.config.apiHost ||
|
|
30
|
+
this.env?.OPENAI_API_HOST ||
|
|
31
|
+
process.env.OPENAI_API_HOST ||
|
|
32
|
+
DEFAULT_OPENAI_HOST);
|
|
28
33
|
}
|
|
29
34
|
getApiKey() {
|
|
30
|
-
return this.config.apiKey || process.env.OPENAI_API_KEY;
|
|
35
|
+
return this.config.apiKey || this.env?.OPENAI_API_KEY || process.env.OPENAI_API_KEY;
|
|
31
36
|
}
|
|
32
37
|
// @ts-ignore: Prompt is not used in this implementation
|
|
33
38
|
async callApi(prompt) {
|
|
@@ -97,11 +102,11 @@ class OpenAiEmbeddingProvider extends OpenAiGenericProvider {
|
|
|
97
102
|
}
|
|
98
103
|
exports.OpenAiEmbeddingProvider = OpenAiEmbeddingProvider;
|
|
99
104
|
class OpenAiCompletionProvider extends OpenAiGenericProvider {
|
|
100
|
-
constructor(modelName,
|
|
105
|
+
constructor(modelName, options = {}) {
|
|
101
106
|
if (!OpenAiCompletionProvider.OPENAI_COMPLETION_MODELS.includes(modelName)) {
|
|
102
107
|
logger_1.default.warn(`Using unknown OpenAI completion model: ${modelName}`);
|
|
103
108
|
}
|
|
104
|
-
super(modelName,
|
|
109
|
+
super(modelName, options);
|
|
105
110
|
}
|
|
106
111
|
async callApi(prompt) {
|
|
107
112
|
if (!this.getApiKey()) {
|
|
@@ -174,11 +179,11 @@ OpenAiCompletionProvider.OPENAI_COMPLETION_MODELS = [
|
|
|
174
179
|
'text-ada-001',
|
|
175
180
|
];
|
|
176
181
|
class OpenAiChatCompletionProvider extends OpenAiGenericProvider {
|
|
177
|
-
constructor(modelName,
|
|
182
|
+
constructor(modelName, options = {}) {
|
|
178
183
|
if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODELS.includes(modelName)) {
|
|
179
184
|
logger_1.default.warn(`Using unknown OpenAI chat model: ${modelName}`);
|
|
180
185
|
}
|
|
181
|
-
super(modelName,
|
|
186
|
+
super(modelName, options);
|
|
182
187
|
}
|
|
183
188
|
async callApi(prompt) {
|
|
184
189
|
if (!this.getApiKey()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/providers/openai.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAC1C,qCAA+D;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/providers/openai.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAC1C,qCAA+D;AAS/D,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAqB7C,MAAM,qBAAqB;IAMzB,YACE,SAAiB,EACjB,UAAiF,EAAE;QAEnF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,EAAE;QACA,OAAO,UAAU,IAAI,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,QAAQ;QACN,OAAO,oBAAoB,IAAI,CAAC,SAAS,GAAG,CAAC;IAC/C,CAAC;IAED,eAAe;QACb,OAAO,CACL,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,GAAG,EAAE,mBAAmB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAC7F,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,CACL,IAAI,CAAC,MAAM,CAAC,OAAO;YACnB,IAAI,CAAC,GAAG,EAAE,eAAe;YACzB,OAAO,CAAC,GAAG,CAAC,eAAe;YAC3B,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IACtF,CAAC;IAED,wDAAwD;IACxD,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF;AAED,MAAa,uBAAwB,SAAQ,qBAAqB;IAChE,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACjC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;SACzE;QAED,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;QACF,IAAI,IAAI,EACN,MAAM,GAAG,KAAK,CAAC;QACjB,IAAI;YACF,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAA,sBAAc,EACvC,WAAW,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAC5C;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,EAAE,EAAE;oBAC3C,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrF;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,EACD,2BAAkB,CACnB,CAAmB,CAAC,CAAC;SACvB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;gBACvC,UAAU,EAAE;oBACV,KAAK,EAAE,CAAC;oBACR,MAAM,EAAE,CAAC;oBACT,UAAU,EAAE,CAAC;iBACd;aACF,CAAC;SACH;QACD,gBAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5E,IAAI;YACF,MAAM,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;YAC7C,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;aAC1C;YACD,MAAM,GAAG,GAAG;gBACV,SAAS;gBACT,UAAU,EAAE,MAAM;oBAChB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;oBACrC,CAAC,CAAC;wBACE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;wBAC9B,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;wBAChC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB;qBACzC;aACN,CAAC;YACF,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACpE,UAAU,EAAE;oBACV,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY;oBAChC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa;oBAClC,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB;iBAC3C;aACF,CAAC;SACH;IACH,CAAC;CACF;AAjED,0DAiEC;AAED,MAAa,wBAAyB,SAAQ,qBAAqB;IASjE,YACE,SAAiB,EACjB,UAAiF,EAAE;QAEnF,IAAI,CAAC,wBAAwB,CAAC,wBAAwB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC1E,gBAAM,CAAC,IAAI,CAAC,0CAA0C,SAAS,EAAE,CAAC,CAAC;SACpE;QACD,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CACb,gHAAgH,CACjH,CAAC;SACH;QAED,IAAI,IAAY,CAAC;QACjB,IAAI;YACF,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW;gBAC5B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;gBACrC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;SAC1D;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;SACnE;QACD,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM;YACN,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC;YACvF,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC;YACzF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC;YACvE,gBAAgB,EACd,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,GAAG,CAAC;YACxF,iBAAiB,EACf,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC;YAC1F,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC;YAC3E,IAAI;SACL,CAAC;QACF,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5D,IAAI,IAAI,EACN,MAAM,GAAG,KAAK,CAAC;QACjB,IAAI;YACF,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAA,sBAAc,EACvC,WAAW,IAAI,CAAC,UAAU,EAAE,iBAAiB,EAC7C;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,EAAE,EAAE;oBAC3C,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrF;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,EACD,2BAAkB,CACnB,CAAmB,CAAC,CAAC;SACvB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;SACH;QACD,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,IAAI;YACF,OAAO;gBACL,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC5B,UAAU,EAAE,MAAM;oBAChB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;oBACrC,CAAC,CAAC;wBACE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;wBAC9B,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;wBAChC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB;qBACzC;aACN,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aACrE,CAAC;SACH;IACH,CAAC;;AAtFH,4DAuFC;AAtFQ,iDAAwB,GAAG;IAChC,kBAAkB;IAClB,kBAAkB;IAClB,gBAAgB;IAChB,kBAAkB;IAClB,cAAc;CACf,CAAC;AAkFJ,MAAa,4BAA6B,SAAQ,qBAAqB;IAcrE,YACE,SAAiB,EACjB,UAAiF,EAAE;QAEnF,IAAI,CAAC,4BAA4B,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACxE,gBAAM,CAAC,IAAI,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;SAC9D;QACD,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CACb,gHAAgH,CACjH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,IAAY,CAAC;QACjB,IAAI;YACF,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW;gBAC5B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;gBACrC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;SAC7B;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;SACnE;QACD,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC;YACvF,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,GAAG,CAAC;YACzF,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC;YACvE,gBAAgB,EACd,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,GAAG,CAAC;YACxF,iBAAiB,EACf,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC;YAC1F,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,SAAS;YAC7C,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,SAAS;YACrD,IAAI;SACL,CAAC;QACF,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5D,IAAI,IAAI,EACN,MAAM,GAAG,KAAK,CAAC;QACjB,IAAI;YACF,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAA,sBAAc,EACvC,WAAW,IAAI,CAAC,UAAU,EAAE,sBAAsB,EAClD;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,EAAE,EAAE;oBAC3C,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrF;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,EACD,2BAAkB,CACnB,CAAmB,CAAC,CAAC;SACvB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;SACH;QAED,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAClF,OAAO;gBACL,MAAM;gBACN,UAAU,EAAE,MAAM;oBAChB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;oBACrC,CAAC,CAAC;wBACE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;wBAC9B,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;wBAChC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB;qBACzC;aACN,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aACrE,CAAC;SACH;IACH,CAAC;;AAlGH,oEAmGC;AAlGQ,+CAAkB,GAAG;IAC1B,OAAO;IACP,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,gBAAgB;IAChB,eAAe;IACf,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,wBAAwB;CACzB,CAAC;AAyFS,QAAA,wBAAwB,GAAG,IAAI,uBAAuB,CAAC,wBAAwB,CAAC,CAAC;AACjF,QAAA,sBAAsB,GAAG,IAAI,4BAA4B,CAAC,YAAY,CAAC,CAAC;AACxE,QAAA,0BAA0B,GAAG,IAAI,4BAA4B,CAAC,YAAY,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ApiProvider, ProviderResponse } from '../types.js';
|
|
1
|
+
import type { ApiProvider, EnvOverrides, ProviderResponse } from '../types.js';
|
|
2
2
|
interface ReplicateCompletionOptions {
|
|
3
3
|
apiKey?: string;
|
|
4
4
|
temperature?: number;
|
|
@@ -11,7 +11,11 @@ export declare class ReplicateProvider implements ApiProvider {
|
|
|
11
11
|
apiKey?: string;
|
|
12
12
|
replicate: any;
|
|
13
13
|
config: ReplicateCompletionOptions;
|
|
14
|
-
constructor(modelName: string,
|
|
14
|
+
constructor(modelName: string, options?: {
|
|
15
|
+
config?: ReplicateCompletionOptions;
|
|
16
|
+
id?: string;
|
|
17
|
+
env?: EnvOverrides;
|
|
18
|
+
});
|
|
15
19
|
id(): string;
|
|
16
20
|
toString(): string;
|
|
17
21
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicate.d.ts","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"replicate.d.ts","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/E,UAAU,0BAA0B;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAG5B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,0BAA0B,CAAC;gBAGjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,0BAA0B,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAcxF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiEzD"}
|
|
@@ -9,11 +9,17 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
|
9
9
|
const logger_1 = __importDefault(require("../logger"));
|
|
10
10
|
const cache_1 = require("../cache");
|
|
11
11
|
class ReplicateProvider {
|
|
12
|
-
constructor(modelName,
|
|
12
|
+
constructor(modelName, options = {}) {
|
|
13
|
+
const { config, id, env } = options;
|
|
13
14
|
this.modelName = modelName;
|
|
14
15
|
this.apiKey =
|
|
15
|
-
config?.apiKey ||
|
|
16
|
+
config?.apiKey ||
|
|
17
|
+
env?.REPLICATE_API_KEY ||
|
|
18
|
+
env?.REPLICATE_API_TOKEN ||
|
|
19
|
+
process.env.REPLICATE_API_TOKEN ||
|
|
20
|
+
process.env.REPLICATE_API_KEY;
|
|
16
21
|
this.config = config || {};
|
|
22
|
+
this.id = id ? () => id : this.id;
|
|
17
23
|
}
|
|
18
24
|
id() {
|
|
19
25
|
return `replicate:${this.modelName}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicate.js","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,4DAA+B;AAC/B,uDAA+B;AAC/B,oCAAoD;AAcpD,MAAa,iBAAiB;IAM5B,
|
|
1
|
+
{"version":3,"file":"replicate.js","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { ApiProvider, ProviderResponse } from '../types.js';
|
|
2
2
|
export declare class WebhookProvider implements ApiProvider {
|
|
3
3
|
webhookUrl: string;
|
|
4
|
-
constructor(webhookUrl: string
|
|
4
|
+
constructor(webhookUrl: string, options?: {
|
|
5
|
+
id?: string;
|
|
6
|
+
});
|
|
5
7
|
id(): string;
|
|
6
8
|
toString(): string;
|
|
7
9
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../src/providers/webhook.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../src/providers/webhook.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEjE,qBAAa,eAAgB,YAAW,WAAW;IACjD,UAAU,EAAE,MAAM,CAAC;gBAEP,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAO;IAM7D,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAuCzD"}
|
|
@@ -8,8 +8,10 @@ const logger_1 = __importDefault(require("../logger"));
|
|
|
8
8
|
const cache_1 = require("../cache");
|
|
9
9
|
const shared_1 = require("./shared");
|
|
10
10
|
class WebhookProvider {
|
|
11
|
-
constructor(webhookUrl) {
|
|
11
|
+
constructor(webhookUrl, options = {}) {
|
|
12
|
+
const { id } = options;
|
|
12
13
|
this.webhookUrl = webhookUrl;
|
|
14
|
+
this.id = id ? () => id : this.id;
|
|
13
15
|
}
|
|
14
16
|
id() {
|
|
15
17
|
return `webhook:${this.webhookUrl}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../src/providers/webhook.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../src/providers/webhook.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAE1C,qCAA8C;AAI9C,MAAa,eAAe;IAG1B,YAAY,UAAkB,EAAE,UAA2B,EAAE;QAC3D,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,EAAE;QACA,OAAO,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAED,QAAQ;QACN,OAAO,qBAAqB,IAAI,CAAC,UAAU,GAAG,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,MAAM,GAAG;YACb,MAAM;SACP,CAAC;QAEF,gBAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,UAAU,iBAAiB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3F,IAAI,QAAQ,CAAC;QACb,IAAI;YACF,QAAQ,GAAG,MAAM,IAAA,sBAAc,EAC7B,IAAI,CAAC,UAAU,EACf;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aAC7B,EACD,2BAAkB,EAClB,MAAM,CACP,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,EAAE;aAC5C,CAAC;SACH;QACD,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErE,IAAI,QAAQ,CAAC,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC7D,OAAO;gBACL,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;aAC7B,CAAC;SACH;aAAM;YACL,OAAO;gBACL,KAAK,EAAE,uDAAuD,IAAI,CAAC,SAAS,CAC1E,QAAQ,CAAC,IAAI,CACd,EAAE;aACJ,CAAC;SACH;IACH,CAAC;CACF;AAxDD,0CAwDC"}
|
package/dist/src/providers.d.ts
CHANGED
|
@@ -2,9 +2,16 @@ import { OpenAiCompletionProvider, OpenAiChatCompletionProvider } from './provid
|
|
|
2
2
|
import { AnthropicCompletionProvider } from './providers/anthropic';
|
|
3
3
|
import { ReplicateProvider } from './providers/replicate';
|
|
4
4
|
import { LocalAiCompletionProvider, LocalAiChatProvider } from './providers/localai';
|
|
5
|
-
import type { ApiProvider, ProviderOptions, ProviderFunction, ProviderId, ProviderOptionsMap } from './types';
|
|
6
|
-
export declare function loadApiProviders(providerPaths: ProviderId | ProviderId[] | ProviderOptionsMap[] | ProviderOptions[] | ProviderFunction,
|
|
7
|
-
|
|
5
|
+
import type { ApiProvider, EnvOverrides, ProviderOptions, ProviderFunction, ProviderId, ProviderOptionsMap } from './types';
|
|
6
|
+
export declare function loadApiProviders(providerPaths: ProviderId | ProviderId[] | ProviderOptionsMap[] | ProviderOptions[] | ProviderFunction, options?: {
|
|
7
|
+
basePath?: string;
|
|
8
|
+
env?: EnvOverrides;
|
|
9
|
+
}): Promise<ApiProvider[]>;
|
|
10
|
+
export declare function loadApiProvider(providerPath: string, context?: {
|
|
11
|
+
options?: ProviderOptions;
|
|
12
|
+
basePath?: string;
|
|
13
|
+
env?: EnvOverrides;
|
|
14
|
+
}): Promise<ApiProvider>;
|
|
8
15
|
declare const _default: {
|
|
9
16
|
OpenAiCompletionProvider: typeof OpenAiCompletionProvider;
|
|
10
17
|
OpenAiChatCompletionProvider: typeof OpenAiChatCompletionProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAE7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAUrF,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAsB,gBAAgB,CACpC,aAAa,EACT,UAAU,GACV,UAAU,EAAE,GACZ,kBAAkB,EAAE,GACpB,eAAe,EAAE,GACjB,gBAAgB,EACpB,QAAQ,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAE7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAUrF,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAsB,gBAAgB,CACpC,aAAa,EACT,UAAU,GACV,UAAU,EAAE,GACZ,kBAAkB,EAAE,GACpB,eAAe,EAAE,GACjB,gBAAgB,EACpB,OAAO,GAAE;IACP,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,YAAY,CAAC;CACf,GACL,OAAO,CAAC,WAAW,EAAE,CAAC,CAuCxB;AAED,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,YAAY,CAAC;CACf,GACL,OAAO,CAAC,WAAW,CAAC,CAuGtB;;;;;;;;;;AAED,wBAQE"}
|
package/dist/src/providers.js
CHANGED
|
@@ -37,9 +37,10 @@ const ollama_1 = require("./providers/ollama");
|
|
|
37
37
|
const webhook_1 = require("./providers/webhook");
|
|
38
38
|
const scriptCompletion_1 = require("./providers/scriptCompletion");
|
|
39
39
|
const azureopenai_1 = require("./providers/azureopenai");
|
|
40
|
-
async function loadApiProviders(providerPaths,
|
|
40
|
+
async function loadApiProviders(providerPaths, options = {}) {
|
|
41
|
+
const { basePath, env } = options;
|
|
41
42
|
if (typeof providerPaths === 'string') {
|
|
42
|
-
return [await loadApiProvider(providerPaths,
|
|
43
|
+
return [await loadApiProvider(providerPaths, { basePath, env })];
|
|
43
44
|
}
|
|
44
45
|
else if (typeof providerPaths === 'function') {
|
|
45
46
|
return [
|
|
@@ -52,7 +53,7 @@ async function loadApiProviders(providerPaths, basePath) {
|
|
|
52
53
|
else if (Array.isArray(providerPaths)) {
|
|
53
54
|
return Promise.all(providerPaths.map((provider, idx) => {
|
|
54
55
|
if (typeof provider === 'string') {
|
|
55
|
-
return loadApiProvider(provider,
|
|
56
|
+
return loadApiProvider(provider, { basePath, env });
|
|
56
57
|
}
|
|
57
58
|
else if (typeof provider === 'function') {
|
|
58
59
|
return {
|
|
@@ -62,22 +63,31 @@ async function loadApiProviders(providerPaths, basePath) {
|
|
|
62
63
|
}
|
|
63
64
|
else if (provider.id) {
|
|
64
65
|
// List of ProviderConfig objects
|
|
65
|
-
return loadApiProvider(provider.id,
|
|
66
|
+
return loadApiProvider(provider.id, {
|
|
67
|
+
options: provider,
|
|
68
|
+
basePath,
|
|
69
|
+
env,
|
|
70
|
+
});
|
|
66
71
|
}
|
|
67
72
|
else {
|
|
68
73
|
// List of { id: string, config: ProviderConfig } objects
|
|
69
74
|
const id = Object.keys(provider)[0];
|
|
70
75
|
const providerObject = provider[id];
|
|
71
76
|
const context = { ...providerObject, id: providerObject.id || id };
|
|
72
|
-
return loadApiProvider(id, context, basePath);
|
|
77
|
+
return loadApiProvider(id, { options: context, basePath, env });
|
|
73
78
|
}
|
|
74
79
|
}));
|
|
75
80
|
}
|
|
76
81
|
throw new Error('Invalid providers list');
|
|
77
82
|
}
|
|
78
83
|
exports.loadApiProviders = loadApiProviders;
|
|
79
|
-
async function loadApiProvider(providerPath,
|
|
80
|
-
|
|
84
|
+
async function loadApiProvider(providerPath, context = {}) {
|
|
85
|
+
const { options = {}, basePath, env } = context;
|
|
86
|
+
const providerOptions = {
|
|
87
|
+
id: options.id,
|
|
88
|
+
config: options.config,
|
|
89
|
+
env,
|
|
90
|
+
};
|
|
81
91
|
if (providerPath?.startsWith('exec:')) {
|
|
82
92
|
// Load script module
|
|
83
93
|
const scriptPath = providerPath.split(':')[1];
|
|
@@ -92,19 +102,23 @@ async function loadApiProvider(providerPath, options, basePath) {
|
|
|
92
102
|
const modelType = splits[1];
|
|
93
103
|
const modelName = splits[2];
|
|
94
104
|
if (modelType === 'chat') {
|
|
95
|
-
return new openai_1.OpenAiChatCompletionProvider(modelName || 'gpt-3.5-turbo',
|
|
105
|
+
return new openai_1.OpenAiChatCompletionProvider(modelName || 'gpt-3.5-turbo', providerOptions);
|
|
96
106
|
}
|
|
97
107
|
else if (modelType === 'embedding') {
|
|
98
|
-
return new openai_1.OpenAiEmbeddingProvider(modelName || 'text-embedding-ada-002',
|
|
108
|
+
return new openai_1.OpenAiEmbeddingProvider(modelName || 'text-embedding-ada-002', {
|
|
109
|
+
id: options.id,
|
|
110
|
+
config: options.config,
|
|
111
|
+
env,
|
|
112
|
+
});
|
|
99
113
|
}
|
|
100
114
|
else if (modelType === 'completion') {
|
|
101
|
-
return new openai_1.OpenAiCompletionProvider(modelName || 'text-davinci-003',
|
|
115
|
+
return new openai_1.OpenAiCompletionProvider(modelName || 'text-davinci-003', providerOptions);
|
|
102
116
|
}
|
|
103
117
|
else if (openai_1.OpenAiChatCompletionProvider.OPENAI_CHAT_MODELS.includes(modelType)) {
|
|
104
|
-
return new openai_1.OpenAiChatCompletionProvider(modelType,
|
|
118
|
+
return new openai_1.OpenAiChatCompletionProvider(modelType, providerOptions);
|
|
105
119
|
}
|
|
106
120
|
else if (openai_1.OpenAiCompletionProvider.OPENAI_COMPLETION_MODELS.includes(modelType)) {
|
|
107
|
-
return new openai_1.OpenAiCompletionProvider(modelType,
|
|
121
|
+
return new openai_1.OpenAiCompletionProvider(modelType, providerOptions);
|
|
108
122
|
}
|
|
109
123
|
else {
|
|
110
124
|
throw new Error(`Unknown OpenAI model type: ${modelType}. Use one of the following providers: openai:chat:<model name>, openai:completion:<model name>`);
|
|
@@ -116,10 +130,10 @@ async function loadApiProvider(providerPath, options, basePath) {
|
|
|
116
130
|
const modelType = splits[1];
|
|
117
131
|
const deploymentName = splits[2];
|
|
118
132
|
if (modelType === 'chat') {
|
|
119
|
-
return new azureopenai_1.AzureOpenAiChatCompletionProvider(deploymentName,
|
|
133
|
+
return new azureopenai_1.AzureOpenAiChatCompletionProvider(deploymentName, providerOptions);
|
|
120
134
|
}
|
|
121
135
|
else if (modelType === 'completion') {
|
|
122
|
-
return new azureopenai_1.AzureOpenAiCompletionProvider(deploymentName,
|
|
136
|
+
return new azureopenai_1.AzureOpenAiCompletionProvider(deploymentName, providerOptions);
|
|
123
137
|
}
|
|
124
138
|
else {
|
|
125
139
|
throw new Error(`Unknown Azure OpenAI model type: ${modelType}. Use one of the following providers: openai:chat:<model name>, openai:completion:<model name>`);
|
|
@@ -131,10 +145,10 @@ async function loadApiProvider(providerPath, options, basePath) {
|
|
|
131
145
|
const modelType = splits[1];
|
|
132
146
|
const modelName = splits[2];
|
|
133
147
|
if (modelType === 'completion') {
|
|
134
|
-
return new anthropic_1.AnthropicCompletionProvider(modelName || 'claude-instant-1',
|
|
148
|
+
return new anthropic_1.AnthropicCompletionProvider(modelName || 'claude-instant-1', providerOptions);
|
|
135
149
|
}
|
|
136
150
|
else if (anthropic_1.AnthropicCompletionProvider.ANTHROPIC_COMPLETION_MODELS.includes(modelType)) {
|
|
137
|
-
return new anthropic_1.AnthropicCompletionProvider(modelType,
|
|
151
|
+
return new anthropic_1.AnthropicCompletionProvider(modelType, providerOptions);
|
|
138
152
|
}
|
|
139
153
|
else {
|
|
140
154
|
throw new Error(`Unknown Anthropic model type: ${modelType}. Use one of the following providers: anthropic:completion:<model name>`);
|
|
@@ -144,32 +158,32 @@ async function loadApiProvider(providerPath, options, basePath) {
|
|
|
144
158
|
// Load Replicate module
|
|
145
159
|
const splits = providerPath.split(':');
|
|
146
160
|
const modelName = splits.slice(1).join(':');
|
|
147
|
-
return new replicate_1.ReplicateProvider(modelName,
|
|
161
|
+
return new replicate_1.ReplicateProvider(modelName, providerOptions);
|
|
148
162
|
}
|
|
149
163
|
if (providerPath.startsWith('webhook:')) {
|
|
150
164
|
const webhookUrl = providerPath.substring('webhook:'.length);
|
|
151
|
-
return new webhook_1.WebhookProvider(webhookUrl);
|
|
165
|
+
return new webhook_1.WebhookProvider(webhookUrl, providerOptions);
|
|
152
166
|
}
|
|
153
167
|
else if (providerPath === 'llama' || providerPath.startsWith('llama:')) {
|
|
154
168
|
const modelName = providerPath.split(':')[1];
|
|
155
|
-
return new llama_1.LlamaProvider(modelName,
|
|
169
|
+
return new llama_1.LlamaProvider(modelName, providerOptions);
|
|
156
170
|
}
|
|
157
171
|
else if (providerPath.startsWith('ollama:')) {
|
|
158
172
|
const modelName = providerPath.split(':')[1];
|
|
159
|
-
return new ollama_1.OllamaProvider(modelName);
|
|
173
|
+
return new ollama_1.OllamaProvider(modelName, providerOptions);
|
|
160
174
|
}
|
|
161
175
|
else if (providerPath?.startsWith('localai:')) {
|
|
162
176
|
const splits = providerPath.split(':');
|
|
163
177
|
const modelType = splits[1];
|
|
164
178
|
const modelName = splits[2];
|
|
165
179
|
if (modelType === 'chat') {
|
|
166
|
-
return new localai_1.LocalAiChatProvider(modelName);
|
|
180
|
+
return new localai_1.LocalAiChatProvider(modelName, providerOptions);
|
|
167
181
|
}
|
|
168
182
|
else if (modelType === 'completion') {
|
|
169
|
-
return new localai_1.LocalAiCompletionProvider(modelName);
|
|
183
|
+
return new localai_1.LocalAiCompletionProvider(modelName, providerOptions);
|
|
170
184
|
}
|
|
171
185
|
else {
|
|
172
|
-
return new localai_1.LocalAiChatProvider(modelType);
|
|
186
|
+
return new localai_1.LocalAiChatProvider(modelType, providerOptions);
|
|
173
187
|
}
|
|
174
188
|
}
|
|
175
189
|
// Load custom module
|