@push.rocks/smartai 2.3.0 → 4.0.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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/index.d.ts +3 -3
- package/dist_ts/index.js +2 -2
- package/dist_ts/smartai.auth.openai.d.ts +15 -15
- package/dist_ts/smartai.auth.openai.js +52 -46
- package/dist_ts/smartai.classes.smartai.js +12 -5
- package/dist_ts/smartai.interfaces.d.ts +10 -11
- package/dist_ts/smartai.middleware.openai.d.ts +6 -0
- package/dist_ts/smartai.middleware.openai.js +40 -0
- package/dist_ts_openai_chatgpt_auth/index.d.ts +43 -0
- package/dist_ts_openai_chatgpt_auth/index.js +249 -0
- package/package.json +6 -1
- package/readme.hints.md +2 -1
- package/readme.md +39 -8
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +21 -21
- package/ts/smartai.auth.openai.ts +85 -76
- package/ts/smartai.classes.smartai.ts +11 -4
- package/ts/smartai.interfaces.ts +10 -11
- package/ts/smartai.middleware.openai.ts +46 -0
- package/ts_openai_chatgpt_auth/index.ts +351 -0
|
@@ -0,0 +1,249 @@
|
|
|
1
|
+
import * as fs from 'node:fs/promises';
|
|
2
|
+
import * as os from 'node:os';
|
|
3
|
+
import * as path from 'node:path';
|
|
4
|
+
import { parseOpenAiChatGptTokenInfo, refreshOpenAiChatGptTokenData, } from '../dist_ts/smartai.auth.openai.js';
|
|
5
|
+
const defaultSources = ['smartai', 'opencode', 'codex'];
|
|
6
|
+
const refreshWindowMs = 5 * 60 * 1000;
|
|
7
|
+
export const getDefaultOpenAiChatGptAuthPath = (source, homeDir = os.homedir()) => {
|
|
8
|
+
switch (source) {
|
|
9
|
+
case 'smartai':
|
|
10
|
+
return path.join(homeDir, '.git.zone', 'ide', 'openai-chatgpt-auth.json');
|
|
11
|
+
case 'opencode':
|
|
12
|
+
return path.join(homeDir, '.local', 'share', 'opencode', 'auth.json');
|
|
13
|
+
case 'codex':
|
|
14
|
+
return path.join(homeDir, '.codex', 'auth.json');
|
|
15
|
+
default:
|
|
16
|
+
throw new Error(`Unsupported OpenAI ChatGPT auth source: ${source}`);
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
export const normalizeOpenAiChatGptAuth = (input, format = 'auto') => {
|
|
20
|
+
if (format === 'auto') {
|
|
21
|
+
return normalizeOpenAiChatGptAuth(input, 'smartai')
|
|
22
|
+
?? normalizeOpenAiChatGptAuth(input, 'opencode')
|
|
23
|
+
?? normalizeOpenAiChatGptAuth(input, 'codex');
|
|
24
|
+
}
|
|
25
|
+
if (!isRecord(input))
|
|
26
|
+
return undefined;
|
|
27
|
+
if (format === 'opencode') {
|
|
28
|
+
return normalizeOpenCodeAuth(input);
|
|
29
|
+
}
|
|
30
|
+
return normalizeTokenObject(isRecord(input.tokens) ? input.tokens : input);
|
|
31
|
+
};
|
|
32
|
+
export const readOpenAiChatGptAuthFile = async (filePath, format = 'auto') => {
|
|
33
|
+
const parsed = JSON.parse(await fs.readFile(filePath, 'utf8'));
|
|
34
|
+
return normalizeOpenAiChatGptAuth(parsed, format);
|
|
35
|
+
};
|
|
36
|
+
export const inspectOpenAiChatGptAuthSources = async (options = {}) => {
|
|
37
|
+
const now = options.now ?? new Date();
|
|
38
|
+
const sourceConfigs = normalizeSourceConfigs(options.sources, options.homeDir);
|
|
39
|
+
return Promise.all(sourceConfigs.map(async (sourceConfig) => {
|
|
40
|
+
try {
|
|
41
|
+
const tokenData = await readOpenAiChatGptAuthFile(sourceConfig.filePath, sourceConfig.format ?? sourceConfig.source);
|
|
42
|
+
if (!tokenData) {
|
|
43
|
+
return {
|
|
44
|
+
source: sourceConfig.source,
|
|
45
|
+
filePath: sourceConfig.filePath,
|
|
46
|
+
exists: true,
|
|
47
|
+
usable: false,
|
|
48
|
+
error: 'No OpenAI ChatGPT auth token found in file.',
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
return toInspection(sourceConfig.source, sourceConfig.filePath, tokenData, now);
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
const nodeError = error;
|
|
55
|
+
return {
|
|
56
|
+
source: sourceConfig.source,
|
|
57
|
+
filePath: sourceConfig.filePath,
|
|
58
|
+
exists: nodeError.code !== 'ENOENT',
|
|
59
|
+
usable: false,
|
|
60
|
+
error: nodeError.code === 'ENOENT' ? undefined : nodeError.message,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
}));
|
|
64
|
+
};
|
|
65
|
+
export const resolveOpenAiChatGptAuth = async (options = {}) => {
|
|
66
|
+
const now = options.now ?? new Date();
|
|
67
|
+
const sourceConfigs = normalizeSourceConfigs(options.sources, options.homeDir);
|
|
68
|
+
const refresh = options.refresh ?? 'ifNeeded';
|
|
69
|
+
for (const sourceConfig of sourceConfigs) {
|
|
70
|
+
let tokenData;
|
|
71
|
+
try {
|
|
72
|
+
tokenData = await readOpenAiChatGptAuthFile(sourceConfig.filePath, sourceConfig.format ?? sourceConfig.source);
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
const nodeError = error;
|
|
76
|
+
if (nodeError.code === 'ENOENT')
|
|
77
|
+
continue;
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
if (!tokenData)
|
|
81
|
+
continue;
|
|
82
|
+
const shouldRefresh = refresh === 'ifNeeded' && shouldRefreshToken(tokenData, now);
|
|
83
|
+
const writeBack = sourceConfig.writeBack ?? options.writeBack?.[sourceConfig.source] ?? sourceConfig.source === 'smartai';
|
|
84
|
+
if (!shouldRefresh) {
|
|
85
|
+
return { source: sourceConfig.source, filePath: sourceConfig.filePath, tokenData, refreshed: false };
|
|
86
|
+
}
|
|
87
|
+
if (!writeBack) {
|
|
88
|
+
if (!isExpired(tokenData, now)) {
|
|
89
|
+
return { source: sourceConfig.source, filePath: sourceConfig.filePath, tokenData, refreshed: false };
|
|
90
|
+
}
|
|
91
|
+
continue;
|
|
92
|
+
}
|
|
93
|
+
try {
|
|
94
|
+
const refreshed = await refreshOpenAiChatGptTokenData(tokenData, options.authOptions ?? {});
|
|
95
|
+
await writeOpenAiChatGptAuthFile(sourceConfig.filePath, refreshed, sourceConfig.format ?? sourceConfig.source);
|
|
96
|
+
return { source: sourceConfig.source, filePath: sourceConfig.filePath, tokenData: refreshed, refreshed: true };
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return undefined;
|
|
103
|
+
};
|
|
104
|
+
export const writeOpenAiChatGptAuthFile = async (filePath, tokenData, format = 'smartai') => {
|
|
105
|
+
const current = await readJsonFileIfExists(filePath);
|
|
106
|
+
const payload = format === 'opencode'
|
|
107
|
+
? toOpenCodeAuthFile(current, tokenData)
|
|
108
|
+
: format === 'codex'
|
|
109
|
+
? toCodexAuthFile(current, tokenData)
|
|
110
|
+
: toSmartAiAuthFile(tokenData);
|
|
111
|
+
await writeJsonAtomic(filePath, payload);
|
|
112
|
+
};
|
|
113
|
+
const normalizeSourceConfigs = (sources, homeDir = os.homedir()) => {
|
|
114
|
+
return (sources ?? defaultSources).map((sourceInput) => {
|
|
115
|
+
const sourceConfig = typeof sourceInput === 'string' ? { source: sourceInput } : sourceInput;
|
|
116
|
+
return {
|
|
117
|
+
source: sourceConfig.source,
|
|
118
|
+
filePath: sourceConfig.filePath ?? getDefaultOpenAiChatGptAuthPath(sourceConfig.source, homeDir),
|
|
119
|
+
format: sourceConfig.format ?? sourceConfig.source,
|
|
120
|
+
writeBack: sourceConfig.writeBack,
|
|
121
|
+
};
|
|
122
|
+
});
|
|
123
|
+
};
|
|
124
|
+
const toInspection = (source, filePath, tokenData, now) => {
|
|
125
|
+
const expired = isExpired(tokenData, now);
|
|
126
|
+
return {
|
|
127
|
+
source,
|
|
128
|
+
filePath,
|
|
129
|
+
exists: true,
|
|
130
|
+
usable: !expired,
|
|
131
|
+
expired,
|
|
132
|
+
accountId: tokenData.accountId ?? tokenData.tokenInfo.chatgptAccountId,
|
|
133
|
+
email: tokenData.tokenInfo.email,
|
|
134
|
+
plan: tokenData.tokenInfo.chatgptPlanType,
|
|
135
|
+
expiresAt: tokenData.tokenInfo.expiresAt,
|
|
136
|
+
};
|
|
137
|
+
};
|
|
138
|
+
const normalizeTokenObject = (input) => {
|
|
139
|
+
const accessToken = stringValue(input.accessToken) ?? stringValue(input.access_token);
|
|
140
|
+
const refreshToken = stringValue(input.refreshToken) ?? stringValue(input.refresh_token);
|
|
141
|
+
const idToken = stringValue(input.idToken) ?? stringValue(input.id_token) ?? stringValue(input.tokenInfo?.rawJwt);
|
|
142
|
+
const accountId = stringValue(input.accountId) ?? stringValue(input.account_id);
|
|
143
|
+
return createTokenDataFromValues({ accessToken, refreshToken, idToken, accountId });
|
|
144
|
+
};
|
|
145
|
+
const normalizeOpenCodeAuth = (input) => {
|
|
146
|
+
if (!isRecord(input.openai))
|
|
147
|
+
return undefined;
|
|
148
|
+
const accessToken = stringValue(input.openai.access);
|
|
149
|
+
const refreshToken = stringValue(input.openai.refresh);
|
|
150
|
+
const accountId = stringValue(input.openai.accountId);
|
|
151
|
+
const expiresAt = typeof input.openai.expires === 'number' ? new Date(input.openai.expires).toISOString() : undefined;
|
|
152
|
+
return createTokenDataFromValues({ accessToken, refreshToken, accountId, fallbackExpiresAt: expiresAt });
|
|
153
|
+
};
|
|
154
|
+
const createTokenDataFromValues = (input) => {
|
|
155
|
+
if (!input.accessToken || !input.refreshToken)
|
|
156
|
+
return undefined;
|
|
157
|
+
const parseToken = input.idToken ?? input.accessToken;
|
|
158
|
+
const tokenInfo = parseTokenInfo(parseToken, input.accountId, input.fallbackExpiresAt);
|
|
159
|
+
return {
|
|
160
|
+
accessToken: input.accessToken,
|
|
161
|
+
refreshToken: input.refreshToken,
|
|
162
|
+
idToken: input.idToken,
|
|
163
|
+
accountId: input.accountId ?? tokenInfo.chatgptAccountId,
|
|
164
|
+
tokenInfo,
|
|
165
|
+
};
|
|
166
|
+
};
|
|
167
|
+
const parseTokenInfo = (token, accountId, fallbackExpiresAt) => {
|
|
168
|
+
try {
|
|
169
|
+
const tokenInfo = parseOpenAiChatGptTokenInfo(token);
|
|
170
|
+
return {
|
|
171
|
+
...tokenInfo,
|
|
172
|
+
chatgptAccountId: tokenInfo.chatgptAccountId ?? accountId,
|
|
173
|
+
expiresAt: tokenInfo.expiresAt ?? fallbackExpiresAt,
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
catch {
|
|
177
|
+
return {
|
|
178
|
+
chatgptAccountId: accountId,
|
|
179
|
+
chatgptAccountIsFedramp: false,
|
|
180
|
+
expiresAt: fallbackExpiresAt,
|
|
181
|
+
rawJwt: token,
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
const toSmartAiAuthFile = (tokenData) => ({
|
|
186
|
+
accessToken: tokenData.accessToken,
|
|
187
|
+
refreshToken: tokenData.refreshToken,
|
|
188
|
+
idToken: tokenData.idToken,
|
|
189
|
+
accountId: tokenData.accountId,
|
|
190
|
+
tokenInfo: tokenData.tokenInfo,
|
|
191
|
+
});
|
|
192
|
+
const toCodexAuthFile = (current, tokenData) => ({
|
|
193
|
+
...current,
|
|
194
|
+
OPENAI_API_KEY: current.OPENAI_API_KEY ?? null,
|
|
195
|
+
tokens: {
|
|
196
|
+
...(isRecord(current.tokens) ? current.tokens : {}),
|
|
197
|
+
id_token: tokenData.idToken,
|
|
198
|
+
access_token: tokenData.accessToken,
|
|
199
|
+
refresh_token: tokenData.refreshToken,
|
|
200
|
+
account_id: tokenData.accountId ?? tokenData.tokenInfo.chatgptAccountId,
|
|
201
|
+
},
|
|
202
|
+
last_refresh: new Date().toISOString(),
|
|
203
|
+
});
|
|
204
|
+
const toOpenCodeAuthFile = (current, tokenData) => ({
|
|
205
|
+
...current,
|
|
206
|
+
openai: {
|
|
207
|
+
...(isRecord(current.openai) ? current.openai : {}),
|
|
208
|
+
type: 'oauth',
|
|
209
|
+
refresh: tokenData.refreshToken,
|
|
210
|
+
access: tokenData.accessToken,
|
|
211
|
+
expires: tokenData.tokenInfo.expiresAt ? Date.parse(tokenData.tokenInfo.expiresAt) : undefined,
|
|
212
|
+
accountId: tokenData.accountId ?? tokenData.tokenInfo.chatgptAccountId,
|
|
213
|
+
},
|
|
214
|
+
});
|
|
215
|
+
const shouldRefreshToken = (tokenData, now) => {
|
|
216
|
+
if (!tokenData.tokenInfo.expiresAt)
|
|
217
|
+
return false;
|
|
218
|
+
return Date.parse(tokenData.tokenInfo.expiresAt) - now.getTime() < refreshWindowMs;
|
|
219
|
+
};
|
|
220
|
+
const isExpired = (tokenData, now) => {
|
|
221
|
+
if (!tokenData.tokenInfo.expiresAt)
|
|
222
|
+
return false;
|
|
223
|
+
return Date.parse(tokenData.tokenInfo.expiresAt) <= now.getTime();
|
|
224
|
+
};
|
|
225
|
+
const readJsonFileIfExists = async (filePath) => {
|
|
226
|
+
try {
|
|
227
|
+
const parsed = JSON.parse(await fs.readFile(filePath, 'utf8'));
|
|
228
|
+
return isRecord(parsed) ? parsed : {};
|
|
229
|
+
}
|
|
230
|
+
catch (error) {
|
|
231
|
+
const nodeError = error;
|
|
232
|
+
if (nodeError.code === 'ENOENT')
|
|
233
|
+
return {};
|
|
234
|
+
throw error;
|
|
235
|
+
}
|
|
236
|
+
};
|
|
237
|
+
const writeJsonAtomic = async (filePath, payload) => {
|
|
238
|
+
const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
|
|
239
|
+
await fs.mkdir(path.dirname(filePath), { recursive: true, mode: 0o700 });
|
|
240
|
+
await fs.writeFile(tempPath, `${JSON.stringify(payload, undefined, 2)}\n`, { mode: 0o600 });
|
|
241
|
+
await fs.rename(tempPath, filePath);
|
|
242
|
+
};
|
|
243
|
+
const isRecord = (value) => {
|
|
244
|
+
return !!value && typeof value === 'object' && !Array.isArray(value);
|
|
245
|
+
};
|
|
246
|
+
const stringValue = (value) => {
|
|
247
|
+
return typeof value === 'string' && value.length > 0 ? value : undefined;
|
|
248
|
+
};
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts_openai_chatgpt_auth/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartai",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Provider registry and capability utilities for ai-sdk (Vercel AI SDK). Core export returns LanguageModel; subpath exports provide vision, audio, image, document and research capabilities.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -30,6 +30,10 @@
|
|
|
30
30
|
"./research": {
|
|
31
31
|
"import": "./dist_ts_research/index.js",
|
|
32
32
|
"types": "./dist_ts_research/index.d.ts"
|
|
33
|
+
},
|
|
34
|
+
"./openai-chatgpt-auth": {
|
|
35
|
+
"import": "./dist_ts_openai_chatgpt_auth/index.js",
|
|
36
|
+
"types": "./dist_ts_openai_chatgpt_auth/index.d.ts"
|
|
33
37
|
}
|
|
34
38
|
},
|
|
35
39
|
"author": "Task Venture Capital GmbH",
|
|
@@ -78,6 +82,7 @@
|
|
|
78
82
|
"ts_image/**/*",
|
|
79
83
|
"ts_document/**/*",
|
|
80
84
|
"ts_research/**/*",
|
|
85
|
+
"ts_openai_chatgpt_auth/**/*",
|
|
81
86
|
"dist_*/**/*",
|
|
82
87
|
"assets/**/*",
|
|
83
88
|
".smartconfig.json",
|
package/readme.hints.md
CHANGED
|
@@ -10,7 +10,8 @@ The package is a **provider registry** built on the Vercel AI SDK (`ai` v6). The
|
|
|
10
10
|
- Providers: anthropic, openai, google, groq, mistral, xai, perplexity, ollama
|
|
11
11
|
- Anthropic prompt caching via `wrapLanguageModel` middleware (enabled by default)
|
|
12
12
|
- Custom Ollama provider implementing `LanguageModelV3` directly (for think, num_ctx support)
|
|
13
|
-
- OpenAI ChatGPT/
|
|
13
|
+
- OpenAI ChatGPT/Codex device-code auth in `smartai.auth.openai.ts`; `openAiChatGptAuth` routes OpenAI models to the ChatGPT Codex backend
|
|
14
|
+
- Node-only local auth source helpers live in `ts_openai_chatgpt_auth/` and support SmartAI, OpenCode, and Codex auth file formats
|
|
14
15
|
|
|
15
16
|
### Subpath Exports
|
|
16
17
|
- `@push.rocks/smartai/vision` — `analyzeImage()` using `generateText` with image content
|
package/readme.md
CHANGED
|
@@ -107,29 +107,60 @@ console.log(result.text);
|
|
|
107
107
|
|
|
108
108
|
OpenAI `reasoningEffort` supports `'none'`, `'minimal'`, `'low'`, `'medium'`, `'high'`, and `'xhigh'`. Model IDs are accepted as strings, so new IDs like `'gpt-5.5'` can be used before upstream model unions are updated.
|
|
109
109
|
|
|
110
|
-
### OpenAI
|
|
110
|
+
### OpenAI ChatGPT / Codex Auth
|
|
111
111
|
|
|
112
|
-
SmartAI can request ChatGPT subscription-backed Codex credentials with OpenAI's device-code flow. The returned credentials are passed to `getModel()` through `
|
|
112
|
+
SmartAI can request ChatGPT subscription-backed Codex credentials with OpenAI's device-code flow. The returned credentials are passed to `getModel()` through `openAiChatGptAuth`; SmartAI then routes OpenAI model calls through the ChatGPT Codex backend with the required account headers.
|
|
113
113
|
|
|
114
114
|
```typescript
|
|
115
115
|
import {
|
|
116
|
-
|
|
116
|
+
completeOpenAiChatGptDeviceCodeLogin,
|
|
117
117
|
getModel,
|
|
118
|
-
|
|
118
|
+
requestOpenAiChatGptDeviceCode,
|
|
119
119
|
} from '@push.rocks/smartai';
|
|
120
120
|
|
|
121
|
-
const deviceCode = await
|
|
121
|
+
const deviceCode = await requestOpenAiChatGptDeviceCode();
|
|
122
122
|
console.log(`Open ${deviceCode.verificationUrl} and enter ${deviceCode.userCode}`);
|
|
123
123
|
|
|
124
|
-
const
|
|
124
|
+
const openAiChatGptAuth = await completeOpenAiChatGptDeviceCodeLogin(deviceCode);
|
|
125
125
|
const model = getModel({
|
|
126
126
|
provider: 'openai',
|
|
127
127
|
model: 'gpt-5.5',
|
|
128
|
-
|
|
128
|
+
openAiChatGptAuth,
|
|
129
129
|
});
|
|
130
130
|
```
|
|
131
131
|
|
|
132
|
-
Use `
|
|
132
|
+
Use `refreshOpenAiChatGptTokenData(openAiChatGptAuth)` before stored credentials expire, or after receiving an unauthorized response.
|
|
133
|
+
|
|
134
|
+
Node.js consumers can inspect and resolve local ChatGPT auth files through the Node-only subpath. This supports SmartAI's canonical auth file, OpenCode's `~/.local/share/opencode/auth.json`, and Codex's `~/.codex/auth.json` without exposing token values in inspection results.
|
|
135
|
+
|
|
136
|
+
```typescript
|
|
137
|
+
import {
|
|
138
|
+
inspectOpenAiChatGptAuthSources,
|
|
139
|
+
resolveOpenAiChatGptAuth,
|
|
140
|
+
} from '@push.rocks/smartai/openai-chatgpt-auth';
|
|
141
|
+
|
|
142
|
+
const sources = await inspectOpenAiChatGptAuthSources({
|
|
143
|
+
sources: ['smartai', 'opencode', 'codex'],
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
const resolved = await resolveOpenAiChatGptAuth({
|
|
147
|
+
sources: ['smartai', 'opencode', 'codex'],
|
|
148
|
+
refresh: 'ifNeeded',
|
|
149
|
+
writeBack: {
|
|
150
|
+
smartai: true,
|
|
151
|
+
opencode: false,
|
|
152
|
+
codex: false,
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
if (resolved) {
|
|
157
|
+
const model = getModel({
|
|
158
|
+
provider: 'openai',
|
|
159
|
+
model: 'gpt-5.5',
|
|
160
|
+
openAiChatGptAuth: resolved.tokenData,
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
```
|
|
133
164
|
|
|
134
165
|
### Re-exported AI SDK Functions
|
|
135
166
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartai',
|
|
6
|
-
version: '
|
|
6
|
+
version: '4.0.1',
|
|
7
7
|
description: 'Provider registry and capability utilities for ai-sdk (Vercel AI SDK). Core export returns LanguageModel; subpath exports provide vision, audio, image, document and research capabilities.'
|
|
8
8
|
}
|
package/ts/index.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
export { getModel, getModelSetup } from './smartai.classes.smartai.js';
|
|
2
2
|
export type {
|
|
3
3
|
IOpenAiProviderOptions,
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
4
|
+
IOpenAiChatGptAuthCredentials,
|
|
5
|
+
IOpenAiChatGptAuthOptions,
|
|
6
|
+
IOpenAiChatGptCompleteDeviceCodeOptions,
|
|
7
|
+
IOpenAiChatGptDeviceCode,
|
|
8
|
+
IOpenAiChatGptDeviceCodePollOptions,
|
|
9
|
+
IOpenAiChatGptTokenData,
|
|
10
|
+
IOpenAiChatGptTokenInfo,
|
|
11
11
|
ISmartAiModelSetup,
|
|
12
12
|
ISmartAiOptions,
|
|
13
13
|
TOpenAiReasoningEffort,
|
|
@@ -36,21 +36,21 @@ export type {
|
|
|
36
36
|
} from './smartai.cache.js';
|
|
37
37
|
export { createOllamaModel } from './smartai.provider.ollama.js';
|
|
38
38
|
export {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
39
|
+
OPENAI_CHATGPT_AUTH_ISSUER,
|
|
40
|
+
OPENAI_CHATGPT_CLIENT_ID,
|
|
41
|
+
OPENAI_CHATGPT_CODEX_BASE_URL,
|
|
42
|
+
OPENAI_CHATGPT_DEFAULT_ORIGINATOR,
|
|
43
|
+
OpenAiChatGptAuthError,
|
|
44
|
+
completeOpenAiChatGptDeviceCodeLogin,
|
|
45
|
+
createOpenAiChatGptProviderSettings,
|
|
46
|
+
ensureOpenAiChatGptWorkspaceAllowed,
|
|
47
|
+
exchangeOpenAiChatGptAuthorizationCode,
|
|
48
|
+
parseOpenAiChatGptTokenInfo,
|
|
49
|
+
pollOpenAiChatGptDeviceCode,
|
|
50
|
+
refreshOpenAiChatGptTokenData,
|
|
51
|
+
requestOpenAiChatGptDeviceCode,
|
|
52
52
|
} from './smartai.auth.openai.js';
|
|
53
|
-
export type {
|
|
53
|
+
export type { IOpenAiChatGptAuthorizationCode } from './smartai.auth.openai.js';
|
|
54
54
|
|
|
55
55
|
// Re-export commonly used ai-sdk functions for consumer convenience
|
|
56
56
|
export { generateText, streamText, tool, jsonSchema } from 'ai';
|