feat: pass supplemental contexts only for token client #697
Conversation
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
volodkevych
reviewed
Jan 3, 2025
| filePath: v.filePath, | ||
| })) | ||
| : [], | ||
| ...(codeWhispererService instanceof CodeWhispererServiceToken && { |
There was a problem hiding this comment.
I suggest to introduce separate if for this below, fetchSupplementalContext only for token-based server and set requestContext.supplementalContexts.
There was a problem hiding this comment.
good idea, I implemented it, I utilized supplementalContextPromise construct to optimize performance and run in parallel, otherwise some tests were failing (e.g. Case 4. Inflight session is closed by subsequent completion request), due to a higher timeToFirstRecommendation value (from 1260, to 2500)
volodkevych
reviewed
Jan 3, 2025
| @@ -406,7 +409,8 @@ export const CodewhispererServerFactory = | |||
| classifierResult: autoTriggerResult?.classifierResult, | |||
| classifierThreshold: autoTriggerResult?.classifierThreshold, | |||
| credentialStartUrl: credentialsProvider.getConnectionMetadata?.()?.sso?.startUrl ?? undefined, | |||
| supplementalMetadata: supplementalContext, | |||
| supplementalMetadata: | |||
| codeWhispererService instanceof CodeWhispererServiceToken ? supplementalContext : undefined, | |||
There was a problem hiding this comment.
Then this check here would not be needed.
volodkevych
approved these changes
Jan 6, 2025
francescoopiccoli
changed the title
francescoopiccoli
deleted the
frapicc/supplemental-contexts-only-with-token-auth
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
From version v0.0.14 to v0.0.15 of lsp-codewhisper, we introduced supplementalContexts universally, regardless of whether it's a iam or token client. However, supplementalContext is only accepted by backend when using token authentication. When using iam authentication, the parameter is not accepted, thus we need to introduce authentication specific logic to deal with supplementalContext.
bearer token based client: https://github.com/aws/language-servers/blob/main/server/aws-lsp-codewhisperer/src/client/token/bearer-token-service.json#L2707
iam based client: https://github.com/aws/language-servers/blob/main/server/aws-lsp-codewhisperer/src/client/sigv4/service.json
Solution
Introducing client specific logic to pass supplementalContext data
I tested the solution via the CodeWhisperer Server Token debug config, and in the spawned vscode client I tried using inline completion.
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.