Skip to content

fix hooks not firing for wp_ai_client_prompt() flows #11342

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
felixarntz wants to merge 1 commit into from
Closed

fix hooks not firing for wp_ai_client_prompt() flows #11342

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
5 changes: 3 additions & 2 deletions 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 @@ -7,6 +7,7 @@
* @since 7.0.0
*/

use WordPress\AiClient\AiClient;
use WordPress\AiClient\Builders\PromptBuilder;
use WordPress\AiClient\Common\Exception\InvalidArgumentException;
use WordPress\AiClient\Common\Exception\TokenLimitReachedException;
Expand Down Expand Up @@ -183,9 +184,9 @@ class WP_AI_Client_Prompt_Builder {
*/
public function __construct( ProviderRegistry $registry, $prompt = null ) {
try {
$this->builder = new PromptBuilder( $registry, $prompt );
$this->builder = new PromptBuilder( $registry, $prompt, AiClient::getEventDispatcher() );
} catch ( Exception $e ) {
$this->builder = new PromptBuilder( $registry );
$this->builder = new PromptBuilder( $registry, null, AiClient::getEventDispatcher() );
$this->error = $this->exception_to_wp_error( $e );
}

Expand Down
57 changes: 57 additions & 0 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 @@ -1599,6 +1599,63 @@ public function test_generate_text_result() {
$this->assertTrue( $modalities[0]->isText() );
}

/**
* Tests that the wrapped PromptBuilder receives the same event dispatcher as AiClient.
*
* @ticket 64935
*/
public function test_prompt_builder_passes_ai_client_event_dispatcher_to_wrapped_builder() {
$builder = new WP_AI_Client_Prompt_Builder( AiClient::defaultRegistry(), 'Test prompt' );

$wrapped_dispatcher = $this->get_wrapped_prompt_builder_property_value( $builder, 'eventDispatcher' );

$this->assertSame( AiClient::getEventDispatcher(), $wrapped_dispatcher );
$this->assertInstanceOf( WP_AI_Client_Event_Dispatcher::class, $wrapped_dispatcher );
}

/**
* Tests that generate_text_result fires wp_ai_client_before_generate_result and wp_ai_client_after_generate_result in order.
*
* @ticket 64935
*/
public function test_generate_text_result_fires_lifecycle_action_hooks() {
$result = new GenerativeAiResult(
'test-result',
array( new Candidate( new ModelMessage( array( new MessagePart( 'Generated text' ) ) ), FinishReasonEnum::stop() ) ),
new TokenUsage( 100, 50, 150 ),
$this->create_test_provider_metadata(),
$this->create_test_text_model_metadata()
);

$metadata = $this->createMock( ModelMetadata::class );
$metadata->method( 'getId' )->willReturn( 'test-model' );

$model = $this->create_mock_text_generation_model( $result, $metadata );

$hook_order = array();

add_action(
'wp_ai_client_before_generate_result',
static function () use ( &$hook_order ) {
$hook_order[] = 'before';
}
);
add_action(
'wp_ai_client_after_generate_result',
static function () use ( &$hook_order ) {
$hook_order[] = 'after';
}
);

$builder = new WP_AI_Client_Prompt_Builder( $this->registry, 'Test prompt' );
$builder->using_model( $model );

$actual_result = $builder->generate_text_result();

$this->assertSame( $result, $actual_result );
$this->assertSame( array( 'before', 'after' ), $hook_order );
}

/**
* Tests generateImageResult method.
*
Expand Down
Loading