add more messaging during refresh and check for in progress jobs when transform initiated; create unit tests for job history feature

Author: tgodara-aws

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -58,6 +58,7 @@ import {
 import { getAuthType } from '../../../auth/utils'
 import fs from '../../../shared/fs/fs'
 import { setContext } from '../../../shared/vscode/setContext'
+import { readHistoryFile } from '../../../codewhisperer/service/transformByQ/transformationHubViewProvider'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -189,9 +190,16 @@ export class GumbyController {
     }
 
     private async transformInitiated(message: any) {
-        this.messenger.sendViewHistoryMessage(message.tabID)
+        // check if any jobs potentially still in progress on backend
+        const history = readHistoryFile()
+        let numInProgress = 0
+        history.forEach((job) => {
+            if (job.status === 'FAILED') {
+                numInProgress += 1
+            }
+        })
+        this.messenger.sendViewHistoryMessage(message.tabID, numInProgress)
         if (transformByQState.isRefreshInProgress()) {
-            transformByQState.setBlockedByRefresh(true)
             this.messenger.sendMessage(
                 'A job refresh is currently in progress. Please wait for it to complete.',
                 message.tabID,
@@ -470,7 +478,6 @@ export class GumbyController {
 
     private async handleUserLanguageUpgradeProjectChoice(message: any) {
         if (transformByQState.isRefreshInProgress()) {
-            transformByQState.setBlockedByRefresh(true)
             this.messenger.sendMessage(
                 'A job refresh is currently in progress. Please wait for it to complete.',
                 message.tabID,
@@ -511,7 +518,6 @@ export class GumbyController {
 
     private async handleUserSQLConversionProjectSelection(message: any) {
         if (transformByQState.isRefreshInProgress()) {
-            transformByQState.setBlockedByRefresh(true)
             this.messenger.sendMessage(
                 'A job refresh is currently in progress. Please wait for it to complete.',
                 message.tabID,

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -377,7 +377,7 @@ export class Messenger {
         this.dispatcher.sendChatMessage(jobSubmittedMessage)
     }
 
-    public sendViewHistoryMessage(tabID: string) {
+    public sendViewHistoryMessage(tabID: string, numInProgress: number) {
         const buttons: ChatItemButton[] = []
 
         buttons.push({
@@ -387,9 +387,14 @@ export class Messenger {
             disabled: false,
         })
 
+        const messageText =
+            numInProgress > 0
+                ? `You have ${numInProgress} job${numInProgress > 1 ? 's' : ''} in progress. You can resume ${numInProgress > 1 ? 'them' : 'it'} in the transformation history table.`
+                : 'View previous transformations run from the IDE'
+
         const message = new ChatMessage(
             {
-                message: 'View previous transformations run from the IDE',
+                message: messageText,
                 messageType: 'ai-prompt',
                 buttons,
             },
@@ -398,6 +403,15 @@ export class Messenger {
         this.dispatcher.sendChatMessage(message)
     }
 
+    public sendJobRefreshInProgressMessage(tabID: string, jobId: string) {
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: `I am now resuming your job (id: ${jobId}). This can take 10 to 30 minutes to complete.`,
+            })
+        )
+    }
+
     public sendMessage(prompt: string, tabID: string, type: 'prompt' | 'ai-prompt') {
         this.dispatcher.sendChatMessage(
             new ChatMessage(

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -79,7 +79,7 @@ import { convertDateToTimestamp } from '../../shared/datetime'
 import { findStringInDirectory } from '../../shared/utilities/workspaceUtils'
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
 import { AuthUtil } from '../util/authUtil'
-import { updateHistoryTable } from '../service/transformByQ/transformationHubViewProvider'
+import { TransformationHubViewProvider } from '../service/transformByQ/transformationHubViewProvider'
 
 export function getFeedbackCommentData() {
     const jobId = transformByQState.getJobId()
@@ -803,33 +803,19 @@ export async function postTransformationJob() {
 
         const jobDetails = fields.join('\t') + '\n'
         fs.writeFileSync(historyLogFilePath, jobDetails, { flag: 'a' })
-        await updateHistoryTable(true)
+        await TransformationHubViewProvider.instance.updateContent('job history', undefined, true)
     }
 }
 
 export async function transformationJobErrorHandler(error: any) {
     if (!transformByQState.isCancelled()) {
         // means some other error occurred; cancellation already handled by now with stopTransformByQ
-        await stopJob(transformByQState.getJobId())
         transformByQState.setToFailed()
         transformByQState.setPolledJobStatus('FAILED')
         // jobFailureErrorNotification should always be defined here
-        const displayedErrorMessage =
-            transformByQState.getJobFailureErrorNotification() ?? CodeWhispererConstants.failedToCompleteJobNotification
         transformByQState.setJobFailureErrorChatMessage(
             transformByQState.getJobFailureErrorChatMessage() ?? CodeWhispererConstants.failedToCompleteJobChatMessage
         )
-        void vscode.window
-            .showErrorMessage(displayedErrorMessage, CodeWhispererConstants.amazonQFeedbackText)
-            .then((choice) => {
-                if (choice === CodeWhispererConstants.amazonQFeedbackText) {
-                    void submitFeedback(
-                        placeholder,
-                        CodeWhispererConstants.amazonQFeedbackKey,
-                        getFeedbackCommentData()
-                    )
-                }
-            })
     } else {
         transformByQState.setToCancelled()
         transformByQState.setPolledJobStatus('CANCELLED')

packages/core/src/codewhisperer/models/model.ts

@@ -763,7 +763,6 @@ export class TransformByQState {
     private intervalId: NodeJS.Timeout | undefined = undefined
 
     private refreshInProgress: boolean = false
-    private blockedByRefresh: boolean = false
 
     public isNotStarted() {
         return this.transformByQState === TransformByQStatus.NotStarted
@@ -793,10 +792,6 @@ export class TransformByQState {
         return this.refreshInProgress
     }
 
-    public wasBlockedByRefresh() {
-        return this.blockedByRefresh
-    }
-
     public getHasSeenTransforming() {
         return this.hasSeenTransforming
     }
@@ -995,10 +990,6 @@ export class TransformByQState {
         this.refreshInProgress = inProgress
     }
 
-    public setBlockedByRefresh(blocked: boolean): void {
-        this.blockedByRefresh = blocked
-    }
-
     public setHasSeenTransforming(hasSeen: boolean) {
         this.hasSeenTransforming = hasSeen
     }

packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts

@@ -17,8 +17,6 @@ import { AbsolutePathDetectedError } from '../../../amazonqGumby/errors'
 import { getLogger } from '../../../shared/logger/logger'
 import AdmZip from 'adm-zip'
 import { IManifestFile } from './humanInTheLoopManager'
-import { HistoryObject } from './transformationHubViewProvider'
-import { isWithin30Days } from '../../../shared/datetime'
 
 export async function getDependenciesFolderInfo(): Promise<FolderInfo> {
     const dependencyFolderName = `${CodeWhispererConstants.dependencyFolderName}${globals.clock.Date.now()}`
@@ -184,34 +182,6 @@ export async function openBuildLogFile() {
     await vscode.window.showTextDocument(doc)
 }
 
-export function readHistoryFile(): HistoryObject[] {
-    const history: HistoryObject[] = []
-    const jobHistoryFilePath = path.join(os.homedir(), '.aws', 'transform', 'transformation-history.tsv')
-    if (existsSync(jobHistoryFilePath)) {
-        const historyFile = readFileSync(jobHistoryFilePath, { encoding: 'utf8', flag: 'r' })
-        const jobs = historyFile.split('\n')
-        jobs.shift() // removes headers
-
-        // Process from end, stop at 10 valid entries
-        for (let i = jobs.length - 1; i >= 0 && history.length < 10; i--) {
-            const job = jobs[i]
-            if (job && isWithin30Days(job.split('\t')[0])) {
-                const jobInfo = job.split('\t')
-                history.push({
-                    startTime: jobInfo[0],
-                    projectName: jobInfo[1],
-                    status: jobInfo[2],
-                    duration: jobInfo[3],
-                    diffPath: jobInfo[4],
-                    summaryPath: jobInfo[5],
-                    jobId: jobInfo[6],
-                })
-            }
-        }
-    }
-    return history
-}
-
 export async function createPomCopy(
     dirname: string,
     pomFileVirtualFileReference: vscode.Uri,