Skip to content

[Platform][Ollama] Better regex for qwen tool pattern #669

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.

Sign up for GitHub

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 1 commit into from
Sep 24, 2025
Merged

[Platform][Ollama] Better regex for qwen tool pattern #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/platform/src/Bridge/Ollama/Ollama.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Ollama extends Model
public const GEMMA_3_N = 'gemma3n';
public const GEMMA_3 = 'gemma3';
public const QWEN_3 = 'qwen3';
public const QWEN_3_32B = 'qwen3:32b';
public const QWEN_2_5_VL = 'qwen2.5vl';
public const LLAMA_3_1 = 'llama3.1';
public const LLAMA_3_2 = 'llama3.2';
Expand All @@ -33,6 +34,7 @@ class Ollama extends Model
public const PHI_3 = 'phi3';
public const GEMMA_2 = 'gemma2';
public const QWEN_2_5_CODER = 'qwen2.5-coder';
public const QWEN_2_5_CODER_32B = 'qwen2.5-coder:32b';
public const GEMMA = 'gemma';
public const QWEN = 'qwen';
public const QWEN_2 = 'qwen2';
Expand All @@ -50,7 +52,7 @@ class Ollama extends Model
'/^llama\D*3(\D*\d+)/' => [
Capability::TOOL_CALLING,
],
'/^qwen\d(\.\d)?(-coder)?$/' => [
'/^qwen\d(\.\d)?(-coder)?(:\d+(\.\d+)?b)?$/' => [
Capability::TOOL_CALLING,
],
'/^(deepseek|mistral)/' => [
Expand Down
2 changes: 2 additions & 0 deletions src/platform/tests/Bridge/Ollama/OllamaTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ public static function provideModelsWithToolCallingCapability(): iterable
yield 'qwen2' => [Ollama::QWEN_2];
yield 'qwen2.5' => [Ollama::QWEN_2_5];
yield 'qwen2.5-coder' => [Ollama::QWEN_2_5_CODER];
yield 'qwen2.5-coder:32b' => [Ollama::QWEN_2_5_CODER_32B];
yield 'qwen3' => [Ollama::QWEN_3];
yield 'qwen3:32b' => [Ollama::QWEN_3_32B];

// Models that match the deepseek pattern
yield 'deepseek-r1' => [Ollama::DEEPSEEK_R_1];
Expand Down