Merge staging into feature/lambda-get-started

aws-toolkit-automation · web-flow · commit 078073b468d8 · 2024-10-28T23:05:33.000+01:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-279c3a22-246e-41ca-9a42-3e446cdb9565.json b/packages/amazonq/.changes/next-release/Bug Fix-279c3a22-246e-41ca-9a42-3e446cdb9565.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Inline Suggestions: Occasional `ValidationException` if user context has too many characters."
+}
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -712,6 +712,7 @@ export const crossFileContextConfig = {
     numberOfChunkToFetch: 60,
     topK: 3,
     numberOfLinesEachChunk: 50,
+    maximumTotalLength: 20480,
 }
 
 export const utgConfig = {
diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts
@@ -132,9 +132,16 @@ export async function fetchSupplementalContextForSrcV1(
 
     // Step 4: Transform best chunks to supplemental contexts
     const supplementalContexts: CodeWhispererSupplementalContextItem[] = []
+    let totalLength = 0
     for (const chunk of bestChunks) {
         throwIfCancelled(cancellationToken)
 
+        totalLength += chunk.nextContent.length
+
+        if (totalLength > crossFileContextConfig.maximumTotalLength) {
+            break
+        }
+
         supplementalContexts.push({
             filePath: chunk.fileName,
             content: chunk.nextContent,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Inline Suggestions: Occasional `ValidationException` if user context has too many characters."
 +}
Original file line number	Diff line number	Diff line change
`@@ -712,6 +712,7 @@ export const crossFileContextConfig = {`
`712`	`712`	`numberOfChunkToFetch: 60,`
`713`	`713`	`topK: 3,`
`714`	`714`	`numberOfLinesEachChunk: 50,`
	`715`	`+ maximumTotalLength: 20480,`
`715`	`716`	`}`
`716`	`717`
`717`	`718`	`export const utgConfig = {`