Skip to content
Open
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
4 changes: 1 addition & 3 deletions src/Providers/Anthropic/Handlers/Structured.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Contracts\PrismRequest;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\Anthropic\Concerns\ExtractsCitations;
use Prism\Prism\Providers\Anthropic\Concerns\ExtractsProviderToolCalls;
use Prism\Prism\Providers\Anthropic\Concerns\ExtractsText;
Expand Down Expand Up @@ -71,8 +70,7 @@ public function handle(): Response

return match ($tempResponse->finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls($toolCalls, $tempResponse),
FinishReason::Stop, FinishReason::Length => $this->handleStop($tempResponse),
default => throw new PrismException('Anthropic: unknown finish reason'),
default => $this->handleStop($tempResponse),
};
}

Expand Down
4 changes: 1 addition & 3 deletions src/Providers/Anthropic/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Contracts\PrismRequest;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\Anthropic\Concerns\ExtractsCitations;
use Prism\Prism\Providers\Anthropic\Concerns\ExtractsProviderToolCalls;
use Prism\Prism\Providers\Anthropic\Concerns\ExtractsText;
Expand Down Expand Up @@ -55,8 +54,7 @@ public function handle(): Response

return match ($this->tempResponse->finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls(),
FinishReason::Stop, FinishReason::Length => $this->handleStop(),
default => throw new PrismException('Anthropic: unknown finish reason'),
default => $this->handleStop(),
};
}

Expand Down
4 changes: 1 addition & 3 deletions src/Providers/DeepSeek/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use Illuminate\Support\Arr;
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\DeepSeek\Concerns\MapsFinishReason;
use Prism\Prism\Providers\DeepSeek\Concerns\ValidatesResponses;
use Prism\Prism\Providers\DeepSeek\Maps\MessageMap;
Expand Down Expand Up @@ -47,8 +46,7 @@ public function handle(Request $request): TextResponse

return match ($this->mapFinishReason($data)) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop => $this->handleStop($data, $request),
default => throw new PrismException('DeepSeek: unknown finish reason'),
default => $this->handleStop($data, $request),
};
}

Expand Down
3 changes: 1 addition & 2 deletions src/Providers/Gemini/Handlers/Structured.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ public function handle(Request $request): StructuredResponse

return match ($finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request, $finishReason),
default => throw new PrismException('Gemini: unhandled finish reason'),
default => $this->handleStop($data, $request, $finishReason),
};
}

Expand Down
4 changes: 1 addition & 3 deletions src/Providers/Gemini/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use Illuminate\Support\Arr;
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\Gemini\Concerns\ValidatesResponse;
use Prism\Prism\Providers\Gemini\Maps\CitationMapper;
use Prism\Prism\Providers\Gemini\Maps\FinishReasonMap;
Expand Down Expand Up @@ -58,8 +57,7 @@ public function handle(Request $request): TextResponse

return match ($finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request, $finishReason),
default => throw new PrismException('Gemini: unhandled finish reason'),
default => $this->handleStop($data, $request, $finishReason),
};
}

Expand Down
4 changes: 1 addition & 3 deletions src/Providers/Groq/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use Illuminate\Support\Arr;
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\Groq\Concerns\ProcessRateLimits;
use Prism\Prism\Providers\Groq\Concerns\ValidateResponse;
use Prism\Prism\Providers\Groq\Maps\FinishReasonMap;
Expand Down Expand Up @@ -50,8 +49,7 @@ public function handle(Request $request): TextResponse

return match ($finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request, $response),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request, $response, $finishReason),
default => throw new PrismException('Groq: unhandled finish reason'),
default => $this->handleStop($data, $request, $response, $finishReason),
};
}

Expand Down
4 changes: 1 addition & 3 deletions src/Providers/Mistral/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use Illuminate\Support\Arr;
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\Mistral\Concerns\ExtractsText;
use Prism\Prism\Providers\Mistral\Concerns\ExtractsThinking;
use Prism\Prism\Providers\Mistral\Concerns\MapsFinishReason;
Expand Down Expand Up @@ -55,8 +54,7 @@ public function handle(Request $request): Response

return match ($this->mapFinishReason($data)) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request, $response),
FinishReason::Stop => $this->handleStop($data, $request, $response),
default => throw PrismException::providerResponseError('Invalid tool choice'),
default => $this->handleStop($data, $request, $response),
};
}

Expand Down
13 changes: 1 addition & 12 deletions src/Providers/Ollama/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
use Illuminate\Http\Client\PendingRequest;
use Illuminate\Support\Arr;
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\Ollama\Concerns\MapsFinishReason;
use Prism\Prism\Providers\Ollama\Concerns\ValidatesResponse;
use Prism\Prism\Providers\Ollama\Maps\MessageMap;
Expand Down Expand Up @@ -48,16 +46,7 @@ public function handle(Request $request): Response
return $this->handleToolCalls($data, $request);
}

$finishReason = $this->mapFinishReason($data);

return match ($finishReason) {
FinishReason::Stop,
FinishReason::Length,
FinishReason::Unknown,
FinishReason::ContentFilter,
FinishReason::Other => $this->handleStop($data, $request),
default => throw new PrismException('Ollama: unknown finish reason'),
};
return $this->handleStop($data, $request);
}

/**
Expand Down
8 changes: 1 addition & 7 deletions src/Providers/OpenAI/Handlers/Structured.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,12 @@ public function handle(Request $request): StructuredResponse

return match ($finishReason = $this->mapFinishReason($data)) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request, $response),
FinishReason::Stop => $this->handleFinalStop($data, $request, $response),
FinishReason::Length => throw new PrismException(sprintf(
'OpenAI: max tokens exceeded (status: %s, type: %s). If using a reasoning model, increase max_tokens to account for internal reasoning token usage.',
data_get($data, 'output.{last}.status', 'n/a'),
data_get($data, 'output.{last}.type', 'n/a'),
)),
default => throw new PrismException(sprintf(
'OpenAI: unhandled finish reason "%s" (status: %s, type: %s)',
$finishReason->value,
data_get($data, 'output.{last}.status', 'n/a'),
data_get($data, 'output.{last}.type', 'n/a'),
)),
default => $this->handleFinalStop($data, $request, $response),
};
}

Expand Down
8 changes: 1 addition & 7 deletions src/Providers/OpenAI/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,12 @@ public function handle(Request $request): Response

return match ($finishReason = $this->mapFinishReason($data)) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request, $response),
FinishReason::Stop => $this->handleStop($data, $request, $response),
FinishReason::Length => throw new PrismException(sprintf(
'OpenAI: max tokens exceeded (status: %s, type: %s). If using a reasoning model, increase max_tokens to account for internal reasoning token usage.',
data_get($data, 'output.{last}.status', 'n/a'),
data_get($data, 'output.{last}.type', 'n/a'),
)),
default => throw new PrismException(sprintf(
'OpenAI: unhandled finish reason "%s" (status: %s, type: %s)',
$finishReason->value,
data_get($data, 'output.{last}.status', 'n/a'),
data_get($data, 'output.{last}.type', 'n/a'),
)),
default => $this->handleStop($data, $request, $response),
};
}

Expand Down
3 changes: 1 addition & 2 deletions src/Providers/OpenRouter/Handlers/Structured.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ public function handle(Request $request): StructuredResponse

return match ($this->mapFinishReason($data)) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request),
default => throw new PrismException('OpenRouter: unknown finish reason'),
default => $this->handleStop($data, $request),
};
}

Expand Down
4 changes: 1 addition & 3 deletions src/Providers/OpenRouter/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Illuminate\Http\Client\Response;
use Prism\Prism\Concerns\CallsTools;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\Providers\OpenRouter\Concerns\BuildsRequestOptions;
use Prism\Prism\Providers\OpenRouter\Concerns\MapsFinishReason;
use Prism\Prism\Providers\OpenRouter\Concerns\ValidatesResponses;
Expand Down Expand Up @@ -46,8 +45,7 @@ public function handle(Request $request): TextResponse

return match ($this->mapFinishReason($data)) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request),
default => throw new PrismException('OpenRouter: unknown finish reason'),
default => $this->handleStop($data, $request),
};
}

Expand Down
3 changes: 1 addition & 2 deletions src/Providers/XAI/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public function handle(Request $request): TextResponse

return match ($finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request),
default => throw new PrismException('XAI: unknown finish reason'),
default => $this->handleStop($data, $request),
};
}

Expand Down
3 changes: 1 addition & 2 deletions src/Providers/Z/Handlers/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public function handle(Request $request): TextResponse

return match ($finishReason) {
FinishReason::ToolCalls => $this->handleToolCalls($data, $request),
FinishReason::Stop, FinishReason::Length => $this->handleStop($data, $request),
default => throw new PrismException('Z: unknown finish reason'),
default => $this->handleStop($data, $request),
};
}

Expand Down
10 changes: 6 additions & 4 deletions tests/Providers/OpenAI/StructuredTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use Illuminate\Http\Client\Request;
use Illuminate\Support\Facades\Http;
use Prism\Prism\Enums\FinishReason;
use Prism\Prism\Enums\Provider;
use Prism\Prism\Enums\StructuredMode;
use Prism\Prism\Exceptions\PrismException;
Expand Down Expand Up @@ -642,7 +643,7 @@
}
});

it('includes status details for unknown finish reasons', function (): void {
it('handles unknown finish reasons gracefully', function (): void {
FixtureResponse::fakeResponseSequence('v1/responses', 'openai/structured-unknown-finish-reason');

$schema = new ObjectSchema(
Expand All @@ -654,10 +655,11 @@
['weather']
);

expect(fn () => Prism::structured()
$response = Prism::structured()
->withSchema($schema)
->using(Provider::OpenAI, 'gpt-4o')
->withPrompt('What is the weather?')
->asStructured()
)->toThrow(PrismException::class, 'some_future_type');
->asStructured();

expect($response->finishReason)->toBe(FinishReason::Unknown);
});
10 changes: 6 additions & 4 deletions tests/Providers/OpenAI/TextTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -886,12 +886,14 @@
}
});

it('includes status details for unknown finish reasons', function (): void {
it('handles unknown finish reasons gracefully', function (): void {
FixtureResponse::fakeResponseSequence('v1/responses', 'openai/text-unknown-finish-reason');

expect(fn () => Prism::text()
$response = Prism::text()
->using('openai', 'gpt-4o')
->withPrompt('Hello')
->asText()
)->toThrow(PrismException::class, 'some_future_type');
->asText();

expect($response->text)->toBe('Some response');
expect($response->finishReason)->toBe(FinishReason::Unknown);
});