Merge pull request #13 from OM4/feature/qa

Fixes during QA

Author: the-csaba

.distignore

@@ -5,6 +5,8 @@
 .git
 .github
 .gitignore
+.idea
+.vscode
 .wp-env.json
 *~
 /node_modules

assets/screenshot-1.png

@@ -46,7 +46,10 @@ public function __construct( Data $settings, OpenAiClient $client ) {
 	 * @param WC_Product $product The WooCommerce product to generate a description for.
 	 *
 	 * @return string The generated product description.
-	 * @throws Exception When an error occurs.
+	 *
+	 * @throws ClientException Is converted to an Exception.
+	 * @throws Exception When no API key exists.
+	 * @throws Exception When an API or moderation error occurs.
 	 */
 	public function generate( WC_Product $product ) {
 		$settings = $this->settings->get_settings();
@@ -74,6 +77,9 @@ public function generate( WC_Product $product ) {
 				$result = $this->client->moderations()->create(
 					new ModerationsRequest( array( 'input' => $prompt ) )
 				)->toArray();
+				if ( array_key_exists( 'error', $result ) ) {
+					throw new ClientException( $result['error']['message'] );
+				}
 
 				$flagged = (int) $result['results'][0]['flagged'];
 				set_transient( $key, $flagged, DAY_IN_SECONDS );
@@ -95,7 +101,7 @@ public function generate( WC_Product $product ) {
 			 *
 			 * @var array $result
 			 */
-			$result          = $completions->create(
+			$result = $completions->create(
 				new CompletionsRequest(
 					array(
 						'model'       => 'text-davinci-003',
@@ -105,6 +111,9 @@ public function generate( WC_Product $product ) {
 					)
 				)
 			)->toArray();
+			if ( array_key_exists( 'error', $result ) ) {
+				throw new ClientException( $result['error']['message'] );
+			}
 			$new_description = $result['choices'][0]['text'];
 
 			// Moderate the result.
@@ -117,6 +126,9 @@ public function generate( WC_Product $product ) {
 			$result = $this->client->moderations()->create(
 				new ModerationsRequest( array( 'input' => $new_description ) )
 			)->toArray();
+			if ( array_key_exists( 'error', $result ) ) {
+				throw new ClientException( $result['error']['message'] );
+			}
 
 			if ( $result['results'][0]['flagged'] ) {
 				throw new Exception(

assets/screenshot-2.png

@@ -142,6 +142,7 @@ public function copycraft_modal_content() {
 			echo '<button id="refresh" class="button button-primary button-large" title="' . esc_attr__( 'Generate a new description.', 'copycraft' ) . '">' . esc_html__( 'Try again', 'copycraft' ) . '</button>';
 			echo '<button id="discard" class="button button-primary button-large" title="' . esc_attr__( 'Return to the Edit Produt screen.', 'copycraft' ) . '">' . esc_html__( 'Discard', 'copycraft' ) . '</button>';
 			echo '</div>';
+			exit;
 		} catch ( Exception $e ) {
 			$this->error( esc_html( $e->getMessage() ) );
 		}