Merge branch 'develop' into update/client-ability-execution

Author: dkotter

includes/Abilities/Title_Generation/Title_Generation.php

@@ -23,15 +23,6 @@
  */
 class Title_Generation extends Abstract_Ability {
 
-	/**
-	 * The default number of candidates to generate.
-	 *
-	 * @since 0.1.0
-	 *
-	 * @var int
-	 */
-	protected const CANDIDATES_DEFAULT = 3;
-
 	/**
 	 * {@inheritDoc}
 	 *
@@ -41,21 +32,14 @@ protected function input_schema(): array {
 		return array(
 			'type'       => 'object',
 			'properties' => array(
-				'content'    => array(
+				'content' => array(
 					'type'        => 'string',
 					'description' => esc_html__( 'Content to generate title suggestions for.', 'ai' ),
 				),
-				'context'    => array(
+				'context' => array(
 					'type'        => 'string',
 					'description' => esc_html__( 'Additional context to use when generating title suggestions. This can either be a string of additional context or can be a post ID that will then be used to get context from that post (if it exists). If no content is provided but a valid post ID is used here, the content from that post will be used.', 'ai' ),
 				),
-				'candidates' => array(
-					'type'        => 'integer',
-					'minimum'     => 1,
-					'maximum'     => 10,
-					'default'     => self::CANDIDATES_DEFAULT,
-					'description' => esc_html__( 'Number of titles to generate', 'ai' ),
-				),
 			),
 		);
 	}
@@ -69,12 +53,9 @@ protected function output_schema(): array {
 		return array(
 			'type'       => 'object',
 			'properties' => array(
-				'titles' => array(
-					'type'        => 'array',
-					'description' => esc_html__( 'Generated title suggestions.', 'ai' ),
-					'items'       => array(
-						'type' => 'string',
-					),
+				'title' => array(
+					'type'        => 'string',
+					'description' => esc_html__( 'Generated title suggestion.', 'ai' ),
 				),
 			),
 		);
@@ -90,9 +71,8 @@ protected function execute_callback( $input ) {
 		$args = wp_parse_args(
 			$input,
 			array(
-				'content'    => null,
-				'context'    => null,
-				'candidates' => self::CANDIDATES_DEFAULT,
+				'content' => null,
+				'context' => null,
 			),
 		);
 
@@ -130,30 +110,25 @@ protected function execute_callback( $input ) {
 			);
 		}
 
-		// Generate the titles.
-		$result = $this->generate_titles( $content, $context, $args['candidates'] );
+		// Generate the title.
+		$result = $this->generate_title( $content, $context );
 
 		// If we have an error, return it.
 		if ( is_wp_error( $result ) ) {
 			return $result;
 		}
 
-		// If we have no results, return an error.
+		// If we have no result, return an error.
 		if ( empty( $result ) ) {
 			return new WP_Error(
 				'no_results',
-				esc_html__( 'No title suggestions were generated.', 'ai' )
+				esc_html__( 'No title suggestion was generated.', 'ai' )
 			);
 		}
 
-		// Return the titles in the format the Ability expects.
+		// Return the title in the format the Ability expects.
 		return array(
-			'titles' => array_map(
-				static function ( $title ) {
-					return sanitize_text_field( trim( $title, ' "\'' ) );
-				},
-				$result
-			),
+			'title' => sanitize_text_field( trim( $result, ' "\'' ) ),
 		);
 	}
 
@@ -220,16 +195,15 @@ protected function meta(): array {
 	}
 
 	/**
-	 * Generates title suggestions from the given content.
+	 * Generates a title suggestion from the given content.
 	 *
 	 * @since 0.1.0
 	 *
-	 * @param string $content The content to generate title suggestions for.
+	 * @param string                       $content The content to generate a title suggestion for.
 	 * @param string|array<string, string> $context Additional context to use.
-	 * @param int $candidates The number of titles to generate.
-	 * @return array<string>|\WP_Error The generated titles, or a WP_Error if there was an error.
+	 * @return string|\WP_Error The generated title, or a WP_Error if there was an error.
 	 */
-	protected function generate_titles( string $content, $context, int $candidates = 1 ) {
+	protected function generate_title( string $content, $context ) {
 		// Convert the context to a string if it's an array.
 		if ( is_array( $context ) ) {
 			$context = implode(
@@ -255,12 +229,17 @@ static function ( $key, $value ) {
 			$content .= "\n\n<additional-context>" . $context . '</additional-context>';
 		}
 
-		// Generate the titles using the AI client.
-		return wp_ai_client_prompt( $content )
+		// Generate the title using the AI client.
+		$result = wp_ai_client_prompt( $content )
 			->using_system_instruction( $this->get_system_instruction() )
 			->using_temperature( 0.7 )
-			->using_candidate_count( absint( $candidates ) )
 			->using_model_preference( ...get_preferred_models_for_text_generation() )
-			->generate_texts();
+			->generate_text();
+
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		}
+
+		return $result;
 	}
 }