@theia/ai-chatgpt 1.77.0-next.99 → 1.77.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/lib/browser/chatgpt-command-contribution.d.ts +1 -1
- package/lib/browser/chatgpt-command-contribution.d.ts.map +1 -1
- package/lib/browser/chatgpt-command-contribution.js +42 -54
- package/lib/browser/chatgpt-command-contribution.js.map +1 -1
- package/lib/browser/chatgpt-command-contribution.spec.js +50 -52
- package/lib/browser/chatgpt-command-contribution.spec.js.map +1 -1
- package/lib/browser/chatgpt-frontend-application-contribution.d.ts +1 -1
- package/lib/browser/chatgpt-frontend-application-contribution.d.ts.map +1 -1
- package/lib/browser/chatgpt-frontend-application-contribution.js +50 -58
- package/lib/browser/chatgpt-frontend-application-contribution.js.map +1 -1
- package/lib/browser/chatgpt-frontend-application-contribution.spec.js +131 -133
- package/lib/browser/chatgpt-frontend-application-contribution.spec.js.map +1 -1
- package/lib/browser/chatgpt-frontend-module.js +23 -25
- package/lib/browser/chatgpt-frontend-module.js.map +1 -1
- package/lib/browser/chatgpt-status-bar-contribution.d.ts +1 -1
- package/lib/browser/chatgpt-status-bar-contribution.d.ts.map +1 -1
- package/lib/browser/chatgpt-status-bar-contribution.js +28 -38
- package/lib/browser/chatgpt-status-bar-contribution.js.map +1 -1
- package/lib/browser/chatgpt-status-bar-contribution.spec.js +39 -41
- package/lib/browser/chatgpt-status-bar-contribution.spec.js.map +1 -1
- package/lib/common/chatgpt-auth-service.js +4 -7
- package/lib/common/chatgpt-auth-service.js.map +1 -1
- package/lib/common/chatgpt-language-models-manager.js +3 -6
- package/lib/common/chatgpt-language-models-manager.js.map +1 -1
- package/lib/common/chatgpt-preferences.js +28 -31
- package/lib/common/chatgpt-preferences.js.map +1 -1
- package/lib/common/chatgpt-preferences.spec.js +9 -11
- package/lib/common/chatgpt-preferences.spec.js.map +1 -1
- package/lib/common/index.d.ts +3 -3
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +3 -6
- package/lib/common/index.js.map +1 -1
- package/lib/node/chatgpt-auth-service-impl.d.ts +2 -2
- package/lib/node/chatgpt-auth-service-impl.d.ts.map +1 -1
- package/lib/node/chatgpt-auth-service-impl.js +31 -38
- package/lib/node/chatgpt-auth-service-impl.js.map +1 -1
- package/lib/node/chatgpt-auth-service-impl.spec.js +203 -201
- package/lib/node/chatgpt-auth-service-impl.spec.js.map +1 -1
- package/lib/node/chatgpt-auth-service.d.ts +1 -1
- package/lib/node/chatgpt-auth-service.d.ts.map +1 -1
- package/lib/node/chatgpt-auth-service.js +8 -11
- package/lib/node/chatgpt-auth-service.js.map +1 -1
- package/lib/node/chatgpt-backend-module.js +25 -27
- package/lib/node/chatgpt-backend-module.js.map +1 -1
- package/lib/node/chatgpt-language-model.d.ts +2 -2
- package/lib/node/chatgpt-language-model.d.ts.map +1 -1
- package/lib/node/chatgpt-language-model.js +15 -19
- package/lib/node/chatgpt-language-model.js.map +1 -1
- package/lib/node/chatgpt-language-model.spec.js +155 -95
- package/lib/node/chatgpt-language-model.spec.js.map +1 -1
- package/lib/node/chatgpt-language-models-manager-impl.d.ts +4 -4
- package/lib/node/chatgpt-language-models-manager-impl.d.ts.map +1 -1
- package/lib/node/chatgpt-language-models-manager-impl.js +33 -42
- package/lib/node/chatgpt-language-models-manager-impl.js.map +1 -1
- package/lib/node/chatgpt-language-models-manager-impl.spec.js +51 -51
- package/lib/node/chatgpt-language-models-manager-impl.spec.js.map +1 -1
- package/lib/node/chatgpt-model-catalog.d.ts +1 -1
- package/lib/node/chatgpt-model-catalog.d.ts.map +1 -1
- package/lib/node/chatgpt-model-catalog.js +21 -29
- package/lib/node/chatgpt-model-catalog.js.map +1 -1
- package/lib/node/chatgpt-model-catalog.spec.js +43 -46
- package/lib/node/chatgpt-model-catalog.spec.js.map +1 -1
- package/lib/node/chatgpt-oauth.js +22 -30
- package/lib/node/chatgpt-oauth.js.map +1 -1
- package/lib/node/chatgpt-oauth.spec.js +33 -35
- package/lib/node/chatgpt-oauth.spec.js.map +1 -1
- package/lib/node/chatgpt-response-api-utils.d.ts +1 -3
- package/lib/node/chatgpt-response-api-utils.d.ts.map +1 -1
- package/lib/node/chatgpt-response-api-utils.js +9 -22
- package/lib/node/chatgpt-response-api-utils.js.map +1 -1
- package/package.json +15 -6
- package/src/browser/chatgpt-command-contribution.spec.ts +2 -2
- package/src/browser/chatgpt-command-contribution.ts +1 -1
- package/src/browser/chatgpt-frontend-application-contribution.spec.ts +3 -3
- package/src/browser/chatgpt-frontend-application-contribution.ts +2 -2
- package/src/browser/chatgpt-frontend-module.ts +4 -4
- package/src/browser/chatgpt-status-bar-contribution.spec.ts +3 -3
- package/src/browser/chatgpt-status-bar-contribution.ts +2 -2
- package/src/common/chatgpt-preferences.spec.ts +1 -1
- package/src/common/index.ts +3 -3
- package/src/node/chatgpt-auth-service-impl.spec.ts +10 -5
- package/src/node/chatgpt-auth-service-impl.ts +3 -3
- package/src/node/chatgpt-auth-service.ts +2 -2
- package/src/node/chatgpt-backend-module.ts +6 -6
- package/src/node/chatgpt-language-model.spec.ts +64 -4
- package/src/node/chatgpt-language-model.ts +3 -3
- package/src/node/chatgpt-language-models-manager-impl.spec.ts +8 -6
- package/src/node/chatgpt-language-models-manager-impl.ts +5 -5
- package/src/node/chatgpt-model-catalog.spec.ts +4 -4
- package/src/node/chatgpt-model-catalog.ts +3 -3
- package/src/node/chatgpt-oauth.spec.ts +1 -1
- package/src/node/chatgpt-response-api-utils.ts +1 -13
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
3
|
//
|
|
@@ -14,18 +13,16 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const chatgpt_model_catalog_1 = require("./chatgpt-model-catalog");
|
|
28
|
-
const chatgpt_oauth_1 = require("./chatgpt-oauth");
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import * as sinon from 'sinon';
|
|
18
|
+
import { Emitter } from '@theia/core';
|
|
19
|
+
import { ILogger } from '@theia/core/lib/common/logger';
|
|
20
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
21
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
22
|
+
import { CHATGPT_FALLBACK_MODELS } from '../common/index.js';
|
|
23
|
+
import { ChatGptBackendAuthService } from './chatgpt-auth-service.js';
|
|
24
|
+
import { ChatGptModelCatalog } from './chatgpt-model-catalog.js';
|
|
25
|
+
import { CHATGPT_ORIGINATOR } from './chatgpt-oauth.js';
|
|
29
26
|
function listing(payload, status = 200) {
|
|
30
27
|
return {
|
|
31
28
|
ok: status < 400,
|
|
@@ -57,9 +54,9 @@ describe('ChatGptModelCatalog', () => {
|
|
|
57
54
|
beforeEach(() => {
|
|
58
55
|
credentials = { accessToken: 'the-token', accountId: 'account-id' };
|
|
59
56
|
credentialsError = undefined;
|
|
60
|
-
authStateEmitter = new
|
|
61
|
-
const container = new
|
|
62
|
-
container.bind(
|
|
57
|
+
authStateEmitter = new Emitter();
|
|
58
|
+
const container = new Container();
|
|
59
|
+
container.bind(ChatGptBackendAuthService).toConstantValue({
|
|
63
60
|
getCredentials: async () => {
|
|
64
61
|
if (credentialsError) {
|
|
65
62
|
throw credentialsError;
|
|
@@ -69,9 +66,9 @@ describe('ChatGptModelCatalog', () => {
|
|
|
69
66
|
getAuthState: async () => ({ isAuthenticated: credentials !== undefined }),
|
|
70
67
|
onAuthStateChanged: authStateEmitter.event
|
|
71
68
|
});
|
|
72
|
-
container.bind(
|
|
73
|
-
container.bind(
|
|
74
|
-
catalog = container.get(
|
|
69
|
+
container.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
70
|
+
container.bind(ChatGptModelCatalog).toSelf().inSingletonScope();
|
|
71
|
+
catalog = container.get(ChatGptModelCatalog);
|
|
75
72
|
fetchStub = sinon.stub(globalThis, 'fetch');
|
|
76
73
|
});
|
|
77
74
|
afterEach(() => {
|
|
@@ -79,31 +76,31 @@ describe('ChatGptModelCatalog', () => {
|
|
|
79
76
|
});
|
|
80
77
|
it('lists the models the signed in account may request', async () => {
|
|
81
78
|
fetchStub.resolves(listing(MODELS));
|
|
82
|
-
|
|
79
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(['gpt-5.6-sol', 'gpt-5.5']);
|
|
83
80
|
});
|
|
84
81
|
it('identifies the client and the account of the listing request', async () => {
|
|
85
82
|
fetchStub.resolves(listing(MODELS));
|
|
86
83
|
await catalog.getAvailableModels();
|
|
87
84
|
const url = new URL(fetchStub.firstCall.args[0]);
|
|
88
|
-
|
|
89
|
-
|
|
85
|
+
expect(url.origin + url.pathname).to.equal('https://chatgpt.com/backend-api/codex/models');
|
|
86
|
+
expect(url.searchParams.get('client_version')).to.have.length.greaterThan(0);
|
|
90
87
|
const { headers } = fetchStub.firstCall.args[1];
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
88
|
+
expect(headers.Authorization).to.equal('Bearer the-token');
|
|
89
|
+
expect(headers['chatgpt-account-id']).to.equal('account-id');
|
|
90
|
+
expect(headers.originator).to.equal(CHATGPT_ORIGINATOR);
|
|
94
91
|
});
|
|
95
92
|
it('offers no models while nobody is signed in', async () => {
|
|
96
93
|
credentials = undefined;
|
|
97
|
-
|
|
98
|
-
|
|
94
|
+
expect(await catalog.getAvailableModels()).to.deep.equal([]);
|
|
95
|
+
expect(fetchStub.called).to.equal(false);
|
|
99
96
|
});
|
|
100
97
|
it('clears a cached listing when the account signs out', async () => {
|
|
101
98
|
fetchStub.resolves(listing(MODELS));
|
|
102
99
|
await catalog.getAvailableModels();
|
|
103
100
|
credentials = undefined;
|
|
104
101
|
authStateEmitter.fire({ isAuthenticated: false });
|
|
105
|
-
|
|
106
|
-
|
|
102
|
+
expect(await catalog.getAvailableModels()).to.deep.equal([]);
|
|
103
|
+
expect(fetchStub.calledOnce).to.equal(true);
|
|
107
104
|
});
|
|
108
105
|
it('does not offer a stale listing or fallback after signing out during discovery', async () => {
|
|
109
106
|
let respond = () => { };
|
|
@@ -113,35 +110,35 @@ describe('ChatGptModelCatalog', () => {
|
|
|
113
110
|
credentials = undefined;
|
|
114
111
|
authStateEmitter.fire({ isAuthenticated: false });
|
|
115
112
|
respond(listing(MODELS));
|
|
116
|
-
|
|
117
|
-
|
|
113
|
+
expect(await models).to.deep.equal([]);
|
|
114
|
+
expect(fetchStub.calledOnce).to.equal(true);
|
|
118
115
|
});
|
|
119
116
|
it('offers the built-in models when the listing is rejected', async () => {
|
|
120
117
|
fetchStub.resolves(listing({ error: 'unsupported client' }, 400));
|
|
121
|
-
|
|
118
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(CHATGPT_FALLBACK_MODELS);
|
|
122
119
|
});
|
|
123
120
|
it('offers the built-in models when the response is not a model listing', async () => {
|
|
124
121
|
fetchStub.resolves(listing({ object: 'list' }));
|
|
125
|
-
|
|
122
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(CHATGPT_FALLBACK_MODELS);
|
|
126
123
|
});
|
|
127
124
|
it('offers the built-in models when the credentials cannot be refreshed', async () => {
|
|
128
125
|
credentialsError = new Error('The ChatGPT session has expired.');
|
|
129
|
-
|
|
130
|
-
|
|
126
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(CHATGPT_FALLBACK_MODELS);
|
|
127
|
+
expect(fetchStub.called).to.equal(false);
|
|
131
128
|
});
|
|
132
129
|
it('requests the listing once and serves it to later callers', async () => {
|
|
133
130
|
fetchStub.resolves(listing(MODELS));
|
|
134
131
|
const [first, second] = await Promise.all([catalog.getAvailableModels(), catalog.getAvailableModels()]);
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
132
|
+
expect(second).to.deep.equal(first);
|
|
133
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(first);
|
|
134
|
+
expect(fetchStub.calledOnce).to.equal(true);
|
|
138
135
|
});
|
|
139
136
|
it('lists the models again once a different account is signed in', async () => {
|
|
140
137
|
fetchStub.resolves(listing(MODELS));
|
|
141
138
|
await catalog.getAvailableModels();
|
|
142
139
|
fetchStub.resolves(listing({ models: [{ slug: 'gpt-5.5-pro', supported_in_api: true, visibility: 'list' }] }));
|
|
143
140
|
authStateEmitter.fire({ isAuthenticated: true, accountLabel: 'other@example.com' });
|
|
144
|
-
|
|
141
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(['gpt-5.5-pro']);
|
|
145
142
|
});
|
|
146
143
|
it('does not serve the models of the account that was replaced while they were listed', async () => {
|
|
147
144
|
let respond = () => { };
|
|
@@ -151,7 +148,7 @@ describe('ChatGptModelCatalog', () => {
|
|
|
151
148
|
authStateEmitter.fire({ isAuthenticated: true, accountLabel: 'other@example.com' });
|
|
152
149
|
fetchStub.resolves(listing({ models: [{ slug: 'gpt-5.5-pro', supported_in_api: true, visibility: 'list' }] }));
|
|
153
150
|
respond(listing(MODELS));
|
|
154
|
-
|
|
151
|
+
expect(await listed).to.deep.equal(['gpt-5.5-pro']);
|
|
155
152
|
});
|
|
156
153
|
it('keeps the listing of the current account when the one of a former account fails', async () => {
|
|
157
154
|
let fail = () => { };
|
|
@@ -160,17 +157,17 @@ describe('ChatGptModelCatalog', () => {
|
|
|
160
157
|
await waitFor(() => fetchStub.called);
|
|
161
158
|
authStateEmitter.fire({ isAuthenticated: true, accountLabel: 'other@example.com' });
|
|
162
159
|
fetchStub.resolves(listing(MODELS));
|
|
163
|
-
|
|
160
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(['gpt-5.6-sol', 'gpt-5.5']);
|
|
164
161
|
fail(new Error('the connection was reset'));
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
162
|
+
expect(await stale).to.deep.equal(['gpt-5.6-sol', 'gpt-5.5']);
|
|
163
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(['gpt-5.6-sol', 'gpt-5.5']);
|
|
164
|
+
expect(fetchStub.callCount).to.equal(2);
|
|
168
165
|
});
|
|
169
166
|
it('retries a listing that failed instead of serving the built-in models for good', async () => {
|
|
170
167
|
fetchStub.resolves(listing({}, 503));
|
|
171
|
-
|
|
168
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(CHATGPT_FALLBACK_MODELS);
|
|
172
169
|
fetchStub.resolves(listing(MODELS));
|
|
173
|
-
|
|
170
|
+
expect(await catalog.getAvailableModels()).to.deep.equal(['gpt-5.6-sol', 'gpt-5.5']);
|
|
174
171
|
});
|
|
175
172
|
});
|
|
176
173
|
//# sourceMappingURL=chatgpt-model-catalog.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-model-catalog.spec.js","sourceRoot":"","sources":["../../src/node/chatgpt-model-catalog.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-model-catalog.spec.js","sourceRoot":"","sources":["../../src/node/chatgpt-model-catalog.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
3
|
//
|
|
@@ -14,51 +13,44 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
exports.CHATGPT_CLIENT_VERSION = exports.CHATGPT_ORIGINATOR = exports.CHATGPT_REDIRECT_URI = exports.CHATGPT_CALLBACK_PATH = exports.CHATGPT_CALLBACK_HOST = exports.CHATGPT_CALLBACK_PORT = exports.CHATGPT_SCOPE = exports.CHATGPT_TOKEN_URL = exports.CHATGPT_AUTHORIZE_URL = exports.CHATGPT_CLIENT_ID = void 0;
|
|
19
|
-
exports.createPkcePair = createPkcePair;
|
|
20
|
-
exports.createLoginState = createLoginState;
|
|
21
|
-
exports.buildAuthorizationUrl = buildAuthorizationUrl;
|
|
22
|
-
exports.parseAuthorizationInput = parseAuthorizationInput;
|
|
23
|
-
exports.decodeChatGptIdentity = decodeChatGptIdentity;
|
|
24
|
-
const crypto_1 = require("crypto");
|
|
16
|
+
import { createHash, randomBytes } from 'crypto';
|
|
25
17
|
/** Public OAuth client id of OpenAI's Codex CLI, used by default to authenticate with a ChatGPT subscription. */
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
18
|
+
export const CHATGPT_CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann';
|
|
19
|
+
export const CHATGPT_AUTHORIZE_URL = 'https://auth.openai.com/oauth/authorize';
|
|
20
|
+
export const CHATGPT_TOKEN_URL = 'https://auth.openai.com/oauth/token';
|
|
21
|
+
export const CHATGPT_SCOPE = 'openid profile email offline_access';
|
|
30
22
|
/**
|
|
31
23
|
* Default callback registered with the OAuth application. Custom clients must use their registered callback.
|
|
32
24
|
*/
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
25
|
+
export const CHATGPT_CALLBACK_PORT = 1455;
|
|
26
|
+
export const CHATGPT_CALLBACK_HOST = 'localhost';
|
|
27
|
+
export const CHATGPT_CALLBACK_PATH = '/auth/callback';
|
|
28
|
+
export const CHATGPT_REDIRECT_URI = `http://${CHATGPT_CALLBACK_HOST}:${CHATGPT_CALLBACK_PORT}${CHATGPT_CALLBACK_PATH}`;
|
|
37
29
|
/** Identifies Theia as the client of the ChatGPT endpoint. */
|
|
38
|
-
|
|
30
|
+
export const CHATGPT_ORIGINATOR = 'theia';
|
|
39
31
|
/** Version of this client. The endpoint requires the model listing to state one, the completion endpoint does not. */
|
|
40
|
-
|
|
32
|
+
export const CHATGPT_CLIENT_VERSION = '1.0.0';
|
|
41
33
|
/** Claim namespaces used by OpenAI to convey the ChatGPT account of the signed in user. */
|
|
42
34
|
const AUTH_CLAIM = 'https://api.openai.com/auth';
|
|
43
35
|
const PROFILE_CLAIM = 'https://api.openai.com/profile';
|
|
44
|
-
function createPkcePair() {
|
|
45
|
-
const verifier =
|
|
46
|
-
return { verifier, challenge:
|
|
36
|
+
export function createPkcePair() {
|
|
37
|
+
const verifier = randomBytes(32).toString('base64url');
|
|
38
|
+
return { verifier, challenge: createHash('sha256').update(verifier).digest('base64url') };
|
|
47
39
|
}
|
|
48
|
-
function createLoginState() {
|
|
49
|
-
return
|
|
40
|
+
export function createLoginState() {
|
|
41
|
+
return randomBytes(16).toString('hex');
|
|
50
42
|
}
|
|
51
|
-
function buildAuthorizationUrl(challenge, state, redirectUri =
|
|
52
|
-
const url = new URL(
|
|
43
|
+
export function buildAuthorizationUrl(challenge, state, redirectUri = CHATGPT_REDIRECT_URI, clientId = CHATGPT_CLIENT_ID) {
|
|
44
|
+
const url = new URL(CHATGPT_AUTHORIZE_URL);
|
|
53
45
|
url.searchParams.set('response_type', 'code');
|
|
54
46
|
url.searchParams.set('client_id', clientId);
|
|
55
47
|
url.searchParams.set('redirect_uri', redirectUri);
|
|
56
|
-
url.searchParams.set('scope',
|
|
48
|
+
url.searchParams.set('scope', CHATGPT_SCOPE);
|
|
57
49
|
url.searchParams.set('code_challenge', challenge);
|
|
58
50
|
url.searchParams.set('code_challenge_method', 'S256');
|
|
59
51
|
url.searchParams.set('state', state);
|
|
60
52
|
url.searchParams.set('id_token_add_organizations', 'true');
|
|
61
|
-
url.searchParams.set('originator',
|
|
53
|
+
url.searchParams.set('originator', CHATGPT_ORIGINATOR);
|
|
62
54
|
return url.toString();
|
|
63
55
|
}
|
|
64
56
|
/**
|
|
@@ -67,7 +59,7 @@ function buildAuthorizationUrl(challenge, state, redirectUri = exports.CHATGPT_R
|
|
|
67
59
|
*
|
|
68
60
|
* @throws if no code can be extracted, if the redirect URL is not the sign in callback or if its state does not match
|
|
69
61
|
*/
|
|
70
|
-
function parseAuthorizationInput(input, expectedState, callbackPath =
|
|
62
|
+
export function parseAuthorizationInput(input, expectedState, callbackPath = CHATGPT_CALLBACK_PATH) {
|
|
71
63
|
const trimmed = input.trim();
|
|
72
64
|
if (!trimmed) {
|
|
73
65
|
throw new Error('No authorization code provided.');
|
|
@@ -93,7 +85,7 @@ function parseAuthorizationInput(input, expectedState, callbackPath = exports.CH
|
|
|
93
85
|
* Reads the ChatGPT account information from the claims of an OpenAI access token.
|
|
94
86
|
* Returns an empty identity if the token is not a readable JWT.
|
|
95
87
|
*/
|
|
96
|
-
function decodeChatGptIdentity(accessToken) {
|
|
88
|
+
export function decodeChatGptIdentity(accessToken) {
|
|
97
89
|
const payload = decodeJwtPayload(accessToken);
|
|
98
90
|
if (!payload) {
|
|
99
91
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-oauth.js","sourceRoot":"","sources":["../../src/node/chatgpt-oauth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-oauth.js","sourceRoot":"","sources":["../../src/node/chatgpt-oauth.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEjD,iHAAiH;AACjH,MAAM,CAAC,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AAChE,MAAM,CAAC,MAAM,qBAAqB,GAAG,yCAAyC,CAAC;AAC/E,MAAM,CAAC,MAAM,iBAAiB,GAAG,qCAAqC,CAAC;AACvE,MAAM,CAAC,MAAM,aAAa,GAAG,qCAAqC,CAAC;AACnE;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAC1C,MAAM,CAAC,MAAM,qBAAqB,GAAG,WAAW,CAAC;AACjD,MAAM,CAAC,MAAM,qBAAqB,GAAG,gBAAgB,CAAC;AACtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,qBAAqB,IAAI,qBAAqB,GAAG,qBAAqB,EAAE,CAAC;AACvH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAC1C,sHAAsH;AACtH,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAAC;AAE9C,2FAA2F;AAC3F,MAAM,UAAU,GAAG,6BAA6B,CAAC;AACjD,MAAM,aAAa,GAAG,gCAAgC,CAAC;AAevD,MAAM,UAAU,cAAc;IAC1B,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACvD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC5B,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,SAAiB,EAAE,KAAa,EAAE,cAAsB,oBAAoB,EAAE,WAAmB,iBAAiB;IACpJ,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAC3C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAC9C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAClD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC7C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAClD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IACtD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC;IAC3D,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;IACvD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAa,EAAE,aAAqB,EAAE,eAAuB,qBAAqB;IACtH,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QACD,4GAA4G;QAC5G,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,aAAa,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAClG,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,WAAmB;IACrD,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,OAAO;QACH,SAAS,EAAE,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,CAAC;QACrD,QAAQ,EAAE,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC;QACnD,KAAK,EAAE,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1E,SAAS,EAAE,UAAU;KACxB,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACnC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAgC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7F,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAChF,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
3
|
//
|
|
@@ -14,80 +13,79 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const chatgpt_oauth_1 = require("./chatgpt-oauth");
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { createHash } from 'crypto';
|
|
18
|
+
import { buildAuthorizationUrl, createPkcePair, decodeChatGptIdentity, parseAuthorizationInput, CHATGPT_CLIENT_ID, CHATGPT_ORIGINATOR, CHATGPT_REDIRECT_URI } from './chatgpt-oauth.js';
|
|
21
19
|
function encodeJwt(payload) {
|
|
22
20
|
return `header.${Buffer.from(JSON.stringify(payload)).toString('base64url')}.signature`;
|
|
23
21
|
}
|
|
24
22
|
describe('ChatGPT OAuth helpers', () => {
|
|
25
23
|
describe('createPkcePair', () => {
|
|
26
24
|
it('derives the challenge as the base64url encoded SHA-256 of the verifier', () => {
|
|
27
|
-
const { verifier, challenge } =
|
|
28
|
-
|
|
25
|
+
const { verifier, challenge } = createPkcePair();
|
|
26
|
+
expect(challenge).to.equal(createHash('sha256').update(verifier).digest('base64url'));
|
|
29
27
|
});
|
|
30
28
|
it('creates a new verifier on each call', () => {
|
|
31
|
-
|
|
29
|
+
expect(createPkcePair().verifier).to.not.equal(createPkcePair().verifier);
|
|
32
30
|
});
|
|
33
31
|
});
|
|
34
32
|
describe('buildAuthorizationUrl', () => {
|
|
35
33
|
it('requests an authorization code for the ChatGPT client using PKCE', () => {
|
|
36
|
-
const url = new URL(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
34
|
+
const url = new URL(buildAuthorizationUrl('challenge', 'state'));
|
|
35
|
+
expect(url.origin + url.pathname).to.equal('https://auth.openai.com/oauth/authorize');
|
|
36
|
+
expect(url.searchParams.get('response_type')).to.equal('code');
|
|
37
|
+
expect(url.searchParams.get('client_id')).to.equal(CHATGPT_CLIENT_ID);
|
|
38
|
+
expect(url.searchParams.get('redirect_uri')).to.equal(CHATGPT_REDIRECT_URI);
|
|
39
|
+
expect(url.searchParams.get('scope')).to.equal('openid profile email offline_access');
|
|
40
|
+
expect(url.searchParams.get('code_challenge')).to.equal('challenge');
|
|
41
|
+
expect(url.searchParams.get('code_challenge_method')).to.equal('S256');
|
|
42
|
+
expect(url.searchParams.get('state')).to.equal('state');
|
|
45
43
|
});
|
|
46
44
|
it('identifies Theia as the client instead of an OpenAI first party client', () => {
|
|
47
|
-
const url = new URL(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
45
|
+
const url = new URL(buildAuthorizationUrl('challenge', 'state'));
|
|
46
|
+
expect(CHATGPT_ORIGINATOR).to.equal('theia');
|
|
47
|
+
expect(url.searchParams.get('originator')).to.equal(CHATGPT_ORIGINATOR);
|
|
48
|
+
expect(url.searchParams.has('codex_cli_simplified_flow')).to.be.false;
|
|
51
49
|
});
|
|
52
50
|
});
|
|
53
51
|
describe('parseAuthorizationInput', () => {
|
|
54
52
|
it('accepts a bare authorization code', () => {
|
|
55
|
-
|
|
53
|
+
expect(parseAuthorizationInput(' the-code ', 'state')).to.equal('the-code');
|
|
56
54
|
});
|
|
57
55
|
it('extracts the code from a redirect URL', () => {
|
|
58
|
-
|
|
56
|
+
expect(parseAuthorizationInput(`${CHATGPT_REDIRECT_URI}?code=the-code&state=state`, 'state')).to.equal('the-code');
|
|
59
57
|
});
|
|
60
58
|
it('rejects a redirect URL with a mismatching state', () => {
|
|
61
|
-
|
|
59
|
+
expect(() => parseAuthorizationInput(`${CHATGPT_REDIRECT_URI}?code=the-code&state=other`, 'state')).to.throw(/state/);
|
|
62
60
|
});
|
|
63
61
|
it('rejects a redirect URL without a state', () => {
|
|
64
|
-
|
|
62
|
+
expect(() => parseAuthorizationInput(`${CHATGPT_REDIRECT_URI}?code=the-code`, 'state')).to.throw(/state/);
|
|
65
63
|
});
|
|
66
64
|
it('rejects a URL that is not the sign in callback', () => {
|
|
67
|
-
|
|
65
|
+
expect(() => parseAuthorizationInput('https://evil.example.com/auth?code=the-code&state=state', 'state')).to.throw(/callback/);
|
|
68
66
|
});
|
|
69
67
|
it('rejects a redirect URL without a code', () => {
|
|
70
|
-
|
|
68
|
+
expect(() => parseAuthorizationInput(`${CHATGPT_REDIRECT_URI}?state=state`, 'state')).to.throw(/authorization code/);
|
|
71
69
|
});
|
|
72
70
|
it('rejects empty input', () => {
|
|
73
|
-
|
|
71
|
+
expect(() => parseAuthorizationInput(' ', 'state')).to.throw(/authorization code/);
|
|
74
72
|
});
|
|
75
73
|
});
|
|
76
74
|
describe('decodeChatGptIdentity', () => {
|
|
77
75
|
it('reads the account, plan and email from the token claims', () => {
|
|
78
|
-
const identity =
|
|
76
|
+
const identity = decodeChatGptIdentity(encodeJwt({
|
|
79
77
|
exp: 1700000000,
|
|
80
78
|
'https://api.openai.com/auth': { chatgpt_account_id: 'account-id', chatgpt_plan_type: 'plus' },
|
|
81
79
|
'https://api.openai.com/profile': { email: 'user@example.com' }
|
|
82
80
|
}));
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
expect(identity.accountId).to.equal('account-id');
|
|
82
|
+
expect(identity.planType).to.equal('plus');
|
|
83
|
+
expect(identity.email).to.equal('user@example.com');
|
|
84
|
+
expect(identity.expiresAt).to.equal(1700000000000);
|
|
87
85
|
});
|
|
88
86
|
it('returns an empty identity for tokens that are no readable JWT', () => {
|
|
89
|
-
|
|
90
|
-
|
|
87
|
+
expect(decodeChatGptIdentity('not-a-jwt')).to.deep.equal({});
|
|
88
|
+
expect(decodeChatGptIdentity('header.not-json.signature')).to.deep.equal({});
|
|
91
89
|
});
|
|
92
90
|
});
|
|
93
91
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-oauth.spec.js","sourceRoot":"","sources":["../../src/node/chatgpt-oauth.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-oauth.spec.js","sourceRoot":"","sources":["../../src/node/chatgpt-oauth.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { LanguageModelMessage } from '@theia/ai-core';
|
|
2
2
|
import { DeveloperMessageSettings } from '@theia/ai-openai/lib/node/openai-language-model';
|
|
3
3
|
import { OpenAiResponseApiUtils } from '@theia/ai-openai/lib/node/openai-response-api-utils';
|
|
4
|
-
import {
|
|
5
|
-
import type { ResponseCreateParamsStreaming, ResponseInputItem, ResponseStreamEvent } from 'openai/resources/responses/responses';
|
|
4
|
+
import type { ResponseInputItem } from 'openai/resources/responses/responses';
|
|
6
5
|
/** Used when a request carries no system message, which the ChatGPT endpoint rejects with `Instructions are required`. */
|
|
7
6
|
export declare const DEFAULT_CHATGPT_INSTRUCTIONS = "You are a helpful assistant.";
|
|
8
7
|
/**
|
|
@@ -11,7 +10,6 @@ export declare const DEFAULT_CHATGPT_INSTRUCTIONS = "You are a helpful assistant
|
|
|
11
10
|
*/
|
|
12
11
|
export declare class ChatGptResponseApiUtils extends OpenAiResponseApiUtils {
|
|
13
12
|
readonly compactionProvider = "chatgpt-responses";
|
|
14
|
-
streamResponse(openai: OpenAI, parameters: ResponseCreateParamsStreaming): AsyncIterable<ResponseStreamEvent>;
|
|
15
13
|
processMessages(messages: LanguageModelMessage[], developerMessageSettings: DeveloperMessageSettings, model: string): {
|
|
16
14
|
instructions?: string;
|
|
17
15
|
input: ResponseInputItem[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-response-api-utils.d.ts","sourceRoot":"","sources":["../../src/node/chatgpt-response-api-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,
|
|
1
|
+
{"version":3,"file":"chatgpt-response-api-utils.d.ts","sourceRoot":"","sources":["../../src/node/chatgpt-response-api-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,0HAA0H;AAC1H,eAAO,MAAM,4BAA4B,iCAAiC,CAAC;AAE3E;;;GAGG;AACH,qBACa,uBAAwB,SAAQ,sBAAsB;IAE/D,SAAkB,kBAAkB,uBAAuB;IAElD,eAAe,CACpB,QAAQ,EAAE,oBAAoB,EAAE,EAChC,wBAAwB,EAAE,wBAAwB,EAClD,KAAK,EAAE,MAAM,GACd;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,iBAAiB,EAAE,CAAA;KAAE;CAM3D"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
3
|
//
|
|
@@ -14,41 +13,29 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const openai_response_api_utils_1 = require("@theia/ai-openai/lib/node/openai-response-api-utils");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { OpenAiResponseApiUtils } from '@theia/ai-openai/lib/node/openai-response-api-utils';
|
|
22
19
|
/** Used when a request carries no system message, which the ChatGPT endpoint rejects with `Instructions are required`. */
|
|
23
|
-
|
|
20
|
+
export const DEFAULT_CHATGPT_INSTRUCTIONS = 'You are a helpful assistant.';
|
|
24
21
|
/**
|
|
25
22
|
* Adapts the OpenAI Response API request to the additional constraints of the ChatGPT endpoint.
|
|
26
23
|
* Bound under its own symbol so the plain OpenAI models keep using {@link OpenAiResponseApiUtils}.
|
|
27
24
|
*/
|
|
28
|
-
let ChatGptResponseApiUtils = class ChatGptResponseApiUtils extends
|
|
25
|
+
let ChatGptResponseApiUtils = class ChatGptResponseApiUtils extends OpenAiResponseApiUtils {
|
|
29
26
|
constructor() {
|
|
30
27
|
super(...arguments);
|
|
31
28
|
this.compactionProvider = 'chatgpt-responses';
|
|
32
29
|
}
|
|
33
|
-
async *streamResponse(openai, parameters) {
|
|
34
|
-
// ChatGPT emits extra events such as response.metadata that the SDK's response accumulator rejects.
|
|
35
|
-
const stream = await openai.responses.create(parameters);
|
|
36
|
-
for await (const event of stream) {
|
|
37
|
-
if (event.type === 'response.failed') {
|
|
38
|
-
throw new Error(event.response.error?.message ?? 'ChatGPT response failed.');
|
|
39
|
-
}
|
|
40
|
-
yield event;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
30
|
processMessages(messages, developerMessageSettings, model) {
|
|
44
31
|
const processed = super.processMessages(messages, developerMessageSettings, model);
|
|
45
32
|
return processed.instructions?.trim()
|
|
46
33
|
? processed
|
|
47
|
-
: { ...processed, instructions:
|
|
34
|
+
: { ...processed, instructions: DEFAULT_CHATGPT_INSTRUCTIONS };
|
|
48
35
|
}
|
|
49
36
|
};
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
(0, inversify_1.injectable)()
|
|
37
|
+
ChatGptResponseApiUtils = __decorate([
|
|
38
|
+
injectable()
|
|
53
39
|
], ChatGptResponseApiUtils);
|
|
40
|
+
export { ChatGptResponseApiUtils };
|
|
54
41
|
//# sourceMappingURL=chatgpt-response-api-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-response-api-utils.js","sourceRoot":"","sources":["../../src/node/chatgpt-response-api-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-response-api-utils.js","sourceRoot":"","sources":["../../src/node/chatgpt-response-api-utils.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAGhF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAG7F,0HAA0H;AAC1H,MAAM,CAAC,MAAM,4BAA4B,GAAG,8BAA8B,CAAC;AAE3E;;;GAGG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,sBAAsB;IAA5D;;QAEe,uBAAkB,GAAG,mBAAmB,CAAC;IAY/D,CAAC;IAVY,eAAe,CACpB,QAAgC,EAChC,wBAAkD,EAClD,KAAa;QAEb,MAAM,SAAS,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC;QACnF,OAAO,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,YAAY,EAAE,4BAA4B,EAAE,CAAC;IACvE,CAAC;CACJ,CAAA;AAdY,uBAAuB;IADnC,UAAU,EAAE;GACA,uBAAuB,CAcnC"}
|