Refactoring Build and execute

Author: laileni-aws

.changes/next-release/feature-272cb837-f551-485a-9f37-43ca37aef75c.json

@@ -29,6 +29,12 @@ 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"),
@@ -40,5 +46,5 @@ fun testGenProgressField(value: Int) = ProgressField(
 val buildAndExecuteProgrogressField = ProgressField(
     status = "default",
     text = message("testgen.progressbar.build_and_execute"),
-    actions = listOf(cancelTestGenButton)
+    actions = listOf(cancelTestGenBuildAndExecuteButton)
 )

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

@@ -87,26 +87,16 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
     ) {
         // 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()
         }
-        val final = session.testGenerationJobGroupName
 
-        if (session.iteration == 1) {
-            codeTestChatHelper.updateUI(
-                promptInputDisabledState = true,
-                promptInputProgress = testGenProgressField(0),
-            )
-        } else {
-            codeTestChatHelper.updateUI(
-                promptInputDisabledState = true,
-                promptInputProgress = buildAndExecuteProgrogressField,
-            )
-        }
-
-        // Set the Progress bar to "Generating unit tests..."
+        codeTestChatHelper.updateUI(
+            promptInputDisabledState = true,
+            promptInputProgress = session.listOfTestGenerationJobId.takeUnless { it.isEmpty() }
+                ?.let { buildAndExecuteProgrogressField }
+                ?: testGenProgressField(0)
+        )
 
         val codeTestResponseContext = createUploadUrl(codeTestChatHelper, previousIterationContext)
         session.srcPayloadSize = codeTestResponseContext.payloadContext.srcPayloadSize
@@ -117,7 +107,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             fileTooLarge()
         }
 
-        val createUploadUrlResponse = codeTestResponseContext.createUploadUrlResponse ?: return
+        val createUploadUrlResponse = codeTestResponseContext.createUploadUrlResponse
         throwIfCancelled(session)
 
         LOG.debug {
@@ -150,7 +140,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                                 .build()
                         ),
                         userInput = prompt,
-                        testGenerationJobGroupName = final
+                        testGenerationJobGroupName = session.testGenerationJobGroupName
                     )
                     delay(200)
                     response?.testGenerationJob() != null
@@ -179,11 +169,12 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
         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 {
@@ -275,8 +266,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 }
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = true,
-                    promptInputProgress = if (session.iteration == 1) {
-                        testGenProgressField(0)
+                    promptInputProgress = if (session.listOfTestGenerationJobId.size == 1) {
+                        testGenProgressField(progressRate)
                     } else {
                         buildAndExecuteProgrogressField
                     }
@@ -312,7 +303,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
         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"),
@@ -360,7 +350,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 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 {
@@ -486,10 +476,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             } else {
                 previousIterationContext.selectedFile
             }
-
-        val combinedBuildAndExecuteLogFile =
-            previousIterationContext?.buildLogFile
-        val codeTestSessionConfig = CodeTestSessionConfig(file, project, combinedBuildAndExecuteLogFile)
+        val codeTestSessionConfig = CodeTestSessionConfig(file, project, previousIterationContext?.buildLogFile)
         codeTestChatHelper.getActiveSession().projectRoot = codeTestSessionConfig.projectRoot.path
 
         val codeTestSessionContext = CodeTestSessionContext(project, codeTestSessionConfig)
@@ -587,7 +574,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                         canBeVoted = false
                     )
                 )
-                if (session.iteration == 1) {
+                if (session.listOfTestGenerationJobId.size < 2) {
                     AmazonqTelemetry.utgGenerateTests(
                         cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                         hasUserPromptSupplied = session.hasUserPromptSupplied,
@@ -624,10 +611,10 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                         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