patch only inplicit timeout apply to timeout

Author: Will-ShaoHua

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

@@ -36,6 +36,7 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
+import software.aws.toolkits.jetbrains.services.amazonq.CHAT_INPLICIT_PROJECT_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
@@ -137,15 +138,15 @@ class ChatController private constructor(
                 shouldUseWorkspaceContext = true
                 prompt = prompt.replace("@workspace", "")
                 val projectContextController = ProjectContextController.getInstance(context.project)
-                queryResult = projectContextController.query(prompt)
+                queryResult = projectContextController.query(prompt, timeout = null)
                 if (!projectContextController.getProjectContextIndexComplete()) shouldAddIndexInProgressMessage = true
                 logger.info { "project context relevant document count: ${queryResult.size}" }
             } else {
                 sendOpenSettingsMessage(message.tabId)
             }
         } else if (CodeWhispererSettings.getInstance().isProjectContextEnabled() && isDataCollectionGroup) {
             val projectContextController = ProjectContextController.getInstance(context.project)
-            queryResult = projectContextController.query(prompt)
+            queryResult = projectContextController.query(prompt, timeout = CHAT_INPLICIT_PROJECT_CONTEXT_TIMEOUT)
         }
 
         handleChat(

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/workspace/context/ProjectContextProviderTest.kt

@@ -216,7 +216,7 @@ class ProjectContextProviderTest {
     @Test
     fun `query should send correct encrypted request to lsp`() = runTest {
         sut = ProjectContextProvider(project, encoderServer, this)
-        val r = sut.query("foo")
+        val r = sut.query("foo", null)
         advanceUntilIdle()
 
         val request = QueryChatRequest("foo")
@@ -271,14 +271,14 @@ class ProjectContextProviderTest {
         )
 
         assertThrows<Exception> {
-            sut.query("foo")
+            sut.query("foo", null)
         }
     }
 
     @Test
     fun `query chat should return deserialized relevantDocument`() = runTest {
         sut = ProjectContextProvider(project, encoderServer, this)
-        val r = sut.query("foo")
+        val r = sut.query("foo", null)
         advanceUntilIdle()
         assertThat(r).hasSize(2)
         assertThat(r[0]).isEqualTo(
@@ -397,7 +397,7 @@ class ProjectContextProviderTest {
             )
 
             withContext(getCoroutineBgContext()) {
-                sut.query("foo")
+                sut.query("foo", timeout = 500L)
             }
 
             advanceUntilIdle()
@@ -418,7 +418,7 @@ class ProjectContextProviderTest {
     @Test
     fun `test query payload is encrypted`() = runTest {
         sut = ProjectContextProvider(project, encoderServer, this)
-        sut.query("what does this project do")
+        sut.query("what does this project do", null)
         advanceUntilIdle()
         verify(encoderServer, times(1)).encrypt(any())
     }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/Constants.kt

@@ -3,6 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq
 
+import kotlin.time.Duration.Companion.minutes
+
 const val APPLICATION_ZIP = "application/zip"
 const val SERVER_SIDE_ENCRYPTION = "x-amz-server-side-encryption"
 const val AWS_KMS = "aws:kms"
@@ -39,3 +41,7 @@ const val CODE_TRANSFORM_PREREQUISITES =
 const val FEATURE_EVALUATION_PRODUCT_NAME = "CodeWhisperer"
 
 const val SUPPLEMENTAL_CONTEXT_TIMEOUT = 100L
+
+val CHAT_EXPLICIT_PROJECT_CONTEXT_TIMEOUT = 5.minutes.inWholeMilliseconds
+
+val CHAT_INPLICIT_PROJECT_CONTEXT_TIMEOUT = 500L // 500ms

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextController.kt

@@ -47,9 +47,9 @@ class ProjectContextController(private val project: Project, private val cs: Cor
 
     fun getProjectContextIndexComplete() = projectContextProvider.isIndexComplete.get()
 
-    suspend fun query(prompt: String): List<RelevantDocument> {
+    suspend fun query(prompt: String, timeout: Long?): List<RelevantDocument> {
         try {
-            return projectContextProvider.query(prompt)
+            return projectContextProvider.query(prompt, timeout)
         } catch (e: Exception) {
             logger.warn { "error while querying for project context $e.message" }
             return emptyList()

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt

@@ -25,6 +25,7 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.services.amazonq.CHAT_EXPLICIT_PROJECT_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
 import software.aws.toolkits.jetbrains.services.amazonq.SUPPLEMENTAL_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
@@ -160,7 +161,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
 
     // TODO: rename queryChat
     // TODO: timeout window not decided
-    suspend fun query(prompt: String): List<RelevantDocument> = withTimeout(500L) {
+    suspend fun query(prompt: String, timeout: Long?): List<RelevantDocument> = withTimeout(timeout ?: CHAT_EXPLICIT_PROJECT_CONTEXT_TIMEOUT) {
         cs.async {
             val encrypted = encryptRequest(QueryChatRequest(prompt))
             val response = sendMsgToLsp(LspMessage.QueryChat, encrypted)