switch to default model when receiving ResourceNotFoundException (#3941)

aws · Oct 26, 2023 · 925cb69 · 925cb69
1 parent 347cfdc
commit 925cb69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/...rc/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt b/...rc/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt
@@ -36,6 +36,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.GenerateComple
 import software.amazon.awssdk.services.codewhispererruntime.model.GenerateCompletionsResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.ProgrammingLanguage
 import software.amazon.awssdk.services.codewhispererruntime.model.RecommendationsWithReferencesPreference
+import software.amazon.awssdk.services.codewhispererruntime.model.ResourceNotFoundException
 import software.amazon.awssdk.services.codewhispererruntime.model.SupplementalContext
 import software.amazon.awssdk.services.codewhispererruntime.model.ThrottlingException
 import software.aws.toolkits.core.utils.debug
@@ -258,8 +259,8 @@ class CodeWhispererService {
                 val displayMessage: String
 
                 if (
-                    CodeWhispererConstants.Customization.customizationNotFoundExceptionPredicate(e) ||
-                    CodeWhispererConstants.Customization.invalidCustomizationExceptionPredicate(e)
+                    CodeWhispererConstants.Customization.invalidCustomizationExceptionPredicate(e) ||
+                    e is ResourceNotFoundException
                 ) {
                     (e as CodeWhispererRuntimeException)
 

diff --git a/...src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt b/...src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt
@@ -93,7 +93,6 @@ object CodeWhispererConstants {
     object Customization {
         private const val noAccessToCustomizationMessage = "Your account is not authorized to use CodeWhisperer Enterprise."
         private const val invalidCustomizationMessage = "You are not authorized to access"
-        private const val customizationNotFoundMessage = "not found"
 
         val noAccessToCustomizationExceptionPredicate: (e: Exception) -> Boolean = { e ->
             if (e !is CodeWhispererRuntimeException) {
@@ -110,14 +109,6 @@ object CodeWhispererConstants {
                 e is AccessDeniedException && (e.message?.contains(invalidCustomizationMessage, ignoreCase = true) ?: false)
             }
         }
-
-        val customizationNotFoundExceptionPredicate: (e: Exception) -> Boolean = { e ->
-            if (e !is CodeWhispererRuntimeException) {
-                false
-            } else {
-                e is AccessDeniedException && (e.message?.contains(customizationNotFoundMessage, ignoreCase = true) ?: false)
-            }
-        }
     }
     object CrossFile {
         const val CHUNK_SIZE = 60