@vscode/chat-lib 0.1.3-3 → 0.1.3-4
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/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +4 -3
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js +28 -3
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts +3 -4
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +28 -57
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts +4 -7
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +5 -8
- package/dist/src/_internal/platform/configuration/common/configurationService.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.d.ts +1 -0
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.js +18 -0
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts +13 -11
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js +47 -27
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/inlineEditsModelsTypes.d.ts +28 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/inlineEditsModelsTypes.d.ts.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/inlineEditsModelsTypes.js +50 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/inlineEditsModelsTypes.js.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts +5 -5
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js +7 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditsModelService.d.ts +12 -0
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditsModelService.d.ts.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditsModelService.js +10 -0
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditsModelService.js.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.d.ts +49 -0
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.d.ts.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js +290 -0
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js.map +1 -0
- package/dist/src/_internal/platform/log/common/logService.d.ts +1 -1
- package/dist/src/_internal/platform/log/common/logService.d.ts.map +1 -1
- package/dist/src/_internal/platform/log/common/logService.js +62 -1
- package/dist/src/_internal/platform/log/common/logService.js.map +1 -1
- package/dist/src/_internal/platform/proxyModels/common/proxyModelsService.d.ts +18 -0
- package/dist/src/_internal/platform/proxyModels/common/proxyModelsService.d.ts.map +1 -0
- package/dist/src/_internal/platform/proxyModels/common/proxyModelsService.js +26 -0
- package/dist/src/_internal/platform/proxyModels/common/proxyModelsService.js.map +1 -0
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.d.ts +23 -0
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.d.ts.map +1 -0
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.js +111 -0
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.js.map +1 -0
- package/dist/src/_internal/util/common/arrays.d.ts +18 -0
- package/dist/src/_internal/util/common/arrays.d.ts.map +1 -0
- package/dist/src/_internal/util/common/arrays.js +80 -0
- package/dist/src/_internal/util/common/arrays.js.map +1 -0
- package/dist/src/_internal/util/common/crypto.d.ts +1 -1
- package/dist/src/_internal/util/common/crypto.d.ts.map +1 -1
- package/dist/src/_internal/util/common/crypto.js +250 -2
- package/dist/src/_internal/util/common/crypto.js.map +1 -1
- package/dist/src/_internal/util/common/tracing.d.ts.map +1 -1
- package/dist/src/_internal/util/common/tracing.js +24 -11
- package/dist/src/_internal/util/common/tracing.js.map +1 -1
- package/dist/src/main.d.ts +3 -1
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +15 -3
- package/dist/src/main.js.map +1 -1
- package/dist/src/package.json +12 -56
- package/package.json +1 -1
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*---------------------------------------------------------------------------------------------
|
|
3
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
|
+
*--------------------------------------------------------------------------------------------*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.WireTypes = void 0;
|
|
8
|
+
const validator_1 = require("../../../configuration/common/validator");
|
|
9
|
+
var WireTypes;
|
|
10
|
+
(function (WireTypes) {
|
|
11
|
+
let Capabilities;
|
|
12
|
+
(function (Capabilities) {
|
|
13
|
+
function is(obj) {
|
|
14
|
+
return !!obj && typeof obj === 'object' &&
|
|
15
|
+
typeof obj.promptStrategy === 'string';
|
|
16
|
+
}
|
|
17
|
+
Capabilities.is = is;
|
|
18
|
+
Capabilities.validator = (0, validator_1.vObj)({
|
|
19
|
+
promptStrategy: (0, validator_1.vString)(),
|
|
20
|
+
});
|
|
21
|
+
})(Capabilities = WireTypes.Capabilities || (WireTypes.Capabilities = {}));
|
|
22
|
+
let Model;
|
|
23
|
+
(function (Model) {
|
|
24
|
+
Model.validator = (0, validator_1.vObj)({
|
|
25
|
+
serviceType: (0, validator_1.vString)(),
|
|
26
|
+
name: (0, validator_1.vString)(),
|
|
27
|
+
provider: (0, validator_1.vString)(),
|
|
28
|
+
capabilities: Capabilities.validator,
|
|
29
|
+
});
|
|
30
|
+
function is(obj) {
|
|
31
|
+
return !!obj && typeof obj === 'object' &&
|
|
32
|
+
typeof obj.serviceType === 'string' &&
|
|
33
|
+
typeof obj.name === 'string' &&
|
|
34
|
+
typeof obj.provider === 'string' &&
|
|
35
|
+
Capabilities.is(obj.capabilities);
|
|
36
|
+
}
|
|
37
|
+
Model.is = is;
|
|
38
|
+
})(Model = WireTypes.Model || (WireTypes.Model = {}));
|
|
39
|
+
let ModelList;
|
|
40
|
+
(function (ModelList) {
|
|
41
|
+
ModelList.validator = (0, validator_1.vObj)({
|
|
42
|
+
models: (0, validator_1.vArray)(Model.validator),
|
|
43
|
+
});
|
|
44
|
+
function is(obj) {
|
|
45
|
+
return !!obj && typeof obj === 'object' && Array.isArray(obj.models) && obj.models.every(Model.is);
|
|
46
|
+
}
|
|
47
|
+
ModelList.is = is;
|
|
48
|
+
})(ModelList = WireTypes.ModelList || (WireTypes.ModelList = {}));
|
|
49
|
+
})(WireTypes || (exports.WireTypes = WireTypes = {}));
|
|
50
|
+
//# sourceMappingURL=inlineEditsModelsTypes.js.map
|
package/dist/src/_internal/platform/inlineEdits/common/dataTypes/inlineEditsModelsTypes.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineEditsModelsTypes.js","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/dataTypes/inlineEditsModelsTypes.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,uEAA4F;AAE5F,IAAiB,SAAS,CAgDzB;AAhDD,WAAiB,SAAS;IAEzB,IAAiB,YAAY,CAW5B;IAXD,WAAiB,YAAY;QAI5B,SAAgB,EAAE,CAAC,GAAY;YAC9B,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;gBACtC,OAAQ,GAAS,CAAC,cAAc,KAAK,QAAQ,CAAC;QAChD,CAAC;QAHe,eAAE,KAGjB,CAAA;QACY,sBAAS,GAAkB,IAAA,gBAAI,EAAC;YAC5C,cAAc,EAAE,IAAA,mBAAO,GAAE;SACzB,CAAC,CAAC;IACJ,CAAC,EAXgB,YAAY,GAAZ,sBAAY,KAAZ,sBAAY,QAW5B;IAED,IAAiB,KAAK,CAoBrB;IApBD,WAAiB,KAAK;QAOR,eAAS,GAAkB,IAAA,gBAAI,EAAC;YAC5C,WAAW,EAAE,IAAA,mBAAO,GAAE;YACtB,IAAI,EAAE,IAAA,mBAAO,GAAE;YACf,QAAQ,EAAE,IAAA,mBAAO,GAAE;YACnB,YAAY,EAAE,YAAY,CAAC,SAAS;SACpC,CAAC,CAAC;QACH,SAAgB,EAAE,CAAC,GAAY;YAC9B,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;gBACtC,OAAQ,GAAS,CAAC,WAAW,KAAK,QAAQ;gBAC1C,OAAQ,GAAS,CAAC,IAAI,KAAK,QAAQ;gBACnC,OAAQ,GAAS,CAAC,QAAQ,KAAK,QAAQ;gBACvC,YAAY,CAAC,EAAE,CAAE,GAAS,CAAC,YAAY,CAAC,CAAC;QAC3C,CAAC;QANe,QAAE,KAMjB,CAAA;IACF,CAAC,EApBgB,KAAK,GAAL,eAAK,KAAL,eAAK,QAoBrB;IAED,IAAiB,SAAS,CAUzB;IAVD,WAAiB,SAAS;QAIZ,mBAAS,GAAkB,IAAA,gBAAI,EAAC;YAC5C,MAAM,EAAE,IAAA,kBAAM,EAAC,KAAK,CAAC,SAAS,CAAC;SAC/B,CAAC,CAAC;QACH,SAAgB,EAAE,CAAC,GAAY;YAC9B,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAE,GAAS,CAAC,MAAM,CAAC,IAAK,GAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClH,CAAC;QAFe,YAAE,KAEjB,CAAA;IACF,CAAC,EAVgB,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAUzB;AACF,CAAC,EAhDgB,SAAS,yBAAT,SAAS,QAgDzB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { IValidator } from '../../../configuration/common/validator';
|
|
1
2
|
export type RecentlyViewedDocumentsOptions = {
|
|
2
3
|
readonly nDocuments: number;
|
|
3
4
|
readonly maxTokens: number;
|
|
@@ -9,6 +10,7 @@ export type LanguageContextLanguages = {
|
|
|
9
10
|
export type LanguageContextOptions = {
|
|
10
11
|
readonly enabled: boolean;
|
|
11
12
|
readonly maxTokens: number;
|
|
13
|
+
readonly traitPosition: 'before' | 'after';
|
|
12
14
|
};
|
|
13
15
|
export type DiffHistoryOptions = {
|
|
14
16
|
readonly nEntries: number;
|
|
@@ -40,12 +42,14 @@ export declare enum PromptingStrategy {
|
|
|
40
42
|
/**
|
|
41
43
|
* Original Xtab unified model prompting strategy.
|
|
42
44
|
*/
|
|
45
|
+
CopilotNesXtab = "copilotNesXtab",
|
|
43
46
|
UnifiedModel = "xtabUnifiedModel",
|
|
44
47
|
Codexv21NesUnified = "codexv21nesUnified",
|
|
45
48
|
Nes41Miniv3 = "nes41miniv3",
|
|
46
49
|
SimplifiedSystemPrompt = "simplifiedSystemPrompt",
|
|
47
50
|
Xtab275 = "xtab275"
|
|
48
51
|
}
|
|
52
|
+
export declare function isPromptingStrategy(value: string): value is PromptingStrategy;
|
|
49
53
|
export declare enum ResponseFormat {
|
|
50
54
|
CodeBlock = "codeBlock",
|
|
51
55
|
UnifiedWithXml = "unifiedWithXml",
|
|
@@ -61,9 +65,5 @@ export interface ModelConfiguration {
|
|
|
61
65
|
promptingStrategy: PromptingStrategy | undefined;
|
|
62
66
|
includeTagsInCurrentFile: boolean;
|
|
63
67
|
}
|
|
64
|
-
export declare const MODEL_CONFIGURATION_VALIDATOR:
|
|
65
|
-
modelName: string;
|
|
66
|
-
promptingStrategy: PromptingStrategy | undefined;
|
|
67
|
-
includeTagsInCurrentFile: boolean;
|
|
68
|
-
}>;
|
|
68
|
+
export declare const MODEL_CONFIGURATION_VALIDATOR: IValidator<ModelConfiguration>;
|
|
69
69
|
//# sourceMappingURL=xtabPromptOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabPromptOptions.d.ts","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xtabPromptOptions.d.ts","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAiE,MAAM,yCAAyC,CAAC;AAEpI,MAAM,MAAM,8BAA8B,GAAG;IAC5C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;CACrC,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAEzE,MAAM,MAAM,sBAAsB,GAAG;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC3C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACnC,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;CACxC,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAe;IACxE,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,uBAAuB,EAAE,8BAA8B,CAAC;IACjE,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;CACpC,CAAA;AAED;;GAEG;AACH,oBAAY,iBAAiB;IAC5B;;OAEG;IACH,cAAc,mBAAmB;IACjC,YAAY,qBAAqB;IACjC,kBAAkB,uBAAuB;IACzC,WAAW,gBAAgB;IAC3B,sBAAsB,2BAA2B;IACjD,OAAO,YAAY;CACnB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,iBAAiB,CAE7E;AAED,oBAAY,cAAc;IACzB,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,cAAc,mBAAmB;CACjC;AAED,yBAAiB,cAAc,CAAC;IAC/B,SAAgB,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,SAAS,GAAG,cAAc,CAe7F;CACD;AAED,eAAO,MAAM,eAAe,EAAE,aA2B7B,CAAC;AAGF,eAAO,MAAM,kCAAkC,EAAE,wBAIhD,CAAC;AAEF,MAAM,WAAW,kBAAkB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAe;IAC/D,wBAAwB,EAAE,OAAO,CAAC;CAClC;AAED,eAAO,MAAM,6BAA6B,EAAE,UAAU,CAAC,kBAAkB,CAIvE,CAAC"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.MODEL_CONFIGURATION_VALIDATOR = exports.LANGUAGE_CONTEXT_ENABLED_LANGUAGES = exports.DEFAULT_OPTIONS = exports.ResponseFormat = exports.PromptingStrategy = void 0;
|
|
8
|
+
exports.isPromptingStrategy = isPromptingStrategy;
|
|
8
9
|
const assert_1 = require("../../../../util/vs/base/common/assert");
|
|
9
10
|
const validator_1 = require("../../../configuration/common/validator");
|
|
10
11
|
/**
|
|
@@ -15,12 +16,16 @@ var PromptingStrategy;
|
|
|
15
16
|
/**
|
|
16
17
|
* Original Xtab unified model prompting strategy.
|
|
17
18
|
*/
|
|
19
|
+
PromptingStrategy["CopilotNesXtab"] = "copilotNesXtab";
|
|
18
20
|
PromptingStrategy["UnifiedModel"] = "xtabUnifiedModel";
|
|
19
21
|
PromptingStrategy["Codexv21NesUnified"] = "codexv21nesUnified";
|
|
20
22
|
PromptingStrategy["Nes41Miniv3"] = "nes41miniv3";
|
|
21
23
|
PromptingStrategy["SimplifiedSystemPrompt"] = "simplifiedSystemPrompt";
|
|
22
24
|
PromptingStrategy["Xtab275"] = "xtab275";
|
|
23
25
|
})(PromptingStrategy || (exports.PromptingStrategy = PromptingStrategy = {}));
|
|
26
|
+
function isPromptingStrategy(value) {
|
|
27
|
+
return Object.values(PromptingStrategy).includes(value);
|
|
28
|
+
}
|
|
24
29
|
var ResponseFormat;
|
|
25
30
|
(function (ResponseFormat) {
|
|
26
31
|
ResponseFormat["CodeBlock"] = "codeBlock";
|
|
@@ -37,6 +42,7 @@ var ResponseFormat;
|
|
|
37
42
|
case PromptingStrategy.Xtab275:
|
|
38
43
|
return ResponseFormat.EditWindowOnly;
|
|
39
44
|
case PromptingStrategy.SimplifiedSystemPrompt:
|
|
45
|
+
case PromptingStrategy.CopilotNesXtab:
|
|
40
46
|
case undefined:
|
|
41
47
|
return ResponseFormat.CodeBlock;
|
|
42
48
|
default:
|
|
@@ -63,6 +69,7 @@ exports.DEFAULT_OPTIONS = {
|
|
|
63
69
|
languageContext: {
|
|
64
70
|
enabled: false,
|
|
65
71
|
maxTokens: 2000,
|
|
72
|
+
traitPosition: 'after',
|
|
66
73
|
},
|
|
67
74
|
diffHistory: {
|
|
68
75
|
nEntries: 25,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabPromptOptions.js","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;
|
|
1
|
+
{"version":3,"file":"xtabPromptOptions.js","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AA2DhG,kDAEC;AA3DD,mEAAqE;AACrE,uEAAoI;AAyCpI;;GAEG;AACH,IAAY,iBAUX;AAVD,WAAY,iBAAiB;IAC5B;;OAEG;IACH,sDAAiC,CAAA;IACjC,sDAAiC,CAAA;IACjC,8DAAyC,CAAA;IACzC,gDAA2B,CAAA;IAC3B,sEAAiD,CAAA;IACjD,wCAAmB,CAAA;AACpB,CAAC,EAVW,iBAAiB,iCAAjB,iBAAiB,QAU5B;AAED,SAAgB,mBAAmB,CAAC,KAAa;IAChD,OAAQ,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC;AAED,IAAY,cAIX;AAJD,WAAY,cAAc;IACzB,yCAAuB,CAAA;IACvB,mDAAiC,CAAA;IACjC,mDAAiC,CAAA;AAClC,CAAC,EAJW,cAAc,8BAAd,cAAc,QAIzB;AAED,WAAiB,cAAc;IAC9B,SAAgB,qBAAqB,CAAC,QAAuC;QAC5E,QAAQ,QAAQ,EAAE,CAAC;YAClB,KAAK,iBAAiB,CAAC,YAAY,CAAC;YACpC,KAAK,iBAAiB,CAAC,kBAAkB,CAAC;YAC1C,KAAK,iBAAiB,CAAC,WAAW;gBACjC,OAAO,cAAc,CAAC,cAAc,CAAC;YACtC,KAAK,iBAAiB,CAAC,OAAO;gBAC7B,OAAO,cAAc,CAAC,cAAc,CAAC;YACtC,KAAK,iBAAiB,CAAC,sBAAsB,CAAC;YAC9C,KAAK,iBAAiB,CAAC,cAAc,CAAC;YACtC,KAAK,SAAS;gBACb,OAAO,cAAc,CAAC,SAAS,CAAC;YACjC;gBACC,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;IAfe,oCAAqB,wBAepC,CAAA;AACF,CAAC,EAjBgB,cAAc,8BAAd,cAAc,QAiB9B;AAEY,QAAA,eAAe,GAAkB;IAC7C,iBAAiB,EAAE,SAAS;IAC5B,WAAW,EAAE;QACZ,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,qBAAqB,EAAE,KAAK;KAC5B;IACD,aAAa,EAAE;QACd,QAAQ,EAAE,EAAE;KACZ;IACD,uBAAuB,EAAE;QACxB,UAAU,EAAE,CAAC;QACb,SAAS,EAAE,IAAI;QACf,kBAAkB,EAAE,KAAK;KACzB;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,OAAO;KACtB;IACD,WAAW,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,IAAI;QACf,mBAAmB,EAAE,KAAK;QAC1B,gBAAgB,EAAE,KAAK;KACvB;IACD,iBAAiB,EAAE,IAAI;CACvB,CAAC;AAEF,mEAAmE;AACtD,QAAA,kCAAkC,GAA6B;IAC3E,QAAQ,EAAE,IAAI;IACd,cAAc,EAAE,IAAI;IACpB,WAAW,EAAE,IAAI;CACjB,CAAC;AAQW,QAAA,6BAA6B,GAAmC,IAAA,gBAAI,EAAC;IACjF,WAAW,EAAE,IAAA,qBAAS,EAAC,IAAA,mBAAO,GAAE,CAAC;IACjC,mBAAmB,EAAE,IAAA,kBAAM,EAAC,IAAA,iBAAK,EAAC,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAA,sBAAU,GAAE,CAAC;IACrF,0BAA0B,EAAE,IAAA,qBAAS,EAAC,IAAA,oBAAQ,GAAE,CAAC;CACjD,CAAC,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type * as vscode from 'vscode';
|
|
2
|
+
import { Event } from '../../../util/vs/base/common/event';
|
|
3
|
+
import { ModelConfiguration } from './dataTypes/xtabPromptOptions';
|
|
4
|
+
export interface IInlineEditsModelService {
|
|
5
|
+
readonly _serviceBrand: undefined;
|
|
6
|
+
readonly modelInfo: vscode.InlineCompletionModelInfo | undefined;
|
|
7
|
+
readonly onModelListUpdated: Event<void>;
|
|
8
|
+
setCurrentModelId(modelId: string): Promise<void>;
|
|
9
|
+
selectedModelConfiguration(): ModelConfiguration;
|
|
10
|
+
}
|
|
11
|
+
export declare const IInlineEditsModelService: import("../../../util/common/services").ServiceIdentifier<IInlineEditsModelService>;
|
|
12
|
+
//# sourceMappingURL=inlineEditsModelService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineEditsModelService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/inlineEdits/common/inlineEditsModelService.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC;IAElC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAEjE,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEzC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,0BAA0B,IAAI,kBAAkB,CAAC;CACjD;AAED,eAAO,MAAM,wBAAwB,qFAAgF,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*---------------------------------------------------------------------------------------------
|
|
3
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
|
+
*--------------------------------------------------------------------------------------------*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.IInlineEditsModelService = void 0;
|
|
8
|
+
const services_1 = require("../../../util/common/services");
|
|
9
|
+
exports.IInlineEditsModelService = (0, services_1.createServiceIdentifier)('IInlineEditsModelService');
|
|
10
|
+
//# sourceMappingURL=inlineEditsModelService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineEditsModelService.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/inlineEdits/common/inlineEditsModelService.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAGhG,4DAAwE;AAgB3D,QAAA,wBAAwB,GAAG,IAAA,kCAAuB,EAA2B,0BAA0B,CAAC,CAAC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type * as vscode from 'vscode';
|
|
2
|
+
import { Disposable } from '../../../util/vs/base/common/lifecycle';
|
|
3
|
+
import { CopilotToken } from '../../authentication/common/copilotToken';
|
|
4
|
+
import { ICopilotTokenStore } from '../../authentication/common/copilotTokenStore';
|
|
5
|
+
import { IConfigurationService } from '../../configuration/common/configurationService';
|
|
6
|
+
import { ILogService } from '../../log/common/logService';
|
|
7
|
+
import { IProxyModelsService } from '../../proxyModels/common/proxyModelsService';
|
|
8
|
+
import { IExperimentationService } from '../../telemetry/common/nullExperimentationService';
|
|
9
|
+
import { ITelemetryService } from '../../telemetry/common/telemetry';
|
|
10
|
+
import { WireTypes } from '../common/dataTypes/inlineEditsModelsTypes';
|
|
11
|
+
import { ModelConfiguration } from '../common/dataTypes/xtabPromptOptions';
|
|
12
|
+
import { IInlineEditsModelService } from '../common/inlineEditsModelService';
|
|
13
|
+
export declare class InlineEditsModelService extends Disposable implements IInlineEditsModelService {
|
|
14
|
+
private readonly _tokenStore;
|
|
15
|
+
private readonly _proxyModelsService;
|
|
16
|
+
private readonly _configService;
|
|
17
|
+
private readonly _expService;
|
|
18
|
+
private readonly _telemetryService;
|
|
19
|
+
private readonly _logService;
|
|
20
|
+
_serviceBrand: undefined;
|
|
21
|
+
private static readonly COPILOT_NES_XTAB_MODEL;
|
|
22
|
+
private static readonly COPILOT_NES_OCT;
|
|
23
|
+
private _copilotTokenObs;
|
|
24
|
+
private _fetchedModelsObs;
|
|
25
|
+
private _preferredModelNameObs;
|
|
26
|
+
private _localModelConfigObs;
|
|
27
|
+
private _expBasedModelConfigObs;
|
|
28
|
+
private _defaultModelConfigObs;
|
|
29
|
+
private _modelInfo;
|
|
30
|
+
private readonly _onModelListUpdated;
|
|
31
|
+
readonly onModelListUpdated: import("../../../util/vs/base/common/event").Event<void>;
|
|
32
|
+
private _tracer;
|
|
33
|
+
constructor(_tokenStore: ICopilotTokenStore, _proxyModelsService: IProxyModelsService, _configService: IConfigurationService, _expService: IExperimentationService, _telemetryService: ITelemetryService, _logService: ILogService);
|
|
34
|
+
get modelInfo(): vscode.InlineCompletionModelInfo | undefined;
|
|
35
|
+
setCurrentModelId(modelId: string): Promise<void>;
|
|
36
|
+
refreshModelsInfo({ copilotToken, fetchedNesModels, preferredModelName, localModelConfig, modelConfigString, defaultModelConfigString, }: {
|
|
37
|
+
copilotToken: CopilotToken | undefined;
|
|
38
|
+
fetchedNesModels: WireTypes.Model.t[] | undefined;
|
|
39
|
+
preferredModelName: string;
|
|
40
|
+
localModelConfig: ModelConfiguration | undefined;
|
|
41
|
+
modelConfigString: string | undefined;
|
|
42
|
+
defaultModelConfigString: string | undefined;
|
|
43
|
+
}): Promise<void>;
|
|
44
|
+
selectedModelConfiguration(): ModelConfiguration;
|
|
45
|
+
private determineDefaultModel;
|
|
46
|
+
private _pickModel;
|
|
47
|
+
private parseModelConfigStringSetting;
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=inlineEditsModelService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineEditsModelService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/inlineEdits/node/inlineEditsModelService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAC;AAOtC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAoC,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AAC1H,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAuB,kBAAkB,EAAqB,MAAM,uCAAuC,CAAC;AACnH,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAQ7E,qBAAa,uBAAwB,SAAQ,UAAW,YAAW,wBAAwB;IAkCrE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW;IArC1C,aAAa,EAAE,SAAS,CAAC;IAEzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAI5C;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAIrC;IAEF,OAAO,CAAC,gBAAgB,CAAqG;IAG7H,OAAO,CAAC,iBAAiB,CAAoH;IAE7I,OAAO,CAAC,sBAAsB,CAA0H;IACxJ,OAAO,CAAC,oBAAoB,CAA6G;IACzI,OAAO,CAAC,uBAAuB,CAAoJ;IACnL,OAAO,CAAC,sBAAsB,CAA2J;IAEzL,OAAO,CAAC,UAAU,CAA4E;IAE9F,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuC;IAC3E,SAAgB,kBAAkB,2DAAkC;IAEpE,OAAO,CAAC,OAAO,CAAgF;gBAGzD,WAAW,EAAE,kBAAkB,EAC9B,mBAAmB,EAAE,mBAAmB,EACtC,cAAc,EAAE,qBAAqB,EACnC,WAAW,EAAE,uBAAuB,EAC1C,iBAAiB,EAAE,iBAAiB,EAC1C,WAAW,EAAE,WAAW;IA0BvD,IAAI,SAAS,IAAI,MAAM,CAAC,yBAAyB,GAAG,SAAS,CAc5D;IAGK,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,iBAAiB,CACtB,EACC,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,GACxB,EAAE;QACF,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;QACvC,gBAAgB,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;QAClD,kBAAkB,EAAE,MAAM,CAAC;QAC3B,gBAAgB,EAAE,kBAAkB,GAAG,SAAS,CAAC;QACjD,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;QACtC,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7C,GACC,OAAO,CAAC,IAAI,CAAC;IAkFT,0BAA0B,IAAI,kBAAkB;IAevD,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,6BAA6B;CAyBrC"}
|
|
@@ -0,0 +1,290 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*---------------------------------------------------------------------------------------------
|
|
3
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
|
+
*--------------------------------------------------------------------------------------------*/
|
|
6
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
+
if (k2 === undefined) k2 = k;
|
|
8
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
9
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
10
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
11
|
+
}
|
|
12
|
+
Object.defineProperty(o, k2, desc);
|
|
13
|
+
}) : (function(o, m, k, k2) {
|
|
14
|
+
if (k2 === undefined) k2 = k;
|
|
15
|
+
o[k2] = m[k];
|
|
16
|
+
}));
|
|
17
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
18
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
19
|
+
}) : function(o, v) {
|
|
20
|
+
o["default"] = v;
|
|
21
|
+
});
|
|
22
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
23
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
24
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
25
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
26
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
27
|
+
};
|
|
28
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
29
|
+
var ownKeys = function(o) {
|
|
30
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
31
|
+
var ar = [];
|
|
32
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
33
|
+
return ar;
|
|
34
|
+
};
|
|
35
|
+
return ownKeys(o);
|
|
36
|
+
};
|
|
37
|
+
return function (mod) {
|
|
38
|
+
if (mod && mod.__esModule) return mod;
|
|
39
|
+
var result = {};
|
|
40
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
41
|
+
__setModuleDefault(result, mod);
|
|
42
|
+
return result;
|
|
43
|
+
};
|
|
44
|
+
})();
|
|
45
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
46
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
47
|
+
};
|
|
48
|
+
var InlineEditsModelService_1;
|
|
49
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
|
+
exports.InlineEditsModelService = void 0;
|
|
51
|
+
const util_1 = require("util");
|
|
52
|
+
const arrays_1 = require("../../../util/common/arrays");
|
|
53
|
+
const errors = __importStar(require("../../../util/common/errors"));
|
|
54
|
+
const tracing_1 = require("../../../util/common/tracing");
|
|
55
|
+
const arrays_2 = require("../../../util/vs/base/common/arrays");
|
|
56
|
+
const assert_1 = require("../../../util/vs/base/common/assert");
|
|
57
|
+
const event_1 = require("../../../util/vs/base/common/event");
|
|
58
|
+
const lifecycle_1 = require("../../../util/vs/base/common/lifecycle");
|
|
59
|
+
const observable_1 = require("../../../util/vs/base/common/observable");
|
|
60
|
+
const copilotTokenStore_1 = require("../../authentication/common/copilotTokenStore");
|
|
61
|
+
const configurationService_1 = require("../../configuration/common/configurationService");
|
|
62
|
+
const logService_1 = require("../../log/common/logService");
|
|
63
|
+
const proxyModelsService_1 = require("../../proxyModels/common/proxyModelsService");
|
|
64
|
+
const nullExperimentationService_1 = require("../../telemetry/common/nullExperimentationService");
|
|
65
|
+
const telemetry_1 = require("../../telemetry/common/telemetry");
|
|
66
|
+
const xtabPromptOptions_1 = require("../common/dataTypes/xtabPromptOptions");
|
|
67
|
+
let InlineEditsModelService = class InlineEditsModelService extends lifecycle_1.Disposable {
|
|
68
|
+
static { InlineEditsModelService_1 = this; }
|
|
69
|
+
static { this.COPILOT_NES_XTAB_MODEL = {
|
|
70
|
+
modelName: 'copilot-nes-xtab',
|
|
71
|
+
promptingStrategy: xtabPromptOptions_1.PromptingStrategy.CopilotNesXtab,
|
|
72
|
+
includeTagsInCurrentFile: true,
|
|
73
|
+
}; }
|
|
74
|
+
static { this.COPILOT_NES_OCT = {
|
|
75
|
+
modelName: 'copilot-nes-oct',
|
|
76
|
+
promptingStrategy: xtabPromptOptions_1.PromptingStrategy.Xtab275,
|
|
77
|
+
includeTagsInCurrentFile: false,
|
|
78
|
+
}; }
|
|
79
|
+
constructor(_tokenStore, _proxyModelsService, _configService, _expService, _telemetryService, _logService) {
|
|
80
|
+
super();
|
|
81
|
+
this._tokenStore = _tokenStore;
|
|
82
|
+
this._proxyModelsService = _proxyModelsService;
|
|
83
|
+
this._configService = _configService;
|
|
84
|
+
this._expService = _expService;
|
|
85
|
+
this._telemetryService = _telemetryService;
|
|
86
|
+
this._logService = _logService;
|
|
87
|
+
this._copilotTokenObs = (0, observable_1.observableFromEvent)(this, this._tokenStore.onDidStoreUpdate, () => this._tokenStore.copilotToken);
|
|
88
|
+
// TODO@ulugbekna: use a derived observable such that it fires only when nesModels change
|
|
89
|
+
this._fetchedModelsObs = (0, observable_1.observableFromEvent)(this, this._proxyModelsService.onModelListUpdated, () => this._proxyModelsService.nesModels);
|
|
90
|
+
this._preferredModelNameObs = this._configService.getExperimentBasedConfigObservable(configurationService_1.ConfigKey.Advanced.InlineEditsPreferredModel, this._expService);
|
|
91
|
+
this._localModelConfigObs = this._configService.getConfigObservable(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderModelConfiguration);
|
|
92
|
+
this._expBasedModelConfigObs = this._configService.getExperimentBasedConfigObservable(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderModelConfigurationString, this._expService);
|
|
93
|
+
this._defaultModelConfigObs = this._configService.getExperimentBasedConfigObservable(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderDefaultModelConfigurationString, this._expService);
|
|
94
|
+
this._onModelListUpdated = this._register(new event_1.Emitter());
|
|
95
|
+
this.onModelListUpdated = this._onModelListUpdated.event;
|
|
96
|
+
this._tracer = (0, tracing_1.createTracer)(['NES', 'ModelsService'], (msg) => this._logService.trace(msg));
|
|
97
|
+
const tracer = this._tracer.sub('constructor');
|
|
98
|
+
const defaultModel = this.determineDefaultModel(this._copilotTokenObs.get(), this._defaultModelConfigObs.get());
|
|
99
|
+
this._modelInfo = { modelList: [defaultModel], currentModelId: defaultModel.modelName };
|
|
100
|
+
tracer.trace('initial modelInfo', this._modelInfo);
|
|
101
|
+
this._register((0, observable_1.autorun)((reader) => {
|
|
102
|
+
this.refreshModelsInfo({
|
|
103
|
+
copilotToken: this._copilotTokenObs.read(reader),
|
|
104
|
+
fetchedNesModels: this._fetchedModelsObs.read(reader),
|
|
105
|
+
preferredModelName: this._preferredModelNameObs.read(reader),
|
|
106
|
+
localModelConfig: this._localModelConfigObs.read(reader),
|
|
107
|
+
modelConfigString: this._expBasedModelConfigObs.read(reader),
|
|
108
|
+
defaultModelConfigString: this._defaultModelConfigObs.read(reader),
|
|
109
|
+
});
|
|
110
|
+
}));
|
|
111
|
+
tracer.trace('updated model info', this._modelInfo);
|
|
112
|
+
}
|
|
113
|
+
get modelInfo() {
|
|
114
|
+
const tracer = this._tracer.sub('modelInfo.getter');
|
|
115
|
+
tracer.trace('model info', this._modelInfo);
|
|
116
|
+
const models = this._modelInfo.modelList.map(m => ({
|
|
117
|
+
id: m.modelName,
|
|
118
|
+
name: m.modelName,
|
|
119
|
+
}));
|
|
120
|
+
return {
|
|
121
|
+
models,
|
|
122
|
+
currentModelId: this._modelInfo.currentModelId,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
async setCurrentModelId(modelId) {
|
|
126
|
+
if (this._modelInfo.currentModelId === modelId) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
if (!this._modelInfo.modelList.some(m => m.modelName === modelId)) {
|
|
130
|
+
this._logService.warn(`Trying to set unknown model id: ${modelId}`);
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
this._modelInfo = { ...this._modelInfo, currentModelId: modelId };
|
|
134
|
+
await this._configService.setConfig(configurationService_1.ConfigKey.Advanced.InlineEditsPreferredModel, modelId);
|
|
135
|
+
this._onModelListUpdated.fire();
|
|
136
|
+
}
|
|
137
|
+
async refreshModelsInfo({ copilotToken, fetchedNesModels, preferredModelName, localModelConfig, modelConfigString, defaultModelConfigString, }) {
|
|
138
|
+
const tracer = this._tracer.sub('refreshModelsInfo');
|
|
139
|
+
tracer.trace('Fetching latest models...');
|
|
140
|
+
const models = [];
|
|
141
|
+
// priority of adding models to the list:
|
|
142
|
+
// 0. model from user local setting
|
|
143
|
+
// 1. model from modelConfigurationString setting (set through ExP)
|
|
144
|
+
// 2. fetched models from /models endpoint (if useSlashModels is true)
|
|
145
|
+
if (localModelConfig) {
|
|
146
|
+
if (models.some(m => m.modelName === localModelConfig.modelName)) {
|
|
147
|
+
tracer.trace('Local model configuration already exists in the model list, skipping.');
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
tracer.trace(`Adding local model configuration: ${localModelConfig.modelName}`);
|
|
151
|
+
models.push({ ...localModelConfig });
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
if (modelConfigString) {
|
|
155
|
+
tracer.trace('Parsing modelConfigurationString...');
|
|
156
|
+
const parsedConfig = this.parseModelConfigStringSetting(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderModelConfigurationString);
|
|
157
|
+
if (parsedConfig && !models.some(m => m.modelName === parsedConfig.modelName)) {
|
|
158
|
+
tracer.trace(`Adding model from modelConfigurationString: ${parsedConfig.modelName}`);
|
|
159
|
+
models.push({ ...parsedConfig });
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
tracer.trace('No valid model found in modelConfigurationString.');
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
const useSlashModels = this._configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsUseSlashModels, this._expService);
|
|
166
|
+
if (useSlashModels && fetchedNesModels && fetchedNesModels.length > 0) {
|
|
167
|
+
tracer.trace('Processing fetched models...');
|
|
168
|
+
if (fetchedNesModels === undefined) {
|
|
169
|
+
tracer.trace('No fetched models available.');
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
tracer.trace(`Fetched ${fetchedNesModels.length} models.`);
|
|
173
|
+
const filteredFetchedModels = (0, arrays_1.filterMap)(fetchedNesModels, (m) => {
|
|
174
|
+
if (!(0, xtabPromptOptions_1.isPromptingStrategy)(m.capabilities.promptStrategy)) {
|
|
175
|
+
return undefined;
|
|
176
|
+
}
|
|
177
|
+
return {
|
|
178
|
+
modelName: m.name,
|
|
179
|
+
promptingStrategy: m.capabilities.promptStrategy,
|
|
180
|
+
includeTagsInCurrentFile: false, // FIXME@ulugbekna: determine this based on model capabilities and config
|
|
181
|
+
};
|
|
182
|
+
});
|
|
183
|
+
tracer.trace(`Adding ${filteredFetchedModels.length} fetched models after filtering.`);
|
|
184
|
+
(0, arrays_2.pushMany)(models, filteredFetchedModels);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
// push default model if /models doesn't give us any models
|
|
189
|
+
tracer.trace(`adding built-in default model: useSlashModels ${useSlashModels}, fetchedNesModels ${fetchedNesModels}`);
|
|
190
|
+
const defaultModel = this.determineDefaultModel(copilotToken, defaultModelConfigString);
|
|
191
|
+
if (defaultModel) {
|
|
192
|
+
if (models.some(m => m.modelName === defaultModel.modelName)) {
|
|
193
|
+
tracer.trace('Default model configuration already exists in the model list, skipping.');
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
tracer.trace(`Adding default model configuration: ${defaultModel.modelName}`);
|
|
197
|
+
models.push(defaultModel);
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
const hasModelListChanged = !(0, util_1.isDeepStrictEqual)(this._modelInfo.modelList, models);
|
|
202
|
+
if (!hasModelListChanged) {
|
|
203
|
+
tracer.trace('Model list unchanged, not updating.');
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
this._modelInfo = {
|
|
207
|
+
modelList: models,
|
|
208
|
+
currentModelId: this._pickModel({ preferredModelName, models }),
|
|
209
|
+
};
|
|
210
|
+
tracer.trace('Model list updated, firing event.');
|
|
211
|
+
this._onModelListUpdated.fire();
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
selectedModelConfiguration() {
|
|
215
|
+
const tracer = this._tracer.sub('selectedModelConfiguration');
|
|
216
|
+
const model = this._modelInfo.modelList.find(m => m.modelName === this._modelInfo.currentModelId);
|
|
217
|
+
if (model) {
|
|
218
|
+
tracer.trace(`Selected model found: ${model.modelName}`);
|
|
219
|
+
return {
|
|
220
|
+
modelName: model.modelName,
|
|
221
|
+
promptingStrategy: model.promptingStrategy,
|
|
222
|
+
includeTagsInCurrentFile: model.includeTagsInCurrentFile,
|
|
223
|
+
};
|
|
224
|
+
}
|
|
225
|
+
tracer.trace('No selected model found, using default model.');
|
|
226
|
+
return this.determineDefaultModel(undefined, undefined);
|
|
227
|
+
}
|
|
228
|
+
determineDefaultModel(copilotToken, defaultModelConfigString) {
|
|
229
|
+
// if a default model config string is specified, use that
|
|
230
|
+
if (defaultModelConfigString) {
|
|
231
|
+
const parsedConfig = this.parseModelConfigStringSetting(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderDefaultModelConfigurationString);
|
|
232
|
+
if (parsedConfig) {
|
|
233
|
+
return { ...parsedConfig };
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
// otherwise, use built-in defaults
|
|
237
|
+
if (copilotToken?.isFcv1()) {
|
|
238
|
+
return InlineEditsModelService_1.COPILOT_NES_XTAB_MODEL;
|
|
239
|
+
}
|
|
240
|
+
else {
|
|
241
|
+
return InlineEditsModelService_1.COPILOT_NES_OCT;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
_pickModel({ preferredModelName, models }) {
|
|
245
|
+
const userHasPreferredModel = preferredModelName !== 'none';
|
|
246
|
+
// FIXME@ulugbekna: respect exp-set model name
|
|
247
|
+
if (userHasPreferredModel && models.some(m => m.modelName === preferredModelName)) {
|
|
248
|
+
return preferredModelName;
|
|
249
|
+
}
|
|
250
|
+
(0, assert_1.softAssert)(models.length > 0, 'InlineEdits model list should have at least one model');
|
|
251
|
+
if (models.length > 0) {
|
|
252
|
+
return models[0].modelName;
|
|
253
|
+
}
|
|
254
|
+
return this.determineDefaultModel(undefined, undefined).modelName;
|
|
255
|
+
}
|
|
256
|
+
parseModelConfigStringSetting(configKey) {
|
|
257
|
+
const configString = this._configService.getExperimentBasedConfig(configKey, this._expService);
|
|
258
|
+
if (configString === undefined) {
|
|
259
|
+
return undefined;
|
|
260
|
+
}
|
|
261
|
+
let parsedConfig;
|
|
262
|
+
try {
|
|
263
|
+
parsedConfig = JSON.parse(configString);
|
|
264
|
+
// FIXME@ulugbekna: validate parsedConfig structure
|
|
265
|
+
}
|
|
266
|
+
catch (e) {
|
|
267
|
+
/* __GDPR__
|
|
268
|
+
"incorrectNesModelConfig" : {
|
|
269
|
+
"owner": "ulugbekna",
|
|
270
|
+
"comment": "Capture if model configuration string is invalid JSON.",
|
|
271
|
+
"configName": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Name of the configuration that failed to parse." },
|
|
272
|
+
"errorMessage": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Error message from JSON.parse." },
|
|
273
|
+
"configValue": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The invalid JSON string." }
|
|
274
|
+
}
|
|
275
|
+
*/
|
|
276
|
+
this._telemetryService.sendMSFTTelemetryEvent('incorrectNesModelConfig', { configName: configKey.id, errorMessage: errors.toString(errors.fromUnknown(e)), configValue: configString });
|
|
277
|
+
}
|
|
278
|
+
return parsedConfig;
|
|
279
|
+
}
|
|
280
|
+
};
|
|
281
|
+
exports.InlineEditsModelService = InlineEditsModelService;
|
|
282
|
+
exports.InlineEditsModelService = InlineEditsModelService = InlineEditsModelService_1 = __decorate([
|
|
283
|
+
__param(0, copilotTokenStore_1.ICopilotTokenStore),
|
|
284
|
+
__param(1, proxyModelsService_1.IProxyModelsService),
|
|
285
|
+
__param(2, configurationService_1.IConfigurationService),
|
|
286
|
+
__param(3, nullExperimentationService_1.IExperimentationService),
|
|
287
|
+
__param(4, telemetry_1.ITelemetryService),
|
|
288
|
+
__param(5, logService_1.ILogService)
|
|
289
|
+
], InlineEditsModelService);
|
|
290
|
+
//# sourceMappingURL=inlineEditsModelService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inlineEditsModelService.js","sourceRoot":"","sources":["../../../../../../src/_internal/platform/inlineEdits/node/inlineEditsModelService.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ declare class LoggerImpl implements ILogger {
|
|
|
83
83
|
show(preserveFocus?: boolean): void;
|
|
84
84
|
}
|
|
85
85
|
export declare function collectErrorMessages(e: any): string;
|
|
86
|
-
export declare function collectSingleLineErrorMessage(e: any): string;
|
|
86
|
+
export declare function collectSingleLineErrorMessage(e: any, includeDetails?: boolean): string;
|
|
87
87
|
export declare class LogMemory {
|
|
88
88
|
private static _logs;
|
|
89
89
|
private static _requestIds;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/log/common/logService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAEpE,eAAO,MAAM,WAAW,wEAAsD,CAAC;AAE/E;;GAEG;AACH,oBAAY,QAAQ;IAEnB;;OAEG;IACH,GAAG,IAAI;IAEP;;OAEG;IACH,KAAK,IAAI;IAET;;OAEG;IACH,KAAK,IAAI;IAET;;OAEG;IACH,IAAI,IAAI;IAER;;OAEG;IACH,OAAO,IAAI;IAEX;;OAEG;IACH,KAAK,IAAI;CACT;AAED,MAAM,WAAW,UAAU;IAC1B,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACnE,IAAI,CAAC,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACrC;AAGD,qBAAa,UAAW,YAAW,UAAU;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAAU,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAA7C,MAAM,CAAC,EAAE,MAAM,YAAA,EAAmB,WAAW,GAAE,QAA2B;IAEvG,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE;CAe3D;AAED,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC3C,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,OAAO;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;;MAKE;IACF,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrD,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACpC;AAED,qBAAa,cAAe,SAAQ,UAAW,YAAW,WAAW;IAC5D,aAAa,EAAE,SAAS,CAAC;IAEjC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;gBAG3B,UAAU,EAAE,UAAU,EAAE;IAOzB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI5B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI3B,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAIpD,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI;CAGnC;AAED,cAAM,UAAW,YAAW,OAAO;IAEjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,UAAU,EAAE;IAG3C,OAAO,CAAC,MAAM;IAKd,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI5B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI3B,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAIpD,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI;CAGnC;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,GAAG,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"logService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/log/common/logService.ts"],"names":[],"mappings":"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"}
|