Merge branch 'feature/build-execute' into build-execute

Randall-Jiang · web-flow · commit 83095f6d5711 · 2025-02-21T13:58:34.000-08:00
diff --git a/.changes/3.56.json b/.changes/3.56.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-02-20",
+  "version" : "3.56",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q /doc: support making changes to architecture diagrams"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-3adca794-d149-4f2e-bf7c-6f748f339849.json b/.changes/next-release/bugfix-3adca794-d149-4f2e-bf7c-6f748f339849.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /doc: update workspace too large error message"
+}
diff --git a/.changes/next-release/bugfix-8878216c-a256-4459-80de-8334711c8d53.json b/.changes/next-release/bugfix-8878216c-a256-4459-80de-8334711c8d53.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
+}
diff --git a/.changes/next-release/feature-bfb6687a-a302-4968-8e7e-8fa0d4ef6c53.json b/.changes/next-release/feature-bfb6687a-a302-4968-8e7e-8fa0d4ef6c53.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.56_ (2025-02-20)
+- **(Feature)** Amazon Q /doc: support making changes to architecture diagrams
+
 # _3.55_ (2025-02-13)
 - **(Feature)** /transform: support transformations to Java 21
 - **(Bug Fix)** Enable syntax highlighting when viewing diff for /test
diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.56-SNAPSHOT
+toolkitVersion=3.57-SNAPSHOT
 
 # Publish Settings
 publishToken=
 publishChannel=
 
-ideProfileName=2024.2
+ideProfileName=2024.3
 
 remoteRobotPort=8080
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/util/AmazonQCodeGenService.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/util/AmazonQCodeGenService.kt
@@ -20,6 +20,7 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.common.clients.AmazonQCodeGenerateClient
 import software.aws.toolkits.jetbrains.common.session.Intent
+import software.aws.toolkits.jetbrains.services.amazonqDoc.docServiceError
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocGenerationStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.ExportDocTaskAssistResultArchiveStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
@@ -31,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevOper
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
+import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
 
@@ -82,7 +84,7 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
         }
     }
 
-    fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String):
+    fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String, featureName: String? = null):
         CreateUploadUrlResponse {
         try {
             logger.debug { "Executing createUploadUrl with conversationId $conversationId" }
@@ -104,6 +106,9 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                 logger.warn(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
 
                 if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
+                    if (featureName?.equals("docGeneration") == true) {
+                        throw docServiceError(message("amazonqDoc.exception.content_length_error"))
+                    }
                     throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/PrepareDocGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/PrepareDocGenerationState.kt
@@ -48,7 +48,8 @@ class PrepareDocGenerationState(
                 config.conversationId,
                 zipFileChecksum,
                 zipFileLength,
-                uploadId
+                uploadId,
+                "docGeneration"
             )
 
             uploadArtifactToS3(
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt
@@ -32,12 +32,10 @@ import kotlinx.coroutines.job
 import kotlinx.coroutines.withContext
 import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
-import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
-import software.aws.toolkits.jetbrains.services.amazonq.CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededState
@@ -140,7 +138,6 @@ class ChatController private constructor(
         val triggerId = UUID.randomUUID().toString()
         var shouldAddIndexInProgressMessage: Boolean = false
         var shouldUseWorkspaceContext: Boolean = false
-        val startUrl = getStartUrl(context.project)
 
         if (prompt.contains("@workspace")) {
             if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
@@ -153,13 +150,6 @@ class ChatController private constructor(
             } else {
                 sendOpenSettingsMessage(message.tabId)
             }
-        } else if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
-            if (ProjectContextController.getInstance(context.project).getProjectContextIndexComplete()) {
-                val projectContextController = ProjectContextController.getInstance(context.project)
-                queryResult = projectContextController.queryChat(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT)
-            } else {
-                logger.debug { "skipping implicit workspace context as index is not ready" }
-            }
         }
 
         handleChat(
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditor.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditor.kt
@@ -395,10 +395,15 @@ class CodeModernizerPlanEditor(val project: Project, private val virtualFile: Vi
 
         val table = tableMapping[step.id()]
 
-        val parsedTable = table?.let {
+        var parsedTable = table?.let {
             MAPPER.readValue<PlanTable>(it)
         }
 
+        if (parsedTable?.rows?.isEmpty() == true) {
+            descriptionText.text += "\n\nThere are no ${parsedTable.name.lowercase()} to display."
+            parsedTable = null
+        }
+
         val renderedStepTable = parsedTable?.let {
             createTable(it)
         }
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -45,7 +45,7 @@ amazonqDoc.edit.message=Okay, let's work on your README. Describe the changes yo
 amazonqDoc.edit.placeholder=Describe documentation changes
 amazonqDoc.error.generating=Unable to generate changes.
 amazonqDoc.error_text=I'm sorry, I ran into an issue while trying to generate your documentation. Please try again.
-amazonqDoc.exception.content_length_error=Your workspace is too large for me to review. Your workspace must be within the quota, even if you choose a smaller folder. For more information on quotas, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas" target="_blank">Amazon Q Developer documentation.</a>
+amazonqDoc.exception.content_length_error=The folder you selected is in a project or workspace that is too large for me to use as context. To create or update a README for your code, choose a folder in a smaller project or workspace. For information on quotas, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas" target="_blank">Amazon Q Developer documentation.</a>
 amazonqDoc.exception.no_change_required=I couldn't find any code changes to update in the README. Try another documentation task.
 amazonqDoc.exception.prompt_too_vague=I need more information to make changes to your README. Try providing some of the following details:\n- Which sections you want to modify\n- The content you want to add or remove\n- Specific issues that need correcting\n\nFor more information on prompt best practices, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html" target="_blank">Amazon Q Developer documentation.</a>
 amazonqDoc.exception.prompt_unrelated=These changes don't seem related to documentation. Try describing your changes again, using the following best practices:\n- Changes should relate to how project functionality is reflected in the README\n- Content you refer to should be available in your codebase\n\nFor more information on prompt best practices, see the <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html" target="_blank">Amazon Q Developer documentation.</a>
diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts
@@ -58,6 +58,7 @@ tasks.test {
     useJUnitPlatform()
 
     systemProperty("ui.test.plugins", testPlugins.get().asPath)
+    systemProperty("org.gradle.project.ideProfileName", ideProfile.name)
 }
 
 // hack to disable ui tests in ./gradlew check
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt
@@ -1,11 +1,12 @@
-// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 package software.aws.toolkits.jetbrains.uitests
 
 import com.intellij.driver.sdk.openFile
 import com.intellij.driver.sdk.ui.ui
 import com.intellij.driver.sdk.waitForProjectOpen
 import com.intellij.ide.starter.ci.CIServer
+import com.intellij.ide.starter.config.ConfigurationStorage
 import com.intellij.ide.starter.di.di
 import com.intellij.ide.starter.driver.engine.runIdeWithDriver
 import com.intellij.ide.starter.ide.IdeProductProvider
@@ -28,6 +29,13 @@ class OfflineAmazonQInlineCompletionTest {
         di = DI {
             extend(di)
             bindSingleton<CIServer>(overrides = true) { TestCIServer }
+            val defaults = ConfigurationStorage.instance().defaults.toMutableMap().apply {
+                put("LOG_ENVIRONMENT_VARIABLES", (!System.getenv("CI").toBoolean()).toString())
+            }
+
+            bindSingleton<ConfigurationStorage>(overrides = true) {
+                ConfigurationStorage(this, defaults)
+            }
         }
     }
 
@@ -38,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest {
             LocalProjectInfo(
                 Paths.get("tstData", "Hello")
             )
-        ).useRelease("2024.2")
+        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
         Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json")
             .createParentDirectories()
             .writeText(

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q /doc: update workspace too large error message"
 +}
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ class PrepareDocGenerationState(`
`48`	`48`	`config.conversationId,`
`49`	`49`	`zipFileChecksum,`
`50`	`50`	`zipFileLength,`
`51`		`- uploadId`
	`51`	`+ uploadId,`
	`52`	`+ "docGeneration"`
`52`	`53`	`)`
`53`	`54`
`54`	`55`	`uploadArtifactToS3(`
Original file line number	Diff line number	Diff line change
`@@ -395,10 +395,15 @@ class CodeModernizerPlanEditor(val project: Project, private val virtualFile: Vi`
`395`	`395`
`396`	`396`	`val table = tableMapping[step.id()]`
`397`	`397`
`398`		`- val parsedTable = table?.let {`
	`398`	`+ var parsedTable = table?.let {`
`399`	`399`	`MAPPER.readValue<PlanTable>(it)`
`400`	`400`	`}`
`401`	`401`
	`402`	`+ if (parsedTable?.rows?.isEmpty() == true) {`
	`403`	`+ descriptionText.text += "\n\nThere are no ${parsedTable.name.lowercase()} to display."`
	`404`	`+ parsedTable = null`
	`405`	`+ }`
	`406`	`+`
`402`	`407`	`val renderedStepTable = parsedTable?.let {`
`403`	`408`	`createTable(it)`
`404`	`409`	`}`