@forestadmin/ai-proxy 1.4.0 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/errors.d.ts +3 -0
- package/dist/errors.js +9 -2
- package/dist/index.js +1 -1
- package/dist/provider-dispatcher.d.ts +0 -1
- package/dist/provider-dispatcher.js +1 -29
- package/dist/router.d.ts +1 -0
- package/dist/router.js +14 -4
- package/dist/supported-models.d.ts +7 -0
- package/dist/supported-models.js +81 -0
- package/package.json +2 -2
package/dist/errors.d.ts
CHANGED
|
@@ -16,6 +16,9 @@ export declare class AIError extends Error {
|
|
|
16
16
|
export declare class AIBadRequestError extends AIError {
|
|
17
17
|
constructor(message: string);
|
|
18
18
|
}
|
|
19
|
+
export declare class AIModelNotSupportedError extends AIBadRequestError {
|
|
20
|
+
constructor(model: string);
|
|
21
|
+
}
|
|
19
22
|
export declare class AINotFoundError extends AIError {
|
|
20
23
|
constructor(message: string);
|
|
21
24
|
}
|
package/dist/errors.js
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
* -------------------------------------
|
|
12
12
|
*/
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.McpConfigError = exports.McpConflictError = exports.McpConnectionError = exports.McpError = exports.AIToolNotFoundError = exports.AIToolUnprocessableError = exports.OpenAIUnprocessableError = exports.AINotConfiguredError = exports.AIUnprocessableError = exports.AINotFoundError = exports.AIBadRequestError = exports.AIError = void 0;
|
|
14
|
+
exports.McpConfigError = exports.McpConflictError = exports.McpConnectionError = exports.McpError = exports.AIToolNotFoundError = exports.AIToolUnprocessableError = exports.OpenAIUnprocessableError = exports.AINotConfiguredError = exports.AIUnprocessableError = exports.AINotFoundError = exports.AIModelNotSupportedError = exports.AIBadRequestError = exports.AIError = void 0;
|
|
15
15
|
// eslint-disable-next-line max-classes-per-file
|
|
16
16
|
class AIError extends Error {
|
|
17
17
|
constructor(message, status = 422) {
|
|
@@ -31,6 +31,13 @@ class AIBadRequestError extends AIError {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
exports.AIBadRequestError = AIBadRequestError;
|
|
34
|
+
class AIModelNotSupportedError extends AIBadRequestError {
|
|
35
|
+
constructor(model) {
|
|
36
|
+
super(`Model '${model}' does not support tools. Please use a model that supports function calling.`);
|
|
37
|
+
this.name = 'AIModelNotSupportedError';
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
exports.AIModelNotSupportedError = AIModelNotSupportedError;
|
|
34
41
|
class AINotFoundError extends AIError {
|
|
35
42
|
constructor(message) {
|
|
36
43
|
super(message, 404);
|
|
@@ -101,4 +108,4 @@ class McpConfigError extends McpError {
|
|
|
101
108
|
}
|
|
102
109
|
}
|
|
103
110
|
exports.McpConfigError = McpConfigError;
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7R0FVRzs7O0FBRUgsZ0RBQWdEO0FBQ2hELE1BQWEsT0FBUSxTQUFRLEtBQUs7SUFHaEMsWUFBWSxPQUFlLEVBQUUsTUFBTSxHQUFHLEdBQUc7UUFDdkMsSUFBSSxNQUFNLEdBQUcsR0FBRyxJQUFJLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQztZQUNqQyxNQUFNLElBQUksVUFBVSxDQUFDLDZCQUE2QixNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzlELENBQUM7UUFFRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLFNBQVMsQ0FBQztRQUN0QixJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN2QixDQUFDO0NBQ0Y7QUFaRCwwQkFZQztBQUVELE1BQWEsaUJBQWtCLFNBQVEsT0FBTztJQUM1QyxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQztRQUNwQixJQUFJLENBQUMsSUFBSSxHQUFHLG1CQUFtQixDQUFDO0lBQ2xDLENBQUM7Q0FDRjtBQUxELDhDQUtDO0FBRUQsTUFBYSx3QkFBeUIsU0FBUSxpQkFBaUI7SUFDN0QsWUFBWSxLQUFhO1FBQ3ZCLEtBQUssQ0FDSCxVQUFVLEtBQUssOEVBQThFLENBQzlGLENBQUM7UUFDRixJQUFJLENBQUMsSUFBSSxHQUFHLDBCQUEwQixDQUFDO0lBQ3pDLENBQUM7Q0FDRjtBQVBELDREQU9DO0FBRUQsTUFBYSxlQUFnQixTQUFRLE9BQU87SUFDMUMsWUFBWSxPQUFlO1FBQ3pCLEtBQUssQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDcEIsSUFBSSxDQUFDLElBQUksR0FBRyxpQkFBaUIsQ0FBQztJQUNoQyxDQUFDO0NBQ0Y7QUFMRCwwQ0FLQztBQUVELE1BQWEsb0JBQXFCLFNBQVEsT0FBTztJQUMvQyxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQztRQUNwQixJQUFJLENBQUMsSUFBSSxHQUFHLHNCQUFzQixDQUFDO0lBQ3JDLENBQUM7Q0FDRjtBQUxELG9EQUtDO0FBRUQsTUFBYSxvQkFBcUIsU0FBUSxPQUFPO0lBQy9DLFlBQVksT0FBTyxHQUFHLHNCQUFzQjtRQUMxQyxLQUFLLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3BCLElBQUksQ0FBQyxJQUFJLEdBQUcsc0JBQXNCLENBQUM7SUFDckMsQ0FBQztDQUNGO0FBTEQsb0RBS0M7QUFFRCxNQUFhLHdCQUF5QixTQUFRLG9CQUFvQjtJQUNoRSxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxhQUFhLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBTEQsNERBS0M7QUFFRCxNQUFhLHdCQUF5QixTQUFRLG9CQUFvQjtJQUNoRSxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxhQUFhLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBTEQsNERBS0M7QUFFRCxNQUFhLG1CQUFvQixTQUFRLGVBQWU7SUFDdEQsWUFBWSxPQUFlO1FBQ3pCLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxJQUFJLEdBQUcscUJBQXFCLENBQUM7SUFDcEMsQ0FBQztDQUNGO0FBTEQsa0RBS0M7QUFFRCxNQUFhLFFBQVMsU0FBUSxPQUFPO0lBQ25DLFlBQVksT0FBZTtRQUN6QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztJQUN6QixDQUFDO0NBQ0Y7QUFMRCw0QkFLQztBQUVELE1BQWEsa0JBQW1CLFNBQVEsUUFBUTtJQUM5QyxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxvQkFBb0IsQ0FBQztJQUNuQyxDQUFDO0NBQ0Y7QUFMRCxnREFLQztBQUVELE1BQWEsZ0JBQWlCLFNBQVEsUUFBUTtJQUM1QyxZQUFZLFVBQWtCO1FBQzVCLEtBQUssQ0FBQyxJQUFJLFVBQVUsbUNBQW1DLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsSUFBSSxHQUFHLGtCQUFrQixDQUFDO0lBQ2pDLENBQUM7Q0FDRjtBQUxELDRDQUtDO0FBRUQsTUFBYSxjQUFlLFNBQVEsUUFBUTtJQUMxQyxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxnQkFBZ0IsQ0FBQztJQUMvQixDQUFDO0NBQ0Y7QUFMRCx3Q0FLQyJ9
|
package/dist/index.js
CHANGED
|
@@ -28,4 +28,4 @@ __exportStar(require("./errors"), exports);
|
|
|
28
28
|
function validMcpConfigurationOrThrow(mcpConfig) {
|
|
29
29
|
return mcp_config_checker_1.default.check(mcpConfig);
|
|
30
30
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQVdBLG9FQUVDO0FBWEQsOEVBQW9EO0FBRXBELHdEQUFzQztBQUN0QyxpREFBK0I7QUFDL0IsMkNBQXlCO0FBQ3pCLCtDQUE2QjtBQUM3Qix5REFBdUM7QUFDdkMsMkNBQXlCO0FBRXpCLFNBQWdCLDRCQUE0QixDQUFDLFNBQTJCO0lBQ3RFLE9BQU8sNEJBQWdCLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzNDLENBQUMifQ==
|
|
@@ -3,7 +3,6 @@ import type { RemoteTools } from './remote-tools';
|
|
|
3
3
|
import type { DispatchBody } from './schemas/route';
|
|
4
4
|
export type { AiConfiguration, AiProvider, BaseAiConfiguration, ChatCompletionMessage, ChatCompletionResponse, ChatCompletionTool, ChatCompletionToolChoice, OpenAiConfiguration, } from './provider';
|
|
5
5
|
export type { DispatchBody } from './schemas/route';
|
|
6
|
-
export declare function isModelSupportingTools(model: string): boolean;
|
|
7
6
|
export declare class ProviderDispatcher {
|
|
8
7
|
private readonly chatModel;
|
|
9
8
|
private readonly remoteTools;
|
|
@@ -1,37 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProviderDispatcher = void 0;
|
|
4
|
-
exports.isModelSupportingTools = isModelSupportingTools;
|
|
5
4
|
const function_calling_1 = require("@langchain/core/utils/function_calling");
|
|
6
5
|
const openai_1 = require("@langchain/openai");
|
|
7
6
|
const errors_1 = require("./errors");
|
|
8
|
-
/**
|
|
9
|
-
* OpenAI model prefixes that do NOT support function calling (tools).
|
|
10
|
-
* Unknown models are allowed.
|
|
11
|
-
* @see https://platform.openai.com/docs/guides/function-calling
|
|
12
|
-
*/
|
|
13
|
-
const OPENAI_MODELS_WITHOUT_TOOLS_SUPPORT = [
|
|
14
|
-
'gpt-4',
|
|
15
|
-
'gpt-3.5-turbo',
|
|
16
|
-
'gpt-3.5',
|
|
17
|
-
'text-davinci',
|
|
18
|
-
'davinci',
|
|
19
|
-
'curie',
|
|
20
|
-
'babbage',
|
|
21
|
-
'ada',
|
|
22
|
-
];
|
|
23
|
-
/**
|
|
24
|
-
* Exceptions to the unsupported list - these models DO support tools
|
|
25
|
-
* even though they start with an unsupported prefix.
|
|
26
|
-
*/
|
|
27
|
-
const OPENAI_MODELS_EXCEPTIONS = ['gpt-4-turbo', 'gpt-4o', 'gpt-4.1'];
|
|
28
|
-
function isModelSupportingTools(model) {
|
|
29
|
-
const isException = OPENAI_MODELS_EXCEPTIONS.some(exception => model === exception || model.startsWith(`${exception}-`));
|
|
30
|
-
if (isException)
|
|
31
|
-
return true;
|
|
32
|
-
const isKnownUnsupported = OPENAI_MODELS_WITHOUT_TOOLS_SUPPORT.some(unsupported => model === unsupported || model.startsWith(`${unsupported}-`));
|
|
33
|
-
return !isKnownUnsupported;
|
|
34
|
-
}
|
|
35
7
|
class ProviderDispatcher {
|
|
36
8
|
constructor(configuration, remoteTools) {
|
|
37
9
|
this.chatModel = null;
|
|
@@ -94,4 +66,4 @@ class ProviderDispatcher {
|
|
|
94
66
|
}
|
|
95
67
|
}
|
|
96
68
|
exports.ProviderDispatcher = ProviderDispatcher;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXItZGlzcGF0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm92aWRlci1kaXNwYXRjaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUtBLDZFQUFpRjtBQUNqRiw4Q0FBK0M7QUFFL0MscUNBQTBFO0FBZTFFLE1BQWEsa0JBQWtCO0lBSzdCLFlBQVksYUFBcUMsRUFBRSxXQUF3QjtRQUoxRCxjQUFTLEdBQXNCLElBQUksQ0FBQztRQUtuRCxJQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQztRQUUvQixJQUFJLGFBQWEsRUFBRSxRQUFRLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDekMsTUFBTSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsR0FBRyxpQkFBaUIsRUFBRSxHQUFHLGFBQWEsQ0FBQztZQUMvRCxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksbUJBQVUsQ0FBQztnQkFDOUIsVUFBVSxFQUFFLENBQUMsRUFBRSxvREFBb0Q7Z0JBQ25FLEdBQUcsaUJBQWlCO2dCQUNwQixvQkFBb0IsRUFBRSxJQUFJO2FBQzNCLENBQUMsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFrQjtRQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ3BCLE1BQU0sSUFBSSw2QkFBb0IsRUFBRSxDQUFDO1FBQ25DLENBQUM7UUFFRCxNQUFNLEVBQ0osS0FBSyxFQUNMLFFBQVEsRUFDUixXQUFXLEVBQUUsVUFBVSxFQUN2QixtQkFBbUIsRUFBRSxpQkFBaUIsR0FDdkMsR0FBRyxJQUFJLENBQUM7UUFFVCxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMscUJBQXFCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDeEQsTUFBTSxLQUFLLEdBQUcsYUFBYSxFQUFFLE1BQU07WUFDakMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLGFBQWEsRUFBRTtnQkFDdEMsV0FBVyxFQUFFLFVBQVU7Z0JBQ3ZCLG1CQUFtQixFQUFFLGlCQUFpQjthQUN2QyxDQUFDO1lBQ0osQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7UUFFbkIsSUFBSSxDQUFDO1lBQ0gsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLFFBQTZCLENBQUMsQ0FBQztZQUVuRSxnREFBZ0Q7WUFDaEQsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLGlCQUFpQixDQUFDLGNBQXdDLENBQUM7WUFFeEYsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO2dCQUNqQixNQUFNLElBQUksaUNBQXdCLENBQ2hDLDZFQUE2RSxDQUM5RSxDQUFDO1lBQ0osQ0FBQztZQUVELE9BQU8sV0FBVyxDQUFDO1FBQ3JCLENBQUM7UUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1lBQ2YsSUFBSSxLQUFLLFlBQVksaUNBQXdCO2dCQUFFLE1BQU0sS0FBSyxDQUFDO1lBRTNELE1BQU0sR0FBRyxHQUFHLEtBQW9DLENBQUM7WUFFakQsSUFBSSxHQUFHLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRSxDQUFDO2dCQUN2QixNQUFNLElBQUksaUNBQXdCLENBQUMsd0JBQXdCLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1lBQzVFLENBQUM7WUFFRCxJQUFJLEdBQUcsQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQ3ZCLE1BQU0sSUFBSSxpQ0FBd0IsQ0FBQywwQkFBMEIsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDOUUsQ0FBQztZQUVELE1BQU0sSUFBSSxpQ0FBd0IsQ0FBQywrQkFBK0IsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDbkYsQ0FBQztJQUNILENBQUM7SUFFTyxxQkFBcUIsQ0FBQyxLQUE0QjtRQUN4RCxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7WUFBRSxPQUFPLEtBQUssQ0FBQztRQUVsRCxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUNoRSxJQUFBLDBDQUF1QixFQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FDekMsQ0FBQztRQUVGLE9BQU8sS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN0QixJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUssVUFBVTtnQkFBRSxPQUFPLElBQUksQ0FBQztZQUUxQyxNQUFNLFlBQVksR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDMUYsSUFBSSxZQUFZO2dCQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksRUFBRSxRQUFRLEVBQUUsWUFBWSxFQUFFLENBQUM7WUFFN0QsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXBGRCxnREFvRkMifQ==
|
package/dist/router.d.ts
CHANGED
package/dist/router.js
CHANGED
|
@@ -4,15 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Router = void 0;
|
|
7
|
-
const
|
|
7
|
+
const errors_1 = require("./errors");
|
|
8
8
|
const mcp_client_1 = __importDefault(require("./mcp-client"));
|
|
9
|
+
const provider_dispatcher_1 = require("./provider-dispatcher");
|
|
9
10
|
const remote_tools_1 = require("./remote-tools");
|
|
10
11
|
const route_1 = require("./schemas/route");
|
|
12
|
+
const supported_models_1 = __importDefault(require("./supported-models"));
|
|
11
13
|
class Router {
|
|
12
14
|
constructor(params) {
|
|
13
15
|
this.aiConfigurations = params?.aiConfigurations ?? [];
|
|
14
16
|
this.localToolsApiKeys = params?.localToolsApiKeys;
|
|
15
17
|
this.logger = params?.logger;
|
|
18
|
+
this.validateConfigurations();
|
|
19
|
+
}
|
|
20
|
+
validateConfigurations() {
|
|
21
|
+
for (const config of this.aiConfigurations) {
|
|
22
|
+
if (!(0, supported_models_1.default)(config.model)) {
|
|
23
|
+
throw new errors_1.AIModelNotSupportedError(config.model);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
16
26
|
}
|
|
17
27
|
/**
|
|
18
28
|
* Route the request to the appropriate handler
|
|
@@ -26,7 +36,7 @@ class Router {
|
|
|
26
36
|
// Validate input with Zod schema
|
|
27
37
|
const result = route_1.routeArgsSchema.safeParse(args);
|
|
28
38
|
if (!result.success) {
|
|
29
|
-
throw new
|
|
39
|
+
throw new errors_1.AIBadRequestError(Router.formatZodError(result.error));
|
|
30
40
|
}
|
|
31
41
|
const validatedArgs = result.data;
|
|
32
42
|
let mcpClient;
|
|
@@ -38,7 +48,7 @@ class Router {
|
|
|
38
48
|
switch (validatedArgs.route) {
|
|
39
49
|
case 'ai-query': {
|
|
40
50
|
const aiConfiguration = this.getAiConfiguration(validatedArgs.query?.['ai-name']);
|
|
41
|
-
return await new
|
|
51
|
+
return await new provider_dispatcher_1.ProviderDispatcher(aiConfiguration, remoteTools).dispatch(validatedArgs.body);
|
|
42
52
|
}
|
|
43
53
|
case 'invoke-remote-tool':
|
|
44
54
|
return await remoteTools.invokeTool(validatedArgs.query['tool-name'], validatedArgs.body.inputs);
|
|
@@ -99,4 +109,4 @@ class Router {
|
|
|
99
109
|
}
|
|
100
110
|
}
|
|
101
111
|
exports.Router = Router;
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JvdXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFPQSxxQ0FBdUU7QUFDdkUsOERBQXFDO0FBQ3JDLCtEQUEyRDtBQUMzRCxpREFBNkM7QUFDN0MsMkNBQWtEO0FBQ2xELDBFQUF3RDtBQWdCeEQsTUFBYSxNQUFNO0lBS2pCLFlBQVksTUFJWDtRQUNDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxNQUFNLEVBQUUsZ0JBQWdCLElBQUksRUFBRSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxpQkFBaUIsR0FBRyxNQUFNLEVBQUUsaUJBQWlCLENBQUM7UUFDbkQsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLEVBQUUsTUFBTSxDQUFDO1FBRTdCLElBQUksQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFTyxzQkFBc0I7UUFDNUIsS0FBSyxNQUFNLE1BQU0sSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUMzQyxJQUFJLENBQUMsSUFBQSwwQkFBc0IsRUFBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDMUMsTUFBTSxJQUFJLGlDQUF3QixDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNuRCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFtRDtRQUM3RCxpQ0FBaUM7UUFDakMsTUFBTSxNQUFNLEdBQUcsdUJBQWUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFL0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNwQixNQUFNLElBQUksMEJBQWlCLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUNuRSxDQUFDO1FBRUQsTUFBTSxhQUFhLEdBQUcsTUFB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
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Checks if a model is compatible with Forest Admin AI.
|
|
3
|
+
*
|
|
4
|
+
* Supported models must handle tool calls and the parallel_tool_calls parameter.
|
|
5
|
+
*/
|
|
6
|
+
export default function isModelSupportingTools(model: string): boolean;
|
|
7
|
+
//# sourceMappingURL=supported-models.d.ts.map
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = isModelSupportingTools;
|
|
4
|
+
/**
|
|
5
|
+
* OpenAI model prefixes that do NOT support tool calls via the chat completions API.
|
|
6
|
+
*
|
|
7
|
+
* Uses prefix matching: model === prefix OR model.startsWith(prefix + '-')
|
|
8
|
+
*
|
|
9
|
+
* Unknown models are allowed by default.
|
|
10
|
+
* If a model fails the integration test, add it here.
|
|
11
|
+
*
|
|
12
|
+
* @see https://platform.openai.com/docs/guides/function-calling
|
|
13
|
+
*/
|
|
14
|
+
const UNSUPPORTED_MODEL_PREFIXES = [
|
|
15
|
+
// Legacy models
|
|
16
|
+
'gpt-4', // Base gpt-4 doesn't honor tool_choice: required
|
|
17
|
+
'text-davinci',
|
|
18
|
+
'davinci',
|
|
19
|
+
'curie',
|
|
20
|
+
'babbage',
|
|
21
|
+
'ada',
|
|
22
|
+
// O-series reasoning models - don't support parallel_tool_calls
|
|
23
|
+
'o1',
|
|
24
|
+
'o3',
|
|
25
|
+
'o4',
|
|
26
|
+
// Non-chat model families
|
|
27
|
+
'dall-e',
|
|
28
|
+
'whisper',
|
|
29
|
+
'tts',
|
|
30
|
+
'text-embedding',
|
|
31
|
+
'omni-moderation',
|
|
32
|
+
'chatgpt', // chatgpt-4o-latest, chatgpt-image-latest
|
|
33
|
+
'computer-use', // computer-use-preview
|
|
34
|
+
'gpt-image', // gpt-image-1, gpt-image-1.5
|
|
35
|
+
'gpt-realtime', // gpt-realtime, gpt-realtime-mini
|
|
36
|
+
'gpt-audio', // gpt-audio
|
|
37
|
+
'sora', // sora-2, sora-2-pro
|
|
38
|
+
'codex', // codex-mini-latest
|
|
39
|
+
];
|
|
40
|
+
/**
|
|
41
|
+
* OpenAI model patterns that do NOT support tool calls.
|
|
42
|
+
* Uses contains matching: model.includes(pattern)
|
|
43
|
+
*/
|
|
44
|
+
const UNSUPPORTED_MODEL_PATTERNS = [
|
|
45
|
+
// Non-chat model variants (can appear in the middle of model names)
|
|
46
|
+
'-realtime',
|
|
47
|
+
'-audio',
|
|
48
|
+
'-transcribe',
|
|
49
|
+
'-tts',
|
|
50
|
+
'-search',
|
|
51
|
+
'-codex',
|
|
52
|
+
'-instruct',
|
|
53
|
+
// Models that only support v1/responses, not v1/chat/completions
|
|
54
|
+
'-pro',
|
|
55
|
+
'-deep-research',
|
|
56
|
+
];
|
|
57
|
+
/**
|
|
58
|
+
* Models that DO support tool calls even though they match an unsupported prefix.
|
|
59
|
+
* These override the UNSUPPORTED_MODEL_PREFIXES list.
|
|
60
|
+
*/
|
|
61
|
+
const SUPPORTED_MODEL_OVERRIDES = ['gpt-4-turbo', 'gpt-4o', 'gpt-4.1'];
|
|
62
|
+
/**
|
|
63
|
+
* Checks if a model is compatible with Forest Admin AI.
|
|
64
|
+
*
|
|
65
|
+
* Supported models must handle tool calls and the parallel_tool_calls parameter.
|
|
66
|
+
*/
|
|
67
|
+
function isModelSupportingTools(model) {
|
|
68
|
+
// Check pattern matches first (contains) - these NEVER support tools
|
|
69
|
+
const matchesUnsupportedPattern = UNSUPPORTED_MODEL_PATTERNS.some(pattern => model.includes(pattern));
|
|
70
|
+
if (matchesUnsupportedPattern)
|
|
71
|
+
return false;
|
|
72
|
+
// Check unsupported prefixes
|
|
73
|
+
const matchesUnsupportedPrefix = UNSUPPORTED_MODEL_PREFIXES.some(prefix => model === prefix || model.startsWith(`${prefix}-`));
|
|
74
|
+
// Check if model is in the supported overrides list
|
|
75
|
+
const isSupportedOverride = SUPPORTED_MODEL_OVERRIDES.some(override => model === override || model.startsWith(`${override}-`));
|
|
76
|
+
// If it matches an unsupported prefix but is not in overrides, reject it
|
|
77
|
+
if (matchesUnsupportedPrefix && !isSupportedOverride)
|
|
78
|
+
return false;
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3VwcG9ydGVkLW1vZGVscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zdXBwb3J0ZWQtbW9kZWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBa0VBLHlDQXFCQztBQXZGRDs7Ozs7Ozs7O0dBU0c7QUFDSCxNQUFNLDBCQUEwQixHQUFHO0lBQ2pDLGdCQUFnQjtJQUNoQixPQUFPLEVBQUUsaURBQWlEO0lBQzFELGNBQWM7SUFDZCxTQUFTO0lBQ1QsT0FBTztJQUNQLFNBQVM7SUFDVCxLQUFLO0lBQ0wsZ0VBQWdFO0lBQ2hFLElBQUk7SUFDSixJQUFJO0lBQ0osSUFBSTtJQUNKLDBCQUEwQjtJQUMxQixRQUFRO0lBQ1IsU0FBUztJQUNULEtBQUs7SUFDTCxnQkFBZ0I7SUFDaEIsaUJBQWlCO0lBQ2pCLFNBQVMsRUFBRSwwQ0FBMEM7SUFDckQsY0FBYyxFQUFFLHVCQUF1QjtJQUN2QyxXQUFXLEVBQUUsNkJBQTZCO0lBQzFDLGNBQWMsRUFBRSxrQ0FBa0M7SUFDbEQsV0FBVyxFQUFFLFlBQVk7SUFDekIsTUFBTSxFQUFFLHFCQUFxQjtJQUM3QixPQUFPLEVBQUUsb0JBQW9CO0NBQzlCLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxNQUFNLDBCQUEwQixHQUFHO0lBQ2pDLG9FQUFvRTtJQUNwRSxXQUFXO0lBQ1gsUUFBUTtJQUNSLGFBQWE7SUFDYixNQUFNO0lBQ04sU0FBUztJQUNULFFBQVE7SUFDUixXQUFXO0lBQ1gsaUVBQWlFO0lBQ2pFLE1BQU07SUFDTixnQkFBZ0I7Q0FDakIsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxhQUFhLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBRXZFOzs7O0dBSUc7QUFDSCxTQUF3QixzQkFBc0IsQ0FBQyxLQUFhO0lBQzFELHFFQUFxRTtJQUNyRSxNQUFNLHlCQUF5QixHQUFHLDBCQUEwQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUMxRSxLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUN4QixDQUFDO0lBQ0YsSUFBSSx5QkFBeUI7UUFBRSxPQUFPLEtBQUssQ0FBQztJQUU1Qyw2QkFBNkI7SUFDN0IsTUFBTSx3QkFBd0IsR0FBRywwQkFBMEIsQ0FBQyxJQUFJLENBQzlELE1BQU0sQ0FBQyxFQUFFLENBQUMsS0FBSyxLQUFLLE1BQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsTUFBTSxHQUFHLENBQUMsQ0FDN0QsQ0FBQztJQUVGLG9EQUFvRDtJQUNwRCxNQUFNLG1CQUFtQixHQUFHLHlCQUF5QixDQUFDLElBQUksQ0FDeEQsUUFBUSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUNuRSxDQUFDO0lBRUYseUVBQXlFO0lBQ3pFLElBQUksd0JBQXdCLElBQUksQ0FBQyxtQkFBbUI7UUFBRSxPQUFPLEtBQUssQ0FBQztJQUVuRSxPQUFPLElBQUksQ0FBQztBQUNkLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/ai-proxy",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@langchain/core": "1.1.15",
|
|
18
18
|
"@langchain/langgraph": "^1.1.0",
|
|
19
19
|
"@langchain/mcp-adapters": "1.1.1",
|
|
20
|
-
"@langchain/openai": "1.2.
|
|
20
|
+
"@langchain/openai": "1.2.5",
|
|
21
21
|
"zod": "^4.3.5"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|