Merge main into feature/q-lsp

aws-toolkit-automation · web-flow · commit 000e80618473 · 2025-02-11T18:13:45.000+01:00
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt
@@ -19,6 +19,14 @@ const val DEFAULT_RETRY_LIMIT = 0
 // Max allowed size for a repository in bytes
 const val MAX_PROJECT_SIZE_BYTES: Long = 200 * 1024 * 1024
 
+val CLIENT_ERROR_MESSAGES = setOf(
+    "Improperly formed request",
+    "Resource not found",
+    "StartTaskAssistCodeGeneration reached for this month.",
+    "The folder you chose did not contain any source files in a supported language. Choose another folder and try again.",
+    "reached the quota for number of iterations on code generation."
+)
+
 enum class ModifySourceFolderErrorReason(
     private val reasonText: String,
 ) {
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
@@ -17,8 +17,9 @@ open class FeatureDevException(override val message: String?, val operation: Str
     fun reason(): String = this.javaClass.simpleName
 
     fun reasonDesc(): String =
-        when (desc) {
-            desc -> "$operation | Description: $desc"
+        when {
+            !desc.isNullOrEmpty() -> "$operation | Description: $desc"
+            !message.isNullOrEmpty() -> "$operation | Description: $message"
             else -> operation
         }
 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt
@@ -5,14 +5,19 @@ package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.controller
 
 import com.intellij.notification.NotificationAction
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CLIENT_ERROR_MESSAGES
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CODE_GENERATION_RETRY_LIMIT
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ContentLengthException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.EmptyPatchException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.GuardrailsException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataOperationName
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataResult
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.NoChangeRequiredException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.PromptRefusalException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ThrottlingException
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FeatureDevMessageType
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUp
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUpStatusType
@@ -154,7 +159,15 @@ suspend fun FeatureDevController.onCodeGeneration(
         messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.after_code_generation"))
     } catch (err: Exception) {
         when (err) {
-            is GuardrailsException, is NoChangeRequiredException, is PromptRefusalException, is ThrottlingException -> {
+            is GuardrailsException,
+            is NoChangeRequiredException,
+            is PromptRefusalException,
+            is ThrottlingException,
+            is CodeIterationLimitException,
+            is MonthlyConversationLimitError,
+            is ContentLengthException,
+            is ZipFileCorruptedException,
+            -> {
                 session.sendMetricDataTelemetry(
                     MetricDataOperationName.EndCodeGeneration,
                     MetricDataResult.Error
@@ -167,10 +180,19 @@ suspend fun FeatureDevController.onCodeGeneration(
                 )
             }
             else -> {
-                session.sendMetricDataTelemetry(
-                    MetricDataOperationName.EndCodeGeneration,
-                    MetricDataResult.Fault
-                )
+                val errorMessage = err.message.orEmpty()
+
+                if (CLIENT_ERROR_MESSAGES.any { errorMessage.contains(it) }) {
+                    session.sendMetricDataTelemetry(
+                        MetricDataOperationName.EndCodeGeneration,
+                        MetricDataResult.Error
+                    )
+                } else {
+                    session.sendMetricDataTelemetry(
+                        MetricDataOperationName.EndCodeGeneration,
+                        MetricDataResult.Fault
+                    )
+                }
             }
         }
         throw err
diff --git a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerTest.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerTest.kt
@@ -38,14 +38,19 @@ import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitConte
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededStates
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ContentLengthException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.EmptyPatchException
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevTestBase
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.GuardrailsException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataOperationName
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataResult
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.NoChangeRequiredException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.PromptRefusalException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ThrottlingException
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FeatureDevMessageType
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUp
@@ -616,6 +621,26 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
                 ThrottlingException(operation = "GenerateCode", desc = "Request throttled"),
                 MetricDataResult.Error
             ),
+            ErrorTestCase(
+                MonthlyConversationLimitError(message = "Monthly limit reached", operation = "GenerateCode", desc = "Monthly limit reached"),
+                MetricDataResult.Error
+            ),
+            ErrorTestCase(
+                CodeIterationLimitException(operation = "GenerateCode", desc = "Code iteration limit reached"),
+                MetricDataResult.Error
+            ),
+            ErrorTestCase(
+                ContentLengthException(operation = "GenerateCode", desc = "Repo size is exceeding the limits"),
+                MetricDataResult.Error
+            ),
+            ErrorTestCase(
+                ZipFileCorruptedException(operation = "GenerateCode", desc = "Zipped file is corrupted"),
+                MetricDataResult.Error
+            ),
+            ErrorTestCase(
+                FeatureDevException(message = "Resource not found", operation = "GenerateCode", desc = null),
+                MetricDataResult.Error
+            ),
             ErrorTestCase(
                 RuntimeException("Unknown error"),
                 MetricDataResult.Fault

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@ open class FeatureDevException(override val message: String?, val operation: Str`
`17`	`17`	`fun reason(): String = this.javaClass.simpleName`
`18`	`18`
`19`	`19`	`fun reasonDesc(): String =`
`20`		`- when (desc) {`
`21`		`- desc -> "$operation \| Description: $desc"`
	`20`	`+ when {`
	`21`	`+ !desc.isNullOrEmpty() -> "$operation \| Description: $desc"`
	`22`	`+ !message.isNullOrEmpty() -> "$operation \| Description: $message"`
`22`	`23`	`else -> operation`
`23`	`24`	`}`
`24`	`25`	`}`