@modelprofile.com/flexharness-providers 8.2.0 → 8.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts_openai_auth/index.d.ts +1 -0
- package/dist_ts_openai_auth/index.js +2 -1
- package/dist_ts_openai_auth/smartai.connection.openai.js +4 -1
- package/dist_ts_openai_auth/smartai.limits.openai.d.ts +6 -0
- package/dist_ts_openai_auth/smartai.limits.openai.js +49 -0
- package/dist_ts_providers/anthropic/index.d.ts +2 -1
- package/dist_ts_providers/anthropic/index.js +8 -5
- package/dist_ts_providers/anthropic/plugins.d.ts +3 -2
- package/dist_ts_providers/anthropic/plugins.js +3 -2
- package/dist_ts_providers/anthropic/smartai.limits.anthropic.d.ts +6 -0
- package/dist_ts_providers/anthropic/smartai.limits.anthropic.js +35 -0
- package/dist_ts_providers/openai/index.d.ts +3 -0
- package/dist_ts_providers/openai/index.js +12 -4
- package/dist_ts_providers/openai/plugins.d.ts +3 -1
- package/dist_ts_providers/openai/plugins.js +3 -1
- package/dist_ts_providers/openai/smartai.limits.openai.d.ts +10 -0
- package/dist_ts_providers/openai/smartai.limits.openai.js +20 -0
- package/package.json +2 -2
- package/ts_openai_auth/index.ts +1 -0
- package/ts_openai_auth/readme.md +6 -0
- package/ts_openai_auth/smartai.connection.openai.ts +3 -0
- package/ts_openai_auth/smartai.limits.openai.ts +55 -0
- package/ts_providers/anthropic/index.ts +9 -5
- package/ts_providers/anthropic/plugins.ts +13 -2
- package/ts_providers/anthropic/readme.md +5 -0
- package/ts_providers/anthropic/smartai.limits.anthropic.ts +40 -0
- package/ts_providers/openai/index.ts +14 -3
- package/ts_providers/openai/plugins.ts +8 -1
- package/ts_providers/openai/readme.md +6 -0
- package/ts_providers/openai/smartai.limits.openai.ts +25 -0
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './smartai.auth.openai.js';
|
|
3
3
|
export * from './smartai.connection.openai.js';
|
|
4
|
+
export * from './smartai.limits.openai.js';
|
|
4
5
|
export * from './smartai.middleware.openai.js';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19vcGVuYWlfYXV0aC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDRCQUE0QixDQUFDO0FBQzNDLGNBQWMsZ0NBQWdDLENBQUMifQ==
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createOpenAiChatGptProviderSettings, OPENAI_CHATGPT_CODEX_BASE_URL, OpenAiChatGptAuthError, } from './smartai.auth.openai.js';
|
|
2
|
+
import { classifyOpenAiChatGptLimit } from './smartai.limits.openai.js';
|
|
2
3
|
import { createOpenAiChatGptInstructionsMiddleware } from './smartai.middleware.openai.js';
|
|
3
4
|
const codexBaseUrl = new URL(OPENAI_CHATGPT_CODEX_BASE_URL);
|
|
4
5
|
function assertCodexRequestUrl(normalizedUrlArg) {
|
|
@@ -51,6 +52,7 @@ export const createOpenAiChatGptModelConnection = (credentialsArg) => ({
|
|
|
51
52
|
middleware: createOpenAiChatGptInstructionsMiddleware(),
|
|
52
53
|
// the ChatGPT Codex backend serves the Responses API only
|
|
53
54
|
apis: ['responses'],
|
|
55
|
+
classifyLimit: classifyOpenAiChatGptLimit,
|
|
54
56
|
});
|
|
55
57
|
export const createOpenAiChatGptDynamicModelConnection = (optionsArg) => {
|
|
56
58
|
if (!optionsArg || typeof optionsArg.resolveAccess !== 'function') {
|
|
@@ -97,6 +99,7 @@ export const createOpenAiChatGptDynamicModelConnection = (optionsArg) => {
|
|
|
97
99
|
middleware: createOpenAiChatGptInstructionsMiddleware(),
|
|
98
100
|
// the ChatGPT Codex backend serves the Responses API only
|
|
99
101
|
apis: ['responses'],
|
|
102
|
+
classifyLimit: classifyOpenAiChatGptLimit,
|
|
100
103
|
};
|
|
101
104
|
};
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS5jb25uZWN0aW9uLm9wZW5haS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX29wZW5haV9hdXRoL3NtYXJ0YWkuY29ubmVjdGlvbi5vcGVuYWkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxFQUNMLG1DQUFtQyxFQUNuQyw2QkFBNkIsRUFDN0Isc0JBQXNCLEdBQ3ZCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDeEUsT0FBTyxFQUFFLHlDQUF5QyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFM0YsTUFBTSxZQUFZLEdBQUcsSUFBSSxHQUFHLENBQUMsNkJBQTZCLENBQUMsQ0FBQztBQUU1RCxTQUFTLHFCQUFxQixDQUFDLGdCQUF3QjtJQUNyRCxNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ3RDLE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxRQUFRLEtBQUssWUFBWSxDQUFDLFFBQVE7V0FDckQsR0FBRyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsR0FBRyxZQUFZLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQztJQUMxRCxJQUNFLEdBQUcsQ0FBQyxNQUFNLEtBQUssWUFBWSxDQUFDLE1BQU07V0FDL0IsR0FBRyxDQUFDLFFBQVEsS0FBSyxFQUFFO1dBQ25CLEdBQUcsQ0FBQyxRQUFRLEtBQUssRUFBRTtXQUNuQixDQUFDLFdBQVcsRUFDZixDQUFDO1FBQ0QsTUFBTSxJQUFJLHNCQUFzQixDQUFDLDZEQUE2RCxDQUFDLENBQUM7SUFDbEcsQ0FBQztBQUNILENBQUM7QUFFRCxTQUFTLHVCQUF1QixDQUFDLFVBQXVEO0lBSXRGLE1BQU0sZ0JBQWdCLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDO0lBQ3JELElBQ0UsQ0FBQyxnQkFBZ0I7V0FDZCxDQUNELGdCQUFnQixDQUFDLFNBQVMsS0FB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
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { TModelLimitClassifier } from '@modelprofile.com/flexharness-models';
|
|
2
|
+
/**
|
|
3
|
+
* The ChatGPT Codex backend reports a spent plan quota as `usage_limit_reached`, and a plan
|
|
4
|
+
* without Codex access as `usage_not_included`, in the 429 body or a `response.failed` frame.
|
|
5
|
+
*/
|
|
6
|
+
export declare const classifyOpenAiChatGptLimit: TModelLimitClassifier;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { readEpochSeconds } from '@modelprofile.com/flexharness-models';
|
|
2
|
+
import { readOpenAiError } from '@modelprofile.com/flexharness-providers/openai';
|
|
3
|
+
const codexUsageLimitIdentifiers = new Set(['usage_limit_reached', 'usage_not_included']);
|
|
4
|
+
const codexWindows = ['primary', 'secondary'];
|
|
5
|
+
function formatWindowMinutes(minutes) {
|
|
6
|
+
if (minutes % 1440 === 0)
|
|
7
|
+
return `${minutes / 1440}d`;
|
|
8
|
+
if (minutes % 60 === 0)
|
|
9
|
+
return `${minutes / 60}h`;
|
|
10
|
+
return `${minutes}m`;
|
|
11
|
+
}
|
|
12
|
+
function readExhaustedWindow(headers) {
|
|
13
|
+
const exhausted = codexWindows.flatMap((name) => {
|
|
14
|
+
const usedPercent = Number(headers[`x-codex-${name}-used-percent`]);
|
|
15
|
+
const minutes = Number(headers[`x-codex-${name}-window-minutes`]);
|
|
16
|
+
const resetsAt = readEpochSeconds(headers[`x-codex-${name}-reset-at`]);
|
|
17
|
+
if (!(usedPercent >= 100) || resetsAt === undefined)
|
|
18
|
+
return [];
|
|
19
|
+
return [{ label: Number.isSafeInteger(minutes) && minutes > 0 ? formatWindowMinutes(minutes) : name, resetsAt }];
|
|
20
|
+
});
|
|
21
|
+
// every exhausted window must reset before a request can pass
|
|
22
|
+
return exhausted.sort((left, right) => right.resetsAt - left.resetsAt)[0];
|
|
23
|
+
}
|
|
24
|
+
function readResetsInSeconds(value, observedAt) {
|
|
25
|
+
return typeof value === 'number' && Number.isFinite(value) && value >= 0
|
|
26
|
+
? observedAt + Math.round(value * 1000)
|
|
27
|
+
: undefined;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* The ChatGPT Codex backend reports a spent plan quota as `usage_limit_reached`, and a plan
|
|
31
|
+
* without Codex access as `usage_not_included`, in the 429 body or a `response.failed` frame.
|
|
32
|
+
*/
|
|
33
|
+
export const classifyOpenAiChatGptLimit = (failure) => {
|
|
34
|
+
const error = readOpenAiError(failure.body);
|
|
35
|
+
if (!error?.identifiers.some((identifier) => codexUsageLimitIdentifiers.has(identifier)))
|
|
36
|
+
return undefined;
|
|
37
|
+
const exhaustedWindow = readExhaustedWindow(failure.headers);
|
|
38
|
+
const resetsAt = readEpochSeconds(error.fields.resets_at)
|
|
39
|
+
?? readResetsInSeconds(error.fields.resets_in_seconds, failure.observedAt)
|
|
40
|
+
?? exhaustedWindow?.resetsAt;
|
|
41
|
+
const planType = error.fields.plan_type;
|
|
42
|
+
return {
|
|
43
|
+
kind: 'usage_limit',
|
|
44
|
+
...(resetsAt === undefined ? {} : { resetsAt }),
|
|
45
|
+
...(typeof planType === 'string' ? { planType } : {}),
|
|
46
|
+
...(exhaustedWindow ? { window: exhaustedWindow.label } : {}),
|
|
47
|
+
};
|
|
48
|
+
};
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS5saW1pdHMub3BlbmFpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfb3BlbmFpX2F1dGgvc21hcnRhaS5saW1pdHMub3BlbmFpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxnREFBZ0QsQ0FBQztBQUVqRixNQUFNLDBCQUEwQixHQUF3QixJQUFJLEdBQUcsQ0FBQyxDQUFDLHFCQUFxQixFQUFFLG9CQUFvQixDQUFDLENBQUMsQ0FBQztBQUMvRyxNQUFNLFlBQVksR0FBRyxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQVUsQ0FBQztBQU92RCxTQUFTLG1CQUFtQixDQUFDLE9BQWU7SUFDMUMsSUFBSSxPQUFPLEdBQUcsSUFBSSxLQUFLLENBQUM7UUFBRSxPQUFPLEdBQUcsT0FBTyxHQUFHLElBQUksR0FBRyxDQUFDO0lBQ3RELElBQUksT0FBTyxHQUFHLEVBQUUsS0FBSyxDQUFDO1FBQUUsT0FBTyxHQUFHLE9BQU8sR0FBRyxFQUFFLEdBQUcsQ0FBQztJQUNsRCxPQUFPLEdBQUcsT0FBTyxHQUFHLENBQUM7QUFDdkIsQ0FBQztBQUVELFNBQVMsbUJBQW1CLENBQUMsT0FBcUM7SUFDaEUsTUFBTSxTQUFTLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBa0IsRUFBRTtRQUM5RCxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsSUFBSSxlQUFlLENBQUMsQ0FBQyxDQUFDO1FBQ3BFLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxJQUFJLGlCQUFpQixDQUFDLENBQUMsQ0FBQztRQUNsRSxNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsV0FBVyxJQUFJLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLENBQUMsV0FBVyxJQUFJLEdBQUcsQ0FBQyxJQUFJLFFBQVEsS0FBSyxTQUFTO1lBQUUsT0FBTyxFQUFFLENBQUM7UUFDL0QsT0FBTyxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ25ILENBQUMsQ0FBQyxDQUFDO0lBQ0gsOERBQThEO0lBQzlELE9BQU8sU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzVFLENBQUM7QUFFRCxTQUFTLG1CQUFtQixDQUFDLEtBQWMsRUFBRSxVQUFrQjtJQUM3RCxPQUFPLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDO1FBQ3RFLENBQUMsQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO1FBQ3ZDLENBQUMsQ0FBQyxTQUFTLENBQUM7QUFDaEIsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUEwQixDQUFDLE9BQU8sRUFBRSxFQUFFO0lBQzNFLE1BQU0sS0FBSyxHQUFHLGVBQWUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDNUMsSUFBSSxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7UUFBRSxPQUFPLFNBQVMsQ0FBQztJQUMzRyxNQUFNLGVBQWUsR0FBRyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDN0QsTUFBTSxRQUFRLEdBQUcsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7V0FDcEQsbUJBQW1CLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDO1dBQ3ZFLGVBQWUsRUFBRSxRQUFRLENBQUM7SUFDL0IsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7SUFDeEMsT0FBTztRQUNMLElBQUksRUFBRSxhQUFhO1FBQ25CLEdBQUcsQ0FBQyxRQUFRLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFDL0MsR0FBRyxDQUFDLE9BQU8sUUFBUSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3JELEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLGVBQWUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0tBQzlELENBQUM7QUFDSixDQUFDLENBQUMifQ==
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { classifyAnthropicLimit } from './smartai.limits.anthropic.js';
|
|
2
3
|
import { createAnthropicCachingMiddleware } from './smartai.middleware.anthropic.js';
|
|
3
4
|
export interface IAnthropicModelOptions extends plugins.ISmartAiOptions {
|
|
4
5
|
provider: 'anthropic';
|
|
5
6
|
promptCaching?: boolean | plugins.ISmartAiCacheOptions;
|
|
6
7
|
}
|
|
7
8
|
export declare const createAnthropicModelProvider: () => plugins.IModelProvider<IAnthropicModelOptions>;
|
|
8
|
-
export { createAnthropicCachingMiddleware };
|
|
9
|
+
export { classifyAnthropicLimit, createAnthropicCachingMiddleware };
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { classifyAnthropicLimit } from './smartai.limits.anthropic.js';
|
|
2
3
|
import { createAnthropicCachingMiddleware } from './smartai.middleware.anthropic.js';
|
|
3
4
|
export const createAnthropicModelProvider = () => ({
|
|
4
5
|
id: 'anthropic',
|
|
5
6
|
getModel: (options) => {
|
|
6
7
|
const model = plugins.createAnthropic({ apiKey: options.apiKey })(options.model);
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const limits = plugins.createModelLimitMiddleware({ provider: 'anthropic', classify: classifyAnthropicLimit });
|
|
9
|
+
const middleware = options.promptCaching === false
|
|
10
|
+
? [limits]
|
|
11
|
+
: [limits, createAnthropicCachingMiddleware(typeof options.promptCaching === 'object' ? options.promptCaching : undefined)];
|
|
12
|
+
return plugins.wrapLanguageModel({ model, middleware });
|
|
10
13
|
},
|
|
11
14
|
});
|
|
12
|
-
export { createAnthropicCachingMiddleware };
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
export { classifyAnthropicLimit, createAnthropicCachingMiddleware };
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19wcm92aWRlcnMvYW50aHJvcGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBT3JGLE1BQU0sQ0FBQyxNQUFNLDRCQUE0QixHQUFHLEdBQW1ELEVBQUUsQ0FBQyxDQUFDO0lBQ2pHLEVBQUUsRUFBRSxXQUFXO0lBQ2YsUUFBUSxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDcEIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDakYsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLDBCQUEwQixDQUFDLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsc0JBQXNCLEVBQUUsQ0FBQyxDQUFDO1FBQy9HLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxhQUFhLEtBQUssS0FBSztZQUNoRCxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUM7WUFDVixDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsZ0NBQWdDLENBQ3ZDLE9BQU8sT0FBTyxDQUFDLGFBQWEsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FDOUUsQ0FBQyxDQUFDO1FBQ1AsT0FBTyxPQUFPLENBQUMsaUJBQWlCLENBQUMsRUFBRSxLQUFLLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUMxRCxDQUFDO0NBQ0YsQ0FBQyxDQUFDO0FBRUgsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGdDQUFnQyxFQUFFLENBQUMifQ==
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createAnthropic } from '@ai-sdk/anthropic';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
|
-
|
|
4
|
-
export
|
|
3
|
+
import { createModelLimitMiddleware, readEpochSeconds, readJsonRecord } from '@modelprofile.com/flexharness-models';
|
|
4
|
+
export { createAnthropic, createModelLimitMiddleware, readEpochSeconds, readJsonRecord, wrapLanguageModel };
|
|
5
|
+
export type { IModelCallFailure, IModelProvider, ISmartAiCacheOptions, ISmartAiOptions, TModelLimitClassifier, } from '@modelprofile.com/flexharness-models';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createAnthropic } from '@ai-sdk/anthropic';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { createModelLimitMiddleware, readEpochSeconds, readJsonRecord, } from '@modelprofile.com/flexharness-models';
|
|
4
|
+
export { createAnthropic, createModelLimitMiddleware, readEpochSeconds, readJsonRecord, wrapLanguageModel };
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3Byb3ZpZGVycy9hbnRocm9waWMvcGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3ZDLE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsZ0JBQWdCLEVBQ2hCLGNBQWMsR0FDZixNQUFNLHNDQUFzQyxDQUFDO0FBQzlDLE9BQU8sRUFBRSxlQUFlLEVBQUUsMEJBQTBCLEVBQUUsZ0JBQWdCLEVBQUUsY0FBYyxFQUFFLGlCQUFpQixFQUFFLENBQUMifQ==
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Anthropic subscriptions reject requests with `anthropic-ratelimit-unified-status: rejected` until
|
|
4
|
+
* the unified reset; API keys answer throttling with 429 `rate_limit_error` and `retry-after`.
|
|
5
|
+
*/
|
|
6
|
+
export declare const classifyAnthropicLimit: plugins.TModelLimitClassifier;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
const unifiedWindows = ['5h', '7d'];
|
|
3
|
+
/** HTTP bodies wrap the error as `{ type: 'error', error }`; stream error parts carry it bare. */
|
|
4
|
+
function readAnthropicErrorType(body) {
|
|
5
|
+
const envelope = plugins.readJsonRecord(body);
|
|
6
|
+
const type = (plugins.readJsonRecord(envelope?.error) ?? envelope)?.type;
|
|
7
|
+
return typeof type === 'string' ? type : undefined;
|
|
8
|
+
}
|
|
9
|
+
function unifiedHeader(headers, name) {
|
|
10
|
+
return headers[`anthropic-ratelimit-unified-${name}`];
|
|
11
|
+
}
|
|
12
|
+
/** The subscription window whose reset time equals the unified reset. */
|
|
13
|
+
function readUnifiedWindow(headers, resetsAt) {
|
|
14
|
+
return unifiedWindows.find((window) => resetsAt !== undefined && plugins.readEpochSeconds(unifiedHeader(headers, `${window}-reset`)) === resetsAt);
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Anthropic subscriptions reject requests with `anthropic-ratelimit-unified-status: rejected` until
|
|
18
|
+
* the unified reset; API keys answer throttling with 429 `rate_limit_error` and `retry-after`.
|
|
19
|
+
*/
|
|
20
|
+
export const classifyAnthropicLimit = (failure) => {
|
|
21
|
+
if (unifiedHeader(failure.headers, 'status') === 'rejected') {
|
|
22
|
+
const resetsAt = plugins.readEpochSeconds(unifiedHeader(failure.headers, 'reset'));
|
|
23
|
+
const window = readUnifiedWindow(failure.headers, resetsAt);
|
|
24
|
+
return {
|
|
25
|
+
kind: 'usage_limit',
|
|
26
|
+
...(resetsAt === undefined ? {} : { resetsAt }),
|
|
27
|
+
...(window === undefined ? {} : { window }),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
if (failure.statusCode === 429 || readAnthropicErrorType(failure.body) === 'rate_limit_error') {
|
|
31
|
+
return { kind: 'rate_limit' };
|
|
32
|
+
}
|
|
33
|
+
return undefined;
|
|
34
|
+
};
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS5saW1pdHMuYW50aHJvcGljLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfcHJvdmlkZXJzL2FudGhyb3BpYy9zbWFydGFpLmxpbWl0cy5hbnRocm9waWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEMsTUFBTSxjQUFjLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFVLENBQUM7QUFFN0Msa0dBQWtHO0FBQ2xHLFNBQVMsc0JBQXNCLENBQUMsSUFBYTtJQUMzQyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzlDLE1BQU0sSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLElBQUksUUFBUSxDQUFDLEVBQUUsSUFBSSxDQUFDO0lBQ3pFLE9BQU8sT0FBTyxJQUFJLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztBQUNyRCxDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsT0FBNkMsRUFBRSxJQUFZO0lBQ2hGLE9BQU8sT0FBTyxDQUFDLCtCQUErQixJQUFJLEVBQUUsQ0FBQyxDQUFDO0FBQ3hELENBQUM7QUFFRCx5RUFBeUU7QUFDekUsU0FBUyxpQkFBaUIsQ0FBQyxPQUE2QyxFQUFFLFFBQTRCO0lBQ3BHLE9BQU8sY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQ3BDLFFBQVEsS0FBSyxTQUFTLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsR0FBRyxNQUFNLFFBQVEsQ0FBQyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUM7QUFDaEgsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFrQyxDQUFDLE9BQU8sRUFBRSxFQUFFO0lBQy9FLElBQUksYUFBYSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLEtBQUssVUFBVSxFQUFFLENBQUM7UUFDNUQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDbkYsTUFBTSxNQUFNLEdBQUcsaUJBQWlCLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztRQUM1RCxPQUFPO1lBQ0wsSUFBSSxFQUFFLGFBQWE7WUFDbkIsR0FBRyxDQUFDLFFBQVEsS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsQ0FBQztZQUMvQyxHQUFHLENBQUMsTUFBTSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO1NBQzVDLENBQUM7SUFDSixDQUFDO0lBQ0QsSUFBSSxPQUFPLENBQUMsVUFBVSxLQUFLLEdBQUcsSUFBSSxzQkFBc0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssa0JBQWtCLEVBQUUsQ0FBQztRQUM5RixPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFDRCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDLENBQUMifQ==
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
export { classifyOpenAiLimit, readOpenAiError, type IOpenAiErrorDetails } from './smartai.limits.openai.js';
|
|
2
3
|
export type TOpenAiReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
|
|
3
4
|
export type TOpenAiTextVerbosity = 'low' | 'medium' | 'high';
|
|
4
5
|
/** `responses` calls `/responses`; `chat` calls `/chat/completions`, the API most OpenAI-compatible servers implement. */
|
|
@@ -19,6 +20,8 @@ export interface IOpenAiModelConnection {
|
|
|
19
20
|
middleware?: plugins.LanguageModelV4Middleware;
|
|
20
21
|
/** The OpenAI APIs this connection serves. Unset means every API; a model asking for another one is refused. */
|
|
21
22
|
apis?: readonly TOpenAiApi[];
|
|
23
|
+
/** Reads this connection's own limit dialect first; the OpenAI API dialect handles the rest. */
|
|
24
|
+
classifyLimit?: plugins.TModelLimitClassifier;
|
|
22
25
|
}
|
|
23
26
|
export interface IOpenAiModelOptions extends plugins.ISmartAiOptions {
|
|
24
27
|
provider: 'openai';
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { classifyOpenAiLimit } from './smartai.limits.openai.js';
|
|
3
|
+
export { classifyOpenAiLimit, readOpenAiError } from './smartai.limits.openai.js';
|
|
2
4
|
export const createOpenAiModelProvider = () => ({
|
|
3
5
|
id: 'openai',
|
|
4
6
|
getModel: (options) => {
|
|
@@ -16,9 +18,15 @@ export const createOpenAiModelProvider = () => ({
|
|
|
16
18
|
...(options.baseUrl ? { baseURL: options.baseUrl } : {}),
|
|
17
19
|
});
|
|
18
20
|
const model = api === 'chat' ? openai.chat(options.model) : openai(options.model);
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
:
|
|
21
|
+
const connection = options.connection;
|
|
22
|
+
const limits = plugins.createModelLimitMiddleware({
|
|
23
|
+
provider: 'openai',
|
|
24
|
+
classify: (failure) => connection?.classifyLimit?.(failure) ?? classifyOpenAiLimit(failure),
|
|
25
|
+
});
|
|
26
|
+
return plugins.wrapLanguageModel({
|
|
27
|
+
model,
|
|
28
|
+
middleware: connection?.middleware ? [limits, connection.middleware] : [limits],
|
|
29
|
+
});
|
|
22
30
|
},
|
|
23
31
|
});
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19wcm92aWRlcnMvb3BlbmFpL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRWpFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxlQUFlLEVBQTRCLE1BQU0sNEJBQTRCLENBQUM7QUFnQzVHLE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFHLEdBQWdELEVBQUUsQ0FBQyxDQUFDO0lBQzNGLEVBQUUsRUFBRSxRQUFRO0lBQ1osUUFBUSxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDcEIsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsSUFBSSxXQUFXLENBQUM7UUFDdkMsSUFBSSxHQUFHLEtBQUssV0FBVyxJQUFJLEdBQUcsS0FBSyxNQUFNLEVBQUUsQ0FBQztZQUMxQyxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixNQUFNLENBQUMsR0FBRyxDQUFDLCtCQUErQixDQUFDLENBQUM7UUFDckYsQ0FBQztRQUNELE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDO1FBQzVDLElBQUksVUFBVSxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQzVDLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbEUsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQ0FBbUMsTUFBTSxjQUFjLEdBQUcsMkJBQTJCLENBQUMsQ0FBQztRQUN6RyxDQUFDO1FBQ0QsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLFFBQVEsSUFBSTtZQUNsRSxNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU07WUFDdEIsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ3pELENBQUMsQ0FBQztRQUNILE1BQU0sS0FBSyxHQUFHLEdBQUcsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2xGLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUM7UUFDdEMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLDBCQUEwQixDQUFDO1lBQ2hELFFBQVEsRUFBRSxRQUFRO1lBQ2xCLFFBQVEsRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsVUFBVSxFQUFFLGFBQWEsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLG1CQUFtQixDQUFDLE9BQU8sQ0FBQztTQUM1RixDQUFDLENBQUM7UUFDSCxPQUFPLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQztZQUMvQixLQUFLO1lBQ0wsVUFBVSxFQUFFLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUM7U0FDaEYsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyJ9
|
|
@@ -3,4 +3,6 @@ import { wrapLanguageModel } from 'ai';
|
|
|
3
3
|
export { createOpenAI, wrapLanguageModel };
|
|
4
4
|
export type { OpenAIChatLanguageModelOptions as OpenAIChatProviderOptions, OpenAIProviderSettings, OpenAIResponsesProviderOptions, } from '@ai-sdk/openai';
|
|
5
5
|
export type { LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
6
|
-
|
|
6
|
+
import { createModelLimitMiddleware, readJsonRecord } from '@modelprofile.com/flexharness-models';
|
|
7
|
+
export { createModelLimitMiddleware, readJsonRecord };
|
|
8
|
+
export type { IModelProvider, ISmartAiOptions, JSONObject, TModelLimitClassifier, } from '@modelprofile.com/flexharness-models';
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { createOpenAI } from '@ai-sdk/openai';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
3
|
export { createOpenAI, wrapLanguageModel };
|
|
4
|
-
|
|
4
|
+
import { createModelLimitMiddleware, readJsonRecord } from '@modelprofile.com/flexharness-models';
|
|
5
|
+
export { createModelLimitMiddleware, readJsonRecord };
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3Byb3ZpZGVycy9vcGVuYWkvcGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQztBQU8zQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbEcsT0FBTyxFQUFFLDBCQUEwQixFQUFFLGNBQWMsRUFBRSxDQUFDIn0=
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
/** The error object of an OpenAI error body or of a Responses `response.failed` stream frame. */
|
|
3
|
+
export interface IOpenAiErrorDetails {
|
|
4
|
+
/** The error's `type` and `code`; HTTP bodies name the error in `type`, stream frames in `code`. */
|
|
5
|
+
readonly identifiers: readonly string[];
|
|
6
|
+
readonly fields: Readonly<Record<string, unknown>>;
|
|
7
|
+
}
|
|
8
|
+
export declare function readOpenAiError(body: unknown): IOpenAiErrorDetails | undefined;
|
|
9
|
+
/** OpenAI API limits: `insufficient_quota` is an exhausted balance, any other 429 a rate limit. */
|
|
10
|
+
export declare const classifyOpenAiLimit: plugins.TModelLimitClassifier;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
export function readOpenAiError(body) {
|
|
3
|
+
const envelope = plugins.readJsonRecord(body);
|
|
4
|
+
const fields = plugins.readJsonRecord(envelope?.error)
|
|
5
|
+
?? plugins.readJsonRecord(plugins.readJsonRecord(envelope?.response)?.error);
|
|
6
|
+
if (!fields)
|
|
7
|
+
return undefined;
|
|
8
|
+
const identifiers = [fields.type, fields.code].filter((value) => typeof value === 'string');
|
|
9
|
+
return { identifiers, fields };
|
|
10
|
+
}
|
|
11
|
+
/** OpenAI API limits: `insufficient_quota` is an exhausted balance, any other 429 a rate limit. */
|
|
12
|
+
export const classifyOpenAiLimit = (failure) => {
|
|
13
|
+
const identifiers = readOpenAiError(failure.body)?.identifiers ?? [];
|
|
14
|
+
if (identifiers.includes('insufficient_quota'))
|
|
15
|
+
return { kind: 'usage_limit' };
|
|
16
|
+
if (failure.statusCode === 429 || identifiers.includes('rate_limit_exceeded'))
|
|
17
|
+
return { kind: 'rate_limit' };
|
|
18
|
+
return undefined;
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS5saW1pdHMub3BlbmFpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfcHJvdmlkZXJzL29wZW5haS9zbWFydGFpLmxpbWl0cy5vcGVuYWkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFTeEMsTUFBTSxVQUFVLGVBQWUsQ0FBQyxJQUFhO0lBQzNDLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDO1dBQ2pELE9BQU8sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDL0UsSUFBSSxDQUFDLE1BQU07UUFBRSxPQUFPLFNBQVMsQ0FBQztJQUM5QixNQUFNLFdBQVcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEtBQUssRUFBbUIsRUFBRSxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFDO0lBQzdHLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDakMsQ0FBQztBQUVELG1HQUFtRztBQUNuRyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBa0MsQ0FBQyxPQUFPLEVBQUUsRUFBRTtJQUM1RSxNQUFNLFdBQVcsR0FBRyxlQUFlLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLFdBQVcsSUFBSSxFQUFFLENBQUM7SUFDckUsSUFBSSxXQUFXLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDO1FBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsQ0FBQztJQUMvRSxJQUFJLE9BQU8sQ0FBQyxVQUFVLEtBQUssR0FBRyxJQUFJLFdBQVcsQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUM7UUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQzdHLE9BQU8sU0FBUyxDQUFDO0FBQ25CLENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness-providers",
|
|
5
|
-
"version": "8.
|
|
5
|
+
"version": "8.3.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Model providers, authentication, account management, media and research integrations in one package.",
|
|
8
8
|
"main": "./dist_ts_providers/index.js",
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"@ai-sdk/provider": "^4.0.8",
|
|
76
76
|
"@ai-sdk/xai": "^4.0.44",
|
|
77
77
|
"@anthropic-ai/sdk": "0.95.2",
|
|
78
|
-
"@modelprofile.com/flexharness-models": "8.
|
|
78
|
+
"@modelprofile.com/flexharness-models": "8.3.0",
|
|
79
79
|
"ai": "^7.0.79",
|
|
80
80
|
"openai": "^6.37.0",
|
|
81
81
|
"proper-lockfile": "^4.1.2"
|
package/ts_openai_auth/index.ts
CHANGED
package/ts_openai_auth/readme.md
CHANGED
|
@@ -31,6 +31,12 @@ multi-step tool runs do not retain the token that admitted the run. Resolution,
|
|
|
31
31
|
identity, expiry, endpoint, redirect, and abort failures stop before the
|
|
32
32
|
underlying transport is called.
|
|
33
33
|
|
|
34
|
+
Both ChatGPT connections classify Codex limits with `classifyOpenAiChatGptLimit`:
|
|
35
|
+
`usage_limit_reached` and `usage_not_included`, from a 429 body or a failed stream,
|
|
36
|
+
fail as a `ModelLimitError` of kind `usage_limit`. Its reset comes from `resets_at`,
|
|
37
|
+
then `resets_in_seconds`, then the exhausted `x-codex-primary` or `x-codex-secondary`
|
|
38
|
+
window, which also names the `window` (for example `5h`); `plan_type` becomes `planType`.
|
|
39
|
+
|
|
34
40
|
## Issue Reporting and Security
|
|
35
41
|
|
|
36
42
|
Report issues and security concerns through [community.foss.global](https://community.foss.global).
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
9
9
|
OpenAiChatGptAuthError,
|
|
10
10
|
} from './smartai.auth.openai.js';
|
|
11
|
+
import { classifyOpenAiChatGptLimit } from './smartai.limits.openai.js';
|
|
11
12
|
import { createOpenAiChatGptInstructionsMiddleware } from './smartai.middleware.openai.js';
|
|
12
13
|
|
|
13
14
|
const codexBaseUrl = new URL(OPENAI_CHATGPT_CODEX_BASE_URL);
|
|
@@ -90,6 +91,7 @@ export const createOpenAiChatGptModelConnection = (
|
|
|
90
91
|
middleware: createOpenAiChatGptInstructionsMiddleware(),
|
|
91
92
|
// the ChatGPT Codex backend serves the Responses API only
|
|
92
93
|
apis: ['responses'],
|
|
94
|
+
classifyLimit: classifyOpenAiChatGptLimit,
|
|
93
95
|
});
|
|
94
96
|
|
|
95
97
|
export const createOpenAiChatGptDynamicModelConnection = (
|
|
@@ -143,5 +145,6 @@ export const createOpenAiChatGptDynamicModelConnection = (
|
|
|
143
145
|
middleware: createOpenAiChatGptInstructionsMiddleware(),
|
|
144
146
|
// the ChatGPT Codex backend serves the Responses API only
|
|
145
147
|
apis: ['responses'],
|
|
148
|
+
classifyLimit: classifyOpenAiChatGptLimit,
|
|
146
149
|
};
|
|
147
150
|
};
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { readEpochSeconds } from '@modelprofile.com/flexharness-models';
|
|
2
|
+
import type { IModelCallFailure, TModelLimitClassifier } from '@modelprofile.com/flexharness-models';
|
|
3
|
+
import { readOpenAiError } from '@modelprofile.com/flexharness-providers/openai';
|
|
4
|
+
|
|
5
|
+
const codexUsageLimitIdentifiers: ReadonlySet<string> = new Set(['usage_limit_reached', 'usage_not_included']);
|
|
6
|
+
const codexWindows = ['primary', 'secondary'] as const;
|
|
7
|
+
|
|
8
|
+
interface ICodexWindow {
|
|
9
|
+
label: string;
|
|
10
|
+
resetsAt: number;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
function formatWindowMinutes(minutes: number): string {
|
|
14
|
+
if (minutes % 1440 === 0) return `${minutes / 1440}d`;
|
|
15
|
+
if (minutes % 60 === 0) return `${minutes / 60}h`;
|
|
16
|
+
return `${minutes}m`;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function readExhaustedWindow(headers: IModelCallFailure['headers']): ICodexWindow | undefined {
|
|
20
|
+
const exhausted = codexWindows.flatMap((name): ICodexWindow[] => {
|
|
21
|
+
const usedPercent = Number(headers[`x-codex-${name}-used-percent`]);
|
|
22
|
+
const minutes = Number(headers[`x-codex-${name}-window-minutes`]);
|
|
23
|
+
const resetsAt = readEpochSeconds(headers[`x-codex-${name}-reset-at`]);
|
|
24
|
+
if (!(usedPercent >= 100) || resetsAt === undefined) return [];
|
|
25
|
+
return [{ label: Number.isSafeInteger(minutes) && minutes > 0 ? formatWindowMinutes(minutes) : name, resetsAt }];
|
|
26
|
+
});
|
|
27
|
+
// every exhausted window must reset before a request can pass
|
|
28
|
+
return exhausted.sort((left, right) => right.resetsAt - left.resetsAt)[0];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function readResetsInSeconds(value: unknown, observedAt: number): number | undefined {
|
|
32
|
+
return typeof value === 'number' && Number.isFinite(value) && value >= 0
|
|
33
|
+
? observedAt + Math.round(value * 1000)
|
|
34
|
+
: undefined;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* The ChatGPT Codex backend reports a spent plan quota as `usage_limit_reached`, and a plan
|
|
39
|
+
* without Codex access as `usage_not_included`, in the 429 body or a `response.failed` frame.
|
|
40
|
+
*/
|
|
41
|
+
export const classifyOpenAiChatGptLimit: TModelLimitClassifier = (failure) => {
|
|
42
|
+
const error = readOpenAiError(failure.body);
|
|
43
|
+
if (!error?.identifiers.some((identifier) => codexUsageLimitIdentifiers.has(identifier))) return undefined;
|
|
44
|
+
const exhaustedWindow = readExhaustedWindow(failure.headers);
|
|
45
|
+
const resetsAt = readEpochSeconds(error.fields.resets_at)
|
|
46
|
+
?? readResetsInSeconds(error.fields.resets_in_seconds, failure.observedAt)
|
|
47
|
+
?? exhaustedWindow?.resetsAt;
|
|
48
|
+
const planType = error.fields.plan_type;
|
|
49
|
+
return {
|
|
50
|
+
kind: 'usage_limit',
|
|
51
|
+
...(resetsAt === undefined ? {} : { resetsAt }),
|
|
52
|
+
...(typeof planType === 'string' ? { planType } : {}),
|
|
53
|
+
...(exhaustedWindow ? { window: exhaustedWindow.label } : {}),
|
|
54
|
+
};
|
|
55
|
+
};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { classifyAnthropicLimit } from './smartai.limits.anthropic.js';
|
|
2
3
|
import { createAnthropicCachingMiddleware } from './smartai.middleware.anthropic.js';
|
|
3
4
|
|
|
4
5
|
export interface IAnthropicModelOptions extends plugins.ISmartAiOptions {
|
|
@@ -10,11 +11,14 @@ export const createAnthropicModelProvider = (): plugins.IModelProvider<IAnthropi
|
|
|
10
11
|
id: 'anthropic',
|
|
11
12
|
getModel: (options) => {
|
|
12
13
|
const model = plugins.createAnthropic({ apiKey: options.apiKey })(options.model);
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
const limits = plugins.createModelLimitMiddleware({ provider: 'anthropic', classify: classifyAnthropicLimit });
|
|
15
|
+
const middleware = options.promptCaching === false
|
|
16
|
+
? [limits]
|
|
17
|
+
: [limits, createAnthropicCachingMiddleware(
|
|
18
|
+
typeof options.promptCaching === 'object' ? options.promptCaching : undefined,
|
|
19
|
+
)];
|
|
20
|
+
return plugins.wrapLanguageModel({ model, middleware });
|
|
17
21
|
},
|
|
18
22
|
});
|
|
19
23
|
|
|
20
|
-
export { createAnthropicCachingMiddleware };
|
|
24
|
+
export { classifyAnthropicLimit, createAnthropicCachingMiddleware };
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
import { createAnthropic } from '@ai-sdk/anthropic';
|
|
2
2
|
import { wrapLanguageModel } from 'ai';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import {
|
|
4
|
+
createModelLimitMiddleware,
|
|
5
|
+
readEpochSeconds,
|
|
6
|
+
readJsonRecord,
|
|
7
|
+
} from '@modelprofile.com/flexharness-models';
|
|
8
|
+
export { createAnthropic, createModelLimitMiddleware, readEpochSeconds, readJsonRecord, wrapLanguageModel };
|
|
9
|
+
export type {
|
|
10
|
+
IModelCallFailure,
|
|
11
|
+
IModelProvider,
|
|
12
|
+
ISmartAiCacheOptions,
|
|
13
|
+
ISmartAiOptions,
|
|
14
|
+
TModelLimitClassifier,
|
|
15
|
+
} from '@modelprofile.com/flexharness-models';
|
|
@@ -11,6 +11,11 @@ pnpm add @modelprofile.com/flexharness-providers
|
|
|
11
11
|
See the [toolbox usage and migration guide](https://code.foss.global/modelprofile.com/flexharness#readme)
|
|
12
12
|
for composition examples and the SmartAI/SmartAgent migration map.
|
|
13
13
|
|
|
14
|
+
A subscription rejected with `anthropic-ratelimit-unified-status: rejected` fails as a
|
|
15
|
+
`ModelLimitError` of kind `usage_limit` that resets at `anthropic-ratelimit-unified-reset` and
|
|
16
|
+
names the `5h` or `7d` window with the same reset; any other 429 or `rate_limit_error` fails as
|
|
17
|
+
kind `rate_limit` with the `retry-after` delay. `classifyAnthropicLimit` is exported.
|
|
18
|
+
|
|
14
19
|
## Issue Reporting and Security
|
|
15
20
|
|
|
16
21
|
Report issues and security concerns through [community.foss.global](https://community.foss.global).
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
|
|
3
|
+
const unifiedWindows = ['5h', '7d'] as const;
|
|
4
|
+
|
|
5
|
+
/** HTTP bodies wrap the error as `{ type: 'error', error }`; stream error parts carry it bare. */
|
|
6
|
+
function readAnthropicErrorType(body: unknown): string | undefined {
|
|
7
|
+
const envelope = plugins.readJsonRecord(body);
|
|
8
|
+
const type = (plugins.readJsonRecord(envelope?.error) ?? envelope)?.type;
|
|
9
|
+
return typeof type === 'string' ? type : undefined;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function unifiedHeader(headers: plugins.IModelCallFailure['headers'], name: string): string | undefined {
|
|
13
|
+
return headers[`anthropic-ratelimit-unified-${name}`];
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** The subscription window whose reset time equals the unified reset. */
|
|
17
|
+
function readUnifiedWindow(headers: plugins.IModelCallFailure['headers'], resetsAt: number | undefined): string | undefined {
|
|
18
|
+
return unifiedWindows.find((window) =>
|
|
19
|
+
resetsAt !== undefined && plugins.readEpochSeconds(unifiedHeader(headers, `${window}-reset`)) === resetsAt);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Anthropic subscriptions reject requests with `anthropic-ratelimit-unified-status: rejected` until
|
|
24
|
+
* the unified reset; API keys answer throttling with 429 `rate_limit_error` and `retry-after`.
|
|
25
|
+
*/
|
|
26
|
+
export const classifyAnthropicLimit: plugins.TModelLimitClassifier = (failure) => {
|
|
27
|
+
if (unifiedHeader(failure.headers, 'status') === 'rejected') {
|
|
28
|
+
const resetsAt = plugins.readEpochSeconds(unifiedHeader(failure.headers, 'reset'));
|
|
29
|
+
const window = readUnifiedWindow(failure.headers, resetsAt);
|
|
30
|
+
return {
|
|
31
|
+
kind: 'usage_limit',
|
|
32
|
+
...(resetsAt === undefined ? {} : { resetsAt }),
|
|
33
|
+
...(window === undefined ? {} : { window }),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
if (failure.statusCode === 429 || readAnthropicErrorType(failure.body) === 'rate_limit_error') {
|
|
37
|
+
return { kind: 'rate_limit' };
|
|
38
|
+
}
|
|
39
|
+
return undefined;
|
|
40
|
+
};
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { classifyOpenAiLimit } from './smartai.limits.openai.js';
|
|
3
|
+
|
|
4
|
+
export { classifyOpenAiLimit, readOpenAiError, type IOpenAiErrorDetails } from './smartai.limits.openai.js';
|
|
2
5
|
|
|
3
6
|
export type TOpenAiReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
|
|
4
7
|
export type TOpenAiTextVerbosity = 'low' | 'medium' | 'high';
|
|
@@ -19,6 +22,8 @@ export interface IOpenAiModelConnection {
|
|
|
19
22
|
middleware?: plugins.LanguageModelV4Middleware;
|
|
20
23
|
/** The OpenAI APIs this connection serves. Unset means every API; a model asking for another one is refused. */
|
|
21
24
|
apis?: readonly TOpenAiApi[];
|
|
25
|
+
/** Reads this connection's own limit dialect first; the OpenAI API dialect handles the rest. */
|
|
26
|
+
classifyLimit?: plugins.TModelLimitClassifier;
|
|
22
27
|
}
|
|
23
28
|
|
|
24
29
|
export interface IOpenAiModelOptions extends plugins.ISmartAiOptions {
|
|
@@ -45,8 +50,14 @@ export const createOpenAiModelProvider = (): plugins.IModelProvider<IOpenAiModel
|
|
|
45
50
|
...(options.baseUrl ? { baseURL: options.baseUrl } : {}),
|
|
46
51
|
});
|
|
47
52
|
const model = api === 'chat' ? openai.chat(options.model) : openai(options.model);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
:
|
|
53
|
+
const connection = options.connection;
|
|
54
|
+
const limits = plugins.createModelLimitMiddleware({
|
|
55
|
+
provider: 'openai',
|
|
56
|
+
classify: (failure) => connection?.classifyLimit?.(failure) ?? classifyOpenAiLimit(failure),
|
|
57
|
+
});
|
|
58
|
+
return plugins.wrapLanguageModel({
|
|
59
|
+
model,
|
|
60
|
+
middleware: connection?.middleware ? [limits, connection.middleware] : [limits],
|
|
61
|
+
});
|
|
51
62
|
},
|
|
52
63
|
});
|
|
@@ -7,4 +7,11 @@ export type {
|
|
|
7
7
|
OpenAIResponsesProviderOptions,
|
|
8
8
|
} from '@ai-sdk/openai';
|
|
9
9
|
export type { LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
10
|
-
|
|
10
|
+
import { createModelLimitMiddleware, readJsonRecord } from '@modelprofile.com/flexharness-models';
|
|
11
|
+
export { createModelLimitMiddleware, readJsonRecord };
|
|
12
|
+
export type {
|
|
13
|
+
IModelProvider,
|
|
14
|
+
ISmartAiOptions,
|
|
15
|
+
JSONObject,
|
|
16
|
+
TModelLimitClassifier,
|
|
17
|
+
} from '@modelprofile.com/flexharness-models';
|
|
@@ -41,6 +41,12 @@ const model = models.getModel({
|
|
|
41
41
|
});
|
|
42
42
|
```
|
|
43
43
|
|
|
44
|
+
A spent API balance (`insufficient_quota`) fails as a `ModelLimitError` of kind `usage_limit`,
|
|
45
|
+
and any other 429 as kind `rate_limit` with the `retry-after` delay; see the toolbox readme's
|
|
46
|
+
usage and rate limits section. A `connection` can add its own limit dialect with
|
|
47
|
+
`classifyLimit`, which is consulted first. `classifyOpenAiLimit` and `readOpenAiError` are
|
|
48
|
+
exported for connections that extend the OpenAI dialect.
|
|
49
|
+
|
|
44
50
|
ChatGPT connections come from the `/auth` subpath. Use the dynamic connection
|
|
45
51
|
factory for delegated authority access so every provider HTTP request resolves
|
|
46
52
|
a current token while the connection retains its pinned account and residency
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
|
|
3
|
+
/** The error object of an OpenAI error body or of a Responses `response.failed` stream frame. */
|
|
4
|
+
export interface IOpenAiErrorDetails {
|
|
5
|
+
/** The error's `type` and `code`; HTTP bodies name the error in `type`, stream frames in `code`. */
|
|
6
|
+
readonly identifiers: readonly string[];
|
|
7
|
+
readonly fields: Readonly<Record<string, unknown>>;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export function readOpenAiError(body: unknown): IOpenAiErrorDetails | undefined {
|
|
11
|
+
const envelope = plugins.readJsonRecord(body);
|
|
12
|
+
const fields = plugins.readJsonRecord(envelope?.error)
|
|
13
|
+
?? plugins.readJsonRecord(plugins.readJsonRecord(envelope?.response)?.error);
|
|
14
|
+
if (!fields) return undefined;
|
|
15
|
+
const identifiers = [fields.type, fields.code].filter((value): value is string => typeof value === 'string');
|
|
16
|
+
return { identifiers, fields };
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/** OpenAI API limits: `insufficient_quota` is an exhausted balance, any other 429 a rate limit. */
|
|
20
|
+
export const classifyOpenAiLimit: plugins.TModelLimitClassifier = (failure) => {
|
|
21
|
+
const identifiers = readOpenAiError(failure.body)?.identifiers ?? [];
|
|
22
|
+
if (identifiers.includes('insufficient_quota')) return { kind: 'usage_limit' };
|
|
23
|
+
if (failure.statusCode === 429 || identifiers.includes('rate_limit_exceeded')) return { kind: 'rate_limit' };
|
|
24
|
+
return undefined;
|
|
25
|
+
};
|