feat(amazonq): UTG build and execute for internal users.

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.297"
+telemetryGenerator = "1.0.299"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt

@@ -29,10 +29,22 @@ val cancelTestGenButton = Button(
     icon = "cancel"
 )
 
+val cancelTestGenBuildAndExecuteButton = Button(
+    id = CodeTestButtonId.StopTestGenBuildAndExecution.id,
+    text = message("general.cancel"),
+    icon = "cancel"
+)
+
 fun testGenProgressField(value: Int) = ProgressField(
     status = "default",
     text = message("testgen.progressbar.generate_unit_tests"),
     value = value,
     valueText = "$value%",
     actions = listOf(cancelTestGenButton)
 )
+
+val buildAndExecuteProgrogressField = ProgressField(
+    status = "default",
+    text = message("testgen.progressbar.build_and_execute"),
+    actions = listOf(cancelTestGenBuildAndExecuteButton)
+)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -37,7 +37,6 @@
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.ShortAnswer
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteProgressStatus
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.Session
-import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.combineBuildAndExecuteLogFiles
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.CodeTestException
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.fileTooLarge
@@ -63,6 +62,7 @@
 import java.nio.file.Paths
 import java.time.Duration
 import java.time.Instant
+import java.util.UUID
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.zip.ZipInputStream
 
@@ -87,13 +87,15 @@
     ) {
         // 1st API call: Zip project and call CreateUploadUrl
         val session = codeTestChatHelper.getActiveSession()
-        session.isGeneratingTests = true
-        session.iteration++
+        if (session.testGenerationJobGroupName.isEmpty()) {
+            session.testGenerationJobGroupName = UUID.randomUUID().toString()
+        }
 
-        // Set the Progress bar to "Generating unit tests..."
         codeTestChatHelper.updateUI(
             promptInputDisabledState = true,
-            promptInputProgress = testGenProgressField(0),
+            promptInputProgress = session.listOfTestGenerationJobId.takeUnless { it.isEmpty() }
+                ?.let { buildAndExecuteProgrogressField }
+                ?: testGenProgressField(0)
         )
 
         val codeTestResponseContext = createUploadUrl(codeTestChatHelper, previousIterationContext)
@@ -105,7 +107,7 @@
             fileTooLarge()
         }
 
-        val createUploadUrlResponse = codeTestResponseContext.createUploadUrlResponse ?: return
+        val createUploadUrlResponse = codeTestResponseContext.createUploadUrlResponse
         throwIfCancelled(session)
 
         LOG.debug {
@@ -137,7 +139,8 @@
                                 )
                                 .build()
                         ),
-                        userInput = prompt
+                        userInput = prompt,
+                        testGenerationJobGroupName = session.testGenerationJobGroupName
                     )
                     delay(200)
                     response?.testGenerationJob() != null
@@ -166,11 +169,12 @@
         session.startTestGenerationRequestId = startTestGenerationResponse.responseMetadata().requestId()
         session.testGenerationJobGroupName = job.testGenerationJobGroupName()
         session.testGenerationJob = job.testGenerationJobId()
+        session.listOfTestGenerationJobId += job.testGenerationJobId()
         throwIfCancelled(session)
 
         // 3rd API call: Step 3:  Polling mechanism on test job status with getTestGenStatus getTestGeneration
         var finished = false
-        var testGenerationResponse: GetTestGenerationResponse? = null
+        var testGenerationResponse: GetTestGenerationResponse?
 
         var shortAnswer = ShortAnswer()
         LOG.debug {
@@ -198,6 +202,7 @@
                     // Setting default value to 0 if the value is null or invalid
                     session.numberOfUnitTestCasesGenerated = shortAnswer.numberOfTestMethods
                     session.testFileRelativePathToProjectRoot = getTestFilePathRelativeToRoot(shortAnswer)
+                    session.shortAnswer = shortAnswer
 
                     // update test summary card in success case
                     if (previousIterationContext == null) {
@@ -261,7 +266,11 @@
                 }
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = true,
-                    promptInputProgress = testGenProgressField(progressRate),
+                    promptInputProgress = if (session.listOfTestGenerationJobId.size == 1) {
+                        testGenProgressField(progressRate)
+                    } else {
+                        buildAndExecuteProgrogressField
+                    }
                 )
             }
 
@@ -294,7 +303,6 @@
         val result = byteArray.reduce { acc, next -> acc + next } // To map the result it is needed to combine the  full byte array
         storeGeneratedTestDiffs(result, session)
         if (!session.isGeneratingTests) {
-            // TODO: Modify text according to FnF
             codeTestChatHelper.addAnswer(
                 CodeTestChatMessageContent(
                     message = message("testgen.error.generic_technical_error_message"),
@@ -342,7 +350,7 @@
                 session.viewDiffMessageId = viewDiffMessageId
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = false,
-                    promptInputPlaceholder = "Specify a function(s) in the current file(optional)",
+//                    promptInputPlaceholder = "Specify a function(s) in the current file(optional)",
                     promptInputProgress = testGenCompletedField,
                 )
             } else {
@@ -468,21 +476,21 @@
             } else {
                 previousIterationContext.selectedFile
             }
-
-        val combinedBuildAndExecuteLogFile = combineBuildAndExecuteLogFiles(
-            previousIterationContext?.buildLogFile,
-            previousIterationContext?.testLogFile
-        )
-        val codeTestSessionConfig = CodeTestSessionConfig(file, project, combinedBuildAndExecuteLogFile)
+        val codeTestSessionConfig = CodeTestSessionConfig(file, project, previousIterationContext?.buildLogFile)
         codeTestChatHelper.getActiveSession().projectRoot = codeTestSessionConfig.projectRoot.path
 
         val codeTestSessionContext = CodeTestSessionContext(project, codeTestSessionConfig)
         val codeWhispererCodeTestSession = CodeWhispererCodeTestSession(codeTestSessionContext)
         return codeWhispererCodeTestSession.run(codeTestChatHelper, previousIterationContext)
     }
 
-    private fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String): StartTestGenerationResponse =
-        CodeWhispererClientAdaptor.getInstance(project).startTestGeneration(uploadId, targetCode, userInput)
+    private fun startTestGeneration(
+        uploadId: String,
+        targetCode: List<TargetCode>,
+        userInput: String,
+        testGenerationJobGroupName: String,
+    ): StartTestGenerationResponse =
+        CodeWhispererClientAdaptor.getInstance(project).startTestGeneration(uploadId, targetCode, userInput, testGenerationJobGroupName)
 
     private fun getTestGenerationStatus(jobId: String, jobGroupName: String): GetTestGenerationResponse =
         CodeWhispererClientAdaptor.getInstance(project).getTestGeneration(jobId, jobGroupName)
@@ -566,28 +574,47 @@
                         canBeVoted = false
                     )
                 )
-
-                AmazonqTelemetry.utgGenerateTests(
-                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
-                    hasUserPromptSupplied = session.hasUserPromptSupplied,
-                    isFileInWorkspace = true,
-                    isSupportedLanguage = true,
-                    credentialStartUrl = getStartUrl(project),
-                    jobGroup = session.testGenerationJobGroupName,
-                    jobId = session.testGenerationJob,
-                    result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
-                    reason = (e as CodeTestException).code ?: "DefaultError",
-                    reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
-                    perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    isCodeBlockSelected = session.isCodeBlockSelected,
-                    artifactsUploadDuration = session.artifactUploadDuration,
-                    buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
-                )
+                if (session.listOfTestGenerationJobId.size < 2) {
+                    AmazonqTelemetry.utgGenerateTests(
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isFileInWorkspace = true,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
+                        reason = (e as CodeTestException).code ?: "DefaultError",
+                        reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
+                        perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildPayloadBytes = session.srcPayloadSize,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId
+                    )
+                } else {
+                    AmazonqTelemetry.unitTestGeneration(
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
+                        reason = (e as CodeTestException).code ?: "DefaultError",
+                        reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
+                        perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId
+                    )
+                }
                 session.isGeneratingTests = false
             } finally {
                 // Reset the flow if there is any error
+                codeTestChatHelper.sendUpdatePromptProgress(session.tabId, null)
                 if (!session.isGeneratingTests) {
                     codeTestChatHelper.updateUI(
                         promptInputProgress = cancellingProgressField