@paroicms/site-generator-plugin 0.3.0 → 0.5.0

package/gen-backend/dist/data-format.js

@@ -1,4 +1,5 @@
 import { boolVal, isObj, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
+import { ApiError } from "@paroicms/public-server-lib";
 export function formatGeneratorPluginConfiguration(pluginConf) {
     const anthropicApiKey = strValOrUndef(pluginConf.anthropicApiKey, { varName: "anthropicApiKey" });
     const mistralApiKey = strValOrUndef(pluginConf.mistralApiKey, { varName: "mistralApiKey" });
@@ -11,27 +12,43 @@ export function formatGeneratorPluginConfiguration(pluginConf) {
 }
 export function formatGeneratorCommand(data) {
     if (!isObj(data))
-        throw new Error("Invalid input");
+        throw new ApiError("Invalid input", 400);
     const command = strVal(data.command, { varName: "command" });
+    if (command === "newSession") {
+        return {
+            command: "newSession",
+            recaptchaToken: strVal(data.recaptchaToken, { varName: "recaptchaToken" }),
+        };
+    }
     if (command === "createSiteSchema") {
         return {
             command: "createSiteSchema",
-            prompt: strVal(data.prompt, { varName: "prompt" }),
+            sessionToken: strVal(data.sessionToken, { varName: "sessionToken" }),
+            prompt: formatPrompt(data.prompt),
         };
     }
     if (command === "updateSiteSchema") {
         return {
             command: "updateSiteSchema",
-            prompt: strVal(data.prompt, { varName: "prompt" }),
+            sessionToken: strVal(data.sessionToken, { varName: "sessionToken" }),
+            prompt: formatPrompt(data.prompt),
             generatedSchema: data.generatedSchema,
         };
     }
     if (command === "generateSite") {
         return {
             command: "generateSite",
+            sessionToken: strVal(data.sessionToken, { varName: "sessionToken" }),
             generatedSchema: data.generatedSchema,
             withFakeContent: boolVal(data.withFakeContent, { varName: "withFakeContent" }),
         };
     }
-    throw new Error(`Invalid command: ${command}`);
+    throw new ApiError(`Invalid command: ${command}`, 400);
+}
+function formatPrompt(val) {
+    const prompt = strVal(val, { varName: "prompt" });
+    if (prompt.length > 5000) {
+        throw new ApiError("Prompt is too long", 400);
+    }
+    return prompt;
 }

package/gen-backend/dist/generator/actions.js

@@ -1,8 +1,16 @@
 import { invokeMessageGuard } from "./llm-queries/invoke-message-guard.js";
 import { invokeNewSiteAnalysis } from "./llm-queries/invoke-new-site-analysis.js";
 import { invokeUpdateSiteSchema } from "./llm-queries/invoke-update-site-schema.js";
+import { newSession, verifySessionToken } from "./session/generator-session.js";
 import { generateSite } from "./site-generator/site-generator.js";
 export async function executeCommand(ctx, input) {
+    if (input.command === "newSession") {
+        return {
+            success: true,
+            result: await newSession(ctx, input),
+        };
+    }
+    verifySessionToken(input.sessionToken);
     if (input.command === "createSiteSchema") {
         const errorResponse = await invokeMessageGuard(ctx, input);
         if (errorResponse)
@@ -13,7 +21,9 @@ export async function executeCommand(ctx, input) {
         };
     }
     if (input.command === "updateSiteSchema") {
-        const errorResponse = await invokeMessageGuard(ctx, input);
+        const errorResponse = await invokeMessageGuard(ctx, input, {
+            skipOutOfScopeCheck: true,
+        });
         if (errorResponse)
             return errorResponse;
         return {

package/gen-backend/dist/generator/lib/parse-llm-response.js

@@ -37,7 +37,7 @@ export function parseLlmResponseAsList(llmResponse, outputTags, options = {}) {
             }
             current = {};
         }
-        if (rawTag.content === "") {
+        if (rawTag.content.trim() === "") {
             if (!outputTag.optional) {
                 const message = `Empty tag <${outputTag.tagName}>`;
                 if (!tolerateErrors)

package/gen-backend/dist/generator/llm-queries/invoke-message-guard.js

@@ -6,7 +6,7 @@ const guardPrompt = await createPromptTemplate({
     fileName: "message-guard.md",
 });
 const invalidCauses = new Set(["rude", "malicious", "outOfScope", "technicalLimits", "noSense"]);
-export async function invokeMessageGuard(ctx, input) {
+export async function invokeMessageGuard(ctx, input, { skipOutOfScopeCheck = false } = {}) {
     const debugName = "guard";
     const llmInput = {
         message: input.prompt,
@@ -27,6 +27,12 @@ export async function invokeMessageGuard(ctx, input) {
         },
     ]);
     const report = formatMessageGuardReport(rawReport.guard);
+    if (report.causes && skipOutOfScopeCheck) {
+        report.causes = report.causes.filter((cause) => cause !== "outOfScope");
+        if (report.causes.length === 0) {
+            report.valid = true;
+        }
+    }
     if (report.valid)
         return;
     return {

package/gen-backend/dist/generator/llm-queries/invoke-new-site-analysis.js

@@ -28,6 +28,7 @@ export async function invokeNewSiteAnalysis(ctx, input) {
             siteTitle,
             siteSchema,
             l10n,
+            changed: true,
             explanation,
         };
     }
@@ -44,7 +45,8 @@ export async function invokeNewSiteAnalysis(ctx, input) {
         siteTitle,
         siteSchema: updated.siteSchema,
         l10n: updated.l10n,
-        explanation: `${explanation}\n\n${updated.explanation}`,
+        changed: true,
+        explanation: updated.changed ? `${explanation}\n\n${updated.explanation}` : explanation,
     };
 }
 async function invokeAnalysisStep1(ctx, input) {
@@ -53,12 +55,12 @@ async function invokeAnalysisStep1(ctx, input) {
         message: input.prompt,
         siteSchemaTsDefs: getSiteSchemaTsDefs(),
     };
-    const debug = await debugLlmOutput(ctx, debugName, ctx.goodModelName, {
+    const debug = await debugLlmOutput(ctx, debugName, ctx.bestModelName, {
         message: llmInput.message,
     });
     let llmMessageContent = debug.storedContent;
     if (!llmMessageContent) {
-        const llmMessage = await analyzePrompt.pipe(ctx.goodModel).invoke(llmInput);
+        const llmMessage = await analyzePrompt.pipe(ctx.bestModel).invoke(llmInput);
         llmMessageContent = await debug.getMessageContent(llmMessage);
     }
     const rawAnalysis = parseLlmResponseAsProperties(llmMessageContent, [

package/gen-backend/dist/generator/llm-queries/invoke-update-site-schema.js

@@ -13,6 +13,7 @@ export async function invokeUpdateSiteSchema(ctx, input) {
         // no changes
         return {
             ...input.generatedSchema,
+            changed: false,
             explanation: task.explanation,
         };
     }
@@ -22,6 +23,7 @@ export async function invokeUpdateSiteSchema(ctx, input) {
     });
     return {
         ...genSchema,
+        changed: true,
         explanation: task.explanation,
     };
 }
@@ -29,6 +31,7 @@ async function invokeUpdateSiteSchemaStep1(ctx, input) {
     const debugName = "update-step1";
     const llmInput = {
         siteSchemaTsDefs: getSiteSchemaTsDefs(),
+        predefinedFields: JSON.stringify(getPredefinedFields(), undefined, 2),
         siteSchemaJson: JSON.stringify(input.generatedSchema.siteSchema, undefined, 2),
         l10nJson: JSON.stringify(input.generatedSchema.l10n, undefined, 2),
         updateMessage: input.prompt,
@@ -66,29 +69,38 @@ async function invokeUpdateSiteSchemaStep2(ctx, input) {
         l10nJson: JSON.stringify(input.generatedSchema.l10n, undefined, 2),
         taskDetailsMd: input.taskDetailsMd,
     };
-    const debug = await debugLlmOutput(ctx, debugName, ctx.goodModelName, {
+    const debug = await debugLlmOutput(ctx, debugName, ctx.bestModelName, {
         taskDetailsMd: llmInput.taskDetailsMd,
         siteSchemaJson: llmInput.siteSchemaJson,
         l10nJson: llmInput.l10nJson,
     });
     let llmMessageContent = debug.storedContent;
     if (!llmMessageContent) {
-        const llmMessage = await prompt2Tpl.pipe(ctx.goodModel).invoke(llmInput);
+        const llmMessage = await prompt2Tpl.pipe(ctx.bestModel).invoke(llmInput);
         llmMessageContent = await debug.getMessageContent(llmMessage);
     }
-    return {
+    const parsed = parseLlmResponseAsProperties(llmMessageContent, [
+        {
+            tagName: "updated_site_schema_json",
+            key: "siteSchema",
+            format: "json",
+            optional: true,
+        },
+        {
+            tagName: "updated_l10n_json",
+            key: "l10n",
+            format: "json",
+            optional: true,
+        },
+    ]);
+    const result = {
         ...input.generatedSchema,
-        ...parseLlmResponseAsProperties(llmMessageContent, [
-            {
-                tagName: "updated_site_schema_json",
-                key: "siteSchema",
-                format: "json",
-            },
-            {
-                tagName: "updated_labels_json",
-                key: "l10n",
-                format: "json",
-            },
-        ]),
     };
+    if (parsed.siteSchema) {
+        result.siteSchema = parsed.siteSchema;
+    }
+    if (parsed.l10n) {
+        result.l10n = parsed.l10n;
+    }
+    return result;
 }

package/gen-backend/dist/generator/session/generator-session.js

@@ -0,0 +1,33 @@
+import { ApiError } from "@paroicms/public-server-lib";
+import { nanoid } from "nanoid";
+const { sign, verify } = (await import("jsonwebtoken")).default;
+const JWT_SECRET = "init"; // FIXME: Hardcoded JWT secret as specified
+export async function newSession(ctx, command) {
+    const { service } = ctx;
+    const { recaptchaToken } = command;
+    const isValid = await service.validateRecaptchaResponse(recaptchaToken);
+    if (!isValid)
+        throw new ApiError("Invalid reCAPTCHA token", 400);
+    const sessionId = nanoid();
+    const token = sign({ sessionId }, JWT_SECRET, { expiresIn: "24h" });
+    return { token };
+}
+/**
+ * Verifies a session token and returns the session ID if valid
+ */
+export function verifySessionToken(token) {
+    let payload;
+    try {
+        payload = verify(token, JWT_SECRET);
+    }
+    catch (error) {
+        if (error.name === "TokenExpiredError")
+            throw new ApiError("Session token expired", 401);
+        if (error.name === "JsonWebTokenError")
+            throw new ApiError("Invalid session token", 401);
+        throw error;
+    }
+    if (!payload || !payload.sessionId)
+        throw new ApiError("Invalid session token", 401);
+    return payload.sessionId;
+}

package/gen-backend/dist/generator/site-generator/document-template-creator.js

@@ -63,7 +63,6 @@ function templateOfSpecialDocument(ctx, documentType) {
   <div class="TextWidth Pt">
     <div
       data-effect="paContactForm"
-      data-recaptcha-key="{{ site.recaptchaKey }}"
       data-home-url="{{ site.home.url }}"></div>
   </div>
 </div>`;

package/gen-backend/dist/generator/site-generator/site-generator.js

@@ -5,15 +5,14 @@ import { join } from "node:path";
 import { fillSiteWithFakeContent } from "../fake-content-generator.ts/create-database-with-fake-content.js";
 import { createTheme } from "./theme-creator.js";
 export async function generateSite(ctx, input) {
-    const { service, logger, pluginConf: { packName }, } = ctx;
+    const { service, logger, packConf } = ctx;
+    const { sitesDir, packName } = packConf;
     const { generatedSchema: { l10n, siteSchema, siteTitle }, withFakeContent, } = input;
-    const siteId = randomUUID();
-    logger.info(`Generating site: ${siteId}…`);
-    const packConf = service.connector.getSitePackConf(packName);
-    const { sitesDir } = packConf;
     if (!sitesDir) {
         throw new Error(`Site-generator plugin can generate sites only for pack with "sitesDir", but pack "${packName}" doesn't have it`);
     }
+    const siteId = randomUUID();
+    logger.info(`Generating site: ${siteId}…`);
     const siteDir = join(sitesDir, siteId);
     await mkdir(siteDir);
     await writeFile(join(siteDir, "site-schema.json"), JSON.stringify(siteSchema, null, 2), "utf-8");

package/gen-backend/dist/plugin.js

@@ -2,7 +2,7 @@ import { ChatAnthropic } from "@langchain/anthropic";
 import { ChatMistralAI } from "@langchain/mistralai";
 import { strVal } from "@paroi/data-formatters-lib";
 import { pathExists } from "@paroicms/internal-server-lib";
-import { escapeHtml } from "@paroicms/public-server-lib";
+import { ApiError, escapeHtml } from "@paroicms/public-server-lib";
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { projectDir } from "./context.js";
@@ -11,12 +11,13 @@ import { executeCommand } from "./generator/actions.js";
 import { initializeImageNames } from "./generator/lib/images-lib.js";
 const packageDir = dirname(projectDir);
 const version = strVal(JSON.parse(readFileSync(join(packageDir, "package.json"), "utf-8")).version);
+const SLUG = "site-generator";
 await initializeImageNames();
 const plugin = {
     version,
-    slug: "site-generator",
+    slug: SLUG,
     async siteInit(service) {
-        const pluginConf = formatGeneratorPluginConfiguration(service.pluginConf);
+        const pluginConf = formatGeneratorPluginConfiguration(service.configuration);
         let debugDir = pluginConf.debugDir;
         if (debugDir) {
             if (!(await pathExists(debugDir))) {
@@ -24,11 +25,23 @@ const plugin = {
                 debugDir = undefined;
             }
         }
+        const bestModel = new ChatAnthropic({
+            modelName: "claude-3-7-sonnet-20250219",
+            anthropicApiKey: pluginConf.anthropicApiKey,
+            temperature: 0.1,
+            maxTokens: 4096,
+            clientOptions: {
+                timeout: 60_000,
+            },
+        });
         const goodModel = new ChatAnthropic({
             modelName: "claude-3-7-sonnet-20250219",
             anthropicApiKey: pluginConf.anthropicApiKey,
-            temperature: 0.2,
-            // maxTokens: 50_000,
+            temperature: 0.1,
+            maxTokens: 4096,
+            clientOptions: {
+                timeout: 20_000,
+            },
         });
         // const cheapModel = new ChatAnthropic({
         //   modelName: "claude-3-5-haiku-20241022",
@@ -43,16 +56,26 @@ const plugin = {
             maxTokens: 50_000,
         });
         service.setPublicAssetsDirectory(join(packageDir, "gen-front", "dist"));
-        service.addHeadTag(`<link rel="stylesheet" href="${escapeHtml(`${service.pluginAssetsUrl}/gen-front.css`)}">`, `<script type="module" src="${escapeHtml(`${service.pluginAssetsUrl}/gen-front.mjs`)}"></script>`);
-        service.setPublicApiHandler(async (service, req, res, relativePath) => {
+        const scriptAttr = [
+            ["type", "module"],
+            ["src", `${service.pluginAssetsUrl}/gen-front.mjs`],
+            ["class", `js-script-${SLUG}`],
+            ["data-google-recaptcha-key", service.configuration.googleRecaptchaKey],
+        ];
+        service.addHeadTag(`<link rel="stylesheet" href="${escapeHtml(`${service.pluginAssetsUrl}/gen-front.css`)}">`, `<script ${scriptAttr.map(([key, val]) => `${key}="${escapeHtml(val)}"`).join(" ")}></script>`);
+        service.setPublicApiHandler(async (service, httpContext, relativePath) => {
+            const { req, res } = httpContext;
             if (relativePath !== "") {
                 res.status(404).send({ status: 404 });
                 return;
             }
             const ctx = {
                 pluginConf,
+                packConf: service.connector.getSitePackConf(pluginConf.packName),
                 service,
                 logger: service.logger,
+                bestModel,
+                bestModelName: bestModel.model,
                 goodModel,
                 goodModelName: goodModel.model,
                 cheapModel,
@@ -76,9 +99,18 @@ const plugin = {
                 res.send(buf);
             }
             catch (error) {
-                service.logger.error("Error while executing command:", error);
-                const response = { success: false };
-                res.status(500).send(response);
+                service.logger.error("Error executing command:", error);
+                if (error instanceof ApiError) {
+                    const response = {
+                        success: false,
+                        userMessage: error.message,
+                    };
+                    res.status(error.status).send(response);
+                }
+                else {
+                    const response = { success: false };
+                    res.status(500).send(response);
+                }
             }
         });
     },

package/gen-backend/prompts/new-site-1-analysis.md

@@ -58,6 +58,7 @@ Guidelines for creating the hierarchical bullet list:
 - Each distinct node type must have a unique name through the whole tree structure.
 - Reusing the same node type several times (for recursivity etc.):
   - When the same node type is reused as a child in several places, then write its children only on the first occurence.
+- On this task, do not focus on fields. If the website description provide fields then you will report them in the unused information. In particular, a collection of medias (a carousel, a slider, an image gallery, a slideshow, etc.) is a type of field.
 
 Here's an example of a correct output:
 
@@ -207,7 +208,7 @@ Then, provide the mardown representing the website tree structure (step 2) withi
 
 Provide the node types properties (step 3) within <dictionary_yaml> tags.
 
-Also, write a short explanation of your choices regarding the 3 steps, within <explanation_md> tags. Write the explanation in markdown and in the website description language. Your explanation message will be shown to the end-user.
+Also, write a short explanation of your choices regarding the 3 steps, within <explanation_md> tags. Write the explanation in markdown and in the website description language. Your explanation message will be shown to the end-user as a message in a chat. The user will also see the website structure and its properties, so don't repeat descriptions, don't describe choices when they're obvious. Be as succinct as possible. If there is nothing valuable to say, then let this tag empty.
 
 Finally, extract and rephrase within <unused_information_md> tags the information from the site description that you weren't able to use in the previous elements, in the form of a short prompt, in markdown format. Do not invent anything. Do not imagine anything. If you used every valuable information, then let this tag empty.
 

package/gen-backend/prompts/new-site-2-fields.md

@@ -32,6 +32,7 @@ Guidelines for creating the dictionnary YAML:
 - Default values:
   - By default, for most of node types, if you are not sure about what could be the best fields, then remember that a document is a webpage and just use a `[htmlContent]`.
   - Except if there are specific instructions in the website description, here is the default value for the `_site` node type: `["logo", "footerMention"]`.
+- Gallery of medias: there is a predefined field named `"gallery"`. It contains a list of medias. The theme can render it as a carousel, a slider, an image gallery, a slideshow, etc.
 
 Here is an example of expected output:
 

package/gen-backend/prompts/predefined-fields.json

@@ -63,7 +63,7 @@
     "fieldName": "gallery",
     "dataType": "gallery",
     "localized": false,
-    "description": "A collection of images. It can be used to create a gallery, a slider or a carousel."
+    "description": "A collection of medias. It can be rendered as a carousel, a slider, a slideshow, an image gallery etc."
   },
   {
     "fieldName": "image",

package/gen-backend/prompts/update-site-schema-1-write-details.md

@@ -1,12 +1,22 @@
 You are tasked with modifying a JSON object of a _site schema_, based on a given TypeScript type definition and an update message, and its localized labels. Follow these steps carefully:
 
-1. Review the TypeScript type definition of the JSON structure:
+# 1. Review the TypeScript type definition of the JSON structure:
 
 <site_schema_ts_defs>
 {siteSchemaTsDefs}
 </site_schema_ts_defs>
 
-2. Examine the current JSON data, which conforms to the `JtSiteSchema` type:
+# 2. About fields
+
+Fields can be either predefined fields or custom fields. Take a look at the predefined fields provided by the CMS:
+
+<predefined_fields_json>
+{predefinedFields}
+</predefined_fields_json>
+
+# 3. The current site schema
+
+Examine the current JSON data, which conforms to the `JtSiteSchema` type:
 
 <site_schema_json>
 {siteSchemaJson}
@@ -18,17 +28,17 @@ Also, the attached localized labels:
 {l10nJson}
 </localized_labels_json>
 
-3. Read the user message that describes the required changes:
+# 4. Read the user message that describes the required changes:
 
 <user_message>
 {updateMessage}
 </user_message>
 
-4. When there is nothing to change
+# 5. When there is nothing to change
 
 Evaluate wether the current schema already implements the update message. If there's nothing to do, provide an empty <task_details_md> tags and you're done.
 
-5. When there are changes to do
+# 6. When there are changes to do
 
 Otherwise, if there is something to change, then rewrite the user's request as a detailed sequence of operations to be carried out one after the other.
 
@@ -40,6 +50,8 @@ Guidelines for reformulating into a detailed sequence of operations:
 - If the user's request is simple and doesn't need to be separated into several operations, write a list with a single operation.
 - Describe each operation concisely in a few words.
 - Make sure that the tree structure of node types is not broken. The `site` node is separate. Then, the root of the tree structure is the `home` routing document. Every other routing document type, regular document type, part type, must be the child of another node type.
+- Prefer predefined fields where you can. In particular, you can use the `"gallery"` field when the user description is a synonym (carousel, slider, slideshow, image gallery).
+- Never use the same field twice in a list of fields.
 
 Be the the less creative as possible. Follow the instructions. In particular:
 
@@ -50,8 +62,8 @@ Be the the less creative as possible. Follow the instructions. In particular:
 
 Provide the bullet list in Markdown within <task_details_md> tags.
 
-6. Write an explanation
+# 6. Write an explanation
 
-Also, write a short explanation of your choices, within <explanation_md> tags. Write the explanation in markdown and in the language of the update message. Your explanation message will be shown to the end-user.
+Also, write a short explanation of your choices, within <explanation_md> tags. Write the explanation in markdown and in the language of the update message. Your explanation message will be shown to the end-user as a message in a chat. Don't describe choices when they're obvious. Be as succinct as possible.
 
 Do not include any other explanation or commentary outside these tags.

package/gen-backend/prompts/update-site-schema-2-execute.md

@@ -16,7 +16,7 @@ Here are the predefined fields provided by ParoiCMS:
 {predefinedFields}
 </predefined_fields_json>
 
-Here is an example of an object for describing an **HTML** field type:
+Here is an example of an object for describing a custom **HTML** field type:
 
 <field_type_example>
 {{
@@ -29,7 +29,7 @@ Here is an example of an object for describing an **HTML** field type:
 }}
 </field_type_example>
 
-Then, in the locales, the translations must be in a sub-key `fields` of the node type:
+Then, in the locales, the translations of custom field types must be in a sub-key `fields` of the node type:
 
 <l10n_example>
 {{
@@ -48,6 +48,11 @@ Then, in the locales, the translations must be in a sub-key `fields` of the node
 }}
 </l10n_example>
 
+Important:
+
+- Never add locales for a predefined field.
+- Never add an unknown predefined field.
+
 # 3. Examine the current JSON data, which conforms to the `JtSiteSchema` type:
 
 <site_schema_json>
@@ -74,4 +79,8 @@ Also, the attached locales:
 
 # 6. Output
 
-Provide the updated site schema in JSON within <updated_site_schema_json> tags, and the new localized labels within <updated_labels_json>  Do not write any explanation or commentary outside these tags.
+If there is a change in the site schema, then provide the updated site schema in JSON within <updated_site_schema_json> tags. Otherwise, let this tag empty.
+
+If there is a change in the locales, then provide the updated attached locales within <updated_l10n_json>. Otherwise, let this tag empty.
+
+Do not write any explanation or commentary outside these tags.