@theia/ai-chatgpt 1.77.0-next.95 → 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,20 +13,18 @@
|
|
|
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
|
-
|
|
28
|
-
|
|
29
|
-
const chatgpt_model_catalog_1 = require("./chatgpt-model-catalog");
|
|
30
|
-
const chatgpt_response_api_utils_1 = require("./chatgpt-response-api-utils");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { LanguageModelRegistry } from '@theia/ai-core';
|
|
18
|
+
import { getProxyUrl } from '@theia/ai-core/lib/node';
|
|
19
|
+
import { ILogger, nls } from '@theia/core';
|
|
20
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
21
|
+
import { OpenAiModelUtils } from '@theia/ai-openai/lib/node/openai-model-utils';
|
|
22
|
+
import { getOpenAiModelDefaults } from '@theia/ai-openai/lib/node/openai-model-defaults';
|
|
23
|
+
import { CHATGPT_RESPONSES_BASE_URL } from '../common/index.js';
|
|
24
|
+
import { ChatGptBackendAuthService } from './chatgpt-auth-service.js';
|
|
25
|
+
import { ChatGptModel } from './chatgpt-language-model.js';
|
|
26
|
+
import { ChatGptModelCatalog } from './chatgpt-model-catalog.js';
|
|
27
|
+
import { ChatGptResponseApiUtils } from './chatgpt-response-api-utils.js';
|
|
31
28
|
let ChatGptLanguageModelsManagerImpl = class ChatGptLanguageModelsManagerImpl {
|
|
32
29
|
setProxyUrl(proxyUrl) {
|
|
33
30
|
this.proxyUrl = proxyUrl || undefined;
|
|
@@ -37,13 +34,13 @@ let ChatGptLanguageModelsManagerImpl = class ChatGptLanguageModelsManagerImpl {
|
|
|
37
34
|
}
|
|
38
35
|
async createOrUpdateLanguageModels(...modelDescriptions) {
|
|
39
36
|
const status = await this.calculateStatus();
|
|
40
|
-
const proxy =
|
|
37
|
+
const proxy = getProxyUrl(CHATGPT_RESPONSES_BASE_URL, this.proxyUrl);
|
|
41
38
|
for (const description of modelDescriptions) {
|
|
42
39
|
// The ChatGPT plan serves OpenAI models, so their published capabilities apply.
|
|
43
|
-
const defaults =
|
|
40
|
+
const defaults = getOpenAiModelDefaults(description.model);
|
|
44
41
|
const existing = await this.languageModelRegistry.getLanguageModel(description.id);
|
|
45
42
|
if (existing) {
|
|
46
|
-
if (!(existing instanceof
|
|
43
|
+
if (!(existing instanceof ChatGptModel)) {
|
|
47
44
|
this.logger.warn(`ChatGPT: model ${description.id} is not a ChatGPT model`);
|
|
48
45
|
continue;
|
|
49
46
|
}
|
|
@@ -60,7 +57,7 @@ let ChatGptLanguageModelsManagerImpl = class ChatGptLanguageModelsManagerImpl {
|
|
|
60
57
|
}
|
|
61
58
|
else {
|
|
62
59
|
this.languageModelRegistry.addLanguageModels([
|
|
63
|
-
new
|
|
60
|
+
new ChatGptModel(description.id, description.model, status, () => this.authService.getCredentials(), this.responseApiUtils, this.modelUtils, description.maxRetries, proxy, defaults.reasoningSupport, defaults.contextWindow, description.serverSideCompactionEnabledByDefault ?? true, description.serverSideCompactionTokenThresholdByDefault)
|
|
64
61
|
]);
|
|
65
62
|
}
|
|
66
63
|
}
|
|
@@ -68,39 +65,33 @@ let ChatGptLanguageModelsManagerImpl = class ChatGptLanguageModelsManagerImpl {
|
|
|
68
65
|
async calculateStatus() {
|
|
69
66
|
return (await this.authService.getAuthState()).isAuthenticated
|
|
70
67
|
? { status: 'ready' }
|
|
71
|
-
: { status: 'unavailable', message:
|
|
68
|
+
: { status: 'unavailable', message: nls.localize('theia/ai/chatgpt/notSignedIn', 'Not signed in with ChatGPT') };
|
|
72
69
|
}
|
|
73
70
|
removeLanguageModels(...modelIds) {
|
|
74
71
|
this.languageModelRegistry.removeLanguageModels(modelIds);
|
|
75
72
|
}
|
|
76
73
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
(0, inversify_1.inject)(ai_core_1.LanguageModelRegistry),
|
|
80
|
-
tslib_1.__metadata("design:type", Object)
|
|
74
|
+
__decorate([
|
|
75
|
+
inject(LanguageModelRegistry)
|
|
81
76
|
], ChatGptLanguageModelsManagerImpl.prototype, "languageModelRegistry", void 0);
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
tslib_1.__metadata("design:type", Object)
|
|
77
|
+
__decorate([
|
|
78
|
+
inject(ChatGptBackendAuthService)
|
|
85
79
|
], ChatGptLanguageModelsManagerImpl.prototype, "authService", void 0);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
tslib_1.__metadata("design:type", chatgpt_response_api_utils_1.ChatGptResponseApiUtils)
|
|
80
|
+
__decorate([
|
|
81
|
+
inject(ChatGptResponseApiUtils)
|
|
89
82
|
], ChatGptLanguageModelsManagerImpl.prototype, "responseApiUtils", void 0);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
tslib_1.__metadata("design:type", openai_model_utils_1.OpenAiModelUtils)
|
|
83
|
+
__decorate([
|
|
84
|
+
inject(OpenAiModelUtils)
|
|
93
85
|
], ChatGptLanguageModelsManagerImpl.prototype, "modelUtils", void 0);
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
tslib_1.__metadata("design:type", chatgpt_model_catalog_1.ChatGptModelCatalog)
|
|
86
|
+
__decorate([
|
|
87
|
+
inject(ChatGptModelCatalog)
|
|
97
88
|
], ChatGptLanguageModelsManagerImpl.prototype, "modelCatalog", void 0);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
tslib_1.__metadata("design:type", Object)
|
|
89
|
+
__decorate([
|
|
90
|
+
inject(ILogger),
|
|
91
|
+
named('ai-chatgpt:ChatGptLanguageModelsManagerImpl')
|
|
102
92
|
], ChatGptLanguageModelsManagerImpl.prototype, "logger", void 0);
|
|
103
|
-
|
|
104
|
-
|
|
93
|
+
ChatGptLanguageModelsManagerImpl = __decorate([
|
|
94
|
+
injectable()
|
|
105
95
|
], ChatGptLanguageModelsManagerImpl);
|
|
96
|
+
export { ChatGptLanguageModelsManagerImpl };
|
|
106
97
|
//# sourceMappingURL=chatgpt-language-models-manager-impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-language-models-manager-impl.js","sourceRoot":"","sources":["../../src/node/chatgpt-language-models-manager-impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-language-models-manager-impl.js","sourceRoot":"","sources":["../../src/node/chatgpt-language-models-manager-impl.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,24 +13,24 @@
|
|
|
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
|
-
|
|
28
|
-
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { Emitter, ILogger } from '@theia/core';
|
|
18
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
19
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
20
|
+
import { LanguageModelRegistry, ToolCallExecutor, ToolCallExecutorImpl } from '@theia/ai-core';
|
|
21
|
+
import { OpenAiModelUtils } from '@theia/ai-openai/lib/node/openai-model-utils';
|
|
22
|
+
import { OpenAiStreamingRetry } from '@theia/ai-openai/lib/node/openai-streaming-retry';
|
|
23
|
+
import { ChatGptBackendAuthService } from './chatgpt-auth-service.js';
|
|
24
|
+
import { ChatGptModel } from './chatgpt-language-model.js';
|
|
25
|
+
import { ChatGptLanguageModelsManagerImpl } from './chatgpt-language-models-manager-impl.js';
|
|
26
|
+
import { ChatGptModelCatalog } from './chatgpt-model-catalog.js';
|
|
27
|
+
import { ChatGptResponseApiUtils } from './chatgpt-response-api-utils.js';
|
|
29
28
|
class FakeLanguageModelRegistry {
|
|
30
29
|
constructor() {
|
|
31
30
|
this.models = new Map();
|
|
32
31
|
this.patches = [];
|
|
33
32
|
this.removed = [];
|
|
34
|
-
this.emitter = new
|
|
33
|
+
this.emitter = new Emitter();
|
|
35
34
|
this.onChange = this.emitter.event;
|
|
36
35
|
}
|
|
37
36
|
addLanguageModels(models) {
|
|
@@ -66,95 +65,96 @@ describe('ChatGptLanguageModelsManagerImpl', () => {
|
|
|
66
65
|
beforeEach(() => {
|
|
67
66
|
registry = new FakeLanguageModelRegistry();
|
|
68
67
|
authState = { isAuthenticated: false };
|
|
69
|
-
const container = new
|
|
70
|
-
container.bind(
|
|
71
|
-
container.bind(
|
|
68
|
+
const container = new Container();
|
|
69
|
+
container.bind(LanguageModelRegistry).toConstantValue(registry);
|
|
70
|
+
container.bind(ChatGptBackendAuthService).toConstantValue({
|
|
72
71
|
getAuthState: async () => authState,
|
|
73
72
|
getCredentials: async () => ({ accessToken: 'token', accountId: 'account-id' })
|
|
74
73
|
});
|
|
75
|
-
container.bind(
|
|
76
|
-
container.bind(
|
|
77
|
-
container.bind(
|
|
78
|
-
container.bind(
|
|
74
|
+
container.bind(ToolCallExecutor).to(ToolCallExecutorImpl).inSingletonScope();
|
|
75
|
+
container.bind(OpenAiStreamingRetry).toSelf().inSingletonScope();
|
|
76
|
+
container.bind(ChatGptResponseApiUtils).toSelf().inSingletonScope();
|
|
77
|
+
container.bind(OpenAiModelUtils).toSelf().inSingletonScope();
|
|
78
|
+
container.bind(ChatGptModelCatalog).toConstantValue({
|
|
79
79
|
getAvailableModels: async () => ['gpt-5.6-sol']
|
|
80
80
|
});
|
|
81
|
-
container.bind(
|
|
82
|
-
container.bind(
|
|
83
|
-
manager = container.get(
|
|
81
|
+
container.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
82
|
+
container.bind(ChatGptLanguageModelsManagerImpl).toSelf().inSingletonScope();
|
|
83
|
+
manager = container.get(ChatGptLanguageModelsManagerImpl);
|
|
84
84
|
});
|
|
85
85
|
it('registers the configured models while nobody is signed in, stating why they are unavailable', async () => {
|
|
86
86
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
87
87
|
const model = registry.models.get('chatgpt/gpt-5.5');
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
88
|
+
expect(model).to.be.instanceOf(ChatGptModel);
|
|
89
|
+
expect(model.status).to.deep.equal(UNAVAILABLE);
|
|
90
|
+
expect(model.vendor).to.equal('chatgpt');
|
|
91
|
+
expect(model.model).to.equal('gpt-5.5');
|
|
92
|
+
expect(model.maxRetries).to.equal(3);
|
|
93
93
|
});
|
|
94
94
|
it('reports the models as ready once the user is signed in', async () => {
|
|
95
95
|
authState = { isAuthenticated: true, accountLabel: 'user@example.com' };
|
|
96
96
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
97
|
-
|
|
97
|
+
expect(registry.models.get('chatgpt/gpt-5.5').status).to.deep.equal({ status: 'ready' });
|
|
98
98
|
});
|
|
99
99
|
it('flips the status of the already registered models on sign out instead of removing them', async () => {
|
|
100
100
|
authState = { isAuthenticated: true };
|
|
101
101
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
102
102
|
authState = { isAuthenticated: false };
|
|
103
103
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
104
|
+
expect(registry.models.size).to.equal(1);
|
|
105
|
+
expect(registry.patches).to.have.lengthOf(1);
|
|
106
|
+
expect(registry.models.get('chatgpt/gpt-5.5').status).to.deep.equal(UNAVAILABLE);
|
|
107
107
|
});
|
|
108
108
|
it('patches an already registered model instead of replacing it', async () => {
|
|
109
109
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
110
110
|
const registered = registry.models.get('chatgpt/gpt-5.5');
|
|
111
111
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5-pro', maxRetries: 5 });
|
|
112
|
-
|
|
113
|
-
|
|
112
|
+
expect(registry.models.get('chatgpt/gpt-5.5')).to.equal(registered);
|
|
113
|
+
expect(registry.patches[0].patch).to.include({ model: 'gpt-5.5-pro', maxRetries: 5 });
|
|
114
114
|
});
|
|
115
115
|
it('applies the OpenAI capabilities of the model', async () => {
|
|
116
116
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
117
117
|
const model = registry.models.get('chatgpt/gpt-5.5');
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
expect(model.reasoningSupport).to.not.equal(undefined);
|
|
119
|
+
expect(model.maxInputTokens).to.be.a('number');
|
|
120
120
|
});
|
|
121
121
|
it('registers and patches compaction defaults, including clearing an optional threshold', async () => {
|
|
122
122
|
const description = { id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 };
|
|
123
123
|
await manager.createOrUpdateLanguageModels(description);
|
|
124
124
|
const model = registry.models.get(description.id);
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
expect(model.serverSideCompactionSupport).to.equal(true);
|
|
126
|
+
expect(model.serverSideCompactionEnabledByDefault).to.equal(true);
|
|
127
|
+
expect(model.serverSideCompactionTokenThresholdByDefault).to.equal(undefined);
|
|
128
128
|
await manager.createOrUpdateLanguageModels({
|
|
129
129
|
...description, serverSideCompactionEnabledByDefault: false, serverSideCompactionTokenThresholdByDefault: 100_000
|
|
130
130
|
});
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
131
|
+
expect(registry.models.get(description.id)).to.equal(model);
|
|
132
|
+
expect(model.serverSideCompactionEnabledByDefault).to.equal(false);
|
|
133
|
+
expect(model.serverSideCompactionTokenThresholdByDefault).to.equal(100_000);
|
|
134
134
|
await manager.createOrUpdateLanguageModels(description);
|
|
135
|
-
|
|
136
|
-
|
|
135
|
+
expect(model.serverSideCompactionEnabledByDefault).to.equal(true);
|
|
136
|
+
expect(model.serverSideCompactionTokenThresholdByDefault).to.equal(undefined);
|
|
137
137
|
});
|
|
138
138
|
it('leaves a model of another provider alone', async () => {
|
|
139
139
|
const foreign = { id: 'chatgpt/gpt-5.5', vendor: 'openai' };
|
|
140
140
|
registry.addLanguageModels([foreign]);
|
|
141
141
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
142
|
-
|
|
143
|
-
|
|
142
|
+
expect(registry.models.get('chatgpt/gpt-5.5')).to.equal(foreign);
|
|
143
|
+
expect(registry.patches).to.be.empty;
|
|
144
144
|
});
|
|
145
145
|
it('passes the configured proxy on to the models', async () => {
|
|
146
146
|
manager.setProxyUrl('http://proxy.example.com:3128');
|
|
147
147
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
148
|
-
|
|
148
|
+
expect(registry.models.get('chatgpt/gpt-5.5').proxy).to.equal('http://proxy.example.com:3128');
|
|
149
149
|
});
|
|
150
150
|
it('serves the models of the plan to the frontend, which decides what to register', async () => {
|
|
151
|
-
|
|
151
|
+
expect(await manager.getAvailableModels()).to.deep.equal(['gpt-5.6-sol']);
|
|
152
152
|
});
|
|
153
153
|
it('removes the models it is asked to remove', async () => {
|
|
154
154
|
await manager.createOrUpdateLanguageModels({ id: 'chatgpt/gpt-5.5', model: 'gpt-5.5', maxRetries: 3 });
|
|
155
155
|
manager.removeLanguageModels('chatgpt/gpt-5.5');
|
|
156
|
-
|
|
157
|
-
|
|
156
|
+
expect(registry.removed).to.deep.equal([['chatgpt/gpt-5.5']]);
|
|
157
|
+
expect(registry.models.size).to.equal(0);
|
|
158
158
|
});
|
|
159
159
|
});
|
|
160
160
|
//# sourceMappingURL=chatgpt-language-models-manager-impl.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-language-models-manager-impl.spec.js","sourceRoot":"","sources":["../../src/node/chatgpt-language-models-manager-impl.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-language-models-manager-impl.spec.js","sourceRoot":"","sources":["../../src/node/chatgpt-language-models-manager-impl.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ILogger } from '@theia/core';
|
|
2
|
-
import { ChatGptBackendAuthService } from './chatgpt-auth-service';
|
|
2
|
+
import { ChatGptBackendAuthService } from './chatgpt-auth-service.js';
|
|
3
3
|
/**
|
|
4
4
|
* The models a ChatGPT plan grants, as reported by the endpoint. The listing is not part of OpenAI's documented
|
|
5
5
|
* API, so the result is treated as a hint: whenever it cannot be obtained, {@link CHATGPT_FALLBACK_MODELS} is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-model-catalog.d.ts","sourceRoot":"","sources":["../../src/node/chatgpt-model-catalog.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAItC,OAAO,EAAE,yBAAyB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"chatgpt-model-catalog.d.ts","sourceRoot":"","sources":["../../src/node/chatgpt-model-catalog.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAItC,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAMtE;;;;GAIG;AACH,qBACa,mBAAmB;IAG5B,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;IAC/D,2GAA2G;IAC3G,SAAS,CAAC,UAAU,SAAK;IAGzB,SAAS,CAAC,IAAI,IAAI,IAAI;IAQhB,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;cA0B7B,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;CAwBlE"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
3
|
//
|
|
@@ -14,17 +13,15 @@
|
|
|
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
|
-
const chatgpt_auth_service_1 = require("./chatgpt-auth-service");
|
|
25
|
-
const chatgpt_oauth_1 = require("./chatgpt-oauth");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { ILogger } from '@theia/core';
|
|
18
|
+
import { createProxyFetch, getProxyUrl } from '@theia/ai-core/lib/node';
|
|
19
|
+
import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
|
|
20
|
+
import { CHATGPT_FALLBACK_MODELS, CHATGPT_RESPONSES_BASE_URL } from '../common/index.js';
|
|
21
|
+
import { ChatGptBackendAuthService } from './chatgpt-auth-service.js';
|
|
22
|
+
import { CHATGPT_CLIENT_VERSION, CHATGPT_ORIGINATOR } from './chatgpt-oauth.js';
|
|
26
23
|
/** Lists the models the endpoint serves to the signed in account. The client version is required. */
|
|
27
|
-
const CHATGPT_MODELS_URL = `${
|
|
24
|
+
const CHATGPT_MODELS_URL = `${CHATGPT_RESPONSES_BASE_URL}/models?client_version=${encodeURIComponent(CHATGPT_CLIENT_VERSION)}`;
|
|
28
25
|
/**
|
|
29
26
|
* The models a ChatGPT plan grants, as reported by the endpoint. The listing is not part of OpenAI's documented
|
|
30
27
|
* API, so the result is treated as a hint: whenever it cannot be obtained, {@link CHATGPT_FALLBACK_MODELS} is
|
|
@@ -65,7 +62,7 @@ let ChatGptModelCatalog = class ChatGptModelCatalog {
|
|
|
65
62
|
}
|
|
66
63
|
break;
|
|
67
64
|
}
|
|
68
|
-
return (await this.authService.getAuthState()).isAuthenticated ? [...
|
|
65
|
+
return (await this.authService.getAuthState()).isAuthenticated ? [...CHATGPT_FALLBACK_MODELS] : [];
|
|
69
66
|
}
|
|
70
67
|
async discoverModels() {
|
|
71
68
|
try {
|
|
@@ -73,12 +70,12 @@ let ChatGptModelCatalog = class ChatGptModelCatalog {
|
|
|
73
70
|
if (!credentials) {
|
|
74
71
|
return [];
|
|
75
72
|
}
|
|
76
|
-
const proxyFetch =
|
|
73
|
+
const proxyFetch = createProxyFetch(getProxyUrl(CHATGPT_MODELS_URL)) ?? fetch;
|
|
77
74
|
const response = await proxyFetch(CHATGPT_MODELS_URL, {
|
|
78
75
|
headers: {
|
|
79
76
|
Authorization: `Bearer ${credentials.accessToken}`,
|
|
80
77
|
'chatgpt-account-id': credentials.accountId,
|
|
81
|
-
originator:
|
|
78
|
+
originator: CHATGPT_ORIGINATOR
|
|
82
79
|
}
|
|
83
80
|
});
|
|
84
81
|
if (!response.ok) {
|
|
@@ -93,25 +90,20 @@ let ChatGptModelCatalog = class ChatGptModelCatalog {
|
|
|
93
90
|
}
|
|
94
91
|
}
|
|
95
92
|
};
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
(0, inversify_1.inject)(chatgpt_auth_service_1.ChatGptBackendAuthService),
|
|
99
|
-
tslib_1.__metadata("design:type", Object)
|
|
93
|
+
__decorate([
|
|
94
|
+
inject(ChatGptBackendAuthService)
|
|
100
95
|
], ChatGptModelCatalog.prototype, "authService", void 0);
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
tslib_1.__metadata("design:type", Object)
|
|
96
|
+
__decorate([
|
|
97
|
+
inject(ILogger),
|
|
98
|
+
named('ai-chatgpt:ChatGptModelCatalog')
|
|
105
99
|
], ChatGptModelCatalog.prototype, "logger", void 0);
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
tslib_1.__metadata("design:type", Function),
|
|
109
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
110
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
100
|
+
__decorate([
|
|
101
|
+
postConstruct()
|
|
111
102
|
], ChatGptModelCatalog.prototype, "init", null);
|
|
112
|
-
|
|
113
|
-
|
|
103
|
+
ChatGptModelCatalog = __decorate([
|
|
104
|
+
injectable()
|
|
114
105
|
], ChatGptModelCatalog);
|
|
106
|
+
export { ChatGptModelCatalog };
|
|
115
107
|
/** Keeps the models that are offered for selection and can actually be requested through the API. */
|
|
116
108
|
function toModelSlugs(payload) {
|
|
117
109
|
const models = payload?.models;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-model-catalog.js","sourceRoot":"","sources":["../../src/node/chatgpt-model-catalog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-model-catalog.js","sourceRoot":"","sources":["../../src/node/chatgpt-model-catalog.ts"],"names":[],"mappings":"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"}
|