Make Apply Streaming Cancelable #5694
Open
Conversation
This file contains hidden or 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
✅ Deploy Preview for continuedev canceled.
|
dosubot
bot
added
the
size:XL
RomneyDa
commented
May 16, 2025
| @@ -62,61 +61,7 @@ import { LLMLogger } from "./llm/logger"; | |||
| import { llmStreamChat } from "./llm/streamChat"; | |||
| import type { FromCoreProtocol, ToCoreProtocol } from "./protocol"; | |||
| import type { IMessenger, Message } from "./protocol/messenger"; | |||
|
|
|||
| // This function is used for jetbrains inline edit and apply | |||
There was a problem hiding this comment.
Removed streamDiffLinesGenerator/moved logic inline because point of it was to account for aborted message ids which wasn't being used, made ~1/2 the lines duplicate, and is now defunct
| input: string; | ||
| language: string | undefined; | ||
| onlyOneInsertion: boolean; | ||
| overridePrompt: ChatMessage[] | undefined; | ||
| rulesToInclude: RuleWithSource[] | undefined; | ||
| }): AsyncGenerator<DiffLine> { | ||
| const abortManager = StreamAbortManager.getInstance(); |
There was a problem hiding this comment.
Took the singleton approach so that functional stream diff lines function (also used in vscode-only code) can have persisted abort controllers that can be cancelled with core messaging
| } else { | ||
| const gen = model.streamChat( | ||
| messages, | ||
| new AbortController().signal, | ||
| abortController.signal, |
There was a problem hiding this comment.
This is significant because before, the connection would be hanging/running in the background until complete even if we've "aborted" using message ids at that point
| @@ -323,14 +341,14 @@ class VertexAI extends BaseLLM { | |||
| ? this.geminiInstance.removeSystemMessage(messages) | |||
| : messages; | |||
| if (this.vertexProvider === "gemini") { | |||
| yield* this.streamChatGemini(convertedMsgs, options); | |||
| yield* this.streamChatGemini(convertedMsgs, options, signal); | |||
There was a problem hiding this comment.
VertexAI fixes - weren't abortable
sestinj
added a commit
that referenced
this pull request
May 17, 2025
dosubot
bot
added
size:L
dosubot
bot
added
size:XL
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.
Made the "Apply" streaming process cancelable so users can stop an in-progress code apply operation in the UI or via the reject diffs OR cancel stream commands.
Approach:
499client cancelled request errorstreamResponsefunction used by all streaming within Continue and just causes a premature return. This is for cases where fetch is aborted after streaming starts499in the ~20 abortable non-streaming places - mostly odd APIs andcompleterequests throughout whereresponse.json()is usedfetch(1.0.10), andopenai-adapters(1.0.25) packages (DONE)Also
Applying...and the cancel keyboard shortcuts if currently applying (same location as "Generating...)To test:
Update package.jsons to use relative paths for fetch package and rebuild fetch package
Use a slower apply model
Cancel streaming mid-apply