move InlineBm25Chunk to LspMessage.kt

Author: Will-ShaoHua

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

@@ -33,6 +33,7 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import software.aws.toolkits.jetbrains.services.amazonq.project.EncoderServer
 import software.aws.toolkits.jetbrains.services.amazonq.project.IndexRequest
+import software.aws.toolkits.jetbrains.services.amazonq.project.IndexUpdateMode
 import software.aws.toolkits.jetbrains.services.amazonq.project.InlineBm25Chunk
 import software.aws.toolkits.jetbrains.services.amazonq.project.LspMessage
 import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextProvider
@@ -188,8 +189,8 @@ class ProjectContextProviderTest {
 
     @Test
     fun `updateIndex should send correct encrypted request to lsp`() {
-        sut.updateIndex(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE)
-        val request = UpdateIndexRequest(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE.value)
+        sut.updateIndex(listOf("foo.java"), IndexUpdateMode.UPDATE)
+        val request = UpdateIndexRequest(listOf("foo.java"), IndexUpdateMode.UPDATE.command)
         val requestJson = mapper.writeValueAsString(request)
 
         assertThat(mapper.readTree(requestJson)).isEqualTo(mapper.readTree("""{ "filePaths": ["foo.java"], "mode": "update" }"""))

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

@@ -59,8 +59,20 @@ data class LspResponse(
     val responseBody: String,
 )
 
-enum class IndexUpdateMode(val value: String) {
+enum class IndexUpdateMode(val command: String) {
     UPDATE("update"),
     REMOVE("remove"),
     ADD("add"),
 }
+
+enum class IndexOption(val command: String) {
+    ALL("all"),
+    DEFAULT("default"),
+}
+
+// TODO: unify with [software.aws.toolkits.jetbrains.services.codewhisperer.model.Chunk]
+data class InlineBm25Chunk(
+    val content: String,
+    val filePath: String,
+    val score: Double,
+)

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

@@ -61,6 +61,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
         val fileSize: Int,
     )
 
+    // TODO: move to LspMessage.kt
     data class Usage(
         @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("memoryUsage")
@@ -69,6 +70,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
         val cpuUsage: Int? = null,
     )
 
+    // TODO: move to LspMessage.kt
     data class Chunk(
         @JsonIgnoreProperties(ignoreUnknown = true)
         @JsonProperty("filePath")
@@ -133,7 +135,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
         logger.debug { "time elapsed to collect project context files: ${duration}ms, collected ${filesResult.files.size} files" }
 
         val indexOption = if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) IndexOption.ALL else IndexOption.DEFAULT
-        val encrypted = encryptRequest(IndexRequest(filesResult.files, projectRoot, indexOption, ""))
+        val encrypted = encryptRequest(IndexRequest(filesResult.files, projectRoot, indexOption.command, ""))
         val response = sendMsgToLsp(LspMessage.Index, encrypted)
 
         duration = (System.currentTimeMillis() - indexStartTime).toDouble()
@@ -185,7 +187,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
     }
 
     fun updateIndex(filePaths: List<String>, mode: IndexUpdateMode) {
-        val encrypted = encryptRequest(UpdateIndexRequest(filePaths, mode.value))
+        val encrypted = encryptRequest(UpdateIndexRequest(filePaths, mode.command))
         sendMsgToLsp(LspMessage.UpdateIndex, encrypted)
     }
 
@@ -329,9 +331,5 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
 
     companion object {
         private val logger = getLogger<ProjectContextProvider>()
-        private object IndexOption {
-            const val ALL = "all"
-            const val DEFAULT = "default"
-        }
     }
 }