@modelprofile.com/flexharness-providers 8.5.0 → 9.1.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_account/plugins.d.ts +2 -0
- package/dist_ts_openai_account/plugins.js +4 -1
- package/dist_ts_openai_account/smartai.providers.interfaces.d.ts +6 -22
- package/dist_ts_openai_account/smartai.providers.openai.js +15 -134
- package/dist_ts_openai_auth/index.d.ts +1 -2
- package/dist_ts_openai_auth/index.js +2 -3
- package/dist_ts_openai_auth/interfaces.d.ts +1 -1
- package/dist_ts_openai_auth/smartai.auth.openai.d.ts +3 -15
- package/dist_ts_openai_auth/smartai.auth.openai.js +3 -17
- package/dist_ts_openai_auth/smartai.connection.openai.d.ts +1 -1
- package/dist_ts_openai_auth/smartai.connection.openai.js +2 -3
- package/dist_ts_providers/openai/index.d.ts +4 -0
- package/dist_ts_providers/openai/index.js +5 -1
- package/dist_ts_providers/openai/plugins.d.ts +4 -4
- package/dist_ts_providers/openai/plugins.js +3 -3
- package/dist_ts_providers/openai/smartai.chatgpt.catalog.d.ts +59 -0
- package/dist_ts_providers/openai/smartai.chatgpt.catalog.js +245 -0
- package/{dist_ts_openai_auth/smartai.limits.openai.d.ts → dist_ts_providers/openai/smartai.chatgpt.limits.d.ts} +2 -2
- package/dist_ts_providers/openai/smartai.chatgpt.limits.js +49 -0
- package/{dist_ts_openai_auth/smartai.middleware.openai.d.ts → dist_ts_providers/openai/smartai.chatgpt.middleware.d.ts} +2 -2
- package/dist_ts_providers/openai/smartai.chatgpt.middleware.js +47 -0
- package/dist_ts_providers/openai/smartai.chatgpt.openai.d.ts +92 -0
- package/dist_ts_providers/openai/smartai.chatgpt.openai.js +160 -0
- package/package.json +2 -2
- package/readme.md +8 -0
- package/ts_openai_account/plugins.ts +5 -0
- package/ts_openai_account/smartai.providers.interfaces.ts +11 -25
- package/ts_openai_account/smartai.providers.openai.ts +16 -135
- package/ts_openai_auth/index.ts +4 -2
- package/ts_openai_auth/interfaces.ts +1 -1
- package/ts_openai_auth/smartai.auth.openai.ts +12 -24
- package/ts_openai_auth/smartai.connection.openai.ts +5 -3
- package/ts_providers/openai/index.ts +29 -0
- package/ts_providers/openai/plugins.ts +4 -3
- package/ts_providers/openai/readme.md +58 -7
- package/ts_providers/openai/smartai.chatgpt.catalog.ts +308 -0
- package/{ts_openai_auth/smartai.limits.openai.ts → ts_providers/openai/smartai.chatgpt.limits.ts} +6 -7
- package/{ts_openai_auth/smartai.middleware.openai.ts → ts_providers/openai/smartai.chatgpt.middleware.ts} +6 -6
- package/ts_providers/openai/smartai.chatgpt.openai.ts +271 -0
- package/ts_providers/readme.md +8 -0
- package/dist_ts_openai_auth/smartai.limits.openai.js +0 -49
- package/dist_ts_openai_auth/smartai.middleware.openai.js +0 -47
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
// OpenAI protocol portions are adapted in TypeScript; see third-party-notices.md.
|
|
2
|
+
import { classifyOpenAiChatGptLimit } from './smartai.chatgpt.limits.js';
|
|
3
|
+
import { createOpenAiChatGptInstructionsMiddleware } from './smartai.chatgpt.middleware.js';
|
|
4
|
+
export const OPENAI_CHATGPT_CODEX_BASE_URL = 'https://chatgpt.com/backend-api/codex';
|
|
5
|
+
export const OPENAI_CHATGPT_DEFAULT_ORIGINATOR = 'smartai';
|
|
6
|
+
export class OpenAiChatGptAuthError extends Error {
|
|
7
|
+
status;
|
|
8
|
+
body;
|
|
9
|
+
requestOutcome;
|
|
10
|
+
retryAfterMs;
|
|
11
|
+
constructor(message, options = {}) {
|
|
12
|
+
super(message);
|
|
13
|
+
this.name = 'OpenAiChatGptAuthError';
|
|
14
|
+
this.status = options.status;
|
|
15
|
+
this.body = options.body;
|
|
16
|
+
this.requestOutcome = options.requestOutcome;
|
|
17
|
+
this.retryAfterMs = options.retryAfterMs;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const codexBaseUrl = new URL(OPENAI_CHATGPT_CODEX_BASE_URL);
|
|
21
|
+
const isNonEmptyString = (value) => typeof value === 'string' && value.length > 0;
|
|
22
|
+
const isGeneration = (value) => Number.isSafeInteger(value) && value >= 1;
|
|
23
|
+
function assertCodexRequestUrl(normalizedUrlArg) {
|
|
24
|
+
const url = new URL(normalizedUrlArg);
|
|
25
|
+
const isCodexPath = url.pathname === codexBaseUrl.pathname
|
|
26
|
+
|| url.pathname.startsWith(`${codexBaseUrl.pathname}/`);
|
|
27
|
+
if (url.origin !== codexBaseUrl.origin
|
|
28
|
+
|| url.username !== ''
|
|
29
|
+
|| url.password !== ''
|
|
30
|
+
|| !isCodexPath) {
|
|
31
|
+
throw new OpenAiChatGptAuthError('OpenAI ChatGPT inference URL is outside the Codex endpoint.');
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
function requireWorkspaceIdentity(identityArg) {
|
|
35
|
+
if (!identityArg
|
|
36
|
+
|| !isNonEmptyString(identityArg.accountId)
|
|
37
|
+
|| typeof identityArg.isFedrampAccount !== 'boolean') {
|
|
38
|
+
throw new OpenAiChatGptAuthError('OpenAI ChatGPT workspace identity is invalid.');
|
|
39
|
+
}
|
|
40
|
+
return Object.freeze({
|
|
41
|
+
accountId: identityArg.accountId,
|
|
42
|
+
isFedrampAccount: identityArg.isFedrampAccount,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
function assertGrant(grantArg, expectedIdentityArg) {
|
|
46
|
+
if (!grantArg
|
|
47
|
+
|| !isNonEmptyString(grantArg.accessToken)
|
|
48
|
+
|| (grantArg.generation !== undefined && !isGeneration(grantArg.generation))) {
|
|
49
|
+
throw new OpenAiChatGptAuthError('OpenAI ChatGPT resolved access is invalid.');
|
|
50
|
+
}
|
|
51
|
+
if (grantArg.accountId !== expectedIdentityArg.accountId
|
|
52
|
+
|| grantArg.isFedrampAccount !== expectedIdentityArg.isFedrampAccount) {
|
|
53
|
+
throw new OpenAiChatGptAuthError('OpenAI ChatGPT resolved access identity does not match the connection.');
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/** The headers a ChatGPT backend request authenticates with. Shared by inference and the model catalog. */
|
|
57
|
+
export function createOpenAiChatGptAccessHeaders(accessArg, originatorArg = OPENAI_CHATGPT_DEFAULT_ORIGINATOR) {
|
|
58
|
+
return {
|
|
59
|
+
Authorization: `Bearer ${accessArg.accessToken}`,
|
|
60
|
+
originator: originatorArg,
|
|
61
|
+
...(accessArg.accountId ? { 'ChatGPT-Account-ID': accessArg.accountId } : {}),
|
|
62
|
+
...(accessArg.isFedrampAccount ? { 'X-OpenAI-Fedramp': 'true' } : {}),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
const accessRejected = () => new OpenAiChatGptAuthError('OpenAI ChatGPT rejected the access token.', { status: 401 });
|
|
66
|
+
/**
|
|
67
|
+
* A ChatGPT connection that resolves its access before every provider HTTP request.
|
|
68
|
+
*
|
|
69
|
+
* The workspace and residency are pinned at construction; an access that states anything else stops the
|
|
70
|
+
* request before the transport is called. A provider 401 is answered once: when the rejected access carried
|
|
71
|
+
* a `generation`, the connection resolves again with `rejectedGeneration` and sends the request a second
|
|
72
|
+
* time with the new access. A 401 that cannot be retried, and a second 401, fail with an
|
|
73
|
+
* `OpenAiChatGptAuthError` whose `status` is 401.
|
|
74
|
+
*/
|
|
75
|
+
export const createOpenAiChatGptResolvingModelConnection = (optionsArg) => {
|
|
76
|
+
if (!optionsArg || typeof optionsArg.resolveAccess !== 'function') {
|
|
77
|
+
throw new OpenAiChatGptAuthError('OpenAI ChatGPT access resolver is required.');
|
|
78
|
+
}
|
|
79
|
+
const expectedIdentity = requireWorkspaceIdentity(optionsArg.expectedIdentity);
|
|
80
|
+
const resolveAccess = optionsArg.resolveAccess;
|
|
81
|
+
const originator = optionsArg.originator ?? OPENAI_CHATGPT_DEFAULT_ORIGINATOR;
|
|
82
|
+
const transport = optionsArg.fetch ?? globalThis.fetch;
|
|
83
|
+
if (typeof transport !== 'function') {
|
|
84
|
+
throw new OpenAiChatGptAuthError('fetch is not available for OpenAI ChatGPT inference.');
|
|
85
|
+
}
|
|
86
|
+
const resolveGrant = async (requestArg) => {
|
|
87
|
+
const grant = await resolveAccess(requestArg);
|
|
88
|
+
requestArg.signal.throwIfAborted();
|
|
89
|
+
assertGrant(grant, expectedIdentity);
|
|
90
|
+
return grant;
|
|
91
|
+
};
|
|
92
|
+
const send = async (requestArg, grantArg) => {
|
|
93
|
+
const headers = new Headers(requestArg.headers);
|
|
94
|
+
for (const [name, value] of Object.entries(createOpenAiChatGptAccessHeaders(grantArg, originator))) {
|
|
95
|
+
headers.set(name, value);
|
|
96
|
+
}
|
|
97
|
+
if (!grantArg.isFedrampAccount)
|
|
98
|
+
headers.delete('X-OpenAI-Fedramp');
|
|
99
|
+
const authenticatedRequest = new Request(requestArg, { headers });
|
|
100
|
+
authenticatedRequest.signal.throwIfAborted();
|
|
101
|
+
return transport(authenticatedRequest);
|
|
102
|
+
};
|
|
103
|
+
const fetchWithCurrentAccess = async (inputArg, initArg) => {
|
|
104
|
+
const request = new Request(inputArg, {
|
|
105
|
+
...initArg,
|
|
106
|
+
redirect: 'error',
|
|
107
|
+
});
|
|
108
|
+
assertCodexRequestUrl(request.url);
|
|
109
|
+
request.signal.throwIfAborted();
|
|
110
|
+
const grant = await resolveGrant({ signal: request.signal });
|
|
111
|
+
// A replay needs the body the first attempt consumes, so it is kept only when a replay can happen.
|
|
112
|
+
const replay = grant.generation === undefined ? undefined : request.clone();
|
|
113
|
+
const response = await send(request, grant);
|
|
114
|
+
if (response.status !== 401)
|
|
115
|
+
return response;
|
|
116
|
+
await response.body?.cancel().catch(() => undefined);
|
|
117
|
+
if (!replay)
|
|
118
|
+
throw accessRejected();
|
|
119
|
+
const renewed = await resolveGrant({ signal: replay.signal, rejectedGeneration: grant.generation });
|
|
120
|
+
const replayed = await send(replay, renewed);
|
|
121
|
+
if (replayed.status !== 401)
|
|
122
|
+
return replayed;
|
|
123
|
+
await replayed.body?.cancel().catch(() => undefined);
|
|
124
|
+
throw accessRejected();
|
|
125
|
+
};
|
|
126
|
+
return {
|
|
127
|
+
settings: {
|
|
128
|
+
apiKey: '',
|
|
129
|
+
baseURL: OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
130
|
+
fetch: fetchWithCurrentAccess,
|
|
131
|
+
},
|
|
132
|
+
middleware: createOpenAiChatGptInstructionsMiddleware(),
|
|
133
|
+
// the ChatGPT Codex backend serves the Responses API only
|
|
134
|
+
apis: ['responses'],
|
|
135
|
+
classifyLimit: classifyOpenAiChatGptLimit,
|
|
136
|
+
};
|
|
137
|
+
};
|
|
138
|
+
/**
|
|
139
|
+
* A ChatGPT connection for one fixed access, with the workspace and residency its issuer stated.
|
|
140
|
+
*
|
|
141
|
+
* It sends exactly the access it was given, and a provider 401 fails with an `OpenAiChatGptAuthError`
|
|
142
|
+
* whose `status` is 401. Use `createOpenAiChatGptResolvingModelConnection` when an authority renews the
|
|
143
|
+
* access.
|
|
144
|
+
*/
|
|
145
|
+
export const createOpenAiChatGptAccessModelConnection = (accessArg, optionsArg = {}) => {
|
|
146
|
+
if (!accessArg || !isNonEmptyString(accessArg.accessToken)) {
|
|
147
|
+
throw new OpenAiChatGptAuthError('OpenAI ChatGPT access is invalid.');
|
|
148
|
+
}
|
|
149
|
+
const access = Object.freeze({
|
|
150
|
+
accessToken: accessArg.accessToken,
|
|
151
|
+
accountId: accessArg.accountId,
|
|
152
|
+
isFedrampAccount: accessArg.isFedrampAccount,
|
|
153
|
+
});
|
|
154
|
+
return createOpenAiChatGptResolvingModelConnection({
|
|
155
|
+
...optionsArg,
|
|
156
|
+
expectedIdentity: access,
|
|
157
|
+
resolveAccess: async () => access,
|
|
158
|
+
});
|
|
159
|
+
};
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhaS5jaGF0Z3B0Lm9wZW5haS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX3Byb3ZpZGVycy9vcGVuYWkvc21hcnRhaS5jaGF0Z3B0Lm9wZW5haS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxrRkFBa0Y7QUFDbEYsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekUsT0FBTyxFQUFFLHlDQUF5QyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHNUYsTUFBTSxDQUFDLE1BQU0sNkJBQTZCLEdBQUcsdUNBQXVDLENBQUM7QUFDckYsTUFBTSxDQUFDLE1BQU0saUNBQWlDLEdBQUcsU0FBUyxDQUFDO0FBSzNELE1BQU0sT0FBTyxzQkFBdUIsU0FBUSxLQUFLO0lBQ3hDLE1BQU0sQ0FBVTtJQUNoQixJQUFJLENBQVU7SUFDZCxjQUFjLENBQWdDO0lBQzlDLFlBQVksQ0FBVTtJQUU3QixZQUFZLE9BQWUsRUFBRSxVQUt6QixFQUFFO1FBQ0osS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyx3QkFBd0IsQ0FBQztRQUNyQyxJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUM7UUFDN0IsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxjQUFjLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQztRQUM3QyxJQUFJLENBQUMsWUFBWSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUM7SUFDM0MsQ0FBQztDQUNGO0FBa0VELE1BQU0sWUFBWSxHQUFHLElBQUksR0FBRyxDQUFDLDZCQUE2QixDQUFDLENBQUM7QUFFNUQsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEtBQWMsRUFBbUIsRUFBRSxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztBQUU1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
|
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": "
|
|
5
|
+
"version": "9.1.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": "
|
|
78
|
+
"@modelprofile.com/flexharness-models": "9.1.0",
|
|
79
79
|
"ai": "^7.0.79",
|
|
80
80
|
"openai": "^6.37.0",
|
|
81
81
|
"proper-lockfile": "^4.1.2"
|
package/readme.md
CHANGED
|
@@ -42,6 +42,14 @@ instead; it resolves current access at every provider HTTP request while keeping
|
|
|
42
42
|
account and residency identity fixed for the connection. API-key inference
|
|
43
43
|
needs no authentication setup.
|
|
44
44
|
|
|
45
|
+
When an account authority such as authswitch owns the login, `/openai` runs
|
|
46
|
+
ChatGPT inference from access alone:
|
|
47
|
+
`createOpenAiChatGptResolvingModelConnection({ expectedIdentity, resolveAccess })`
|
|
48
|
+
resolves the access token, workspace and residency before every provider request
|
|
49
|
+
and resolves once more after a rejected token, and `listOpenAiChatGptModels()`
|
|
50
|
+
reads the model catalog with the same access. Neither parses the token; see
|
|
51
|
+
`openai/readme.md`.
|
|
52
|
+
|
|
45
53
|
The package includes the applicable OpenAI Codex license and third-party notices.
|
|
46
54
|
|
|
47
55
|
## License and Legal Information
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import type { TOpenAiChatGptRequestOutcome } from '@modelprofile.com/flexharness-providers/auth';
|
|
2
|
+
import type {
|
|
3
|
+
IOpenAiChatGptModel,
|
|
4
|
+
IOpenAiChatGptModelReasoningEffort,
|
|
5
|
+
IOpenAiChatGptModelServiceTier,
|
|
6
|
+
TOpenAiChatGptInputModality,
|
|
7
|
+
} from '@modelprofile.com/flexharness-providers/openai';
|
|
2
8
|
|
|
3
9
|
export type TSmartAiProviderId = string;
|
|
4
10
|
export type TSmartAiProviderLoginFlow = 'browser' | 'device';
|
|
5
|
-
export type TSmartAiProviderInputModality =
|
|
11
|
+
export type TSmartAiProviderInputModality = TOpenAiChatGptInputModality;
|
|
6
12
|
|
|
7
13
|
export interface ISmartAiProviderDescriptor {
|
|
8
14
|
providerId: TSmartAiProviderId;
|
|
@@ -87,32 +93,12 @@ export interface ISmartAiProviderOperationOptions {
|
|
|
87
93
|
timeoutMs?: number;
|
|
88
94
|
}
|
|
89
95
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
description: string;
|
|
93
|
-
}
|
|
96
|
+
/** The catalog shapes are defined once, by the access-only catalog read in `/openai`. */
|
|
97
|
+
export interface ISmartAiProviderModelReasoningEffort extends IOpenAiChatGptModelReasoningEffort {}
|
|
94
98
|
|
|
95
|
-
export interface ISmartAiProviderModelServiceTier {
|
|
96
|
-
id: string;
|
|
97
|
-
name: string;
|
|
98
|
-
description: string;
|
|
99
|
-
}
|
|
99
|
+
export interface ISmartAiProviderModelServiceTier extends IOpenAiChatGptModelServiceTier {}
|
|
100
100
|
|
|
101
|
-
export interface ISmartAiProviderModel {
|
|
102
|
-
providerId: 'openai';
|
|
103
|
-
modelId: string;
|
|
104
|
-
wireModel: string;
|
|
105
|
-
displayName: string;
|
|
106
|
-
description: string;
|
|
107
|
-
hidden: boolean;
|
|
108
|
-
reasoningEfforts: ISmartAiProviderModelReasoningEffort[];
|
|
109
|
-
defaultReasoningEffort: string;
|
|
110
|
-
inputModalities: TSmartAiProviderInputModality[];
|
|
111
|
-
supportsPersonality: boolean;
|
|
112
|
-
serviceTiers: ISmartAiProviderModelServiceTier[];
|
|
113
|
-
defaultServiceTier?: string;
|
|
114
|
-
isDefault: boolean;
|
|
115
|
-
}
|
|
101
|
+
export interface ISmartAiProviderModel extends IOpenAiChatGptModel {}
|
|
116
102
|
|
|
117
103
|
export interface ISmartAiProviderModelListOptions extends ISmartAiProviderOperationOptions {
|
|
118
104
|
cursor?: string;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// OpenAI protocol portions are adapted in TypeScript; see third-party-notices.md.
|
|
2
2
|
import * as plugins from './plugins.js';
|
|
3
3
|
import {
|
|
4
|
-
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
5
4
|
OPENAI_CHATGPT_DEFAULT_ORIGINATOR,
|
|
6
5
|
OpenAiChatGptAuthError,
|
|
7
6
|
completeOpenAiChatGptDeviceCodeLogin,
|
|
@@ -43,13 +42,10 @@ const defaultBrowserLoginTimeoutMs = 11 * 60 * 1000;
|
|
|
43
42
|
const defaultDeviceLoginTimeoutMs = 15 * 60 * 1000;
|
|
44
43
|
const defaultOperationTimeoutMs = 30_000;
|
|
45
44
|
const maximumOperationTimeoutMs = 20 * 60 * 1000;
|
|
46
|
-
const maximumCatalogBytes = 2 * 1024 * 1024;
|
|
47
45
|
const maximumAccountRateLimitsBytes = 256 * 1024;
|
|
48
|
-
const maximumCatalogModels = 256;
|
|
49
46
|
const maximumAdditionalRateLimits = 128;
|
|
50
47
|
const maximumCursorBytes = 4096;
|
|
51
48
|
const maximumModelPageSize = 50;
|
|
52
|
-
const defaultClientVersion = '0.146.1';
|
|
53
49
|
const maximumHeaderBytes = 16 * 1024;
|
|
54
50
|
const maximumCallbackUrlBytes = 4096;
|
|
55
51
|
const accountRateLimitsUrl = 'https://chatgpt.com/backend-api/wham/usage';
|
|
@@ -185,15 +181,9 @@ const toTokenData = (credentialArg: IOpenAiChatGptOAuthCredential): IOpenAiChatG
|
|
|
185
181
|
};
|
|
186
182
|
};
|
|
187
183
|
|
|
188
|
-
interface IOpenAiChatGptReadAccess {
|
|
189
|
-
accessToken: string;
|
|
190
|
-
accountId?: string;
|
|
191
|
-
isFedrampAccount: boolean;
|
|
192
|
-
}
|
|
193
|
-
|
|
194
184
|
const toReadAccess = (
|
|
195
185
|
credentialArg: TOpenAiChatGptReadCredential,
|
|
196
|
-
): IOpenAiChatGptReadAccess => {
|
|
186
|
+
): plugins.openAi.IOpenAiChatGptReadAccess => {
|
|
197
187
|
if (!isRecord(credentialArg)) throw createSmartAiProviderError('CREDENTIAL_INVALID');
|
|
198
188
|
if (credentialArg.kind === 'chatgptOAuth') {
|
|
199
189
|
const tokenData = toTokenData(credentialArg);
|
|
@@ -634,95 +624,6 @@ const projectAccountRateLimits = (
|
|
|
634
624
|
};
|
|
635
625
|
};
|
|
636
626
|
|
|
637
|
-
const projectCatalog = (valueArg: unknown): ISmartAiProviderModel[] => {
|
|
638
|
-
if (!isRecord(valueArg) || !Array.isArray(valueArg.models) || valueArg.models.length > maximumCatalogModels) {
|
|
639
|
-
throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
640
|
-
}
|
|
641
|
-
const modelIds = new Set<string>();
|
|
642
|
-
const entries = valueArg.models.map((rawModel, sourceIndex) => {
|
|
643
|
-
if (!isRecord(rawModel)) throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
644
|
-
const modelId = boundedString(rawModel.slug, 256);
|
|
645
|
-
if (modelIds.has(modelId)) throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
646
|
-
modelIds.add(modelId);
|
|
647
|
-
const visibility = rawModel.visibility;
|
|
648
|
-
if (visibility !== 'list' && visibility !== 'hide' && visibility !== 'none') {
|
|
649
|
-
throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
650
|
-
}
|
|
651
|
-
if (!Number.isSafeInteger(rawModel.priority)) throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
652
|
-
if (!Array.isArray(rawModel.supported_reasoning_levels) || rawModel.supported_reasoning_levels.length > 16) {
|
|
653
|
-
throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
654
|
-
}
|
|
655
|
-
const reasoningEfforts = rawModel.supported_reasoning_levels.map((rawEffort) => {
|
|
656
|
-
if (!isRecord(rawEffort)) throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
657
|
-
return {
|
|
658
|
-
effort: boundedString(rawEffort.effort, 128),
|
|
659
|
-
description: boundedString(rawEffort.description, 1024, true),
|
|
660
|
-
};
|
|
661
|
-
});
|
|
662
|
-
const modalities = rawModel.input_modalities ?? ['text', 'image'];
|
|
663
|
-
if (
|
|
664
|
-
!Array.isArray(modalities)
|
|
665
|
-
|| modalities.length > 3
|
|
666
|
-
|| modalities.some((entry) => entry !== 'text' && entry !== 'image' && entry !== 'audio')
|
|
667
|
-
|| new Set(modalities).size !== modalities.length
|
|
668
|
-
) {
|
|
669
|
-
throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
670
|
-
}
|
|
671
|
-
const rawServiceTiers = rawModel.service_tiers ?? [];
|
|
672
|
-
if (!Array.isArray(rawServiceTiers) || rawServiceTiers.length > 16) {
|
|
673
|
-
throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
674
|
-
}
|
|
675
|
-
const serviceTiers = rawServiceTiers.map((rawTier) => {
|
|
676
|
-
if (!isRecord(rawTier)) throw createSmartAiProviderError('PROTOCOL_ERROR');
|
|
677
|
-
return {
|
|
678
|
-
id: boundedString(rawTier.id, 128),
|
|
679
|
-
name: boundedString(rawTier.name, 256),
|
|
680
|
-
description: boundedString(rawTier.description, 1024, true),
|
|
681
|
-
};
|
|
682
|
-
});
|
|
683
|
-
const modelMessages = isRecord(rawModel.model_messages) ? rawModel.model_messages : undefined;
|
|
684
|
-
const variables = isRecord(modelMessages?.instructions_variables)
|
|
685
|
-
? modelMessages.instructions_variables
|
|
686
|
-
: undefined;
|
|
687
|
-
const supportsPersonality = typeof modelMessages?.instructions_template === 'string'
|
|
688
|
-
&& modelMessages.instructions_template.includes('{{ personality }}')
|
|
689
|
-
&& typeof variables?.personality_default === 'string'
|
|
690
|
-
&& typeof variables.personality_friendly === 'string'
|
|
691
|
-
&& typeof variables.personality_pragmatic === 'string';
|
|
692
|
-
return {
|
|
693
|
-
priority: rawModel.priority as number,
|
|
694
|
-
sourceIndex,
|
|
695
|
-
model: {
|
|
696
|
-
providerId: 'openai' as const,
|
|
697
|
-
modelId,
|
|
698
|
-
wireModel: modelId,
|
|
699
|
-
displayName: boundedString(rawModel.display_name, 512),
|
|
700
|
-
description: rawModel.description === null || rawModel.description === undefined
|
|
701
|
-
? ''
|
|
702
|
-
: boundedString(rawModel.description, 4096, true),
|
|
703
|
-
hidden: visibility !== 'list',
|
|
704
|
-
reasoningEfforts,
|
|
705
|
-
defaultReasoningEffort: rawModel.default_reasoning_level === null
|
|
706
|
-
|| rawModel.default_reasoning_level === undefined
|
|
707
|
-
? 'none'
|
|
708
|
-
: boundedString(rawModel.default_reasoning_level, 128),
|
|
709
|
-
inputModalities: modalities as ISmartAiProviderModel['inputModalities'],
|
|
710
|
-
supportsPersonality,
|
|
711
|
-
serviceTiers,
|
|
712
|
-
...(rawModel.default_service_tier === null || rawModel.default_service_tier === undefined
|
|
713
|
-
? {}
|
|
714
|
-
: { defaultServiceTier: boundedString(rawModel.default_service_tier, 128) }),
|
|
715
|
-
isDefault: false,
|
|
716
|
-
},
|
|
717
|
-
};
|
|
718
|
-
});
|
|
719
|
-
entries.sort((left, right) => left.priority - right.priority || left.sourceIndex - right.sourceIndex);
|
|
720
|
-
const models = entries.map((entry) => entry.model);
|
|
721
|
-
const defaultModel = models.find((model) => !model.hidden) ?? models[0];
|
|
722
|
-
if (defaultModel) defaultModel.isDefault = true;
|
|
723
|
-
return models;
|
|
724
|
-
};
|
|
725
|
-
|
|
726
627
|
export class OpenAiProviderAdapter implements ISmartAiProviderAdapter {
|
|
727
628
|
public readonly descriptor: ISmartAiProviderDescriptor = {
|
|
728
629
|
providerId: 'openai',
|
|
@@ -995,47 +896,27 @@ export class OpenAiProviderAdapter implements ISmartAiProviderAdapter {
|
|
|
995
896
|
}
|
|
996
897
|
|
|
997
898
|
private async fetchCatalog(
|
|
998
|
-
accessArg: IOpenAiChatGptReadAccess,
|
|
899
|
+
accessArg: plugins.openAi.IOpenAiChatGptReadAccess,
|
|
999
900
|
signalArg: AbortSignal,
|
|
1000
901
|
): Promise<ISmartAiProviderModel[]> {
|
|
1001
|
-
const accountId = accessArg.accountId;
|
|
1002
|
-
const url = `${OPENAI_CHATGPT_CODEX_BASE_URL}/models?client_version=${encodeURIComponent(defaultClientVersion)}`;
|
|
1003
|
-
let response: Response;
|
|
1004
|
-
let onAbort!: () => void;
|
|
1005
902
|
try {
|
|
1006
|
-
|
|
1007
|
-
method: 'GET',
|
|
1008
|
-
redirect: 'error',
|
|
903
|
+
return await plugins.openAi.listOpenAiChatGptModels(accessArg, {
|
|
1009
904
|
signal: signalArg,
|
|
1010
|
-
|
|
1011
|
-
|
|
1012
|
-
Authorization: `Bearer ${accessArg.accessToken}`,
|
|
1013
|
-
...(accountId ? { 'ChatGPT-Account-ID': accountId } : {}),
|
|
1014
|
-
...(accessArg.isFedrampAccount ? { 'X-OpenAI-Fedramp': 'true' } : {}),
|
|
1015
|
-
originator: this.originator,
|
|
1016
|
-
version: defaultClientVersion,
|
|
1017
|
-
},
|
|
905
|
+
originator: this.originator,
|
|
906
|
+
fetch: this.fetchImplementation,
|
|
1018
907
|
});
|
|
1019
|
-
|
|
1020
|
-
if (signalArg.aborted) void lateResponse.body?.cancel().catch(() => undefined);
|
|
1021
|
-
}).catch(() => undefined);
|
|
1022
|
-
const aborted = new Promise<never>((_resolve, reject) => {
|
|
1023
|
-
onAbort = () => reject(createSmartAiProviderError('ABORTED'));
|
|
1024
|
-
signalArg.addEventListener('abort', onAbort, { once: true });
|
|
1025
|
-
if (signalArg.aborted) onAbort();
|
|
1026
|
-
});
|
|
1027
|
-
response = await Promise.race([fetchPromise, aborted]);
|
|
1028
|
-
} catch {
|
|
908
|
+
} catch (errorArg) {
|
|
1029
909
|
if (signalArg.aborted) throw createSmartAiProviderError('ABORTED');
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
910
|
+
if (errorArg instanceof OpenAiChatGptAuthError && errorArg.status === 401) {
|
|
911
|
+
throw new ModelHttpError(401);
|
|
912
|
+
}
|
|
913
|
+
if (errorArg instanceof plugins.openAi.OpenAiChatGptModelListError) {
|
|
914
|
+
throw errorArg.code === 'HTTP_ERROR'
|
|
915
|
+
? new ModelHttpError(errorArg.status ?? 0)
|
|
916
|
+
: createSmartAiProviderError(errorArg.code);
|
|
917
|
+
}
|
|
918
|
+
throw errorArg;
|
|
1037
919
|
}
|
|
1038
|
-
return projectCatalog(await readBoundedJson(response, signalArg, maximumCatalogBytes));
|
|
1039
920
|
}
|
|
1040
921
|
|
|
1041
922
|
private encodeCursor(payloadArg: ICursorPayload): string {
|
|
@@ -1141,7 +1022,7 @@ export class OpenAiProviderAdapter implements ISmartAiProviderAdapter {
|
|
|
1141
1022
|
}
|
|
1142
1023
|
|
|
1143
1024
|
private async fetchAccountRateLimits(
|
|
1144
|
-
accessArg: IOpenAiChatGptReadAccess,
|
|
1025
|
+
accessArg: plugins.openAi.IOpenAiChatGptReadAccess,
|
|
1145
1026
|
signalArg: AbortSignal,
|
|
1146
1027
|
): Promise<ISmartAiProviderAccountRateLimits> {
|
|
1147
1028
|
const accountId = accessArg.accountId;
|
package/ts_openai_auth/index.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './smartai.auth.openai.js';
|
|
3
3
|
export * from './smartai.connection.openai.js';
|
|
4
|
-
export
|
|
5
|
-
|
|
4
|
+
export {
|
|
5
|
+
classifyOpenAiChatGptLimit,
|
|
6
|
+
createOpenAiChatGptInstructionsMiddleware,
|
|
7
|
+
} from '@modelprofile.com/flexharness-providers/openai';
|
|
@@ -70,7 +70,7 @@ export interface IOpenAiChatGptAuthOptions {
|
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
/** A failed refresh is replayable only when no request was handed to fetch. */
|
|
73
|
-
export type TOpenAiChatGptRequestOutcome
|
|
73
|
+
export type { TOpenAiChatGptRequestOutcome } from '@modelprofile.com/flexharness-providers/openai';
|
|
74
74
|
|
|
75
75
|
export interface IOpenAiChatGptBrowserAuthorizationOptions extends IOpenAiChatGptAuthOptions {
|
|
76
76
|
redirectUri: string;
|
|
@@ -13,13 +13,22 @@ import type {
|
|
|
13
13
|
IOpenAiChatGptTokenData,
|
|
14
14
|
IOpenAiChatGptTokenInfo,
|
|
15
15
|
TOpenAiChatGptBrowserCallback,
|
|
16
|
-
TOpenAiChatGptRequestOutcome,
|
|
17
16
|
} from './interfaces.js';
|
|
17
|
+
import {
|
|
18
|
+
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
19
|
+
OPENAI_CHATGPT_DEFAULT_ORIGINATOR,
|
|
20
|
+
OpenAiChatGptAuthError,
|
|
21
|
+
type TOpenAiChatGptRequestOutcome,
|
|
22
|
+
} from '@modelprofile.com/flexharness-providers/openai';
|
|
23
|
+
|
|
24
|
+
export {
|
|
25
|
+
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
26
|
+
OPENAI_CHATGPT_DEFAULT_ORIGINATOR,
|
|
27
|
+
OpenAiChatGptAuthError,
|
|
28
|
+
};
|
|
18
29
|
|
|
19
30
|
export const OPENAI_CHATGPT_AUTH_ISSUER = 'https://auth.openai.com';
|
|
20
31
|
export const OPENAI_CHATGPT_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann';
|
|
21
|
-
export const OPENAI_CHATGPT_CODEX_BASE_URL = 'https://chatgpt.com/backend-api/codex';
|
|
22
|
-
export const OPENAI_CHATGPT_DEFAULT_ORIGINATOR = 'smartai';
|
|
23
32
|
|
|
24
33
|
const DEVICE_CODE_TIMEOUT_MS = 15 * 60 * 1000;
|
|
25
34
|
const SAFE_MAX_RESPONSE_BYTES = 64 * 1024;
|
|
@@ -41,27 +50,6 @@ const usesSafeErrors = (optionsArg: IOpenAiChatGptAuthOptions): boolean =>
|
|
|
41
50
|
optionsArg.safeErrors !== false;
|
|
42
51
|
const utf8ByteLength = (valueArg: string): number => textEncoder.encode(valueArg).byteLength;
|
|
43
52
|
|
|
44
|
-
export class OpenAiChatGptAuthError extends Error {
|
|
45
|
-
public status?: number;
|
|
46
|
-
public body?: string;
|
|
47
|
-
public requestOutcome?: TOpenAiChatGptRequestOutcome;
|
|
48
|
-
public retryAfterMs?: number;
|
|
49
|
-
|
|
50
|
-
constructor(message: string, options: {
|
|
51
|
-
status?: number;
|
|
52
|
-
body?: string;
|
|
53
|
-
requestOutcome?: TOpenAiChatGptRequestOutcome;
|
|
54
|
-
retryAfterMs?: number;
|
|
55
|
-
} = {}) {
|
|
56
|
-
super(message);
|
|
57
|
-
this.name = 'OpenAiChatGptAuthError';
|
|
58
|
-
this.status = options.status;
|
|
59
|
-
this.body = options.body;
|
|
60
|
-
this.requestOutcome = options.requestOutcome;
|
|
61
|
-
this.retryAfterMs = options.retryAfterMs;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
|
|
65
53
|
export interface IOpenAiChatGptAuthorizationCode {
|
|
66
54
|
authorizationCode: string;
|
|
67
55
|
codeChallenge: string;
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {
|
|
2
|
+
classifyOpenAiChatGptLimit,
|
|
3
|
+
createOpenAiChatGptInstructionsMiddleware,
|
|
4
|
+
type IOpenAiModelConnection,
|
|
5
|
+
} from '@modelprofile.com/flexharness-providers/openai';
|
|
2
6
|
import type {
|
|
3
7
|
IOpenAiChatGptAuthCredentials,
|
|
4
8
|
IOpenAiChatGptDynamicModelConnectionOptions,
|
|
@@ -8,8 +12,6 @@ import {
|
|
|
8
12
|
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
9
13
|
OpenAiChatGptAuthError,
|
|
10
14
|
} from './smartai.auth.openai.js';
|
|
11
|
-
import { classifyOpenAiChatGptLimit } from './smartai.limits.openai.js';
|
|
12
|
-
import { createOpenAiChatGptInstructionsMiddleware } from './smartai.middleware.openai.js';
|
|
13
15
|
|
|
14
16
|
const codexBaseUrl = new URL(OPENAI_CHATGPT_CODEX_BASE_URL);
|
|
15
17
|
|
|
@@ -2,6 +2,35 @@ import * as plugins from './plugins.js';
|
|
|
2
2
|
import { classifyOpenAiLimit } from './smartai.limits.openai.js';
|
|
3
3
|
|
|
4
4
|
export { classifyOpenAiLimit, readOpenAiError, type IOpenAiErrorDetails } from './smartai.limits.openai.js';
|
|
5
|
+
export { classifyOpenAiChatGptLimit } from './smartai.chatgpt.limits.js';
|
|
6
|
+
export { createOpenAiChatGptInstructionsMiddleware } from './smartai.chatgpt.middleware.js';
|
|
7
|
+
export {
|
|
8
|
+
createOpenAiChatGptAccessHeaders,
|
|
9
|
+
createOpenAiChatGptAccessModelConnection,
|
|
10
|
+
createOpenAiChatGptResolvingModelConnection,
|
|
11
|
+
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
12
|
+
OPENAI_CHATGPT_DEFAULT_ORIGINATOR,
|
|
13
|
+
OpenAiChatGptAuthError,
|
|
14
|
+
type IOpenAiChatGptAccess,
|
|
15
|
+
type IOpenAiChatGptAccessConnectionOptions,
|
|
16
|
+
type IOpenAiChatGptAccessGrant,
|
|
17
|
+
type IOpenAiChatGptAccessResolveRequest,
|
|
18
|
+
type IOpenAiChatGptReadAccess,
|
|
19
|
+
type IOpenAiChatGptResolvingConnectionOptions,
|
|
20
|
+
type IOpenAiChatGptWorkspaceIdentity,
|
|
21
|
+
type TOpenAiChatGptRequestOutcome,
|
|
22
|
+
} from './smartai.chatgpt.openai.js';
|
|
23
|
+
export {
|
|
24
|
+
listOpenAiChatGptModels,
|
|
25
|
+
OPENAI_CHATGPT_CATALOG_CLIENT_VERSION,
|
|
26
|
+
OpenAiChatGptModelListError,
|
|
27
|
+
type IOpenAiChatGptModel,
|
|
28
|
+
type IOpenAiChatGptModelListOptions,
|
|
29
|
+
type IOpenAiChatGptModelReasoningEffort,
|
|
30
|
+
type IOpenAiChatGptModelServiceTier,
|
|
31
|
+
type TOpenAiChatGptInputModality,
|
|
32
|
+
type TOpenAiChatGptModelListErrorCode,
|
|
33
|
+
} from './smartai.chatgpt.catalog.js';
|
|
5
34
|
|
|
6
35
|
export type TOpenAiReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
|
|
7
36
|
export type TOpenAiTextVerbosity = 'low' | 'medium' | 'high';
|
|
@@ -6,10 +6,11 @@ export type {
|
|
|
6
6
|
OpenAIProviderSettings,
|
|
7
7
|
OpenAIResponsesProviderOptions,
|
|
8
8
|
} from '@ai-sdk/openai';
|
|
9
|
-
export type { LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
10
|
-
import { createModelLimitMiddleware, readJsonRecord } from '@modelprofile.com/flexharness-models';
|
|
11
|
-
export { createModelLimitMiddleware, readJsonRecord };
|
|
9
|
+
export type { LanguageModelV4CallOptions, LanguageModelV4Middleware } from '@ai-sdk/provider';
|
|
10
|
+
import { createModelLimitMiddleware, readEpochSeconds, readJsonRecord } from '@modelprofile.com/flexharness-models';
|
|
11
|
+
export { createModelLimitMiddleware, readEpochSeconds, readJsonRecord };
|
|
12
12
|
export type {
|
|
13
|
+
IModelCallFailure,
|
|
13
14
|
IModelProvider,
|
|
14
15
|
ISmartAiOptions,
|
|
15
16
|
JSONObject,
|