dms setup

Author: David Hasani

packages/core/src/amazonq/webview/ui/quickActions/generator.ts

@@ -37,7 +37,7 @@ export class QuickActionGenerator {
                         ? [
                               {
                                   command: '/transform',
-                                  description: 'Transform your Java 8 or 11 Maven project to Java 17',
+                                  description: 'Transform your Java project',
                               },
                           ]
                         : []),

packages/core/src/amazonq/webview/ui/tabs/constants.ts

@@ -35,6 +35,7 @@ What would you like to work on?`,
         placeholder: 'Open a new tab to chat with Q',
         welcome: `Welcome to Code Transformation!
 
-I can help you upgrade your Java 8 and 11 codebases to Java 17.`,
+I can help you upgrade your Java 8 and 11 codebases to Java 17 ("language upgrade") & 
+I can also convert embedded SQL from Oracle to PostgreSQL ("SQL conversion"). What would you like to do?`,
     },
 }

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

@@ -184,9 +184,17 @@ export class GumbyController {
 
     private async transformInitiated(message: any) {
         // Start /transform chat flow
-        const session: Session = this.sessionStorage.getSession()
         CodeTransformTelemetryState.instance.setSessionId()
 
+        this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_OBJECTIVE
+        this.messenger.sendStaticTextResponse('choose-transformation-objective', 'ai-prompt', message.tabID)
+        this.messenger.sendChatInputEnabled(message.tabID, true)
+        this.messenger.sendUpdatePlaceholder(message.tabID, "Enter 'language upgrade' or 'SQL conversion'")
+    }
+
+    private async handleLanguageUpgrade(message: any) {
+        const session: Session = this.sessionStorage.getSession()
+        this.messenger.sendStaticTextResponse('language-upgrade-selected', 'prompt', message.tabID)
         try {
             await telemetry.codeTransform_initiateTransform.run(async () => {
                 const authType = await getAuthType()
@@ -195,14 +203,6 @@ export class GumbyController {
                     credentialSourceId: authType,
                 })
 
-                // check that a project is open
-                const workspaceFolders = vscode.workspace.workspaceFolders
-                if (workspaceFolders === undefined || workspaceFolders.length === 0) {
-                    this.messenger.sendUnrecoverableErrorResponse('no-project-found', message.tabID)
-                    telemetry.record({ result: MetadataResult.Fail, reason: 'no-project-found' })
-                    return
-                }
-
                 // check that the session is authenticated
                 const authState = await AuthUtil.instance.getChatAuthState()
                 if (authState.amazonQ !== 'connected') {
@@ -212,8 +212,17 @@ export class GumbyController {
                     return
                 }
 
+                // check that a project is open
+                const workspaceFolders = vscode.workspace.workspaceFolders
+                if (workspaceFolders === undefined || workspaceFolders.length === 0) {
+                    this.messenger.sendUnrecoverableErrorResponse('no-project-found', message.tabID)
+                    telemetry.record({ result: MetadataResult.Fail, reason: 'no-project-found' })
+                    return
+                }
+
                 // If previous transformation was already running
                 switch (this.sessionStorage.getSession().conversationState) {
+                    // TODO: figure out if/when to set these states for SQL conversions
                     case ConversationState.JOB_SUBMITTED:
                         this.messenger.sendAsyncEventProgress(
                             message.tabID,
@@ -236,8 +245,8 @@ export class GumbyController {
                 this.messenger.sendTransformationIntroduction(message.tabID)
             })
         } catch (e: any) {
-            // if there was an issue getting the list of valid projects, the error message will be shown here
             this.messenger.sendErrorMessage(e.message, message.tabID)
+            return
         }
 
         try {
@@ -247,11 +256,16 @@ export class GumbyController {
                 await this.messenger.sendProjectPrompt(validProjects, message.tabID)
             }
         } catch (err: any) {
-            // if there was an issue getting the list of valid projects, the error message will be shown here
+            // if there was an issue showing the list of valid projects, the error message will be shown here
             this.messenger.sendErrorMessage(err.message, message.tabID)
+            return
         }
     }
 
+    private async handleSQLConversion(message: any) {
+        this.messenger.sendStaticTextResponse('sql-conversion-selected', 'prompt', message.tabID)
+    }
+
     private async validateProjectsWithReplyOnError(message: any): Promise<TransformationCandidateProject[]> {
         let telemetryJavaVersion = JDKToTelemetryValue(JDKVersion.UNSUPPORTED) as CodeTransformJavaSourceVersionsAllowed
         try {
@@ -443,7 +457,7 @@ export class GumbyController {
         } catch (err: any) {
             if (err instanceof JavaHomeNotSetError) {
                 this.sessionStorage.getSession().conversationState = ConversationState.PROMPT_JAVA_HOME
-                this.messenger.sendStaticTextResponse('java-home-not-set', message.tabID)
+                this.messenger.sendStaticTextResponse('java-home-not-set', 'ai-prompt', message.tabID)
                 this.messenger.sendChatInputEnabled(message.tabID, true)
                 this.messenger.sendUpdatePlaceholder(message.tabID, 'Enter the path to your Java installation.')
                 // const fileUri = await vscode.window.showOpenDialog({
@@ -478,7 +492,7 @@ export class GumbyController {
     }
 
     private startHILIntervention(data: { tabID: string; codeSnippet: string }) {
-        this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_INPUT
+        this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_HIL_INPUT
         this.messenger.sendHumanInTheLoopInitialMessage(data.tabID, data.codeSnippet)
     }
 
@@ -500,7 +514,6 @@ export class GumbyController {
         switch (session.conversationState) {
             case ConversationState.PROMPT_JAVA_HOME: {
                 const pathToJavaHome = extractPath(data.message)
-
                 if (pathToJavaHome) {
                     await this.prepareProjectForSubmission({
                         pathToJavaHome,
@@ -509,6 +522,23 @@ export class GumbyController {
                 } else {
                     this.messenger.sendUnrecoverableErrorResponse('invalid-java-home', data.tabID)
                 }
+                break
+            }
+
+            case ConversationState.WAITING_FOR_OBJECTIVE: {
+                const objective = data.message.trim().toLowerCase()
+                if (objective === 'language upgrade') {
+                    vscode.window.showInformationMessage('You chose language upgrade!')
+                    this.handleLanguageUpgrade(data)
+                } else if (objective === 'sql conversion') {
+                    vscode.window.showInformationMessage('You chose SQL conversion!')
+                    this.handleSQLConversion(data)
+                } else {
+                    vscode.window.showInformationMessage('You did not enter a valid objective')
+                    // keep prompting user until they enter a valid option
+                    this.transformInitiated(data)
+                }
+                break
             }
         }
     }
@@ -557,7 +587,7 @@ export class GumbyController {
             this.transformationFinished({ tabID: message.tabID, message: (err as Error).message })
         }
 
-        this.messenger.sendStaticTextResponse('end-HIL-early', message.tabID)
+        this.messenger.sendStaticTextResponse('end-HIL-early', 'ai-prompt', message.tabID)
     }
 }
 

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

@@ -35,6 +35,9 @@ export type StaticTextResponseType =
     | 'start-transformation-confirmed'
     | 'job-transmitted'
     | 'end-HIL-early'
+    | 'choose-transformation-objective'
+    | 'language-upgrade-selected'
+    | 'sql-conversion-selected'
 
 export type UnrecoverableErrorType =
     | 'no-project-found'
@@ -315,23 +318,29 @@ export class Messenger {
         )
     }
 
-    public sendStaticTextResponse(type: StaticTextResponseType, tabID: string) {
+    public sendStaticTextResponse(messageType: StaticTextResponseType, itemType: ChatItemType, tabID: string) {
         let message = '...'
 
-        switch (type) {
+        switch (messageType) {
             case 'java-home-not-set':
                 message = MessengerUtils.createJavaHomePrompt()
                 break
             case 'end-HIL-early':
-                message = `I will continue transforming your code without upgrading this dependency.`
+                message = 'I will continue transforming your code without upgrading this dependency.'
+                break
+            case 'choose-transformation-objective':
+                message = 'Choose your transformation objective.'
+                break
+            case 'language-upgrade-selected':
+                message = 'Got it! I can upgrade your Java 8 or 11 project to Java 17.'
                 break
         }
 
         this.dispatcher.sendChatMessage(
             new ChatMessage(
                 {
                     message,
-                    messageType: 'ai-prompt',
+                    messageType: itemType,
                 },
                 tabID
             )

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

@@ -10,7 +10,8 @@ export enum ConversationState {
     PROMPT_JAVA_HOME,
     COMPILING,
     JOB_SUBMITTED,
-    WAITING_FOR_INPUT,
+    WAITING_FOR_HIL_INPUT,
+    WAITING_FOR_OBJECTIVE,
 }
 
 export interface ProjectDetails {