<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12626] sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers: Translate: Use the faster ajax version for fetching the chatgpt review</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12626">12626</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12626","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>akirk</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-06 15:41:05 +0000 (Tue, 06 Jun 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Translate: Use the faster ajax version for fetching the chatgpt review</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgpopenaireviewphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-openai-review.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgptranslationhelpersphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersjseditorjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/editor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgpopenaireviewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-openai-review.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-openai-review.php 2023-06-06 15:39:20 UTC (rev 12625)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-openai-review.php 2023-06-06 15:41:05 UTC (rev 12626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function get_openai_review( $original_singular, $translation, $locale, $glossary_query, $is_retry ): array {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_openai_review( $original, $translation, $language, $glossary_query, $is_retry ): array {
</ins><span class="cx" style="display: block; padding: 0 10px"> $openai_query = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $openai_key = apply_filters( 'gp_get_openai_key', self::$gp_openai_key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $openai_temperature = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 . '?';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $openai_query .= 'For the english text "' . $original . '", is "' . $translation . '" a correct translation in ' . $language . '?';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $glossary_query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'system',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,17 +64,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response_status = wp_remote_retrieve_response_code( $openai_response );
</span><span class="cx" style="display: block; padding: 0 10px"> $output = json_decode( wp_remote_retrieve_body( $openai_response ), true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 200 !== $response_status || is_wp_error( $openai_response ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['openai']['status'] = $response_status;
- $response['openai']['error'] = wp_remote_retrieve_response_message( $openai_response );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['status'] = $response_status;
+ $response['error'] = wp_remote_retrieve_response_message( $openai_response );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $response;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $output['choices'][0]['message'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['openai']['status'] = $response_status;
- $response['openai']['review'] = trim( trim( $message['content'] ), '"' );
- $response['openai']['time_taken'] = $time_taken;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['status'] = $response_status;
+ $response['review'] = trim( trim( $message['content'] ), '"' );
+ $response['time_taken'] = $time_taken;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $response;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersincludesclassgptranslationhelpersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php 2023-06-06 15:39:20 UTC (rev 12625)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php 2023-06-06 15:41:05 UTC (rev 12626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,17 +445,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function fetch_openai_review() {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'gp_comment_feedback', 'nonce' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $translation = GP::$translation->get( $translation_id );
- $original = GP::$original->get( $translation->original_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $openai_response = GP_OpenAI_Review::get_openai_review( $original, $translation, $language, $glossary, $is_retry );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_send_json_success( $openai_response );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpersjseditorjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/editor.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/editor.js 2023-06-06 15:39:20 UTC (rev 12625)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/editor.js 2023-06-06 15:41:05 UTC (rev 12626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var data = {};
</span><span class="cx" style="display: block; padding: 0 10px"> var original_str = currentRow.find( '.original' );
</span><span class="cx" style="display: block; padding: 0 10px"> var glossary_prompt = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var translationId = $gp.editor.translation_id_from_row_id( rowId );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var translation = currentRow.find( '.foreign-text:first' ).val();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.each( $( original_str ).find( '.glossary-word' ), function( k, word ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $.each( $( word ).data( 'translations' ), function( i, e ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,8 +258,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== glossary_prompt ) {
</span><span class="cx" style="display: block; padding: 0 10px"> glossary_prompt = 'You are required to follow these rules, ' + glossary_prompt + 'for words found in the English text you are translating.';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- payload.locale_slug = $gp_comment_feedback_settings.locale_slug;
- payload.translation_id = translationId;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ payload.language = $gp_comment_feedback_settings.language;
+ payload.original = currentRow.find( '.original-raw' ).text();
+ payload.translation = translation;
</ins><span class="cx" style="display: block; padding: 0 10px"> payload.glossary_query = glossary_prompt;
</span><span class="cx" style="display: block; padding: 0 10px"> payload.is_retry = isRetry;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $.ajax(
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'POST',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url: $gp_comment_feedback_settings.url,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url: '/wp-content/plugins/wporg-gp-translation-suggestions/ajax-fetch-openai-review.php',
</ins><span class="cx" style="display: block; padding: 0 10px"> data: data,
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ).done(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> currentRow.find( '.openai-review .suggestions__loading-indicator' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 200 === response.data.status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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)' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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)' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> currentRow.find( '.openai-review .auto-review-result' ).text( 'Error ' + response.data.status + ' : ' + response.data.error );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>