Skip to content

log(amazonq): update log string when workspace process is not spinned up #5375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 18, 2025
Merged

log(amazonq): update log string when workspace process is not spinned up #5375

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd4a20e
add safe checks of workspace process status before making calls
Will-ShaoHua Feb 13, 2025
8cd2314
Merge remote-tracking branch 'upstream/main' into project-context
Will-ShaoHua Feb 14, 2025
4910fc7
test
Will-ShaoHua Feb 14, 2025
f085ce8
Revert "add safe checks of workspace process status before making calls"
Will-ShaoHua Feb 17, 2025
3fee712
Revert "test"
Will-ShaoHua Feb 17, 2025
9fcdeac
Merge remote-tracking branch 'upstream/main' into project-context
Will-ShaoHua Feb 17, 2025
5991546
update projectContext log string when process is not spinned up
Will-ShaoHua Feb 17, 2025
582fb89
Merge branch 'main' into project-context
Will-ShaoHua Feb 18, 2025
b4ee16d
empty commit
Will-ShaoHua Feb 18, 2025
2afd849
Merge branch 'main' into project-context
Will-ShaoHua Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...are/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererFileContextProviderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import software.aws.toolkits.jetbrains.utils.rules.HeavyJavaCodeInsightTestFixtu
import software.aws.toolkits.jetbrains.utils.rules.addClass
import software.aws.toolkits.jetbrains.utils.rules.addModule
import software.aws.toolkits.jetbrains.utils.rules.addTestClass
import java.util.concurrent.atomic.AtomicBoolean
import kotlin.test.assertNotNull

class CodeWhispererFileContextProviderTest {
Expand Down Expand Up @@ -230,6 +231,26 @@ class CodeWhispererFileContextProviderTest {
assertThat(serverContext.constructed()).hasSize(1)

whenever(providerContext.constructed()[0].queryInline(any(), any(), any())).thenThrow(RuntimeException("mock exception"))
whenever(providerContext.constructed()[0].isIndexComplete).thenReturn(AtomicBoolean(true))

val result = controller.queryInline("query", "filePath")
assertThat(result).isEmpty()
}
}
}

@Test
fun `projectContextController should return empty result if index is not ready`() = runTest {
mockConstruction(ProjectContextProvider::class.java).use { providerContext ->
mockConstruction(EncoderServer::class.java).use { serverContext ->
assertThat(providerContext.constructed()).hasSize(0)
assertThat(serverContext.constructed()).hasSize(0)
val controller = ProjectContextController(project, TestScope())
assertThat(providerContext.constructed()).hasSize(1)
assertThat(serverContext.constructed()).hasSize(1)

whenever(providerContext.constructed()[0].queryInline(any(), any(), any())).thenReturn(listOf(InlineBm25Chunk("foo", "path", 0.0)))
whenever(providerContext.constructed()[0].isIndexComplete).thenReturn(AtomicBoolean(false))

val result = controller.queryInline("query", "filePath")
assertThat(result).isEmpty()
Expand Down
18 changes: 16 additions & 2 deletions .../src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ class ProjectContextController(private val project: Project, private val cs: Cor
fun getProjectContextIndexComplete() = projectContextProvider.isIndexComplete.get()

suspend fun queryChat(prompt: String, timeout: Long?): List<RelevantDocument> {
if (!getProjectContextIndexComplete()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually allowed

logger.warn { "attempt to query project context while index for ${project.name} isn't ready" }
return emptyList()
}
try {
return projectContextProvider.query(prompt, timeout)
} catch (e: Exception) {
Expand All @@ -60,8 +64,13 @@ class ProjectContextController(private val project: Project, private val cs: Cor
}
}

suspend fun queryInline(query: String, filePath: String): List<InlineBm25Chunk> =
try {
suspend fun queryInline(query: String, filePath: String): List<InlineBm25Chunk> {
if (!getProjectContextIndexComplete()) {
logger.warn { "attempt to query project context while index for ${project.name} isn't ready" }
return emptyList()
}

return try {
projectContextProvider.queryInline(query, filePath, InlineContextTarget.CODEMAP)
} catch (e: Exception) {
var logStr = "error while querying inline for project context $e.message"
Expand All @@ -71,9 +80,14 @@ class ProjectContextController(private val project: Project, private val cs: Cor
logger.warn { logStr }
emptyList()
}
}

@RequiresBackgroundThread
fun updateIndex(filePaths: List<String>, mode: IndexUpdateMode) {
if (!getProjectContextIndexComplete()) {
return
}

try {
return projectContextProvider.updateIndex(filePaths, mode)
} catch (e: Exception) {
Expand Down
Loading