Skip to content
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

Instantiate a new chat client on every request #351

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Instantiate a new chat client on every request #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { ChatSessionService } from './chatSessionService'
describe('Chat Session Service', () => {
let generateAssistantResponseStub: sinon.SinonStub<any, any>
let abortStub: sinon.SinonStub<any, any>
let destroyClientStub: sinon.SinonStub<any, any>
let chatSessionService: ChatSessionService
const mockCredentialsProvider: CredentialsProvider = {
hasCredentials: sinon.stub().returns(true),
Expand Down Expand Up @@ -45,14 +44,11 @@ describe('Chat Session Service', () => {
.stub(CodeWhispererStreaming.prototype, 'generateAssistantResponse')
.callsFake(() => Promise.resolve(mockRequestResponse))

destroyClientStub = sinon.stub(CodeWhispererStreaming.prototype, 'destroy')

chatSessionService = new ChatSessionService(mockCredentialsProvider)
})

afterEach(() => {
generateAssistantResponseStub.restore()
destroyClientStub.restore()
abortStub.restore()
})

Expand Down Expand Up @@ -94,13 +90,12 @@ describe('Chat Session Service', () => {
sinon.assert.calledOnce(abortStub)
})

it('dispose() calls client.destroy and aborts outgoing requests', async () => {
it('dispose() calls aborts outgoing requests', async () => {
await chatSessionService.generateAssistantResponse(mockRequestParams)

chatSessionService.dispose()

sinon.assert.calledOnce(abortStub)
sinon.assert.calledOnce(destroyClientStub)
})

it('clear() reset session id and aborts outgoing request', async () => {
Expand Down
25 changes: 14 additions & 11 deletions server/aws-lsp-codewhisperer/src/language-server/chat/chatSessionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export class ChatSessionService {
public shareCodeWhispererContentWithAWS = false
readonly #codeWhispererRegion = 'us-east-1'
readonly #codeWhispererEndpoint = 'https://codewhisperer.us-east-1.amazonaws.com/'
#client: CodeWhispererStreaming
#abortController?: AbortController
#credentialsProvider: CredentialsProvider
#config?: CodeWhispererStreamingClientConfig
#sessionId?: string

public get sessionId(): string | undefined {
Expand All @@ -26,14 +27,8 @@ export class ChatSessionService {
}

constructor(credentialsProvider: CredentialsProvider, config?: CodeWhispererStreamingClientConfig) {
this.#client = new CodeWhispererStreaming({
region: this.#codeWhispererRegion,
endpoint: this.#codeWhispererEndpoint,
token: () => Promise.resolve({ token: getBearerTokenFromProvider(credentialsProvider) }),
retryStrategy: new ConfiguredRetryStrategy(0, (attempt: number) => 500 + attempt ** 10),
customUserAgent: '%Amazon-Q-For-LanguageServers%',
...config,
})
this.#credentialsProvider = credentialsProvider
this.#config = config
}

public async generateAssistantResponse(
Expand All @@ -45,7 +40,16 @@ export class ChatSessionService {
request.conversationState.conversationId = this.#sessionId
}

const response = await this.#client.generateAssistantResponse(request, {
const client = new CodeWhispererStreaming({
region: this.#codeWhispererRegion,
endpoint: this.#codeWhispererEndpoint,
token: () => Promise.resolve({ token: getBearerTokenFromProvider(this.#credentialsProvider) }),
retryStrategy: new ConfiguredRetryStrategy(0, (attempt: number) => 500 + attempt ** 10),
customUserAgent: '%Amazon-Q-For-LanguageServers%',
...this.#config,
})

const response = await client.generateAssistantResponse(request, {
abortSignal: this.#abortController?.signal,
})

Expand All @@ -61,7 +65,6 @@ export class ChatSessionService {

public dispose(): void {
this.#abortController?.abort()
this.#client.destroy()
}

public abortRequest(): void {
Expand Down
Loading