Merge branch 'main' into lsp0.1.13

leigaol · web-flow · commit 02cbac6a1e60 · 2024-10-09T12:29:59.000-07:00
diff --git a/.changes/next-release/bugfix-caf370b9-c943-4ece-a4c0-81bcefa7a4f5.json b/.changes/next-release/bugfix-caf370b9-c943-4ece-a4c0-81bcefa7a4f5.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Feature Dev: Add error messages when the upload URL expires"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevExceptions.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevExceptions.kt
@@ -16,6 +16,13 @@ class CodeIterationLimitError(override val message: String, override val cause:
 
 class MonthlyConversationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
+class UploadURLExpired(
+    override val message: String = message(
+        "amazonqFeatureDev.exception.upload_url_expiry"
+    ),
+    override val cause: Throwable? = null,
+) : FeatureDevException(message, cause)
+
 internal fun featureDevServiceError(message: String?): Nothing =
     throw FeatureDevException(message)
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
@@ -36,6 +36,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevExce
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.InboundAppMessagesHandler
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderErrorReason
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.UploadURLExpired
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.createUserFacingErrorMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.denyListedErrors
@@ -444,6 +445,12 @@ class FeatureDevController(
                 messenger.sendMonthlyLimitError(tabId = tabId)
                 messenger.sendChatInputEnabledMessage(tabId, enabled = false)
             }
+            is UploadURLExpired -> messenger.sendAnswer(
+                tabId = tabId,
+                message = err.message,
+                messageType = FeatureDevMessageType.Answer,
+                canBeVoted = true
+            )
             is FeatureDevException -> {
                 messenger.sendError(
                     tabId = tabId,
@@ -471,7 +478,6 @@ class FeatureDevController(
                     ),
                 )
             }
-
             else -> {
                 var msg = createUserFacingErrorMessage("$FEATURE_NAME request failed: ${err.message ?: err.cause?.message}")
                 val isDenyListedError = denyListedErrors.any { msg?.contains(it) ?: false }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/UploadArtifact.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/UploadArtifact.kt
@@ -14,6 +14,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.CONTENT_SHA256
 import software.aws.toolkits.jetbrains.services.amazonq.SERVER_SIDE_ENCRYPTION
 import software.aws.toolkits.jetbrains.services.amazonq.SERVER_SIDE_ENCRYPTION_AWS_KMS_KEY_ID
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.UploadURLExpired
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.uploadCodeError
 import java.io.File
@@ -36,9 +37,13 @@ fun uploadArtifactToS3(url: String, fileToUpload: File, checksumSha256: String,
                 connection.setFixedLengthStreamingMode(fileToUpload.length())
                 IoUtils.copy(fileToUpload.inputStream(), connection.outputStream)
             }
-    } catch (err: Exception) {
+    } catch (err: HttpRequests.HttpStatusException) {
         logger.warn(err) { "$FEATURE_NAME: Failed to upload code to S3" }
-        uploadCodeError()
+
+        when (err.statusCode) {
+            403 -> throw UploadURLExpired()
+            else -> uploadCodeError()
+        }
     }
 }
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt
@@ -58,7 +58,14 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
             .onStart {
                 // The first thing we always send back is an AnswerStream message to indicate the beginning of a streaming answer
                 val response =
-                    ChatMessage(tabId = tabId, triggerId = triggerId, messageId = requestId, messageType = ChatMessageType.AnswerStream, message = "")
+                    ChatMessage(
+                        tabId = tabId,
+                        triggerId = triggerId,
+                        messageId = requestId,
+                        messageType = ChatMessageType.AnswerStream,
+                        message = "",
+                        userIntent = data.userIntent,
+                    )
 
                 telemetryHelper.setResponseStreamStartTime(tabId)
                 emit(response)
@@ -81,13 +88,20 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                         messageType = ChatMessageType.AnswerPart,
                         message = responseText.toString(),
                         relatedSuggestions = relatedSuggestions,
+                        userIntent = data.userIntent,
                     )
                     emit(suggestionMessage)
                 }
 
                 // Send the Answer message to indicate the end of the response stream
-                val response =
-                    ChatMessage(tabId = tabId, triggerId = triggerId, messageId = requestId, messageType = ChatMessageType.Answer, followUps = followUps)
+                val response = ChatMessage(
+                    tabId = tabId,
+                    triggerId = triggerId,
+                    messageId = requestId,
+                    messageType = ChatMessageType.Answer,
+                    followUps = followUps,
+                    userIntent = data.userIntent,
+                )
 
                 telemetryHelper.setResponseStreamTotalTime(tabId)
                 telemetryHelper.setResponseHasProjectContext(
@@ -119,11 +133,23 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                 }
             }
             .collect { responseEvent ->
-                processChatEvent(tabId, triggerId, responseEvent, shouldAddIndexInProgressMessage)?.let { emit(it) }
+                processChatEvent(
+                    tabId,
+                    triggerId,
+                    data,
+                    responseEvent,
+                    shouldAddIndexInProgressMessage
+                )?.let { emit(it) }
             }
     }
 
-    private fun processChatEvent(tabId: String, triggerId: String, event: ChatResponseEvent, shouldAddIndexInProgressMessage: Boolean): ChatMessage? {
+    private fun processChatEvent(
+        tabId: String,
+        triggerId: String,
+        data: ChatRequestData,
+        event: ChatResponseEvent,
+        shouldAddIndexInProgressMessage: Boolean,
+    ): ChatMessage? {
         requestId = event.requestId
         statusCode = event.statusCode
 
@@ -190,6 +216,7 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                 messageType = ChatMessageType.AnswerPart,
                 message = message,
                 codeReference = codeReferences,
+                userIntent = data.userIntent,
             )
         } else {
             null
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt
@@ -213,6 +213,7 @@ data class ChatMessage(
     val followUpsHeader: String? = null,
     val relatedSuggestions: List<Suggestion>? = null,
     val codeReference: List<CodeReference>? = null,
+    val userIntent: UserIntent? = null,
 ) : UiMessage(
     tabId = tabId,
     type = "chatMessage",
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/cwChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/cwChatConnector.ts
@@ -3,11 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChatItem, ChatItemAction, ChatItemType, FeedbackPayload } from '@aws/mynah-ui-chat'
+import { ChatItemAction, ChatItemType, FeedbackPayload } from '@aws/mynah-ui-chat'
 import { ExtensionMessage } from '../commands'
 import { CodeReference } from './amazonqCommonsConnector'
 import { TabOpenType, TabsStorage } from '../storages/tabsStorage'
 import { FollowUpGenerator } from '../followUps/generator'
+import { CWCChatItem } from "../connector";
 
 interface ChatPayload {
     chatMessage: string
@@ -17,8 +18,8 @@ interface ChatPayload {
 export interface ConnectorProps {
     sendMessageToExtension: (message: ExtensionMessage) => void
     onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
-    onChatAnswerReceived?: (tabID: string, message: ChatItem) => void
-    onCWCContextCommandMessage: (message: ChatItem, command?: string) => string | undefined
+    onChatAnswerReceived?: (tabID: string, message: CWCChatItem) => void
+    onCWCContextCommandMessage: (message: CWCChatItem, command?: string) => string | undefined
     onError: (tabID: string, message: string, title: string) => void
     onWarning: (tabID: string, message: string, title: string) => void
     onOpenSettingsMessage: (tabID: string) => void
@@ -98,7 +99,8 @@ export class Connector {
         codeReference?: CodeReference[],
         eventId?: string,
         codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        totalCodeBlocks?: number,
+        userIntent?: string,
     ): void => {
         this.sendMessageToExtension({
             tabID: tabID,
@@ -111,6 +113,7 @@ export class Connector {
             eventId,
             codeBlockIndex,
             totalCodeBlocks,
+            userIntent
         })
     }
 
@@ -122,7 +125,8 @@ export class Connector {
         codeReference?: CodeReference[],
         eventId?: string,
         codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        totalCodeBlocks?: number,
+        userIntent?: string,
     ): void => {
         this.sendMessageToExtension({
             tabID: tabID,
@@ -135,6 +139,7 @@ export class Connector {
             eventId,
             codeBlockIndex,
             totalCodeBlocks,
+            userIntent
         })
     }
 
@@ -258,13 +263,14 @@ export class Connector {
                       }
                     : undefined
 
-            const answer: ChatItem = {
+            const answer: CWCChatItem = {
                 type: messageData.messageType,
                 messageId: messageData.messageId ?? messageData.triggerID,
                 body: messageData.message,
                 followUp: followUps,
                 canBeVoted: true,
                 codeReference: messageData.codeReference,
+                userIntent: messageData.userIntent,
             }
 
             // If it is not there we will not set it
@@ -291,12 +297,13 @@ export class Connector {
             return
         }
         if (messageData.messageType === ChatItemType.ANSWER) {
-            const answer: ChatItem = {
+            const answer: CWCChatItem = {
                 type: messageData.messageType,
                 body: undefined,
                 relatedContent: undefined,
                 messageId: messageData.messageId,
                 codeReference: messageData.codeReference,
+                userIntent: messageData.userIntent,
                 followUp:
                     messageData.followUps !== undefined && messageData.followUps.length > 0
                         ? {
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts
@@ -30,6 +30,10 @@ export interface ChatPayload {
     chatCommand?: string
 }
 
+export interface CWCChatItem extends ChatItem {
+    userIntent?: string
+}
+
 export interface ConnectorProps {
     sendMessageToExtension: (message: ExtensionMessage) => void
     onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
@@ -230,7 +234,8 @@ export class Connector {
         codeReference?: CodeReference[],
         eventId?: string,
         codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        totalCodeBlocks?: number,
+        userIntent?: string
     ): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
@@ -242,7 +247,8 @@ export class Connector {
                     codeReference,
                     eventId,
                     codeBlockIndex,
-                    totalCodeBlocks
+                    totalCodeBlocks,
+                    userIntent
                 )
                 break
             case 'featuredev':
@@ -259,7 +265,8 @@ export class Connector {
         codeReference?: CodeReference[],
         eventId?: string,
         codeBlockIndex?: number,
-        totalCodeBlocks?: number
+        totalCodeBlocks?: number,
+        userIntent?: string
     ): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
@@ -271,7 +278,8 @@ export class Connector {
                     codeReference,
                     eventId,
                     codeBlockIndex,
-                    totalCodeBlocks
+                    totalCodeBlocks,
+                    userIntent
                 )
                 break
             case 'featuredev':
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/main.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/main.ts
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q Feature Dev: Add error messages when the upload URL expires"
 +}