Changeset 12629

Timestamp:

06/07/2023 08:07:12 AM (3 years ago)

Author:

akirk

Message:

Translate: allow switching on thin ajax request via flag

Location:

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

Files:

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

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

@@ -25 +25 @@
 
                 if ( empty( trim( $openai_key ) ) ) {
-                        return array();
+                        return array(
+                                'status' => 404,
+                                'error' => 'No OpenAI Key defined',
+                        );
                 }
-                $openai_temperature = 0;
 
                 $openai_query .= 'For the english text  "' . $original . '", is "' . $translation . '" a correct translation in ' . $language . '?';
@@ -55 +57 @@
                                                 'n'           => 1,
                                                 'messages'    => $messages,
-                                                'temperature' => $openai_temperature,
                                         )
                                 ),

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

@@ -397 +397 @@
                 gp_enqueue_script( 'gp-comment-feedback-js' );
 
+                $gp_locale = GP_Locales::by_field( 'slug', $translation_set['locale_slug'] );
                 wp_localize_script(
                         'gp-comment-feedback-js',
@@ -404 +405 @@
                                 'nonce'           => wp_create_nonce( 'gp_comment_feedback' ),
                                 'locale_slug'     => $translation_set['locale_slug'],
+                                'language'        => $gp_locale ? $gp_locale->english_name : 'Unknown',
+                                'has_openai_key'  => !! apply_filters( 'gp_get_openai_key', null ),
                                 'comment_reasons' => Helper_Translation_Discussion::get_comment_reasons( $translation_set['locale_slug'] ),
                         )
@@ -453 +456 @@
 
                 $openai_response = GP_OpenAI_Review::get_openai_review( $original, $translation, $language, $glossary, $is_retry );
-
+                if ( isset( $openai_response['error'] ) ) {
+                        wp_send_json_error( $openai_response );
+                }
                 wp_send_json_success( $openai_response );
         }

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

@@ -26 +26 @@
                 focusedRowId = rowId;
                 loadTabsAndDivs( tr );
-                if ( $gp_editor_options.can_approve && ( 'waiting' === translation_status || 'fuzzy' === translation_status ) ) {
+                if ( $gp_comment_feedback_settings.has_openai_key && $gp_editor_options.can_approve && ( 'waiting' === translation_status || 'fuzzy' === translation_status ) ) {
                         fetchOpenAIReviewResponse( rowId, tr, false );
+                } else {
+                        tr.find( '.openai-review' ).hide();
                 }
         } );
@@ -274 +276 @@
                         {
                                 type: 'POST',
-                                url: '/wp-content/plugins/wporg-gp-translation-suggestions/ajax-fetch-openai-review.php',
+                                url: typeof window.useThinFetch !== 'undefined' && window.useThinFetch ? '/wp-content/plugins/wporg-gp-translation-suggestions/ajax-fetch-openai-review.php' : $gp_comment_feedback_settings.url,
                                 data: data,
                         }
@@ -280 +282 @@
                         function( response ) {
                                 currentRow.find( '.openai-review .suggestions__loading-indicator' ).hide();
-                                if ( 200 === response.data.status ) {
+                                if ( response.success ) {
                                         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 if ( 404 === response.data.status ) {
+                                        currentRow.find( '.openai-review' ).hide();
+                                        return;
                                 } else {
                                         currentRow.find( '.openai-review .auto-review-result' ).text( 'Error ' + response.data.status + ' : ' + response.data.error );
@@ -291 +296 @@
                                 /* eslint no-console: ["error", { allow: ["error"] }] */
                                 console.error( data );
-                                msg = 'An error has occurred';
-                                if ( xhr.responseText ) {
-                                        msg += ': ' + xhr.responseText;
-                                }
-                                msg += '. Please, take a screenshot of the output in the browser console, send it to the developers, and reload the page to see if it works.';
-                                $gp.notices.error( msg );
                         }
                 );