-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
chore: add mutagen prompting gRPC #118
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,53 @@ | ||
import GRPC | ||
|
||
extension MutagenDaemon { | ||
typealias PromptStream = GRPCAsyncBidirectionalStreamingCall<Prompting_HostRequest, Prompting_HostResponse> | ||
|
||
func host(allowPrompts: Bool = true) async throws(DaemonError) -> (PromptStream, identifier: String) { | ||
let stream = client!.prompt.makeHostCall() | ||
|
||
do { | ||
try await stream.requestStream.send(.with { req in req.allowPrompts = allowPrompts }) | ||
} catch { | ||
throw .grpcFailure(error) | ||
} | ||
|
||
// We can't make call `makeAsyncIterator` more than once | ||
// (as a for-loop would do implicitly) | ||
var iter = stream.responseStream.makeAsyncIterator() | ||
|
||
let initResp: Prompting_HostResponse? | ||
do { | ||
initResp = try await iter.next() | ||
} catch { | ||
throw .grpcFailure(error) | ||
} | ||
guard let initResp else { | ||
throw .unexpectedStreamClosure | ||
} | ||
try initResp.ensureValid(first: true, allowPrompts: allowPrompts) | ||
|
||
Task.detached(priority: .background) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This block is self-contained, and we're currently doing a lot on the main actor already. I was previously running into issues on startup with the VPN code getting starved by file sync code. |
||
do { | ||
while let msg = try await iter.next() { | ||
try msg.ensureValid(first: false, allowPrompts: allowPrompts) | ||
var reply: Prompting_HostRequest = .init() | ||
if msg.isPrompt { | ||
// Handle SSH key prompts | ||
if msg.message.contains("yes/no/[fingerprint]") { | ||
reply.response = "yes" | ||
} | ||
// Any other messages that require a non-empty response will | ||
// cause the create op to fail, showing an error. This is ok for now. | ||
} | ||
try await stream.requestStream.send(reply) | ||
} | ||
} catch let error as GRPCStatus where error.code == .cancelled { | ||
return | ||
} catch { | ||
self.logger.critical("Prompt stream failed: \(error)") | ||
ethanndickson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
return (stream, identifier: initResp.identifier) | ||
} | ||
} |
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.
Making this
internal
instead ofprivate
so we can split the daemon class up into multiple extensions, across multiple files.