@aws/lsp-codewhisperer 0.0.71 → 0.0.72
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/CHANGELOG.md +17 -0
- package/out/language-server/agenticChat/agenticChatController.js +5 -5
- package/out/language-server/agenticChat/agenticChatController.js.map +1 -1
- package/out/language-server/agenticChat/constants/modelSelection.js +1 -1
- package/out/language-server/agenticChat/constants/modelSelection.js.map +1 -1
- package/out/language-server/agenticChat/tools/chatDb/chatDb.d.ts +7 -1
- package/out/language-server/agenticChat/tools/chatDb/chatDb.js +64 -17
- package/out/language-server/agenticChat/tools/chatDb/chatDb.js.map +1 -1
- package/out/language-server/agenticChat/tools/chatDb/util.d.ts +3 -2
- package/out/language-server/agenticChat/tools/chatDb/util.js.map +1 -1
- package/out/language-server/agenticChat/tools/executeBash.d.ts +1 -0
- package/out/language-server/agenticChat/tools/executeBash.js +33 -0
- package/out/language-server/agenticChat/tools/executeBash.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js +22 -18
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpManager.d.ts +1 -0
- package/out/language-server/agenticChat/tools/mcp/mcpManager.js +68 -32
- package/out/language-server/agenticChat/tools/mcp/mcpManager.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpTypes.d.ts +1 -0
- package/out/language-server/agenticChat/tools/mcp/mcpTypes.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.d.ts +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.js +70 -7
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.js.map +1 -1
- package/out/language-server/agenticChat/tools/qCodeAnalysis/displayFindingsConstants.js +1 -0
- package/out/language-server/agenticChat/tools/qCodeAnalysis/displayFindingsConstants.js.map +1 -1
- package/out/language-server/agenticChat/utils/agenticChatControllerHelper.js +1 -1
- package/out/language-server/agenticChat/utils/agenticChatControllerHelper.js.map +1 -1
- package/out/language-server/chat/chatSessionService.js +1 -1
- package/out/language-server/chat/chatSessionService.js.map +1 -1
- package/out/language-server/chat/telemetry/chatTelemetryController.d.ts +1 -0
- package/out/language-server/chat/telemetry/chatTelemetryController.js +11 -0
- package/out/language-server/chat/telemetry/chatTelemetryController.js.map +1 -1
- package/out/language-server/inline-completion/codeDiffTracker.d.ts +9 -0
- package/out/language-server/inline-completion/codeDiffTracker.js.map +1 -1
- package/out/language-server/inline-completion/codeWhispererServer.d.ts +0 -3
- package/out/language-server/inline-completion/codeWhispererServer.js +48 -172
- package/out/language-server/inline-completion/codeWhispererServer.js.map +1 -1
- package/out/language-server/inline-completion/constants.d.ts +9 -0
- package/out/language-server/inline-completion/constants.js +10 -0
- package/out/language-server/inline-completion/constants.js.map +1 -0
- package/out/language-server/inline-completion/documentChangedListener.d.ts +8 -0
- package/out/language-server/inline-completion/documentChangedListener.js +20 -0
- package/out/language-server/inline-completion/documentChangedListener.js.map +1 -0
- package/out/language-server/inline-completion/editCompletionHandler.d.ts +49 -0
- package/out/language-server/inline-completion/editCompletionHandler.js +320 -0
- package/out/language-server/inline-completion/editCompletionHandler.js.map +1 -0
- package/out/language-server/inline-completion/session/sessionManager.d.ts +10 -2
- package/out/language-server/inline-completion/session/sessionManager.js +34 -7
- package/out/language-server/inline-completion/session/sessionManager.js.map +1 -1
- package/out/language-server/inline-completion/telemetry.js +12 -2
- package/out/language-server/inline-completion/telemetry.js.map +1 -1
- package/out/language-server/inline-completion/trigger.d.ts +17 -0
- package/out/language-server/inline-completion/trigger.js +42 -0
- package/out/language-server/inline-completion/trigger.js.map +1 -0
- package/out/shared/codeWhispererService.d.ts +36 -1
- package/out/shared/codeWhispererService.js +77 -0
- package/out/shared/codeWhispererService.js.map +1 -1
- package/out/shared/constants.d.ts +1 -0
- package/out/shared/constants.js +2 -1
- package/out/shared/constants.js.map +1 -1
- package/out/shared/supplementalContextUtil/crossFileContextUtil.d.ts +3 -4
- package/out/shared/supplementalContextUtil/crossFileContextUtil.js +5 -5
- package/out/shared/supplementalContextUtil/crossFileContextUtil.js.map +1 -1
- package/out/shared/supplementalContextUtil/supplementalContextUtil.d.ts +1 -2
- package/out/shared/supplementalContextUtil/supplementalContextUtil.js +2 -2
- package/out/shared/supplementalContextUtil/supplementalContextUtil.js.map +1 -1
- package/out/shared/telemetry/telemetryService.js +6 -1
- package/out/shared/telemetry/telemetryService.js.map +1 -1
- package/out/shared/telemetry/types.d.ts +8 -0
- package/out/shared/telemetry/types.js +1 -0
- package/out/shared/telemetry/types.js.map +1 -1
- package/out/shared/utils.d.ts +1 -0
- package/out/shared/utils.js +7 -1
- package/out/shared/utils.js.map +1 -1
- package/package.json +2 -2
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SessionManager = exports.CodeWhispererSession = void 0;
|
|
4
4
|
const uuid_1 = require("uuid");
|
|
5
|
+
const codeWhispererService_1 = require("../../../shared/codeWhispererService");
|
|
5
6
|
class CodeWhispererSession {
|
|
6
7
|
id;
|
|
7
8
|
document;
|
|
@@ -41,6 +42,9 @@ class CodeWhispererSession {
|
|
|
41
42
|
includeImportsWithSuggestions;
|
|
42
43
|
codewhispererSuggestionImportCount = 0;
|
|
43
44
|
suggestionType;
|
|
45
|
+
hasEditsPending = false;
|
|
46
|
+
// Track the most recent itemId for paginated Edit suggestions
|
|
47
|
+
recentItemId;
|
|
44
48
|
constructor(data) {
|
|
45
49
|
this.id = this.generateSessionId();
|
|
46
50
|
this.document = data.document;
|
|
@@ -101,7 +105,9 @@ class CodeWhispererSession {
|
|
|
101
105
|
}
|
|
102
106
|
setClientResultData(completionSessionResult, firstCompletionDisplayLatency, totalSessionDisplayTime, typeaheadLength) {
|
|
103
107
|
// Skip if session results were already recorded for session of session is closed
|
|
104
|
-
if (this.state === 'CLOSED' ||
|
|
108
|
+
if (this.state === 'CLOSED' ||
|
|
109
|
+
this.state === 'DISCARD' ||
|
|
110
|
+
(this.completionSessionResult && this.suggestionType === codeWhispererService_1.SuggestionType.COMPLETION)) {
|
|
105
111
|
return;
|
|
106
112
|
}
|
|
107
113
|
this.completionSessionResult = completionSessionResult;
|
|
@@ -141,6 +147,7 @@ class CodeWhispererSession {
|
|
|
141
147
|
// No recommendation was accepted, but user have seen this suggestion
|
|
142
148
|
this.setSuggestionState(itemId, 'Reject');
|
|
143
149
|
}
|
|
150
|
+
this.recentItemId = itemId;
|
|
144
151
|
}
|
|
145
152
|
this.firstCompletionDisplayLatency = firstCompletionDisplayLatency;
|
|
146
153
|
this.totalSessionDisplayTime = totalSessionDisplayTime;
|
|
@@ -182,10 +189,29 @@ class CodeWhispererSession {
|
|
|
182
189
|
}
|
|
183
190
|
return isEmpty ? 'Empty' : 'Discard';
|
|
184
191
|
}
|
|
192
|
+
/**
|
|
193
|
+
* Determines trigger decision based on the most recent user action.
|
|
194
|
+
* Uses the last processed itemId to determine the overall session decision.
|
|
195
|
+
*/
|
|
196
|
+
getLatestUserTriggerDecision() {
|
|
197
|
+
// Force Discard trigger decision when session was explicitly discarded by server
|
|
198
|
+
if (this.state === 'DISCARD') {
|
|
199
|
+
return 'Discard';
|
|
200
|
+
}
|
|
201
|
+
if (!this.recentItemId)
|
|
202
|
+
return;
|
|
203
|
+
const state = this.getSuggestionState(this.recentItemId);
|
|
204
|
+
if (state === 'Accept')
|
|
205
|
+
return 'Accept';
|
|
206
|
+
if (state === 'Reject')
|
|
207
|
+
return 'Reject';
|
|
208
|
+
return state === 'Empty' ? 'Empty' : 'Discard';
|
|
209
|
+
}
|
|
185
210
|
}
|
|
186
211
|
exports.CodeWhispererSession = CodeWhispererSession;
|
|
187
212
|
class SessionManager {
|
|
188
|
-
static
|
|
213
|
+
static _completionInstance;
|
|
214
|
+
static _editInstance;
|
|
189
215
|
currentSession;
|
|
190
216
|
sessionsLog = [];
|
|
191
217
|
maxHistorySize = 5;
|
|
@@ -195,15 +221,16 @@ class SessionManager {
|
|
|
195
221
|
/**
|
|
196
222
|
* Singleton SessionManager class
|
|
197
223
|
*/
|
|
198
|
-
static getInstance() {
|
|
199
|
-
if (
|
|
200
|
-
SessionManager.
|
|
224
|
+
static getInstance(type = 'COMPLETIONS') {
|
|
225
|
+
if (type === 'EDITS') {
|
|
226
|
+
return (SessionManager._editInstance ??= new SessionManager());
|
|
201
227
|
}
|
|
202
|
-
return SessionManager.
|
|
228
|
+
return (SessionManager._completionInstance ??= new SessionManager());
|
|
203
229
|
}
|
|
204
230
|
// For unit tests
|
|
205
231
|
static reset() {
|
|
206
|
-
SessionManager.
|
|
232
|
+
SessionManager._completionInstance = undefined;
|
|
233
|
+
SessionManager._editInstance = undefined;
|
|
207
234
|
}
|
|
208
235
|
createSession(data) {
|
|
209
236
|
this.closeCurrentSession();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":";;;AAMA,+BAAmC;
|
|
1
|
+
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.emitAggregatedUserTriggerDecisionTelemetry = exports.emitUserTriggerDecisionTelemetry = exports.emitPerceivedLatencyTelemetry = exports.emitServiceInvocationFailure = exports.emitServiceInvocationTelemetry = void 0;
|
|
4
4
|
const utils_1 = require("../../shared/utils");
|
|
5
|
+
const codeWhispererService_1 = require("../../shared/codeWhispererService");
|
|
5
6
|
const emitServiceInvocationTelemetry = (telemetry, session, requestId) => {
|
|
6
7
|
const duration = new Date().getTime() - session.startTime;
|
|
7
8
|
const data = {
|
|
@@ -94,12 +95,21 @@ const emitUserTriggerDecisionTelemetry = async (telemetry, telemetryService, ses
|
|
|
94
95
|
if (session.reportedUserDecision) {
|
|
95
96
|
return;
|
|
96
97
|
}
|
|
98
|
+
// Edits show one suggestion sequentially (with pagination), so use latest itemId state;
|
|
99
|
+
// Completions show multiple suggestions together, so aggregate all states
|
|
100
|
+
const userTriggerDecision = session.suggestionType === codeWhispererService_1.SuggestionType.EDIT
|
|
101
|
+
? session.getLatestUserTriggerDecision()
|
|
102
|
+
: session.getAggregatedUserTriggerDecision();
|
|
97
103
|
// Can not emit previous trigger decision if it's not available on the session
|
|
98
|
-
if (!
|
|
104
|
+
if (!userTriggerDecision) {
|
|
99
105
|
return;
|
|
100
106
|
}
|
|
101
107
|
await (0, exports.emitAggregatedUserTriggerDecisionTelemetry)(telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength);
|
|
102
|
-
|
|
108
|
+
// Mark telemetry as complete unless Edit suggestion was accepted with more pending
|
|
109
|
+
const hasPendingEditTelemetry = session.suggestionType === codeWhispererService_1.SuggestionType.EDIT && session.acceptedSuggestionId && session.hasEditsPending;
|
|
110
|
+
if (!hasPendingEditTelemetry) {
|
|
111
|
+
session.reportedUserDecision = true;
|
|
112
|
+
}
|
|
103
113
|
};
|
|
104
114
|
exports.emitUserTriggerDecisionTelemetry = emitUserTriggerDecisionTelemetry;
|
|
105
115
|
const emitAggregatedUserTriggerDecisionTelemetry = (telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/telemetry.ts"],"names":[],"mappings":";;;AAIA,8CAAkE;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { CodewhispererLanguage } from '../../shared/languageDetection';
|
|
2
|
+
import { SessionManager } from './session/sessionManager';
|
|
3
|
+
import { InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/protocol';
|
|
4
|
+
import { CursorTracker } from './tracker/cursorTracker';
|
|
5
|
+
import { RecentEditTracker } from './tracker/codeEditTracker';
|
|
6
|
+
import { CodeWhispererServiceBase } from '../../shared/codeWhispererService';
|
|
7
|
+
export declare class NepTrigger {
|
|
8
|
+
}
|
|
9
|
+
export declare function shouldTriggerEdits(service: CodeWhispererServiceBase, fileContext: {
|
|
10
|
+
fileUri: string;
|
|
11
|
+
filename: string;
|
|
12
|
+
programmingLanguage: {
|
|
13
|
+
languageName: CodewhispererLanguage;
|
|
14
|
+
};
|
|
15
|
+
leftFileContent: string;
|
|
16
|
+
rightFileContent: string;
|
|
17
|
+
}, inlineParams: InlineCompletionWithReferencesParams, cursorTracker: CursorTracker, recentEditsTracker: RecentEditTracker, sessionManager: SessionManager, editsEnabled: boolean): NepTrigger | undefined;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NepTrigger = void 0;
|
|
4
|
+
exports.shouldTriggerEdits = shouldTriggerEdits;
|
|
5
|
+
const editPredictionAutoTrigger_1 = require("./auto-trigger/editPredictionAutoTrigger");
|
|
6
|
+
const codeWhispererService_1 = require("../../shared/codeWhispererService");
|
|
7
|
+
class NepTrigger {
|
|
8
|
+
}
|
|
9
|
+
exports.NepTrigger = NepTrigger;
|
|
10
|
+
function shouldTriggerEdits(service, fileContext, inlineParams, cursorTracker, recentEditsTracker, sessionManager, editsEnabled) {
|
|
11
|
+
if (!editsEnabled) {
|
|
12
|
+
return undefined;
|
|
13
|
+
}
|
|
14
|
+
// edits type suggestion is only implemented in bearer token based IDE for now, we dont want to expose such suggestions to other platforms
|
|
15
|
+
if (!(service instanceof codeWhispererService_1.CodeWhispererServiceToken)) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
const documentChangeParams = inlineParams.documentChangeParams;
|
|
19
|
+
const hasDocChangedParams = documentChangeParams?.contentChanges &&
|
|
20
|
+
documentChangeParams.contentChanges.length > 0 &&
|
|
21
|
+
documentChangeParams.contentChanges[0].text !== undefined;
|
|
22
|
+
// if the client does not emit document change for the trigger, use left most character.
|
|
23
|
+
const triggerCharacters = hasDocChangedParams
|
|
24
|
+
? documentChangeParams.contentChanges[0].text
|
|
25
|
+
: (fileContext.leftFileContent.trim().at(-1) ?? '');
|
|
26
|
+
const previousDecision = sessionManager.getPreviousSession()?.getAggregatedUserTriggerDecision();
|
|
27
|
+
const res = (0, editPredictionAutoTrigger_1.editPredictionAutoTrigger)({
|
|
28
|
+
fileContext: fileContext,
|
|
29
|
+
lineNum: inlineParams.position.line,
|
|
30
|
+
char: triggerCharacters,
|
|
31
|
+
previousDecision: previousDecision ?? '',
|
|
32
|
+
cursorHistory: cursorTracker,
|
|
33
|
+
recentEdits: recentEditsTracker,
|
|
34
|
+
});
|
|
35
|
+
if (res.shouldTrigger) {
|
|
36
|
+
return new NepTrigger();
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=trigger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/trigger.ts"],"names":[],"mappings":";;;AAUA,gDAmDC;AA1DD,wFAAoF;AAGpF,4EAAuG;AAEvG,MAAa,UAAU;CAAG;AAA1B,gCAA0B;AAE1B,SAAgB,kBAAkB,CAC9B,OAAiC,EACjC,WAQC,EACD,YAAkD,EAClD,aAA4B,EAC5B,kBAAqC,EACrC,cAA8B,EAC9B,YAAqB;IAErB,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,0IAA0I;IAC1I,IAAI,CAAC,CAAC,OAAO,YAAY,gDAAyB,CAAC,EAAE,CAAC;QAClD,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CAAA;IAC9D,MAAM,mBAAmB,GACrB,oBAAoB,EAAE,cAAc;QACpC,oBAAoB,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;QAC9C,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAA;IAE7D,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,mBAAmB;QACzC,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;QAC7C,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAEvD,MAAM,gBAAgB,GAAG,cAAc,CAAC,kBAAkB,EAAE,EAAE,gCAAgC,EAAE,CAAA;IAChG,MAAM,GAAG,GAAG,IAAA,qDAAyB,EAAC;QAClC,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;QACnC,IAAI,EAAE,iBAAiB;QACvB,gBAAgB,EAAE,gBAAgB,IAAI,EAAE;QACxC,aAAa,EAAE,aAAa;QAC5B,WAAW,EAAE,kBAAkB;KAClC,CAAC,CAAA;IAEF,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO,IAAI,UAAU,EAAE,CAAA;IAC3B,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { CredentialsProvider, CredentialsType, Workspace, Logging, SDKInitializator, CancellationToken } from '@aws/language-server-runtimes/server-interface';
|
|
1
|
+
import { CredentialsProvider, CredentialsType, Workspace, Logging, SDKInitializator, CancellationToken, TextDocument, Position, WorkspaceFolder, InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/server-interface';
|
|
2
2
|
import { AWSError, ConfigurationOptions } from 'aws-sdk';
|
|
3
3
|
import { PromiseResult } from 'aws-sdk/lib/request';
|
|
4
4
|
import { RequestExtras } from '../client/token/codewhisperer';
|
|
5
5
|
import CodeWhispererSigv4Client = require('../client/sigv4/codewhisperersigv4client');
|
|
6
6
|
import CodeWhispererTokenClient = require('../client/token/codewhispererbearertokenclient');
|
|
7
|
+
import { CodewhispererLanguage } from './languageDetection';
|
|
8
|
+
import { RecentEditTracker } from '../language-server/inline-completion/tracker/codeEditTracker';
|
|
9
|
+
import { CodeWhispererSupplementalContext } from './models/model';
|
|
7
10
|
export interface Suggestion extends CodeWhispererTokenClient.Completion, CodeWhispererSigv4Client.Recommendation {
|
|
8
11
|
itemId: string;
|
|
9
12
|
}
|
|
@@ -25,6 +28,20 @@ export interface GenerateSuggestionsResponse {
|
|
|
25
28
|
suggestionType?: SuggestionType;
|
|
26
29
|
responseContext: ResponseContext;
|
|
27
30
|
}
|
|
31
|
+
export declare function getFileContext(params: {
|
|
32
|
+
textDocument: TextDocument;
|
|
33
|
+
position: Position;
|
|
34
|
+
inferredLanguageId: CodewhispererLanguage;
|
|
35
|
+
workspaceFolder: WorkspaceFolder | null | undefined;
|
|
36
|
+
}): {
|
|
37
|
+
fileUri: string;
|
|
38
|
+
filename: string;
|
|
39
|
+
programmingLanguage: {
|
|
40
|
+
languageName: CodewhispererLanguage;
|
|
41
|
+
};
|
|
42
|
+
leftFileContent: string;
|
|
43
|
+
rightFileContent: string;
|
|
44
|
+
};
|
|
28
45
|
export declare abstract class CodeWhispererServiceBase {
|
|
29
46
|
protected readonly codeWhispererRegion: string;
|
|
30
47
|
protected readonly codeWhispererEndpoint: string;
|
|
@@ -38,6 +55,12 @@ export declare abstract class CodeWhispererServiceBase {
|
|
|
38
55
|
completeRequest(request: AWS.Request<any, AWSError> & RequestExtras): void;
|
|
39
56
|
abstract getCredentialsType(): CredentialsType;
|
|
40
57
|
abstract generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
|
|
58
|
+
abstract constructSupplementalContext(document: TextDocument, position: Position, workspace: Workspace, recentEditTracker: RecentEditTracker, logging: Logging, cancellationToken: CancellationToken, opentabs: InlineCompletionWithReferencesParams['openTabFilepaths'], config: {
|
|
59
|
+
includeRecentEdits: boolean;
|
|
60
|
+
}): Promise<{
|
|
61
|
+
supContextData: CodeWhispererSupplementalContext;
|
|
62
|
+
items: CodeWhispererTokenClient.SupplementalContextList;
|
|
63
|
+
} | undefined>;
|
|
41
64
|
constructor(codeWhispererRegion: string, codeWhispererEndpoint: string);
|
|
42
65
|
/**
|
|
43
66
|
* Updates Service Client options after client was instantiated.
|
|
@@ -54,6 +77,12 @@ export declare class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
|
|
|
54
77
|
client: CodeWhispererSigv4Client;
|
|
55
78
|
constructor(credentialsProvider: CredentialsProvider, workspace: Workspace, logging: Logging, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator);
|
|
56
79
|
getCredentialsType(): CredentialsType;
|
|
80
|
+
constructSupplementalContext(document: TextDocument, position: Position, workspace: Workspace, recentEditTracker: RecentEditTracker, logging: Logging, cancellationToken: CancellationToken, opentabs: InlineCompletionWithReferencesParams['openTabFilepaths'], config: {
|
|
81
|
+
includeRecentEdits: boolean;
|
|
82
|
+
}): Promise<{
|
|
83
|
+
supContextData: CodeWhispererSupplementalContext;
|
|
84
|
+
items: CodeWhispererTokenClient.SupplementalContextList;
|
|
85
|
+
} | undefined>;
|
|
57
86
|
generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
|
|
58
87
|
}
|
|
59
88
|
/**
|
|
@@ -66,6 +95,12 @@ export declare class CodeWhispererServiceToken extends CodeWhispererServiceBase
|
|
|
66
95
|
client: CodeWhispererTokenClient;
|
|
67
96
|
constructor(credentialsProvider: CredentialsProvider, workspace: Workspace, logging: Logging, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator);
|
|
68
97
|
getCredentialsType(): CredentialsType;
|
|
98
|
+
constructSupplementalContext(document: TextDocument, position: Position, workspace: Workspace, recentEditTracker: RecentEditTracker, logging: Logging, cancellationToken: CancellationToken, opentabs: InlineCompletionWithReferencesParams['openTabFilepaths'], config: {
|
|
99
|
+
includeRecentEdits: boolean;
|
|
100
|
+
}): Promise<{
|
|
101
|
+
supContextData: CodeWhispererSupplementalContext;
|
|
102
|
+
items: CodeWhispererTokenClient.SupplementalContextList;
|
|
103
|
+
} | undefined>;
|
|
69
104
|
private withProfileArn;
|
|
70
105
|
generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
|
|
71
106
|
private mapCodeWhispererApiResponseToSuggestion;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CodeWhispererServiceToken = exports.CodeWhispererServiceIAM = exports.CodeWhispererServiceBase = exports.SuggestionType = void 0;
|
|
4
|
+
exports.getFileContext = getFileContext;
|
|
4
5
|
const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
|
|
5
6
|
const timeoutUtils_1 = require("@aws/lsp-core/out/util/timeoutUtils");
|
|
6
7
|
const aws_sdk_1 = require("aws-sdk");
|
|
@@ -8,11 +9,40 @@ const uuid_1 = require("uuid");
|
|
|
8
9
|
const codewhisperer_1 = require("../client/sigv4/codewhisperer");
|
|
9
10
|
const codewhisperer_2 = require("../client/token/codewhisperer");
|
|
10
11
|
const utils_1 = require("./utils");
|
|
12
|
+
const util_1 = require("../language-server/workspaceContext/util");
|
|
13
|
+
const languageDetection_1 = require("./languageDetection");
|
|
14
|
+
const supplementalContextUtil_1 = require("./supplementalContextUtil/supplementalContextUtil");
|
|
15
|
+
const path = require("path");
|
|
16
|
+
const constants_1 = require("../language-server/inline-completion/constants");
|
|
11
17
|
var SuggestionType;
|
|
12
18
|
(function (SuggestionType) {
|
|
13
19
|
SuggestionType["EDIT"] = "EDIT";
|
|
14
20
|
SuggestionType["COMPLETION"] = "COMPLETION";
|
|
15
21
|
})(SuggestionType || (exports.SuggestionType = SuggestionType = {}));
|
|
22
|
+
function getFileContext(params) {
|
|
23
|
+
const left = params.textDocument.getText({
|
|
24
|
+
start: { line: 0, character: 0 },
|
|
25
|
+
end: params.position,
|
|
26
|
+
});
|
|
27
|
+
const trimmedLeft = left.slice(-constants_1.CONTEXT_CHARACTERS_LIMIT).replaceAll('\r\n', '\n');
|
|
28
|
+
const right = params.textDocument.getText({
|
|
29
|
+
start: params.position,
|
|
30
|
+
end: params.textDocument.positionAt(params.textDocument.getText().length),
|
|
31
|
+
});
|
|
32
|
+
const trimmedRight = right.slice(0, constants_1.CONTEXT_CHARACTERS_LIMIT).replaceAll('\r\n', '\n');
|
|
33
|
+
const relativeFilePath = params.workspaceFolder
|
|
34
|
+
? (0, util_1.getRelativePath)(params.workspaceFolder, params.textDocument.uri)
|
|
35
|
+
: path.basename(params.textDocument.uri);
|
|
36
|
+
return {
|
|
37
|
+
fileUri: params.textDocument.uri.substring(0, constants_1.FILE_URI_CHARS_LIMIT),
|
|
38
|
+
filename: relativeFilePath.substring(0, constants_1.FILENAME_CHARS_LIMIT),
|
|
39
|
+
programmingLanguage: {
|
|
40
|
+
languageName: (0, languageDetection_1.getRuntimeLanguage)(params.inferredLanguageId),
|
|
41
|
+
},
|
|
42
|
+
leftFileContent: trimmedLeft,
|
|
43
|
+
rightFileContent: trimmedRight,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
16
46
|
// This abstract class can grow in the future to account for any additional changes across the clients
|
|
17
47
|
class CodeWhispererServiceBase {
|
|
18
48
|
codeWhispererRegion;
|
|
@@ -80,6 +110,9 @@ class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
|
|
|
80
110
|
getCredentialsType() {
|
|
81
111
|
return 'iam';
|
|
82
112
|
}
|
|
113
|
+
async constructSupplementalContext(document, position, workspace, recentEditTracker, logging, cancellationToken, opentabs, config) {
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
83
116
|
async generateSuggestions(request) {
|
|
84
117
|
// add cancellation check
|
|
85
118
|
// add error check
|
|
@@ -167,6 +200,50 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
167
200
|
getCredentialsType() {
|
|
168
201
|
return 'bearer';
|
|
169
202
|
}
|
|
203
|
+
async constructSupplementalContext(document, position, workspace, recentEditTracker, logging, cancellationToken, opentabs, config) {
|
|
204
|
+
const items = [];
|
|
205
|
+
const projectContext = await (0, supplementalContextUtil_1.fetchSupplementalContext)(document, position, workspace, logging, cancellationToken, opentabs);
|
|
206
|
+
if (projectContext) {
|
|
207
|
+
items.push(...projectContext.supplementalContextItems.map(v => ({
|
|
208
|
+
content: v.content,
|
|
209
|
+
filePath: v.filePath,
|
|
210
|
+
})));
|
|
211
|
+
}
|
|
212
|
+
const recentEditsContext = config.includeRecentEdits
|
|
213
|
+
? await recentEditTracker.generateEditBasedContext(document)
|
|
214
|
+
: undefined;
|
|
215
|
+
if (recentEditsContext) {
|
|
216
|
+
items.push(...recentEditsContext.supplementalContextItems.map(item => ({
|
|
217
|
+
content: item.content,
|
|
218
|
+
filePath: item.filePath,
|
|
219
|
+
type: 'PreviousEditorState',
|
|
220
|
+
metadata: {
|
|
221
|
+
previousEditorStateMetadata: {
|
|
222
|
+
timeOffset: 1000,
|
|
223
|
+
},
|
|
224
|
+
},
|
|
225
|
+
})));
|
|
226
|
+
}
|
|
227
|
+
const merged = recentEditsContext
|
|
228
|
+
? {
|
|
229
|
+
contentsLength: (projectContext?.contentsLength || 0) + (recentEditsContext?.contentsLength || 0),
|
|
230
|
+
latency: Math.max(projectContext?.latency || 0, recentEditsContext?.latency || 0),
|
|
231
|
+
isUtg: projectContext?.isUtg || false,
|
|
232
|
+
isProcessTimeout: projectContext?.isProcessTimeout || false,
|
|
233
|
+
strategy: recentEditsContext ? 'recentEdits' : projectContext?.strategy || 'Empty',
|
|
234
|
+
supplementalContextItems: [
|
|
235
|
+
...(projectContext?.supplementalContextItems || []),
|
|
236
|
+
...(recentEditsContext?.supplementalContextItems || []),
|
|
237
|
+
],
|
|
238
|
+
}
|
|
239
|
+
: projectContext;
|
|
240
|
+
return merged
|
|
241
|
+
? {
|
|
242
|
+
supContextData: merged,
|
|
243
|
+
items: items,
|
|
244
|
+
}
|
|
245
|
+
: undefined;
|
|
246
|
+
}
|
|
170
247
|
withProfileArn(request) {
|
|
171
248
|
if (!this.profileArn)
|
|
172
249
|
return request;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeWhispererService.js","sourceRoot":"","sources":["../../src/shared/codeWhispererService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codeWhispererService.js","sourceRoot":"","sources":["../../src/shared/codeWhispererService.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export declare const AWS_Q_REGION_ENV_VAR = "AWS_Q_REGION";
|
|
|
10
10
|
export declare const AWS_Q_ENDPOINT_URL_ENV_VAR = "AWS_Q_ENDPOINT_URL";
|
|
11
11
|
export declare const Q_CONFIGURATION_SECTION = "aws.q";
|
|
12
12
|
export declare const CODE_WHISPERER_CONFIGURATION_SECTION = "aws.codeWhisperer";
|
|
13
|
+
export declare const SAGEMAKER_UNIFIED_STUDIO_SERVICE = "SageMakerUnifiedStudio";
|
|
13
14
|
/**
|
|
14
15
|
* Names of directories relevant to the crash reporting functionality.
|
|
15
16
|
*
|
package/out/shared/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.COMMON_GITIGNORE_PATTERNS = exports.driveLetterRegex = exports.crashMonitoringDirName = exports.CODE_WHISPERER_CONFIGURATION_SECTION = exports.Q_CONFIGURATION_SECTION = exports.AWS_Q_ENDPOINT_URL_ENV_VAR = exports.AWS_Q_REGION_ENV_VAR = exports.AWS_Q_ENDPOINTS = exports.DEFAULT_AWS_Q_REGION = exports.DEFAULT_AWS_Q_ENDPOINT_URL = exports.INTERNAL_USER_START_URL = exports.BUILDER_ID_START_URL = exports.GENERIC_UNAUTHORIZED_ERROR = exports.INVALID_TOKEN = exports.MISSING_BEARER_TOKEN_ERROR = void 0;
|
|
3
|
+
exports.COMMON_GITIGNORE_PATTERNS = exports.driveLetterRegex = exports.crashMonitoringDirName = exports.SAGEMAKER_UNIFIED_STUDIO_SERVICE = exports.CODE_WHISPERER_CONFIGURATION_SECTION = exports.Q_CONFIGURATION_SECTION = exports.AWS_Q_ENDPOINT_URL_ENV_VAR = exports.AWS_Q_REGION_ENV_VAR = exports.AWS_Q_ENDPOINTS = exports.DEFAULT_AWS_Q_REGION = exports.DEFAULT_AWS_Q_ENDPOINT_URL = exports.INTERNAL_USER_START_URL = exports.BUILDER_ID_START_URL = exports.GENERIC_UNAUTHORIZED_ERROR = exports.INVALID_TOKEN = exports.MISSING_BEARER_TOKEN_ERROR = void 0;
|
|
4
4
|
exports.MISSING_BEARER_TOKEN_ERROR = 'credentialsProvider does not have bearer token credentials';
|
|
5
5
|
exports.INVALID_TOKEN = 'The bearer token included in the request is invalid.';
|
|
6
6
|
exports.GENERIC_UNAUTHORIZED_ERROR = 'User is not authorized to make this call';
|
|
@@ -17,6 +17,7 @@ exports.AWS_Q_REGION_ENV_VAR = 'AWS_Q_REGION';
|
|
|
17
17
|
exports.AWS_Q_ENDPOINT_URL_ENV_VAR = 'AWS_Q_ENDPOINT_URL';
|
|
18
18
|
exports.Q_CONFIGURATION_SECTION = 'aws.q';
|
|
19
19
|
exports.CODE_WHISPERER_CONFIGURATION_SECTION = 'aws.codeWhisperer';
|
|
20
|
+
exports.SAGEMAKER_UNIFIED_STUDIO_SERVICE = 'SageMakerUnifiedStudio';
|
|
20
21
|
/**
|
|
21
22
|
* Names of directories relevant to the crash reporting functionality.
|
|
22
23
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,4DAA4D,CAAA;AACzF,QAAA,aAAa,GAAG,sDAAsD,CAAA;AACtE,QAAA,0BAA0B,GAAG,0CAA0C,CAAA;AACvE,QAAA,oBAAoB,GAAG,gCAAgC,CAAA;AACvD,QAAA,uBAAuB,GAAG,gCAAgC,CAAA;AAC1D,QAAA,0BAA0B,GAAG,gDAAgD,CAAA;AAC7E,QAAA,oBAAoB,GAAG,WAAW,CAAA;AAElC,QAAA,eAAe,GAAG,IAAI,GAAG,CAAC;IACnC,CAAC,4BAAoB,EAAE,kCAA0B,CAAC;IAClD,CAAC,WAAW,EAAE,gDAAgD,CAAC;IAC/D,CAAC,cAAc,EAAE,uCAAuC,CAAC;CAC5D,CAAC,CAAA;AAEW,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,0BAA0B,GAAG,oBAAoB,CAAA;AAEjD,QAAA,uBAAuB,GAAG,OAAO,CAAA;AACjC,QAAA,oCAAoC,GAAG,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from '../models/model';
|
|
2
2
|
import { CancellationToken, Position, TextDocument, Workspace } from '@aws/language-server-runtimes/server-interface';
|
|
3
|
-
import { AmazonQBaseServiceManager } from '../amazonQServiceManager/BaseAmazonQServiceManager';
|
|
4
3
|
type CrossFileSupportedLanguage = 'java' | 'python' | 'javascript' | 'typescript' | 'javascriptreact' | 'typescriptreact';
|
|
5
4
|
export declare const supportedLanguageToDialects: Readonly<Record<CrossFileSupportedLanguage, Set<string>>>;
|
|
6
5
|
interface Chunk {
|
|
@@ -9,9 +8,9 @@ interface Chunk {
|
|
|
9
8
|
nextContent: string;
|
|
10
9
|
score?: number;
|
|
11
10
|
}
|
|
12
|
-
export declare function fetchSupplementalContextForSrc(document: TextDocument, position: Position, workspace: Workspace, cancellationToken: CancellationToken,
|
|
13
|
-
export declare function codemapContext(document: TextDocument, position: Position, workspace: Workspace, cancellationToken: CancellationToken,
|
|
14
|
-
export declare function fetchProjectContext(document: TextDocument, position: Position, target: 'default' | 'codemap' | 'bm25'
|
|
11
|
+
export declare function fetchSupplementalContextForSrc(document: TextDocument, position: Position, workspace: Workspace, cancellationToken: CancellationToken, openTabFiles?: string[]): Promise<Pick<CodeWhispererSupplementalContext, 'supplementalContextItems' | 'strategy'> | undefined>;
|
|
12
|
+
export declare function codemapContext(document: TextDocument, position: Position, workspace: Workspace, cancellationToken: CancellationToken, openTabFiles?: string[]): Promise<Pick<CodeWhispererSupplementalContext, 'supplementalContextItems' | 'strategy'> | undefined>;
|
|
13
|
+
export declare function fetchProjectContext(document: TextDocument, position: Position, target: 'default' | 'codemap' | 'bm25'): Promise<CodeWhispererSupplementalContextItem[]>;
|
|
15
14
|
export declare function fetchOpenTabsContext(document: TextDocument, position: Position, workspace: Workspace, cancellationToken: CancellationToken, openTabFiles?: string[]): Promise<CodeWhispererSupplementalContextItem[]>;
|
|
16
15
|
export declare function splitFileToChunks(document: TextDocument, chunkSize: number): Chunk[];
|
|
17
16
|
/**
|
|
@@ -35,24 +35,24 @@ exports.supportedLanguageToDialects = {
|
|
|
35
35
|
function isCrossFileSupported(languageId) {
|
|
36
36
|
return Object.keys(exports.supportedLanguageToDialects).includes(languageId);
|
|
37
37
|
}
|
|
38
|
-
async function fetchSupplementalContextForSrc(document, position, workspace, cancellationToken,
|
|
38
|
+
async function fetchSupplementalContextForSrc(document, position, workspace, cancellationToken, openTabFiles) {
|
|
39
39
|
const supplementalContextConfig = getSupplementalContextConfig(document.languageId);
|
|
40
40
|
if (supplementalContextConfig === undefined) {
|
|
41
41
|
return supplementalContextConfig;
|
|
42
42
|
}
|
|
43
43
|
//TODO: add logic for other strategies once available
|
|
44
44
|
if (supplementalContextConfig === 'codemap') {
|
|
45
|
-
return await codemapContext(document, position, workspace, cancellationToken,
|
|
45
|
+
return await codemapContext(document, position, workspace, cancellationToken, openTabFiles);
|
|
46
46
|
}
|
|
47
47
|
return { supplementalContextItems: [], strategy: 'Empty' };
|
|
48
48
|
}
|
|
49
|
-
async function codemapContext(document, position, workspace, cancellationToken,
|
|
49
|
+
async function codemapContext(document, position, workspace, cancellationToken, openTabFiles) {
|
|
50
50
|
let strategy = 'Empty';
|
|
51
51
|
const openTabsContextPromise = (0, timeoutUtils_1.waitUntil)(async function () {
|
|
52
52
|
return await fetchOpenTabsContext(document, position, workspace, cancellationToken, openTabFiles);
|
|
53
53
|
}, { timeout: constants_1.supplementalContextTimeoutInMs, interval: 5, truthy: false });
|
|
54
54
|
const projectContextPromise = (0, timeoutUtils_1.waitUntil)(async function () {
|
|
55
|
-
return await fetchProjectContext(document, position, 'codemap'
|
|
55
|
+
return await fetchProjectContext(document, position, 'codemap');
|
|
56
56
|
}, { timeout: constants_1.supplementalContextTimeoutInMs, interval: 5, truthy: false });
|
|
57
57
|
const supContext = [];
|
|
58
58
|
const [openTabsContext, projectContext] = await Promise.all([openTabsContextPromise, projectContextPromise]);
|
|
@@ -79,7 +79,7 @@ async function codemapContext(document, position, workspace, cancellationToken,
|
|
|
79
79
|
strategy,
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
|
-
async function fetchProjectContext(document, position, target
|
|
82
|
+
async function fetchProjectContext(document, position, target) {
|
|
83
83
|
const inputChunk = getInputChunk(document, position, constants_1.crossFileContextConfig.numberOfLinesEachChunk);
|
|
84
84
|
const fsPath = vscode_uri_1.URI.parse(document.uri).fsPath;
|
|
85
85
|
let controller;
|