-
Notifications
You must be signed in to change notification settings - Fork 623
[Go] Fixed streaming. #285
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f90338f
[Go] add general prompt support to ai package
ianlancetaylor ae86a09
Fixed streaming (almost).
apascal07 9f3ccca
Merge branch 'main' into ap-go-stream
apascal07 349c67e
Fixed correct ending of stream.
apascal07 1009d0f
Update main.go
apascal07 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 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -122,7 +122,13 @@ func (s *devServer) handleRunAction(w http.ResponseWriter, r *http.Request) erro | |
| // Stream results are newline-separated JSON. | ||
| callback = func(ctx context.Context, msg json.RawMessage) error { | ||
| _, err := fmt.Fprintf(w, "%s\n", msg) | ||
| return err | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if f, ok := w.(http.Flusher); ok { | ||
| f.Flush() | ||
|
Collaborator
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. I'm surprised |
||
| } | ||
| return nil | ||
| } | ||
| } | ||
| resp, err := runAction(ctx, s.reg, body.Key, body.Input, callback) | ||
|
|
@@ -393,14 +399,18 @@ func currentEnvironment() Environment { | |
| } | ||
| return EnvironmentProd | ||
| } | ||
|
|
||
| func writeJSON(ctx context.Context, w http.ResponseWriter, value any) error { | ||
| data, err := json.MarshalIndent(value, "", " ") | ||
| data, err := json.Marshal(value) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = w.Write(data) | ||
| if err != nil { | ||
| logger.FromContext(ctx).Error("writing output", "err", err) | ||
| } | ||
| if f, ok := w.(http.Flusher); ok { | ||
| f.Flush() | ||
| } | ||
| return nil | ||
| } | ||
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
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
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 by any chance also fix #271?
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.
No :( I didn't realize you filed an issue for this in JS but I've been running into the same issue with Go. Getting closer to fixing it but not quite there yet...
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.
Hmm... you tried or guessing? I'm thinking it might...
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.
I didn't try with your case but the case I'm trying to fix similarly crashes the process due to schema validation and it didn't fix it. We're throwing an exception and it's not caught anywhere so it makes sense that it crashes it, no?