AI: Validate filtered default request timeout in WP_AI_Client_Prompt_Builder.

This checks that the return value of the `wp_ai_client_default_request_timeout` filter is a non-negative number before passing it to `RequestOptions`. If the filtered value is invalid, it is discarded in favor of the original default of `30.0` and a `_doing_it_wrong()` notice is issued. Without this check, a fatal error would ensue from the exception thrown in `\WordPress\AiClient\Providers\Http\DTO\RequestOptions::validateTimeout()`.

The following static analysis issues are addressed:

* Use `float` instead of `int` for the `wp_ai_client_default_request_timeout` filter parameter.
* Add missing PHP imports for `Message` and `MessagePart` in the PHPDoc for `wp_ai_client_prompt()`.
* Add PHP return type hints for `wp_ai_client_prompt()` and `WP_AI_Client_Cache::getMultiple()`.
* Use native property type hints in `WP_AI_Client_HTTP_Client`.

Developed in WordPress/wordpress-develop#11596

Reviewed by peterwilsoncc.
Merges r62255 to the 7.0 branch.

Props westonruter, justlevine, flixos90, khushdoms, darshitrajyaguru97, adrmf25, jarodortegaaraya, tusharaddweb, gaurangsondagar.
Fixes #65094.


Built from https://develop.svn.wordpress.org/branches/7.0@62266


git-svn-id: http://core.svn.wordpress.org/branches/7.0@61546 1a063a9b-81f0-0310-95a4-ce76da25c4cd

Author: peterwilsoncc

wp-includes/ai-client.php

@@ -8,6 +8,8 @@
  */
 
 use WordPress\AiClient\AiClient;
+use WordPress\AiClient\Messages\DTO\Message;
+use WordPress\AiClient\Messages\DTO\MessagePart;
 
 /**
  * Returns whether AI features are supported in the current environment.
@@ -55,6 +57,6 @@ function wp_supports_ai(): bool {
  *                                                                                                   conversations. Default null.
  * @return WP_AI_Client_Prompt_Builder The prompt builder instance.
  */
-function wp_ai_client_prompt( $prompt = null ) {
+function wp_ai_client_prompt( $prompt = null ): WP_AI_Client_Prompt_Builder {
 	return new WP_AI_Client_Prompt_Builder( AiClient::defaultRegistry(), $prompt );
 }

wp-includes/ai-client/adapters/class-wp-ai-client-cache.php

@@ -104,7 +104,7 @@ public function clear(): bool {
 	 * @param mixed            $default_value Default value to return for keys that do not exist.
 	 * @return array<string, mixed> A list of key => value pairs.
 	 */
-	public function getMultiple( $keys, $default_value = null ) {
+	public function getMultiple( $keys, $default_value = null ): array {
 		/**
 		 * Keys array.
 		 *

wp-includes/ai-client/adapters/class-wp-ai-client-http-client.php

@@ -32,17 +32,15 @@ class WP_AI_Client_HTTP_Client implements ClientInterface, ClientWithOptionsInte
 	 * Response factory instance.
 	 *
 	 * @since 7.0.0
-	 * @var ResponseFactoryInterface
 	 */
-	private $response_factory;
+	private ResponseFactoryInterface $response_factory;
 
 	/**
 	 * Stream factory instance.
 	 *
 	 * @since 7.0.0
-	 * @var StreamFactoryInterface
 	 */
-	private $stream_factory;
+	private StreamFactoryInterface $stream_factory;
 
 	/**
 	 * Constructor.

wp-includes/ai-client/class-wp-ai-client-prompt-builder.php

@@ -190,14 +190,29 @@ public function __construct( ProviderRegistry $registry, $prompt = null ) {
 			$this->error   = $this->exception_to_wp_error( $e );
 		}
 
+		$default_timeout = 30.0;
+
 		/**
 		 * Filters the default request timeout in seconds for AI Client HTTP requests.
 		 *
 		 * @since 7.0.0
 		 *
-		 * @param int $default_timeout The default timeout in seconds.
+		 * @param float $default_timeout The default timeout in seconds.
 		 */
-		$default_timeout = (int) apply_filters( 'wp_ai_client_default_request_timeout', 30 );
+		$filtered_default_timeout = apply_filters( 'wp_ai_client_default_request_timeout', $default_timeout );
+		if ( is_numeric( $filtered_default_timeout ) && (float) $filtered_default_timeout >= 0.0 ) {
+			$default_timeout = (float) $filtered_default_timeout;
+		} else {
+			_doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					/* translators: %s: wp_ai_client_default_request_timeout */
+					__( 'The %s filter must return a non-negative number.' ),
+					'<code>wp_ai_client_default_request_timeout</code>'
+				),
+				'7.0.0'
+			);
+		}
 
 		$this->builder->usingRequestOptions(
 			RequestOptions::fromArray(

wp-includes/version.php

@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-RC2-62265';
+$wp_version = '7.0-RC2-62266';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.