CYS - AI Improvements

plugins/woocommerce/patterns/hero-product-3-split.php

@@ -7,10 +7,10 @@
 
 use Automattic\WooCommerce\Blocks\Patterns\PatternsHelper;
 
-$main_title   = $content['titles'][0]['default'] ?? '';
-$first_title  = $content['titles'][1]['default'] ?? '';
-$second_title = $content['titles'][2]['default'] ?? '';
-$third_title  = $content['titles'][3]['default'] ?? '';
+$main_title   = $content['titles'][3]['default'] ?? '';
+$first_title  = $content['titles'][0]['default'] ?? '';
+$second_title = $content['titles'][1]['default'] ?? '';
+$third_title  = $content['titles'][2]['default'] ?? '';
 
 $first_description  = $content['descriptions'][0]['default'] ?? '';
 $second_description = $content['descriptions'][1]['default'] ?? '';

plugins/woocommerce/patterns/testimonials-3-columns.php

@@ -7,10 +7,10 @@
 
 use Automattic\WooCommerce\Blocks\Patterns\PatternsHelper;
 
-$main_header        = $content['titles'][0]['default'] ?? '';
-$first_review       = $content['titles'][1]['default'] ?? '';
-$second_review      = $content['titles'][2]['default'] ?? '';
-$third_review       = $content['titles'][3]['default'] ?? '';
+$main_header        = $content['titles'][3]['default'] ?? '';
+$first_review       = $content['titles'][0]['default'] ?? '';
+$second_review      = $content['titles'][1]['default'] ?? '';
+$third_review       = $content['titles'][2]['default'] ?? '';
 $first_description  = $content['descriptions'][0]['default'] ?? '';
 $second_description = $content['descriptions'][1]['default'] ?? '';
 $third_description  = $content['descriptions'][2]['default'] ?? '';

plugins/woocommerce/src/Blocks/AI/Connection.php

@@ -20,23 +20,29 @@ class Connection {
 	 * @param string $token The JWT token.
 	 * @param string $prompt The prompt to send to the API.
 	 * @param int    $timeout The timeout for the request.
+	 * @param string $response_format The response format.
 	 *
 	 * @return mixed
 	 */
-	public function fetch_ai_response( $token, $prompt, $timeout = 15 ) {
+	public function fetch_ai_response( $token, $prompt, $timeout = 15, $response_format = null ) {
 		if ( $token instanceof \WP_Error ) {
 			return $token;
 		}
 
+		$body = array(
+			'feature' => 'woocommerce_blocks_patterns',
+			'prompt'  => $prompt,
+			'token'   => $token,
+		);
+
+		if ( $response_format ) {
+			$body['response_format'] = $response_format;
+		}
+
 		$response = wp_remote_post(
 			self::TEXT_COMPLETION_API_URL,
 			array(
-				'body'    =>
-					array(
-						'feature' => 'woocommerce_blocks_patterns',
-						'prompt'  => $prompt,
-						'token'   => $token,
-					),
+				'body'    => $body,
 				'timeout' => $timeout,
 			)
 		);
@@ -56,27 +62,32 @@ public function fetch_ai_response( $token, $prompt, $timeout = 15 ) {
 	 * @param string $token The JWT token.
 	 * @param array  $prompts The prompts to send to the API.
 	 * @param int    $timeout The timeout for the request.
+	 * @param string $response_format The response format.
 	 *
 	 * @return array|WP_Error The responses or a WP_Error object.
 	 */
-	public function fetch_ai_responses( $token, array $prompts, $timeout = 15 ) {
+	public function fetch_ai_responses( $token, array $prompts, $timeout = 15, $response_format = null ) {
 		if ( $token instanceof \WP_Error ) {
 			return $token;
 		}
 
 		$requests = array();
 		foreach ( $prompts as $prompt ) {
+			$data = array(
+				'feature' => 'woocommerce_blocks_patterns',
+				'prompt'  => $prompt,
+				'token'   => $token,
+			);
+
+			if ( $response_format ) {
+				$data['response_format'] = $response_format;
+			}
+
 			$requests[] = array(
 				'url'     => self::TEXT_COMPLETION_API_URL,
 				'type'    => 'POST',
 				'headers' => array( 'Content-Type' => 'application/json; charset=utf-8' ),
-				'data'    => wp_json_encode(
-					array(
-						'feature' => 'woocommerce_blocks_patterns',
-						'prompt'  => $prompt,
-						'token'   => $token,
-					)
-				),
+				'data'    => wp_json_encode( $data ),
 			);
 		}
 

plugins/woocommerce/src/Blocks/Images/Pexels.php

@@ -93,7 +93,7 @@ public function get_images( $ai_connection, $token, $business_description ) {
 			return new \WP_Error( 'woocommerce_no_images_found', __( 'No images found.', 'woocommerce' ) );
 		}
 
-		return $refined_images;
+		return array( 'images' => $refined_images, 'search_term' => $search_term );
 	}
 
 	/**
@@ -108,7 +108,7 @@ public function get_images( $ai_connection, $token, $business_description ) {
 	 * @return mixed|\WP_Error
 	 */
 	private function define_search_term( $ai_connection, $token, $business_description ) {
-		$prompt = sprintf( 'Based on the description "%s", generate one word that precisely describe what this business is selling. The returned word should be as accurate as possible to describe the products sold, do not include any adjectives or descriptions of the qualities of the product. The generated word must exist in the english dictionary and not be a proper name, the returned word should be simple, do not add any explanations.', $business_description );
+		$prompt = sprintf( 'You are a teacher. Based on the following business description, \'%s\', describe to a child exactly what this store is selling in one or two words and be as precise as you can possibly be. Do not reply with generic words that could cause confusion and be associated with other businesses as a response. Make sure you do not add double quotes in your response. Do not add any explanations in the response', $business_description );
 
 		$response = $ai_connection->fetch_ai_response( $token, $prompt, 30 );
 
@@ -141,7 +141,7 @@ private function refine_returned_images_results( $ai_connection, $token, $busine
 			}
 		}
 
-		$prompt = sprintf( 'Compare the following business description: "%s" with the image titles listed in the JSON below: if the image is not aligned with what the business is selling, delete the description from the list. Do not include any explanations or introductions to the response. The JSON is: %s', $business_description, wp_json_encode( $image_titles ) );
+		$prompt = sprintf( 'Given that you own a store described as "%s", remove from the following JSON all titles that do not represent products that could be sold on your store: %s', $business_description, wp_json_encode( $image_titles ) );
 
 		$response = $ai_connection->fetch_ai_response( $token, $prompt, 30 );
 

plugins/woocommerce/src/Blocks/Patterns/PatternUpdater.php

@@ -36,10 +36,6 @@ class PatternUpdater {
 	 * @return bool|WP_Error
 	 */
 	public function generate_content( $ai_connection, $token, $images, $business_description ) {
-		if ( empty( $images ) ) {
-			return new \WP_Error( 'images_not_found', __( 'No images provided for generating AI content.', 'woocommerce' ) );
-		}
-
 		if ( is_wp_error( $images ) ) {
 			return $images;
 		}
@@ -48,6 +44,10 @@ public function generate_content( $ai_connection, $token, $images, $business_des
 			return $token;
 		}
 
+		if ( ! isset( $images['images'] ) ) {
+			return new \WP_Error( 'images_not_found', __( 'No images provided for generating AI content.', 'woo-gutenberg-products-block' ) );
+		}
+
 		$last_business_description = get_option( 'last_business_description_with_ai_content_generated' );
 
 		if ( $last_business_description === $business_description ) {
@@ -58,11 +58,11 @@ public function generate_content( $ai_connection, $token, $images, $business_des
 			}
 		}
 
-		if ( 0 === count( $images ) ) {
+		if ( 0 === count( $images['images'] ) ) {
 			$images = get_transient( 'woocommerce_ai_managed_images' );
 		}
 
-		if ( empty( $images ) ) {
+		if ( empty( $images['images'] ) ) {
 			return new WP_Error( 'no_images_found', __( 'No images found.', 'woocommerce' ) );
 		}
 
@@ -75,7 +75,7 @@ public function generate_content( $ai_connection, $token, $images, $business_des
 			return $patterns_dictionary;
 		}
 
-		$patterns = $this->assign_selected_images_to_patterns( $patterns_dictionary, $images );
+		$patterns = $this->assign_selected_images_to_patterns( $patterns_dictionary, $images['images'] );
 
 		if ( is_wp_error( $patterns ) ) {
 			return new WP_Error( 'failed_to_set_pattern_images', __( 'Failed to set the pattern images.', 'woocommerce' ) );
@@ -218,7 +218,7 @@ private function format_prompts_for_ai( array $prompts, string $business_descrip
 		$formatted_prompts = [];
 		foreach ( $prompts as $prompt ) {
 			$formatted_prompts[] = sprintf(
-				"Given the following description '%s' generate long texts for the sections using the following prompts for each one of them: `'%s'`. Ensure each entry is unique and does not repeat the given examples. The response should be an array of data in JSON format. Each element should be an object with the pattern name as the key, and the generated content as values. Do not include backticks or the word json in the response. Here's an example format: `'%s'`",
+				"You are an experienced writer. Given a business described as: '%s', generate content for the sections using the following prompts for each one of them: `'%s'`, always making sure that the expected number of characters is respected. The response should be an array of data in JSON format. Each element should be an object with the pattern name as the key, and the generated content as values. Here's an example format: `'%s'`",
 				$business_description,
 				wp_json_encode( $prompt ),
 				wp_json_encode( $expected_results_format[ $i ] )
@@ -245,7 +245,7 @@ private function fetch_and_validate_ai_responses( $ai_connection, $token, $forma
 		$success            = false;
 		while ( $ai_request_retries < 5 && ! $success ) {
 			$ai_request_retries ++;
-			$ai_responses = $ai_connection->fetch_ai_responses( $token, $formatted_prompts, 60 );
+			$ai_responses = $ai_connection->fetch_ai_responses( $token, $formatted_prompts, 60, 'json_object' );
 
 			if ( is_wp_error( $ai_responses ) ) {
 				continue;

plugins/woocommerce/src/Blocks/Patterns/PatternsHelper.php

@@ -8,52 +8,6 @@
  * Pattern Images Helper class.
  */
 class PatternsHelper {
-	/**
-	 * Returns the pattern content.
-	 *
-	 * @param string $pattern_slug The pattern slug.
-	 *
-	 * @return array The pattern content.
-	 */
-	public static function get_pattern_content( string $pattern_slug ) {
-		$pattern = self::get_patterns_dictionary( $pattern_slug );
-
-		if ( empty( $pattern ) ) {
-			return array();
-		}
-
-		if ( ! isset( $pattern['content'] ) ) {
-			return array();
-		}
-
-		return $pattern['content'];
-	}
-
-	/**
-	 * Returns the pattern images.
-	 *
-	 * @param string $pattern_slug The pattern slug.
-	 *
-	 * @return array The pattern images.
-	 */
-	public static function get_pattern_images( string $pattern_slug ): array {
-		$pattern = self::get_patterns_dictionary( $pattern_slug );
-
-		if ( empty( $pattern ) ) {
-			return array();
-		}
-
-		if ( ! isset( $pattern['images'] ) ) {
-			return array();
-		}
-
-		if ( ! isset( $pattern['images_total'] ) ) {
-			return array();
-		}
-
-		return $pattern['images'];
-	}
-
 	/**
 	 * Returns the image for the given pattern.
 	 *