feat(amazonq): Prefetch next inline recommendation #5290
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "type" : "feature", | ||
| "description" : "Amazon Q: Instantly show the next recommendation after the current recommendation is accepted" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ import com.intellij.openapi.editor.Editor | |
| import com.intellij.openapi.editor.VisualPosition | ||
| import com.intellij.openapi.project.Project | ||
| import com.intellij.openapi.ui.popup.JBPopup | ||
| import com.intellij.openapi.ui.popup.JBPopupFactory | ||
| import com.intellij.openapi.util.Disposer | ||
| import com.intellij.psi.PsiDocumentManager | ||
| import com.intellij.psi.PsiFile | ||
|
|
@@ -24,6 +25,7 @@ import com.intellij.util.messages.Topic | |
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Deferred | ||
| import kotlinx.coroutines.Job | ||
| import kotlinx.coroutines.SupervisorJob | ||
| import kotlinx.coroutines.async | ||
| import kotlinx.coroutines.delay | ||
| import kotlinx.coroutines.isActive | ||
|
|
@@ -98,6 +100,7 @@ import java.util.concurrent.TimeUnit | |
| class CodeWhispererService(private val cs: CoroutineScope) : Disposable { | ||
| private val codeInsightSettingsFacade = CodeInsightsSettingsFacade() | ||
| private var refreshFailure: Int = 0 | ||
| private var nextInvocationContext: InvocationContext? = null | ||
|
|
||
| init { | ||
| Disposer.register(this, codeInsightSettingsFacade) | ||
|
|
@@ -209,7 +212,118 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable { | |
| invokeCodeWhispererInBackground(requestContext) | ||
| } | ||
|
|
||
| internal suspend fun invokeCodeWhispererInBackground( | ||
| requestContext: RequestContext, | ||
| currStates: InvocationContext? = null, | ||
| ): Job { | ||
| // current states != null means that it's prefetch | ||
| if (currStates != null) { | ||
| val firstValidRecommendation = currStates.recommendationContext.details | ||
| .firstOrNull { | ||
| !it.isDiscarded && it.recommendation.content().isNotEmpty() | ||
| } ?: return SupervisorJob().apply { complete() } | ||
| val job = cs.launch(getCoroutineBgContext()) { | ||
| val latencyContext = LatencyContext().apply { | ||
| codewhispererPreprocessingStart = System.nanoTime() | ||
| codewhispererEndToEndStart = System.nanoTime() | ||
| } | ||
|
|
||
| val nextCaretPosition = CaretPosition( | ||
| line = requestContext.caretPosition.line + firstValidRecommendation.recommendation.content().count { it == '\n' }, | ||
| offset = requestContext.caretPosition.offset + firstValidRecommendation.recommendation.content().length | ||
| ) | ||
|
|
||
| val nextFileContextInfo = requestContext.fileContextInfo.copy( | ||
| caretContext = requestContext.fileContextInfo.caretContext.copy( | ||
| leftFileContext = requestContext.fileContextInfo.caretContext.leftFileContext + firstValidRecommendation.recommendation.content() | ||
| ) | ||
| ) | ||
|
|
||
| val nextRequestContext = requestContext.copy( | ||
| caretPosition = nextCaretPosition, | ||
| fileContextInfo = nextFileContextInfo, | ||
| latencyContext = latencyContext | ||
| ) | ||
| val newVisualPosition = withContext(EDT) { | ||
| runReadAction { | ||
| nextRequestContext.editor.offsetToVisualPosition(nextRequestContext.caretPosition.offset) | ||
| } | ||
| } | ||
| try { | ||
| val nextResponse = CodeWhispererClientAdaptor | ||
| .getInstance(nextRequestContext.project) | ||
| .generateCompletions( | ||
| buildCodeWhispererRequest( | ||
| nextRequestContext.fileContextInfo, | ||
| nextRequestContext.awaitSupplementalContext(), | ||
| nextRequestContext.customizationArn | ||
| ) | ||
| ) | ||
| val startTime = System.nanoTime() | ||
| nextRequestContext.latencyContext.codewhispererPreprocessingEnd = System.nanoTime() | ||
| nextRequestContext.latencyContext.paginationAllCompletionsStart = System.nanoTime() | ||
| CodeWhispererInvocationStatus.getInstance().setInvocationStart() | ||
| nextResponse.let { | ||
| val endTime = System.nanoTime() | ||
| val latency = TimeUnit.NANOSECONDS.toMillis(endTime - startTime).toDouble() | ||
| val requestId = nextResponse.responseMetadata().requestId() | ||
| val sessionId = nextResponse.sdkHttpResponse().headers().getOrDefault(KET_SESSION_ID, listOf(requestId))[0] | ||
|
|
||
| nextRequestContext.latencyContext.apply { | ||
| codewhispererPostprocessingStart = System.nanoTime() | ||
| paginationFirstCompletionTime = (endTime - codewhispererEndToEndStart).toDouble() | ||
| firstRequestId = requestId | ||
| } | ||
|
|
||
| CodeWhispererInvocationStatus.getInstance().setInvocationSessionId(sessionId) | ||
|
|
||
| val nextResponseContext = ResponseContext(sessionId) | ||
| CodeWhispererTelemetryService.getInstance().sendServiceInvocationEvent( | ||
| nextResponse.responseMetadata().requestId(), | ||
| nextRequestContext, | ||
| nextResponseContext, | ||
| nextResponse.completions().size, | ||
| invocationSuccess = true, | ||
| latency, | ||
| null | ||
| ) | ||
| val validatedResponse = validateResponse(it) | ||
| val detailContexts = withContext(EDT) { | ||
| runReadAction { | ||
| CodeWhispererRecommendationManager.getInstance().buildDetailContext( | ||
| nextRequestContext, | ||
| "", | ||
| validatedResponse.completions(), | ||
| validatedResponse.responseMetadata().requestId() | ||
| ) | ||
| } | ||
| } | ||
| val nextRecommendationContext = RecommendationContext(detailContexts, "", "", newVisualPosition) | ||
| val newPopup = withContext(EDT) { | ||
| JBPopupFactory.getInstance().createMessage("Dummy popup") | ||
|
There was a problem hiding this comment. Is this ever shown to the user? Should this be a more user-friendly message? There was a problem hiding this comment. This dummy popup is not shown to the user. I created it as a placeholder since it's required for the nextInvocationContext variable. If there's a need to display a popup in the future, a new user-friendly popup will be created accordingly. There was a problem hiding this comment. can't we just handle the case where there is no prior popup there? There was a problem hiding this comment. The If the creation of this dummy popup seems unusual, an alternative would be to make the popup field nullable. However, this would require adding null checks at every location where To minimize the impact, maintain consistency and ensure this feature can be launched this week, I opted for this approach. If there are better suggestions for handling this scenario, I'm happy to discuss them! |
||
| } | ||
|
|
||
| // send userDecision and trigger decision when next recommendation haven't been seen | ||
| if (currStates.popup.isDisposed) { | ||
| CodeWhispererTelemetryService.getInstance().sendUserDecisionEventForAll( | ||
| nextRequestContext, | ||
| nextResponseContext, | ||
| nextRecommendationContext, | ||
| SessionContext(), | ||
| false | ||
| ) | ||
| } else { | ||
| nextInvocationContext = InvocationContext(nextRequestContext, nextResponseContext, nextRecommendationContext, newPopup) | ||
| } | ||
| LOG.debug { "Prefetched next invocation stored in nextInvocationContext" } | ||
| } | ||
| } catch (ex: Exception) { | ||
| LOG.warn { "Failed to prefetch next codewhisperer invocation: ${ex.message}" } | ||
| } | ||
| } | ||
| return job | ||
| } | ||
|
|
||
| val popup = withContext(EDT) { | ||
| CodeWhispererPopupManager.getInstance().initPopup().also { | ||
| Disposer.register(it) { CodeWhispererInvocationStatus.getInstance().finishInvocation() } | ||
|
|
@@ -491,6 +605,9 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable { | |
| CodeWhispererPopupManager.getInstance().cancelPopup(popup) | ||
| return null | ||
| } | ||
| cs.launch(getCoroutineBgContext()) { | ||
| invokeCodeWhispererInBackground(requestContext, nextStates) | ||
| } | ||
| } else { | ||
| // subsequent responses | ||
| nextStates = updateStates(currStates, response) | ||
|
|
@@ -616,6 +733,34 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable { | |
| CodeWhispererPopupManager.getInstance().changeStates(states, 0, recommendationAdded) | ||
| } | ||
|
|
||
| fun promoteNextInvocationIfAvailable() { | ||
| val nextStates = nextInvocationContext ?: run { | ||
| LOG.debug { "No nextInvocationContext found, nothing to promote." } | ||
| return | ||
| } | ||
| nextInvocationContext?.popup?.let { Disposer.dispose(it) } | ||
| nextInvocationContext = null | ||
|
|
||
| runInEdt { | ||
|
There was a problem hiding this comment. if we're already using coroutines, we do not need to use runInEdt There was a problem hiding this comment. Thank you for pointing that out! I use There was a problem hiding this comment.
There was a problem hiding this comment. Thanks for the clarification! Just to confirm—are you suggesting that I replace |
||
| val newPopup = CodeWhispererPopupManager.getInstance().initPopup() | ||
| val updatedNextStates = nextStates.copy(popup = newPopup).also { | ||
| addPopupChildDisposables(it.requestContext.project, it.requestContext.editor, it.popup) | ||
| Disposer.register(newPopup, it) | ||
| } | ||
| CodeWhispererPopupManager.getInstance().initPopupListener(updatedNextStates) | ||
| CodeWhispererPopupManager.getInstance().changeStates( | ||
| updatedNextStates, | ||
| 0, | ||
| recommendationAdded = false | ||
| ) | ||
| cs.launch(getCoroutineBgContext()) { | ||
| invokeCodeWhispererInBackground(updatedNextStates.requestContext, updatedNextStates) | ||
| } | ||
| } | ||
|
|
||
| LOG.debug { "Promoted nextInvocationContext to current session and displayed next recommendation." } | ||
| } | ||
|
|
||
| private fun sendDiscardedUserDecisionEventForAll( | ||
| requestContext: RequestContext, | ||
| responseContext: ResponseContext, | ||
|
|
@@ -782,6 +927,8 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable { | |
|
|
||
| override fun dispose() {} | ||
|
|
||
| fun getNextInvocationContext(): InvocationContext? = nextInvocationContext | ||
|
|
||
| companion object { | ||
| private val LOG = getLogger<CodeWhispererService>() | ||
| private const val MAX_REFRESH_ATTEMPT = 3 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this actually need to return a job?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The function's return type is explicitly defined as Job, and there is an existing test that relies on this return value. So I return a
SupervisorJobto maintain consistency with current codebase.https://github.com/evanliu048/aws-toolkit-jetbrains/blob/prefechNextInlineRecommendation/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererServiceTest.kt#L219