add support for OpenAIEmbedding

10up · Aug 30, 2024 · 8ffd0f0 · 8ffd0f0
1 parent 8f1d26a
commit 8ffd0f0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 11 deletions.
diff --git a/includes/Classifai/Providers/Azure/Embeddings.php b/includes/Classifai/Providers/Azure/Embeddings.php
@@ -358,9 +358,13 @@ public function get_post_classifier_embeddings_preview_data(): array {
 		// Add terms to this item based on embedding data.
 		if ( $embeddings && ! is_wp_error( $embeddings ) ) {
 			$embeddings_terms = $this->get_terms( $embeddings );
+
+			if ( is_wp_error( $embeddings_terms ) ) {
+				wp_send_json_error( $embeddings_terms->get_error_message() );
+			}
 		}
 
-		return wp_send_json_success( $embeddings_terms );
+		wp_send_json_success( $embeddings_terms );
 	}
 
 	/**

diff --git a/includes/Classifai/Providers/OpenAI/Embeddings.php b/includes/Classifai/Providers/OpenAI/Embeddings.php
@@ -470,9 +470,13 @@ public function get_post_classifier_embeddings_preview_data(): array {
 		// Add terms to this item based on embedding data.
 		if ( $embeddings && ! is_wp_error( $embeddings ) ) {
 			$embeddings_terms = $this->get_terms( $embeddings );
+
+			if ( is_wp_error( $embeddings_terms ) ) {
+				wp_send_json_error( $embeddings_terms->get_error_message() );
+			}
 		}
 
-		return wp_send_json_success( $embeddings_terms );
+		wp_send_json_success( $embeddings_terms );
 	}
 
 	/**
@@ -683,31 +687,29 @@ function ( $a, $b ) {
 		}
 
 		// Prepare the results.
-		$index   = 0;
 		$results = [];
 
 		foreach ( $sorted_results as $tax => $terms ) {
 			// Get the taxonomy name.
 			$taxonomy = get_taxonomy( $tax );
 			$tax_name = $taxonomy->labels->singular_name;
 
-			// Setup our taxonomy object.
-			$results[] = new \stdClass();
-
-			$results[ $index ]->{$tax_name} = [];
+			// Initialize the taxonomy bucket in results.
+			$results[ $tax ] = [
+				'label' => $tax_name,
+				'data'  => []
+			];
 
 			foreach ( $terms as $term ) {
 				// Convert $similarity to percentage.
 				$similarity = round( ( 1 - $term['similarity'] ), 10 );
 
 				// Store the results.
-				$results[ $index ]->{$tax_name}[] = [ // phpcs:ignore Squiz.PHP.DisallowMultipleAssignments.Found
+				$results[ $tax ]['data'][] = [
 					'label' => get_term( $term['term_id'] )->name,
 					'score' => $similarity,
 				];
 			}
-
-			++$index;
 		}
 
 		return $results;

diff --git a/src/js/settings/components/feature-additional-settings/classification.js b/src/js/settings/components/feature-additional-settings/classification.js
@@ -338,27 +338,37 @@ function PreviewerResults() {
 
 	return (
 		<div className='classifai__classification-previewer-search-result-container'>
-			{ 'azure_openai_embeddings' === activeProvider && <AzureOpenAIEmbeddingsResults postId={ selectedPostId } /> }
+			{ 'azure_openai_embeddings' === activeProvider || 'openai_embeddings' === activeProvider && <AzureOpenAIEmbeddingsResults postId={ selectedPostId } /> }
 		</div>
 	);
 }
 
 function AzureOpenAIEmbeddingsResults( { postId } ) {
 	const {
+		isPreviewUnderProcess,
 		setPreviewUnderProcess,
 		setIsPreviewerOpen,
 	} = useContext( PreviewerProviderContext );
 
 	const [ responseData, setResponseData ] = useState( [] );
+	const [ errorMessage, setErrorMessage ] = useState( '' );
 	const settings = useSelect( ( select ) => select( STORE_NAME ).getFeatureSettings() );
 
+	useEffect( () => {
+		// Reset previous results.
+		if ( isPreviewUnderProcess ) {
+			setResponseData( [] );
+		}
+	}, [ isPreviewUnderProcess ] );
+
 	useEffect( () => {
 		if ( ! postId ) {
 			return;
 		}
 
 		setPreviewUnderProcess( true );
 		setIsPreviewerOpen( true );
+		setErrorMessage( '' );
 
 		const formData = new FormData();
 
@@ -384,6 +394,8 @@ function AzureOpenAIEmbeddingsResults( { postId } ) {
 
 			if ( responseJSON.success ) {
 				setResponseData( responseJSON.data );
+			} else {
+				setErrorMessage( responseJSON.data );
 			}
 
 			setPreviewUnderProcess( false );
@@ -419,6 +431,14 @@ function AzureOpenAIEmbeddingsResults( { postId } ) {
 		)
 	} );
 
+	if ( errorMessage ) {
+		return (
+			<Notice status='error' isDismissible={ false } className='classifai__classification-previewer-result-notice'>
+				{ errorMessage }
+			</Notice>
+		);
+	}
+
 	return card.length ? (
 		<>
 			<Notice status='success' isDismissible={ false } className='classifai__classification-previewer-result-notice'>