Changeset 12626

Timestamp:

06/06/2023 03:41:05 PM (23 months ago)

Author:

akirk

Message:

Translate: Use the faster ajax version for fetching the chatgpt review

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers

Files:

• includes/class-gp-openai-review.php (modified) (3 diffs)
• includes/class-gp-translation-helpers.php (modified) (1 diff)
• js/editor.js (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-openai-review.php

@@ -20 +20 @@
      * @return array
      */
-    public static function get_openai_review( $original_singular, $translation, $locale, $glossary_query, $is_retry ): array {
+    public static function get_openai_review( $original, $translation, $language, $glossary_query, $is_retry ): array {
         $openai_query = '';
         $openai_key   = apply_filters( 'gp_get_openai_key', self::$gp_openai_key );
@@ -29 +29 @@
         $openai_temperature = 0;
 
-        $gp_locale     = GP_Locales::by_field( 'slug', $locale );
-        $openai_query .= 'For the english text  "' . $original_singular . '", is "' . $translation . '" a correct translation in ' . $gp_locale->english_name . '?';
+        $openai_query .= 'For the english text  "' . $original . '", is "' . $translation . '" a correct translation in ' . $language . '?';
         if ( $glossary_query ) {
             $messages[] = array(
@@ -66 +65 @@
         $response_status = wp_remote_retrieve_response_code( $openai_response );
         $output          = json_decode( wp_remote_retrieve_body( $openai_response ), true );
+        $response = array();
 
         if ( 200 !== $response_status || is_wp_error( $openai_response ) ) {
-            $response['openai']['status'] = $response_status;
-            $response['openai']['error']  = wp_remote_retrieve_response_message( $openai_response );
+            $response['status'] = $response_status;
+            $response['error']  = wp_remote_retrieve_response_message( $openai_response );
             return $response;
         }
 
         $message                          = $output['choices'][0]['message'];
-        $response['openai']['status']     = $response_status;
-        $response['openai']['review']     = trim( trim( $message['content'] ), '"' );
-        $response['openai']['time_taken'] = $time_taken;
+        $response['status']     = $response_status;
+        $response['review']     = trim( trim( $message['content'] ), '"' );
+        $response['time_taken'] = $time_taken;
 
         return $response;

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php

@@ -446 +446 @@
     public static function fetch_openai_review() {
         check_ajax_referer( 'gp_comment_feedback', 'nonce' );
-        $translation_id = sanitize_text_field( $_POST['data']['translation_id'] );
-        $locale_slug    = sanitize_text_field( $_POST['data']['locale_slug'] );
-        $glossary_query = sanitize_text_field( $_POST['data']['glossary_query'] );
-        $is_retry       = filter_var( $_POST['data']['is_retry'], FILTER_VALIDATE_BOOLEAN );
-
-        $translation = GP::$translation->get( $translation_id );
-        $original    = GP::$original->get( $translation->original_id );
-
-        $openai_response = GP_OpenAI_Review::get_openai_review( $original->singular, $translation->translation_0, $locale_slug, $glossary_query, $is_retry );
-
-        wp_send_json_success( $openai_response['openai'] );
+        $original    = sanitize_text_field( $_POST['data']['original'] );
+        $translation = sanitize_text_field( $_POST['data']['translation'] );
+        $language    = sanitize_text_field( $_POST['data']['language'] );
+        $glossary    = sanitize_text_field( $_POST['data']['glossary_query'] );
+        $is_retry    = filter_var( $_POST['data']['is_retry'], FILTER_VALIDATE_BOOLEAN );
+
+        $openai_response = GP_OpenAI_Review::get_openai_review( $original, $translation, $language, $glossary, $is_retry );
+
+        wp_send_json_success( $openai_response );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/editor.js

@@ -244 +244 @@
         var original_str = currentRow.find( '.original' );
         var glossary_prompt = '';
-        var translationId = $gp.editor.translation_id_from_row_id( rowId );
+        var translation = currentRow.find( '.foreign-text:first' ).val();
 
         $.each( $( original_str ).find( '.glossary-word' ), function( k, word ) {
@@ -259 +259 @@
             glossary_prompt = 'You are required to follow these rules, ' + glossary_prompt + 'for words found in the English text you are translating.';
         }
-        payload.locale_slug = $gp_comment_feedback_settings.locale_slug;
-        payload.translation_id = translationId;
+        payload.language = $gp_comment_feedback_settings.language;
+        payload.original = currentRow.find( '.original-raw' ).text();
+        payload.translation = translation;
         payload.glossary_query = glossary_prompt;
         payload.is_retry = isRetry;
@@ -273 +274 @@
             {
                 type: 'POST',
-                url: $gp_comment_feedback_settings.url,
+                url: '/wp-content/plugins/wporg-gp-translation-suggestions/ajax-fetch-openai-review.php',
                 data: data,
             }
@@ -280 +281 @@
                 currentRow.find( '.openai-review .suggestions__loading-indicator' ).hide();
                 if ( 200 === response.data.status ) {
-                    currentRow.find( '.openai-review .auto-review-result' ).html( '<h4>Auto-review by ChatGPT' ).append( $( '<span/>' ).text( response.data.review + ' (' + response.data.time_taken.toFixed( 2 ) + 's)' ) );
+                    currentRow.find( '.openai-review .auto-review-result' ).html( '<h4>Review by ChatGPT' ).append( $( '<span/>' ).text( response.data.review + ' (' + response.data.time_taken.toFixed( 2 ) + 's)' ) );
                 } else {
                     currentRow.find( '.openai-review .auto-review-result' ).text( 'Error ' + response.data.status + ' : ' + response.data.error );