Skip to content
Closed
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
36 changes: 35 additions & 1 deletion src/platform/src/Bridge/Ollama/ModelCatalog.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
namespace Symfony\AI\Platform\Bridge\Ollama;

use Symfony\AI\Platform\Capability;
use Symfony\AI\Platform\Exception\InvalidArgumentException;
use Symfony\AI\Platform\Exception\ModelNotFoundException;
use Symfony\AI\Platform\Model;
use Symfony\AI\Platform\ModelCatalog\AbstractModelCatalog;

/**
Expand All @@ -20,7 +23,7 @@
final class ModelCatalog extends AbstractModelCatalog
{
/**
* @param array<string, array{class: class-string<\Symfony\AI\Platform\Model>, capabilities: list<Capability>}> $additionalModels
* @param array<string, array{class: class-string<Model>, capabilities: list<Capability>}> $additionalModels
*/
public function __construct(array $additionalModels = [])
{
Expand Down Expand Up @@ -210,4 +213,35 @@ public function __construct(array $additionalModels = [])

$this->models = array_merge($defaultModels, $additionalModels);
}

public function getModel(string $modelName): Model
{
if ('' === $modelName) {
throw new InvalidArgumentException('Model name cannot be empty.');
}

$parsed = self::parseModelName($modelName);
$actualModelName = $parsed['name'];
$options = $parsed['options'];

$baseModelName = explode(':', $actualModelName, 2)[0];

if (!isset($this->models[$actualModelName]) && !isset($this->models[$baseModelName])) {
throw new ModelNotFoundException(\sprintf('Model "%s" not found.', $actualModelName));
}

$modelConfig = $this->models[$actualModelName] ?? $this->models[$baseModelName];
$modelClass = $modelConfig['class'];

if (!class_exists($modelClass)) {
throw new InvalidArgumentException(\sprintf('Model class "%s" does not exist.', $modelClass));
}

$model = new $modelClass($actualModelName, $modelConfig['capabilities'], $options);
if (!$model instanceof Model) {
throw new InvalidArgumentException(\sprintf('Model class "%s" must extend "%s".', $modelClass, Model::class));
}

return $model;
}
}
2 changes: 2 additions & 0 deletions src/platform/tests/Bridge/Ollama/ModelCatalogTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public static function modelsProvider(): iterable
yield 'llama3' => ['llama3', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
yield 'mistral' => ['mistral', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
yield 'qwen3' => ['qwen3', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
yield 'qwen3:32b' => ['qwen3:32b', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
yield 'qwen' => ['qwen', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
yield 'qwen2' => ['qwen2', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
yield 'qwen2.5' => ['qwen2.5', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::TOOL_CALLING]];
Expand All @@ -45,6 +46,7 @@ public static function modelsProvider(): iterable
yield 'nomic-embed-text' => ['nomic-embed-text', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::INPUT_MULTIPLE]];
yield 'bge-m3' => ['bge-m3', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::INPUT_MULTIPLE]];
yield 'all-minilm' => ['all-minilm', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::INPUT_MULTIPLE]];
yield 'all-minilm:33m' => ['all-minilm:33m', Ollama::class, [Capability::INPUT_MESSAGES, Capability::OUTPUT_TEXT, Capability::OUTPUT_STRUCTURED, Capability::INPUT_MULTIPLE]];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for this model

}

protected function createModelCatalog(): ModelCatalogInterface
Expand Down