-
-
Notifications
You must be signed in to change notification settings - Fork 136
[Chat] Add streaming support & persistence to storage through accumulator callback chaining #928
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
Open
marco-jouwweb
wants to merge
18
commits into
symfony:main
Choose a base branch
from
marco-jouwweb:feature/stream-support-chat-storage
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
28caec6
Added streaming support to Chat API & persistence to storage through …
de0bce3
added newline
434e688
reverted irrelevant test changes
534e122
fixed phpstan chat
40f9a65
Fixed metadata overwriting bug in StreamResult
e33303a
Reverted whitespace change
a1e2d4a
Reverted whitespace change
b5a4f68
Finally reverted whitespace properly
1fe2de8
Revert whole file
7376c15
Fixed changelog
61df964
added mongodb streaminablestoreinterface
5f99daa
Fixed style issues (fabbot)
7f5b884
fix indentaiton changelog
96c693d
readded whitespace
62503c1
Removed redundant onComplete function, added constructor promotion, f…
19a0782
Removed unused import
cb2890f
reverted accidental change
f9eaf7e
Changed to one-line arrow function
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
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
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\AI\Chat\Result; | ||
|
|
||
| use Symfony\AI\Agent\Toolbox\StreamResult as ToolboxStreamResult; | ||
| use Symfony\AI\Platform\Message\Message; | ||
| use Symfony\AI\Platform\Metadata\Metadata; | ||
| use Symfony\AI\Platform\Result\StreamResult; | ||
| use Symfony\AI\Platform\Result\ToolCallResult; | ||
|
|
||
| /** | ||
| * @author Marco van Angeren <marco@jouwweb.nl> | ||
| */ | ||
| final class AccumulatingStreamResult | ||
| { | ||
| public function __construct( | ||
| private readonly StreamResult|ToolboxStreamResult $innerResult, | ||
| private ?\Closure $onComplete = null, | ||
| ) { | ||
| } | ||
|
|
||
| public function getContent(): \Generator | ||
| { | ||
| $accumulatedContent = ''; | ||
| $toolCalls = []; | ||
|
|
||
| try { | ||
| foreach ($this->innerResult->getContent() as $value) { | ||
| if ($value instanceof ToolCallResult) { | ||
| array_push($toolCalls, ...$value->getContent()); | ||
| yield $value; | ||
| continue; | ||
| } | ||
|
|
||
| $accumulatedContent .= $value; | ||
| yield $value; | ||
| } | ||
| } finally { | ||
| if (null !== $this->onComplete) { | ||
| $assistantMessage = Message::ofAssistant( | ||
| '' === $accumulatedContent ? null : $accumulatedContent, | ||
| $toolCalls ?: null | ||
| ); | ||
|
|
||
| $assistantMessage->getMetadata()->set($this->innerResult->getMetadata()->all()); | ||
|
|
||
| ($this->onComplete)($assistantMessage); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public function getMetadata(): Metadata | ||
| { | ||
| return $this->innerResult->getMetadata(); | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\AI\Chat; | ||
|
|
||
| /** | ||
| * @author Marco van Angeren <marco@jouwweb.nl> | ||
| */ | ||
| interface StreamableStoreInterface | ||
| { | ||
| } |
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.
I'm not sure that we should throw an exception here, maybe just returning the complete stream at once?
Or maybe we can just store the message "as it" in the store?
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'm fairly certain throwing is the right call here. Returning the stream "as is" would work, but it's likely to confuse developers and hide the fact that streaming and session storage are incompatible by nature. As a developer, I'd rather get an early exception that forces me to fix a faulty configuration than a silently degraded solution. I think it'll also prevent a lot of GitHub issues down the road.