Used util function isAPIClientError when filtering error

Author: linyuxi-0511

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -15,6 +15,7 @@ import {
     createUserFacingErrorMessage,
     denyListedErrors,
     FeatureDevServiceError,
+    isAPIClientError,
     MonthlyConversationLimitError,
     NoChangeRequiredException,
     PrepareRepoFailedError,
@@ -29,14 +30,7 @@ import {
 } from '../../errors'
 import { codeGenRetryLimit, defaultRetryLimit } from '../../limits'
 import { Session } from '../../session/session'
-import {
-    clientErrorMessages,
-    featureDevScheme,
-    featureName,
-    generateDevFilePrompt,
-    startCodeGenClientErrorMessages,
-    startTaskAssistLimitReachedMessage,
-} from '../../constants'
+import { featureDevScheme, featureName, generateDevFilePrompt } from '../../constants'
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
@@ -569,12 +563,7 @@ export class FeatureDevController {
                     result = MetricDataResult.Error
                     break
                 default:
-                    if (
-                        (err.code === 'StartCodeGenerationFailed' &&
-                            startCodeGenClientErrorMessages.some((msg) => err.message.includes(msg))) ||
-                        clientErrorMessages.some((msg) => err.message.includes(msg)) ||
-                        err.message.includes(startTaskAssistLimitReachedMessage)
-                    ) {
+                    if (isAPIClientError(err)) {
                         result = MetricDataResult.Error
                     } else {
                         result = MetricDataResult.Fault

packages/core/src/amazonqFeatureDev/errors.ts

@@ -4,7 +4,12 @@
  */
 
 import { ToolkitError } from '../shared/errors'
-import { featureName } from './constants'
+import {
+    featureName,
+    clientErrorMessages,
+    startCodeGenClientErrorMessages,
+    startTaskAssistLimitReachedMessage,
+} from './constants'
 import { uploadCodeError } from './userFacingText'
 import { i18n } from '../shared/i18n-helper'
 
@@ -140,3 +145,12 @@ export function createUserFacingErrorMessage(message: string) {
     }
     return message
 }
+
+export function isAPIClientError(error: { code?: string; message: string }): boolean {
+    return (
+        (error.code === 'StartCodeGenerationFailed' &&
+            startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))) ||
+        clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
+        error.message.includes(startTaskAssistLimitReachedMessage)
+    )
+}

packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts

@@ -24,6 +24,7 @@ import {
     ContentLengthError,
     createUserFacingErrorMessage,
     FeatureDevServiceError,
+    isAPIClientError,
     MonthlyConversationLimitError,
     NoChangeRequiredException,
     PrepareRepoFailedError,
@@ -39,14 +40,7 @@ import { CodeGenState, PrepareCodeGenState } from '../../../../amazonqFeatureDev
 import { FeatureDevClient } from '../../../../amazonqFeatureDev/client/featureDev'
 import { createAmazonQUri } from '../../../../amazonq/commons/diff'
 import { AuthUtil } from '../../../../codewhisperer'
-import {
-    featureDevScheme,
-    featureName,
-    messageWithConversationId,
-    clientErrorMessages,
-    startCodeGenClientErrorMessages,
-    startTaskAssistLimitReachedMessage,
-} from '../../../../amazonqFeatureDev'
+import { featureDevScheme, featureName, messageWithConversationId } from '../../../../amazonqFeatureDev'
 import { i18n } from '../../../../shared/i18n-helper'
 import { FollowUpTypes } from '../../../../amazonq/commons/types'
 import { ToolkitError } from '../../../../shared'
@@ -486,12 +480,7 @@ describe('Controller', () => {
                 if (error instanceof FeatureDevServiceError && error.code) {
                     return errorResultMapping.get(error.code) ?? MetricDataResult.Error
                 }
-                if (
-                    (error.code === 'StartCodeGenerationFailed' &&
-                        startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))) ||
-                    clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
-                    error.message.includes(startTaskAssistLimitReachedMessage)
-                ) {
+                if (isAPIClientError(error)) {
                     return MetricDataResult.Error
                 }
                 return errorResultMapping.get(error.constructor.name) ?? MetricDataResult.Fault