@griddo/cx 10.5.4 → 10.6.1

package/build/utils/core-utils.d.ts

@@ -41,8 +41,8 @@ declare function exporterCleanDisposableDirectories(domain: string): Promise<voi
  */
 declare function verbose(str: string): void;
 /**
- * Returns true for `true`, true, positive numbers
- * Returns false for `false`, false, 0, negative integers and anything else
+ * Returns true for "true", "on", true and positive numbers.
+ * Returns false for "false", "off", false, 0, negative integers and anything else.
  */
 declare function isTruthy(value: any): boolean;
 /**

package/build/utils/searches.d.ts

@@ -11,4 +11,5 @@ declare function postSearchInfo(props: PostSearchInfoProps): Promise<PostSearchI
  * send it to the search table in the ddbb using the API.
  */
 declare function uploadRenderedSearchContentToAPI(distDomainPath: string, domain: string): Promise<void>;
-export { postSearchInfo, uploadRenderedSearchContentToAPI };
+declare function startAIEmbeddings(): Promise<void>;
+export { postSearchInfo, startAIEmbeddings, uploadRenderedSearchContentToAPI };

package/cx.config.d.ts

@@ -11,6 +11,8 @@ declare const CXDir: {
 	SSG: "__ssg";
 	COMPONENTS: "__components";
 	ROOT: "__root";
+	EXPORT_DIST: "__exports_dist";
+	CX_DIST: "__cx_dist";
 };
 
 export type Artifact = "store" | "apiCache" | "dist" | "assets";

package/cx.config.js

@@ -28,6 +28,8 @@ const config = {
 		SSG: "__ssg",
 		COMPONENTS: "__components",
 		ROOT: "__root",
+		EXPORTS_DIST: "__exports_dist",
+		CX_DIST: "__cx_dist",
 	},
 	paths: (domain) => ({
 		__caches: path.join(CX_CACHE_DIR, domain || ""),
@@ -36,6 +38,8 @@ const config = {
 		__exports: path.join(EXPORTS_DIR, domain || ""),
 		__root: REPO_ROOT_DIR,
 		__ssg: SSG_DIR,
+		__exports_dist: domain ? path.join(EXPORTS_DIR, domain, "dist") : "",
+		__cx_dist: path.join(CX_ROOT_DIR, "dist"),
 	}),
 };
 

package/exporter/services/distributors.ts

@@ -105,10 +105,10 @@ class DistributorService {
 		const { site, lang } = data;
 
 		// Infor that the distributor has not dat.sources
-		if (!data.sources) {
+		if (!data.sources && data.mode === "auto") {
 			logBox(
-				`Warning: Page with id: ${page.id} in the site ${site} has a ReferenceField with \`undefined\` \`data.sources\``,
-				"Undefined data.sources in ReferenceField"
+				`Warning: Page with id: ${page.id} has a ReferenceField with \`undefined\` \`data.sources\``,
+				"undefined data.sources in ReferenceField"
 			);
 		}
 

package/exporter/types/global.ts

@@ -94,7 +94,9 @@ type CXDir =
 	| "__cx"
 	| "__ssg"
 	| "__components"
-	| "__root";
+	| "__root"
+	| "__exports_dist"
+	| "__cx_dist";
 
 interface CXConfig {
 	proDomain: string;
@@ -106,10 +108,17 @@ interface CXConfig {
 		SSG: "__ssg";
 		COMPONENTS: "__components";
 		ROOT: "__root";
+		EXPORTS_DIST: "__exports_dist";
+		CX_DIST: "__cx_dist";
 	};
 	paths: (domain?: string) => Record<CXDir, string>;
 }
 
+interface AIEmbeddingsResponse {
+	code: number;
+	message: string;
+}
+
 export {
 	BuildProcessData,
 	CXConfig,
@@ -123,4 +132,5 @@ export {
 	Robot,
 	Robots,
 	Settings,
+	type AIEmbeddingsResponse,
 };

package/exporter/upload-search-content.ts

@@ -1,35 +1,40 @@
 import fs from "node:fs";
-import path from "node:path";
 
-import pkgDir from "pkg-dir";
+import dotenv from "dotenv";
 
+import { getConfig, isTruthy } from "./utils/core-utils";
 import { getInstanceDomains } from "./utils/domains";
-import { uploadRenderedSearchContentToAPI } from "./utils/searches";
+import {
+	startAIEmbeddings,
+	uploadRenderedSearchContentToAPI,
+} from "./utils/searches";
 
-const doSearch = JSON.parse(process.env.GRIDDO_SEARCH_FEATURE || "false");
+dotenv.config();
 
-// Where we are going to find export folders
-const execBasePath = pkgDir.sync(path.resolve(__dirname, "../.."))!;
-
-// Where we are going to find archived exports
-const exportArchiveBasePath = path.resolve(execBasePath, "exports/sites");
+const GRIDDO_SEARCH_FEATURE = isTruthy(process.env.GRIDDO_SEARCH_FEATURE);
+const GRIDDO_AI_EMBEDDINGS = isTruthy(process.env.GRIDDO_AI_EMBEDDINGS);
 
 async function main() {
-	// Feature not enabled
-	if (!doSearch) {
+	if (!GRIDDO_SEARCH_FEATURE) {
 		return;
 	}
 
 	const domains = await getInstanceDomains();
+	const config = getConfig();
 
 	for (const domain of domains) {
-		const distDomainPath = path.resolve(exportArchiveBasePath, domain, "dist");
+		const { __exports_dist } = config.paths();
 
-		// If the export/sites/domain has not exported sites, do not upload search content.
-		if (fs.existsSync(distDomainPath)) {
-			await uploadRenderedSearchContentToAPI(distDomainPath, domain);
+		// If __exports_dist has not exported sites (directories), it does not
+		// upload search content.
+		if (fs.existsSync(__exports_dist)) {
+			await uploadRenderedSearchContentToAPI(__exports_dist, domain);
 		}
 	}
+
+	if (GRIDDO_AI_EMBEDDINGS) {
+		await startAIEmbeddings();
+	}
 }
 
 main().catch((err) => {

package/exporter/utils/core-utils.ts

@@ -99,19 +99,23 @@ function verbose(str: string) {
 }
 
 /**
- * Returns true for `true`, true, positive numbers
- * Returns false for `false`, false, 0, negative integers and anything else
+ * Returns true for "true", "on", true and positive numbers.
+ * Returns false for "false", "off", false, 0, negative integers and anything else.
  */
 function isTruthy(value: any): boolean {
 	// Return if Boolean
-	if (typeof value === `boolean`) return value;
+	if (typeof value === "boolean") return value;
 
 	// Return false if null or undefined
 	if (value === undefined || value === null) return false;
 
 	// If the String is true or false
-	if (value.toLowerCase() === `true`) return true;
-	if (value.toLowerCase() === `false`) return false;
+	if (value.toLowerCase() === "true") return true;
+	if (value.toLowerCase() === "false") return false;
+
+	// "on" | "off", We love them in Griddo ^^.
+	if (value.toLowerCase() === "on") return true;
+	if (value.toLowerCase() === "off") return false;
 
 	// Now check if it's a number
 	const number = parseInt(value, 10);

package/exporter/utils/searches.ts

@@ -1,5 +1,8 @@
 import type { PostSearchInfoResponse } from "../types/api";
-import type { PostSearchInfoProps } from "../types/global";
+import type {
+	AIEmbeddingsResponse,
+	PostSearchInfoProps,
+} from "../types/global";
 
 import fs from "node:fs";
 import path from "node:path";
@@ -55,7 +58,7 @@ async function postSearchInfo(props: PostSearchInfoProps) {
 function prepareHTMLContentForSearch(content: string) {
 	const noTagsContent = removeHTMLTags(
 		["meta", "link", "style", "script", "noscript", "nav", "header", "footer"],
-		content
+		content,
 	);
 	const plainTextContent = stripHTMLTags(noTagsContent);
 
@@ -109,7 +112,7 @@ function stripSpaces(str: string) {
  */
 async function uploadRenderedSearchContentToAPI(
 	distDomainPath: string,
-	domain: string
+	domain: string,
 ) {
 	const config = getConfig();
 	const { __caches } = config.paths(domain);
@@ -121,7 +124,7 @@ async function uploadRenderedSearchContentToAPI(
 	// renderizardos bajo el mismo. Por lo que `store` no existe.
 	if (!fs.existsSync(storeFolder)) {
 		console.log(
-			`Skipping uploading content to the search endpoint for the domain ${domain}, it has not exported sites.`
+			`Skipping uploading content to the search endpoint for the domain ${domain}, it has not exported sites.`,
 		);
 		return;
 	}
@@ -156,4 +159,15 @@ async function uploadRenderedSearchContentToAPI(
 	}
 }
 
-export { postSearchInfo, uploadRenderedSearchContentToAPI };
+async function startAIEmbeddings() {
+	try {
+		await post<AIEmbeddingsResponse>({ endpoint: `${API_URL}/ai/embeddings` });
+	} catch (error) {
+		console.warn(
+			"There was an error with the ai embeddings",
+			(error as Error).message,
+		);
+	}
+}
+
+export { postSearchInfo, startAIEmbeddings, uploadRenderedSearchContentToAPI };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "10.5.4",
+	"version": "10.6.1",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -48,7 +48,7 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "10.5.4",
+		"@griddo/core": "10.6.1",
 		"@svgr/webpack": "^5.5.0",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-transform-runtime": "^6.23.0",
@@ -119,5 +119,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "aee8c57f859479efdec9e7e1d1acfdcd4caa34b8"
+	"gitHead": "7c09ff5f84d88f828072c1e328345173f2cdf992"
 }