Skip to content
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

fix: various fixes for bundle release 0.3 #56

Merged
merged 1 commit into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/Chain.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,27 @@

final readonly class Chain
{
/**
* @var InputProcessor[]
*/
private array $inputProcessor;

/**
* @var OutputProcessor[]
*/
private array $outputProcessor;

/**
* @param InputProcessor[] $inputProcessor
* @param OutputProcessor[] $outputProcessor
*/
public function __construct(
private LanguageModel $llm,
private array $inputProcessor = [],
private array $outputProcessor = [],
iterable $inputProcessor = [],
iterable $outputProcessor = [],
) {
$this->inputProcessor = $inputProcessor instanceof \Traversable ? iterator_to_array($inputProcessor) : $inputProcessor;
$this->outputProcessor = $outputProcessor instanceof \Traversable ? iterator_to_array($outputProcessor) : $outputProcessor;
}

/**
Expand Down
15 changes: 13 additions & 2 deletions src/StructuredOutput/ChainProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@ public function __construct(

public function processInput(Input $input): void
{
$options = $input->getOptions();

if (!isset($options['output_structure'])) {
return;
}

if (!$input->llm->supportsStructuredOutput()) {
throw MissingModelSupport::forStructuredOutput($input->llm::class);
}

$options = $input->getOptions();
$options['response_format'] = $this->responseFormatFactory->create($options['output_structure']);

$this->outputStructure = $options['output_structure'];
Expand All @@ -36,8 +41,14 @@ public function processInput(Input $input): void
$input->setOptions($options);
}

public function processOutput(Output $output): object
public function processOutput(Output $output): ?object
{
$options = $output->options;

if (!isset($options['output_structure'])) {
return null;
}

return $this->serializer->deserialize($output->response->getContent(), $this->outputStructure, 'json');
}
}
2 changes: 1 addition & 1 deletion src/ToolBox/ChainProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
final readonly class ChainProcessor implements InputProcessor, OutputProcessor
{
public function __construct(
private ToolBox $toolBox,
private ToolBoxInterface $toolBox,
) {
}

Expand Down