Skip to content

AI: Wrap SDK constructor exceptions into WP_Error in prompt builder #11114

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

Closed
gziolo wants to merge 4 commits into from
Closed

AI: Wrap SDK constructor exceptions into WP_Error in prompt builder #11114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39e7d7d
AI: Wrap SDK constructor exceptions into WP_Error in prompt builder.
gziolo Mar 2, 2026
30a3a81
Merge branch 'trunk' into fix/ai-client-constructor-exception-handling
gziolo Mar 2, 2026
bbbff31
Remove unnecessary backslashes.
felixarntz Mar 3, 2026
3b20708
Merge branch 'trunk' into fix/ai-client-constructor-exception-handling
felixarntz Mar 3, 2026
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
13 changes: 12 additions & 1 deletion src/wp-includes/ai-client/class-wp-ai-client-prompt-builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,18 @@ class WP_AI_Client_Prompt_Builder {
* conversations. Default null.
*/
public function __construct( ProviderRegistry $registry, $prompt = null ) {
$this->builder = new PromptBuilder( $registry, $prompt );
try {
$this->builder = new PromptBuilder( $registry, $prompt );
} catch ( Exception $e ) {
$this->builder = new PromptBuilder( $registry );
$this->error = new WP_Error(
'prompt_builder_error',
$e->getMessage(),
array(
'exception_class' => get_class( $e ),
)
);
}

/**
* Filters the default request timeout in seconds for AI Client HTTP requests.
Expand Down
64 changes: 37 additions & 27 deletions tests/phpunit/tests/ai-client/wpAiClientPromptBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,22 +1347,15 @@ public function test_validate_messages_non_user_last_returns_wp_error() {
/**
* Tests parseMessage with empty string returns WP_Error on termination.
*
* The SDK constructor throws immediately for empty strings, so the exception
* is caught in the constructor and stored.
*
* @ticket 64591
*/
public function test_parse_message_empty_string_returns_wp_error() {
// The empty string exception is thrown by the SDK's PromptBuilder constructor,
// which happens before our __call() error handling. We must catch it manually.
try {
$builder = new WP_AI_Client_Prompt_Builder( $this->registry, ' ' );
// If we get here, the SDK didn't throw. Test would need adjusting.
$result = $builder->generate_result();
$this->assertWPError( $result );
} catch ( InvalidArgumentException $e ) {
$this->assertStringContainsString( 'Cannot create a message from an empty string', $e->getMessage() );
}
$builder = new WP_AI_Client_Prompt_Builder( $this->registry, ' ' );
$result = $builder->generate_result();

$this->assertWPError( $result );
$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
$this->assertStringContainsString( 'Cannot create a message from an empty string', $result->get_error_message() );
}

/**
Expand All @@ -1371,13 +1364,12 @@ public function test_parse_message_empty_string_returns_wp_error() {
* @ticket 64591
*/
public function test_parse_message_empty_array_returns_wp_error() {
try {
$builder = new WP_AI_Client_Prompt_Builder( $this->registry, array() );
$result = $builder->generate_result();
$this->assertWPError( $result );
} catch ( InvalidArgumentException $e ) {
$this->assertStringContainsString( 'Cannot create a message from an empty array', $e->getMessage() );
}
$builder = new WP_AI_Client_Prompt_Builder( $this->registry, array() );
$result = $builder->generate_result();

$this->assertWPError( $result );
$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
$this->assertStringContainsString( 'Cannot create a message from an empty array', $result->get_error_message() );
}

/**
Expand All @@ -1386,13 +1378,31 @@ public function test_parse_message_empty_array_returns_wp_error() {
* @ticket 64591
*/
public function test_parse_message_invalid_type_returns_wp_error() {
try {
$builder = new WP_AI_Client_Prompt_Builder( $this->registry, 123 );
$result = $builder->generate_result();
$this->assertWPError( $result );
} catch ( InvalidArgumentException $e ) {
$this->assertStringContainsString( 'Input must be a string, MessagePart, MessagePartArrayShape', $e->getMessage() );
}
$builder = new WP_AI_Client_Prompt_Builder( $this->registry, 123 );
$result = $builder->generate_result();

$this->assertWPError( $result );
$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
$this->assertStringContainsString( 'Input must be a string, MessagePart, MessagePartArrayShape', $result->get_error_message() );
}

/**
* Tests that wp_ai_client_prompt() with an empty string does not throw.
*
* Constructor exceptions are caught and surfaced as WP_Error from
* generating methods, consistent with the __call() wrapping behavior.
*
* @ticket 64591
*/
public function test_wp_ai_client_prompt_empty_string_returns_wp_error() {
$builder = wp_ai_client_prompt( ' ' );

$this->assertInstanceOf( WP_AI_Client_Prompt_Builder::class, $builder );

$result = $builder->generate_text();

$this->assertWPError( $result );
$this->assertSame( 'prompt_builder_error', $result->get_error_code() );
}

/**
Expand Down
Loading