← All changes | includes/class-mxchat-utils.php +25 -87 3.2.5 → 3.1.3 View file →

		@@ -5,51 +5,8 @@
5	5
6	6	class MxChat_Utils {
7	7
8	8	/**
9		- * Centralized embedding model registry. Single source of truth for dimensions
10		- * and provider, so model-switch protection logic doesn't drift across files.
11		- */
12		-public static function embedding_model_registry() {
13		- return array(
14		- 'text-embedding-ada-002' => array('dims' => 1536, 'provider' => 'openai', 'label' => 'Ada 2'),
15		- 'text-embedding-3-small' => array('dims' => 1536, 'provider' => 'openai', 'label' => 'TE3 Small'),
16		- 'text-embedding-3-large' => array('dims' => 3072, 'provider' => 'openai', 'label' => 'TE3 Large'),
17		- 'voyage-3-large' => array('dims' => 2048, 'provider' => 'voyage', 'label' => 'Voyage-3 Large'),
18		- 'gemini-embedding-001' => array('dims' => 1536, 'provider' => 'gemini', 'label' => 'Gemini Embedding'),
19		- );
20		-}
21		-
22		-public static function embedding_model_dimensions($model) {
23		- $registry = self::embedding_model_registry();
24		- return isset($registry[$model]) ? (int) $registry[$model]['dims'] : 0;
25		-}
26		-
27		-public static function embedding_model_label($model) {
28		- $registry = self::embedding_model_registry();
29		- return isset($registry[$model]) ? $registry[$model]['label'] : $model;
30		-}
31		-
32		-/**
33		- * Returns the model that was last used to actually write embeddings into the
34		- * KB. Differs from the user-selected setting once a switch has happened but
35		- * no re-embed has occurred yet — that's the mismatch state we warn about.
36		- */
37		-public static function get_active_embedding_model() {
38		- return get_option('mxchat_active_embedding_model', '');
39		-}
40		-
41		-/**
42		- * Stamp the model that produced the most recent successful embedding. Called
43		- * from generate_embedding() right after the API responds with a valid vector.
44		- */
45		-public static function stamp_active_embedding_model($model) {
46		- if (!empty($model) && $model !== self::get_active_embedding_model()) {
47		- update_option('mxchat_active_embedding_model', $model, false);
48		- }
49		-}
50		-
51		-/**
52	9	* UPDATED: Submit or update content (and its embedding) in the database.
53	10	* Stores in Pinecone if enabled, otherwise stores in WordPress DB.
54	11	*
55	12	* @param string $content The content to be embedded.
		@@ -220,15 +177,9 @@
220	177	}
221	178
222	179	// ===== FIXED: Generate unique identifier for manual content =====
223	180	$original_source_url = $source_url;
224		- // Check if this is truly manual content (no URL at all) vs a real URL that filter_var rejects
225		- // filter_var(FILTER_VALIDATE_URL) rejects valid URLs with encoded chars, non-ASCII, fragments, etc.
226		- // Use a looser check: if it starts with http(s):// or has a scheme, it's a URL
227		- $has_url_scheme = !empty($source_url) && preg_match('#^https?://#i', $source_url);
228		- // Treat legacy mxchat.ai source URLs as manual — old bug assigned the site URL to manual entries
229		- $is_legacy_mxchat_url = $has_url_scheme && strpos($source_url, 'mxchat.ai') !== false;
230		- $is_manual_content = empty($source_url) || $source_url === '' || !$has_url_scheme || $is_legacy_mxchat_url;
	181	+ $is_manual_content = empty($source_url) || $source_url === '' || !filter_var($source_url, FILTER_VALIDATE_URL);
231	182
232	183	if ($is_manual_content) {
233	184	// Generate unique identifier for manual content to prevent overwrites
234	185	$source_url = 'mxchat://manual-content/' . time() . '-' . wp_generate_password(8, false);
		@@ -352,14 +303,14 @@
352	303	// ===== UPDATED: Handle manual content with unique vector IDs =====
353	304	if ($vector_id) {
354	305	// Use provided vector ID
355	306	//error_log('[MXCHAT-PINECONE-MAIN] Using provided vector ID: ' . $vector_id);
356		- } elseif (!empty($url) && preg_match('#^https?://#i', $url)) {
357		- // For URLs, use URL-based ID (existing behavior)
	307	+ } elseif (!empty($url) && filter_var($url, FILTER_VALIDATE_URL)) {
	308	+ // For valid URLs, use URL-based ID (existing behavior)
358	309	$vector_id = md5($url);
359	310	//error_log('[MXCHAT-PINECONE-MAIN] Generated vector ID from URL: ' . $vector_id);
360	311	} else {
361		- // For manual content (empty/no URL scheme), generate unique ID
	312	+ // For manual content (empty/invalid URL), generate unique ID
362	313	$vector_id = 'manual_' . time() . '_' . substr(md5($content . microtime(true)), 0, 8);
363	314	//error_log('[MXCHAT-PINECONE-MAIN] Generated unique vector ID for manual content: ' . $vector_id);
364	315	}
365	316	// ===== END UPDATE =====
		@@ -395,9 +346,9 @@
395	346	// Fallback to old detection logic for backwards compatibility
396	347	$is_product = false;
397	348	$content_type = 'manual'; // Default for manual content
398	349
399		- if (!empty($url) && preg_match('#^https?://#i', $url)) {
	350	+ if (!empty($url) && filter_var($url, FILTER_VALIDATE_URL)) {
400	351	$is_product = (strpos($url, '/product/') !== false || strpos($url, '/shop/') !== false);
401	352	$content_type = $is_product ? 'product' : 'content';
402	353	}
403	354	}
		@@ -414,9 +365,9 @@
414	365	'source_url' => $url, // Can be empty for manual content
415	366	'type' => $content_type, // Now supports: post, page, pdf, url, manual, product, etc.
416	367	'last_updated' => time(),
417	368	'created_at' => time(), // Add creation timestamp
418		- 'bot_id' => $bot_id, // Add bot identification
	369	+ 'bot_id' => $bot_id // Add bot identification
419	370	);
420	371
421	372	$vector_data = array(
422	373	'id' => $vector_id,
		@@ -564,9 +515,8 @@
564	515	// Handle different response formats based on provider
565	516	if (strpos($selected_model, 'gemini-embedding') === 0) {
566	517	// Gemini API response format
567	518	if (isset($response_body['embedding']['values']) && is_array($response_body['embedding']['values'])) {
568		- self::stamp_active_embedding_model($selected_model);
569	519	return $response_body['embedding']['values'];
570	520	} else {
571	521	//error_log('Invalid response received from Gemini embedding API for bot ' . $bot_id . ': ' . wp_json_encode($response_body));
572	522	return null;
		@@ -573,9 +523,8 @@
573	523	}
574	524	} else {
575	525	// OpenAI/Voyage API response format
576	526	if (isset($response_body['data'][0]['embedding']) && is_array($response_body['data'][0]['embedding'])) {
577		- self::stamp_active_embedding_model($selected_model);
578	527	return $response_body['data'][0]['embedding'];
579	528	} else {
580	529	//error_log('Invalid response received from embedding API for bot ' . $bot_id . ': ' . wp_json_encode($response_body));
581	530	return null;
		@@ -731,9 +680,9 @@
731	680	'total_chunks' => $chunk_metadata['total_chunks'],
732	681	'parent_url_hash' => $chunk_metadata['parent_url_hash'],
733	682	'last_updated' => time(),
734	683	'created_at' => time(),
735		- 'bot_id' => $bot_id,
	684	+ 'bot_id' => $bot_id
736	685	);
737	686
738	687	$vector_data = array(
739	688	'id' => $vector_id,
		@@ -849,34 +798,31 @@
849	798
850	799	// Add the original single-vector ID (for non-chunked content)
851	800	$vectors_to_delete[] = $base_vector_id;
852	801
853		- // Pinecone /vectors/list is a GET endpoint with query-string parameters; a POST here returns a
854		- // non-200 silently and we end up only deleting the base vector, leaving chunks orphaned.
855		- $query_params = array(
	802	+ // Use Pinecone list API to find all chunk vectors with this prefix
	803	+ $list_url = "https://{$host}/vectors/list";
	804	+
	805	+ $list_body = array(
856	806	'prefix' => $base_vector_id . '_chunk_',
857		- 'limit' => 100,
	807	+ 'limit' => 100
858	808	);
	809	+
859	810	if (!empty($namespace)) {
860		- $query_params['namespace'] = $namespace;
	811	+ $list_body['namespace'] = $namespace;
861	812	}
862	813
863		- $list_url = "https://{$host}/vectors/list?" . http_build_query($query_params);
	814	+ $list_response = wp_remote_post($list_url, array(
	815	+ 'headers' => array(
	816	+ 'Api-Key' => $api_key,
	817	+ 'accept' => 'application/json',
	818	+ 'content-type' => 'application/json'
	819	+ ),
	820	+ 'body' => wp_json_encode($list_body),
	821	+ 'timeout' => 30
	822	+ ));
864	823
865		- // Paginate in case a URL has more than 100 chunks.
866		- do {
867		- $list_response = wp_remote_get($list_url, array(
868		- 'headers' => array(
869		- 'Api-Key' => $api_key,
870		- 'accept' => 'application/json',
871		- ),
872		- 'timeout' => 30,
873		- ));
874		-
875		- if (is_wp_error($list_response) || wp_remote_retrieve_response_code($list_response) !== 200) {
876		- break;
877		- }
878		-
	824	+ if (!is_wp_error($list_response)) {
879	825	$list_data = json_decode(wp_remote_retrieve_body($list_response), true);
880	826	if (!empty($list_data['vectors'])) {
881	827	foreach ($list_data['vectors'] as $vector) {
882	828	if (isset($vector['id'])) {
		@@ -883,17 +829,9 @@
883	829	$vectors_to_delete[] = $vector['id'];
884	830	}
885	831	}
886	832	}
887		-
888		- $next_token = $list_data['pagination']['next'] ?? '';
889		- if (empty($next_token)) {
890		- break;
891		- }
892		-
893		- $query_params['paginationToken'] = $next_token;
894		- $list_url = "https://{$host}/vectors/list?" . http_build_query($query_params);
895		- } while (true);
	833	+ }
896	834
897	835	if (empty($vectors_to_delete)) {
898	836	//error_log('[MXCHAT-CHUNK-DELETE] No vectors found to delete');
899	837	return true;