-
-
Notifications
You must be signed in to change notification settings - Fork 112
Support mixed for getContent method
#820
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
paulinevos
wants to merge
1
commit into
symfony:main
Choose a base branch
from
paulinevos:mixed-content
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
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 |
|---|---|---|
|
|
@@ -14,16 +14,17 @@ | |
| use Psr\Log\LoggerInterface; | ||
| use Psr\Log\NullLogger; | ||
| use Symfony\AI\Platform\Capability; | ||
| use Symfony\AI\Platform\Exception\ExceptionInterface; | ||
| use Symfony\AI\Platform\PlatformInterface; | ||
| use Symfony\AI\Platform\Vector\Vector; | ||
| use Symfony\AI\Store\Exception\RuntimeException; | ||
|
|
||
| final readonly class Vectorizer implements VectorizerInterface | ||
| final class Vectorizer implements VectorizerInterface | ||
| { | ||
| public function __construct( | ||
| private PlatformInterface $platform, | ||
| private string $model, | ||
| private LoggerInterface $logger = new NullLogger(), | ||
| private readonly PlatformInterface $platform, | ||
|
Contributor
Author
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. PHPStan complained about the
Member
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. yes, it is, see symfony/symfony#62168 (comment) |
||
| private readonly string $model, | ||
| private readonly LoggerInterface $logger = new NullLogger(), | ||
| ) { | ||
| } | ||
|
|
||
|
|
@@ -75,6 +76,8 @@ private function validateArray(array $values, string $expectedType): void | |
|
|
||
| /** | ||
| * @param array<string, mixed> $options | ||
| * | ||
| * @throws ExceptionInterface | ||
| */ | ||
| private function vectorizeString(string|\Stringable $string, array $options = []): Vector | ||
| { | ||
|
|
@@ -93,14 +96,20 @@ private function vectorizeString(string|\Stringable $string, array $options = [] | |
|
|
||
| /** | ||
| * @param array<string, mixed> $options | ||
| * | ||
| * @throws ExceptionInterface | ||
| */ | ||
| private function vectorizeEmbeddableDocument(EmbeddableDocumentInterface $document, array $options = []): VectorDocument | ||
| { | ||
| $this->logger->debug('Vectorizing embeddable document', ['document_id' => $document->getId()]); | ||
| $result = $this->platform->invoke($this->model, $document->getContent(), $options); | ||
| $vectors = $result->asVectors(); | ||
|
|
||
| $vector = $this->vectorizeString($document->getContent(), $options); | ||
| if (!isset($vectors[0])) { | ||
| throw new RuntimeException('No vector returned for vectorization.'); | ||
| } | ||
|
|
||
| return new VectorDocument($document->getId(), $vector, $document->getMetadata()); | ||
| return new VectorDocument($document->getId(), $vectors[0], $document->getMetadata()); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
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.
Maybe
string|objectis a good alternative if we want to be a bit stricter? Because theplatformnormalizers also mostly assume that you're passing either strings or data classes.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.
If possible I would vote to use
string|objectinstead ofmixed, WDYT @chr-hertel ?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.
Yes, i would agree, currently the
invokealso is explicit on the$inputwitharray|string|objectso it would be more consistent to be explicit here as well =>string|object