Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: restructure ai package (#3118)

Bogdan Chadkin9136430cb54d
diff --git a/apps/builder/app/builder/features/ai/ai-fetch-result.ts b/apps/builder/app/builder/features/ai/ai-fetch-result.ts
index 0b080a1551..d778e39c12 100644
--- a/apps/builder/app/builder/features/ai/ai-fetch-result.ts
+++ b/apps/builder/app/builder/features/ai/ai-fetch-result.ts
@@ -13,6 +13,7 @@ import {
getStyleRules,
idAttribute,
componentAttribute,
+ type WsEmbedTemplate,
} from "@webstudio-is/react-sdk";
import { Instance, createScope, findTreeInstanceIds } from "@webstudio-is/sdk";
import { computed } from "nanostores";
@@ -30,7 +31,6 @@ import {
import { applyOperations, patchTextInstance } from "./apply-operations";
import { restAi } from "~/shared/router-utils";
import untruncateJson from "untruncate-json";
-import { traverseTemplate } from "@webstudio-is/jsx-utils";
import { RequestParamsSchema } from "~/routes/rest.ai._index";
import {
AiApiException,
@@ -220,11 +220,24 @@ const $availableComponentsNames = computed(
}
);
+const traverseTemplate = (
+ template: WsEmbedTemplate,
+ fn: (node: WsEmbedTemplate[number]) => void
+) => {
+ for (const node of template) {
+ fn(node);
+ if (node.type === "instance") {
+ traverseTemplate(node.children, fn);
+ }
+ }
+};
+
// The LLM gets a list of available component names
// therefore we need to replace the component namespace with a LLM-friendly one
// preserving context eg. Radix.Dialog instead of just Dialog
const parseComponentName = (name: string) =>
name.replace("@webstudio-is/sdk-components-react-radix:", "Radix.");
+
// When AI generation is done we need to restore components namespaces.
const restoreComponentsNamespace = (operations: operations.WsOperations) => {
for (const operation of operations) {
diff --git a/apps/builder/app/builder/features/ai/apply-operations.ts b/apps/builder/app/builder/features/ai/apply-operations.ts
index 21577f05a3..224f7cd00b 100644
--- a/apps/builder/app/builder/features/ai/apply-operations.ts
+++ b/apps/builder/app/builder/features/ai/apply-operations.ts
@@ -1,6 +1,6 @@
import { serverSyncStore } from "~/shared/sync";
import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";
-import { copywriter, type operations } from "@webstudio-is/ai";
+import type { copywriter, operations } from "@webstudio-is/ai";
import { isBaseBreakpoint } from "~/shared/breakpoints";
import {
deleteInstanceMutable,
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 89b7868c42..2a03a7561d 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -66,7 +66,6 @@
"@webstudio-is/http-client": "workspace:*",
"@webstudio-is/icons": "workspace:*",
"@webstudio-is/image": "workspace:*",
- "@webstudio-is/jsx-utils": "workspace:*",
"@webstudio-is/prisma-client": "workspace:*",
"@webstudio-is/project": "workspace:*",
"@webstudio-is/project-build": "workspace:*",
diff --git a/packages/ai/src/chains/command-detect/chain.ts b/packages/ai/src/chains/command-detect/chain.server.ts
similarity index 85%
rename from packages/ai/src/chains/command-detect/chain.ts
rename to packages/ai/src/chains/command-detect/chain.server.ts
index 8dadf19d02..2a506c97c2 100644
--- a/packages/ai/src/chains/command-detect/chain.ts
+++ b/packages/ai/src/chains/command-detect/chain.server.ts
@@ -1,9 +1,9 @@
-import { z } from "zod";
import type { Model as BaseModel, ModelMessage, Chain } from "../../types";
import { formatPrompt } from "../../utils/format-prompt";
import { prompt as promptSystemTemplate } from "./__generated__/command-detect.system.prompt";
import { prompt as promptUserTemplate } from "./__generated__/command-detect.user.prompt";
import { createErrorResponse } from "../../utils/create-error-response";
+import { type Context, type Response, ResponseSchema, name } from "./schema";
/**
* Command Detect Chain
@@ -11,18 +11,7 @@ import { createErrorResponse } from "../../utils/create-error-response";
* Given a prompt and a list of possible commands and descriptions, it returns an array of operations matching the prompt request.
*/
-export const name = "command-detect";
-
-export const ContextSchema = z.object({
- // The prompt provides the original user request.
- prompt: z.string(),
- // Command name - description pairs.
- commands: z.record(z.string(), z.string()),
-});
-export type Context = z.infer<typeof ContextSchema>;
-
-export const ResponseSchema = z.array(z.string());
-export type Response = z.infer<typeof ResponseSchema>;
+export { name };
export const createChain = <ModelMessageFormat>(): Chain<
BaseModel<ModelMessageFormat>,
diff --git a/packages/ai/src/chains/command-detect/index.server.ts b/packages/ai/src/chains/command-detect/index.server.ts
deleted file mode 100644
index c815182484..0000000000
--- a/packages/ai/src/chains/command-detect/index.server.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./chain";
diff --git a/packages/ai/src/chains/command-detect/index.ts b/packages/ai/src/chains/command-detect/index.ts
deleted file mode 100644
index 66fd813adf..0000000000
--- a/packages/ai/src/chains/command-detect/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { name, type Response, ResponseSchema } from "./chain";
diff --git a/packages/ai/src/chains/command-detect/schema.ts b/packages/ai/src/chains/command-detect/schema.ts
new file mode 100644
index 0000000000..dde92d319d
--- /dev/null
+++ b/packages/ai/src/chains/command-detect/schema.ts
@@ -0,0 +1,14 @@
+import { z } from "zod";
+
+export const name = "command-detect";
+
+export const ContextSchema = z.object({
+ // The prompt provides the original user request.
+ prompt: z.string(),
+ // Command name - description pairs.
+ commands: z.record(z.string(), z.string()),
+});
+export type Context = z.infer<typeof ContextSchema>;
+
+export const ResponseSchema = z.array(z.string());
+export type Response = z.infer<typeof ResponseSchema>;
diff --git a/packages/ai/src/chains/copywriter/chain.ts b/packages/ai/src/chains/copywriter/chain.server.ts
similarity index 84%
rename from packages/ai/src/chains/copywriter/chain.ts
rename to packages/ai/src/chains/copywriter/chain.server.ts
index b8514ec3cd..826fe418fa 100644
--- a/packages/ai/src/chains/copywriter/chain.ts
+++ b/packages/ai/src/chains/copywriter/chain.server.ts
@@ -1,11 +1,17 @@
import { z } from "zod";
+import type { Instance, Instances } from "@webstudio-is/sdk";
import type { Model as BaseModel, ModelMessage, Chain } from "../../types";
import { formatPrompt } from "../../utils/format-prompt";
import { prompt as promptSystemTemplate } from "./__generated__/copy.system.prompt";
import { prompt as promptUserTemplate } from "./__generated__/copy.user.prompt";
-import type { Instance, Instances } from "@webstudio-is/sdk";
import { createErrorResponse } from "../../utils/create-error-response";
import type { RemixStreamingTextResponse } from "../../utils/remix-streaming-text-response";
+import {
+ type Context,
+ name,
+ TextInstanceSchema,
+ type TextInstance,
+} from "./schema";
/**
* Copywriter chain.
@@ -14,31 +20,7 @@ import type { RemixStreamingTextResponse } from "../../utils/remix-streaming-tex
* this chain generates copy for the instance and all its descendant text nodes.
*/
-export const name = "copywriter";
-
-export const TextInstanceSchema = z.object({
- instanceId: z.string(),
- index: z.number(),
- type: z.union([
- z.literal("Heading"),
- z.literal("Paragraph"),
- z.literal("Text"),
- ]),
- text: z.string(),
-});
-
-export type TextInstance = z.infer<typeof TextInstanceSchema>;
-
-export const ContextSchema = z.object({
- // The prompt provides context about the copy to generate and comes from the user.
- prompt: z.string(),
- // An array of text nodes to generate copy for.
- textInstances: z.array(TextInstanceSchema),
-});
-export type Context = z.infer<typeof ContextSchema>;
-
-export const ResponseSchema = z.array(TextInstanceSchema);
-export type Response = z.infer<typeof ResponseSchema>;
+export { name };
export const createChain = <ModelMessageFormat>(): Chain<
BaseModel<ModelMessageFormat>,
diff --git a/packages/ai/src/chains/copywriter/index.server.ts b/packages/ai/src/chains/copywriter/index.server.ts
deleted file mode 100644
index c815182484..0000000000
--- a/packages/ai/src/chains/copywriter/index.server.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./chain";
diff --git a/packages/ai/src/chains/copywriter/index.ts b/packages/ai/src/chains/copywriter/index.ts
deleted file mode 100644
index e469ad4ea5..0000000000
--- a/packages/ai/src/chains/copywriter/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export {
- name,
- type Response,
- ResponseSchema,
- type TextInstance,
- TextInstanceSchema,
- collectTextInstances,
-} from "./chain";
diff --git a/packages/ai/src/chains/copywriter/schema.ts b/packages/ai/src/chains/copywriter/schema.ts
new file mode 100644
index 0000000000..05983158c1
--- /dev/null
+++ b/packages/ai/src/chains/copywriter/schema.ts
@@ -0,0 +1,27 @@
+import { z } from "zod";
+
+export const name = "copywriter";
+
+export const TextInstanceSchema = z.object({
+ instanceId: z.string(),
+ index: z.number(),
+ type: z.union([
+ z.literal("Heading"),
+ z.literal("Paragraph"),
+ z.literal("Text"),
+ ]),
+ text: z.string(),
+});
+
+export type TextInstance = z.infer<typeof TextInstanceSchema>;
+
+export const ContextSchema = z.object({
+ // The prompt provides context about the copy to generate and comes from the user.
+ prompt: z.string(),
+ // An array of text nodes to generate copy for.
+ textInstances: z.array(TextInstanceSchema),
+});
+export type Context = z.infer<typeof ContextSchema>;
+
+export const ResponseSchema = z.array(TextInstanceSchema);
+export type Response = z.infer<typeof ResponseSchema>;
diff --git a/packages/ai/src/chains/operations/chain.ts b/packages/ai/src/chains/operations/chain.server.ts
similarity index 72%
rename from packages/ai/src/chains/operations/chain.ts
rename to packages/ai/src/chains/operations/chain.server.ts
index 7699b55d70..7e806df29a 100644
--- a/packages/ai/src/chains/operations/chain.ts
+++ b/packages/ai/src/chains/operations/chain.server.ts
@@ -1,18 +1,27 @@
-import { z } from "zod";
import type { Model as BaseModel, ModelMessage, Chain } from "../../types";
import { formatPrompt } from "../../utils/format-prompt";
import { prompt as promptSystemTemplate } from "./__generated__/operations.system.prompt";
import { prompt as promptUserTemplate } from "./__generated__/operations.user.prompt";
-
-import {
- AiOperationsSchema,
- aiToWs,
- WsOperationsSchema,
- type WsOperations,
-} from "./shared";
import { zodToJsonSchema } from "zod-to-json-schema";
import { postProcessTemplate } from "../../utils/jsx-to-template.server";
import { createErrorResponse } from "../../utils/create-error-response";
+import {
+ type Context,
+ type Response,
+ type AiOperations,
+ type WsOperations,
+ AiOperationsSchema,
+ name,
+} from "./schema";
+import * as editStyles from "./edit-styles.server";
+import * as generateTemplatePrompt from "./generate-template-prompt.server";
+// import * as generateInsertTemplate from "./generate-insert-template.server";
+import * as deleteInstance from "./delete-instance.server";
+
+export * as editStyles from "./edit-styles.server";
+export * as generateTemplatePrompt from "./generate-template-prompt.server";
+export * as generateInsertTemplate from "./generate-insert-template.server";
+export * as deleteInstance from "./delete-instance.server";
/**
* Operations Chain.
@@ -21,17 +30,28 @@ import { createErrorResponse } from "../../utils/create-error-response";
* it generates a series of edit operations to fulfill an edit request coming from the user.
*/
-export const name = "operations";
-
-export const ContextSchema = z.object({
- prompt: z.string().describe("Edit request from the user"),
- components: z.array(z.string()).describe("Available Webstudio components"),
- jsx: z.string().describe("Input JSX to edit"),
-});
-export type Context = z.infer<typeof ContextSchema>;
+export { name };
-export const ResponseSchema = WsOperationsSchema;
-export type Response = z.infer<typeof ResponseSchema>;
+const aiToWs = (aiOperations: AiOperations) => {
+ return aiOperations
+ .map((aiOperation) => {
+ if (aiOperation.operation === "editStylesWithTailwindCSS") {
+ return editStyles.aiOperationToWs(aiOperation);
+ }
+ if (aiOperation.operation === "generateTemplatePrompt") {
+ return generateTemplatePrompt.aiOperationToWs(aiOperation);
+ }
+ // if (aiOperation.operation === "generateInstanceWithTailwindStyles") {
+ // return generateInsertTemplate.aiOperationToWs(aiOperation);
+ // }
+ if (aiOperation.operation === "deleteInstance") {
+ return deleteInstance.aiOperationToWs(aiOperation);
+ }
+ })
+ .filter(function <T>(value: T): value is NonNullable<T> {
+ return value !== undefined;
+ });
+};
export const createChain = <ModelMessageFormat>(): Chain<
BaseModel<ModelMessageFormat>,
diff --git a/packages/ai/src/chains/operations/delete-instance.server.ts b/packages/ai/src/chains/operations/delete-instance.server.ts
new file mode 100644
index 0000000000..d00da3d685
--- /dev/null
+++ b/packages/ai/src/chains/operations/delete-instance.server.ts
@@ -0,0 +1,9 @@
+import type { aiOperation, wsOperation } from "./delete-instance";
+
+export { name } from "./delete-instance";
+
+export type { wsOperation };
+
+export const aiOperationToWs = async (
+ operation: aiOperation
+): Promise<wsOperation> => operation;
diff --git a/packages/ai/src/chains/operations/delete-instance.ts b/packages/ai/src/chains/operations/delete-instance.ts
index 416c3c4d81..2ea2f5a8f7 100644
--- a/packages/ai/src/chains/operations/delete-instance.ts
+++ b/packages/ai/src/chains/operations/delete-instance.ts
@@ -13,7 +13,3 @@ export type aiOperation = z.infer<typeof aiOperation>;
export const wsOperation = aiOperation;
export type wsOperation = z.infer<typeof wsOperation>;
-
-export const aiOperationToWs = async (
- operation: aiOperation
-): Promise<wsOperation> => operation;
diff --git a/packages/ai/src/chains/operations/edit-styles.server.ts b/packages/ai/src/chains/operations/edit-styles.server.ts
new file mode 100644
index 0000000000..c717446e93
--- /dev/null
+++ b/packages/ai/src/chains/operations/edit-styles.server.ts
@@ -0,0 +1,20 @@
+import { parseTailwindToWebstudio } from "@webstudio-is/css-data";
+import type { aiOperation, wsOperation } from "./edit-styles";
+
+export { name } from "./edit-styles";
+
+export type { wsOperation };
+
+export const aiOperationToWs = async (
+ operation: aiOperation
+): Promise<wsOperation> => {
+ if (operation.className === "") {
+ throw new Error(`Operation ${operation.operation} className is empty`);
+ }
+ const styles = await parseTailwindToWebstudio(operation.className);
+ return {
+ operation: "applyStyles",
+ instanceIds: operation.wsIds,
+ styles: styles,
+ };
+};
diff --git a/packages/ai/src/chains/operations/edit-styles.ts b/packages/ai/src/chains/operations/edit-styles.ts
index ff3e0b0c01..c1c73196ae 100644
--- a/packages/ai/src/chains/operations/edit-styles.ts
+++ b/packages/ai/src/chains/operations/edit-styles.ts
@@ -1,6 +1,5 @@
import { z } from "zod";
import { EmbedTemplateStyleDecl, idAttribute } from "@webstudio-is/react-sdk";
-import { parseTailwindToWebstudio } from "@webstudio-is/css-data";
export const name = "edit-styles";
@@ -25,17 +24,3 @@ export const wsOperation = z.object({
styles: z.array(EmbedTemplateStyleDecl),
});
export type wsOperation = z.infer<typeof wsOperation>;
-
-export const aiOperationToWs = async (
- operation: aiOperation
-): Promise<wsOperation> => {
- if (operation.className === "") {
- throw new Error(`Operation ${operation.operation} className is empty`);
- }
- const styles = await parseTailwindToWebstudio(operation.className);
- return {
- operation: "applyStyles",
- instanceIds: operation.wsIds,
- styles: styles,
- };
-};
diff --git a/packages/ai/src/chains/operations/generate-insert-template.server.ts b/packages/ai/src/chains/operations/generate-insert-template.server.ts
new file mode 100644
index 0000000000..7aed23b680
--- /dev/null
+++ b/packages/ai/src/chains/operations/generate-insert-template.server.ts
@@ -0,0 +1,15 @@
+import { jsxToTemplate } from "../../utils/jsx-to-template.server";
+import type { aiOperation, wsOperation } from "./generate-insert-template";
+
+export type { wsOperation };
+
+export const aiOperationToWs = async (
+ operation: aiOperation
+): Promise<wsOperation> => {
+ return {
+ operation: "insertTemplate",
+ addTo: operation.addTo,
+ addAtIndex: operation.addAtIndex,
+ template: await jsxToTemplate(operation.jsx),
+ };
+};
diff --git a/packages/ai/src/chains/operations/generate-insert-template.ts b/packages/ai/src/chains/operations/generate-insert-template.ts
index 4e643507a9..3654eb2422 100644
--- a/packages/ai/src/chains/operations/generate-insert-template.ts
+++ b/packages/ai/src/chains/operations/generate-insert-template.ts
@@ -1,6 +1,5 @@
import { z } from "zod";
import { WsEmbedTemplate, idAttribute } from "@webstudio-is/react-sdk";
-import { jsxToTemplate } from "../../utils/jsx-to-template.server";
// Currently this operation is used is a separate LLM call after the main one has returned an insert-instance operation. This is to produce better results.
// Effectively the aiOperation from this module is not used. The separate chain will call the LLM and we use the resulting completion to construct an aiOperation by hand
@@ -35,14 +34,3 @@ export const wsOperation = z.object({
template: WsEmbedTemplate,
});
export type wsOperation = z.infer<typeof wsOperation>;
-
-export const aiOperationToWs = async (
- operation: aiOperation
-): Promise<wsOperation> => {
- return {
- operation: "insertTemplate",
- addTo: operation.addTo,
- addAtIndex: operation.addAtIndex,
- template: await jsxToTemplate(operation.jsx),
- };
-};
diff --git a/packages/ai/src/chains/operations/generate-template-prompt.server.ts b/packages/ai/src/chains/operations/generate-template-prompt.server.ts
new file mode 100644
index 0000000000..31c5714cd7
--- /dev/null
+++ b/packages/ai/src/chains/operations/generate-template-prompt.server.ts
@@ -0,0 +1,9 @@
+import type { aiOperation, wsOperation } from "./generate-template-prompt";
+
+export { name } from "./generate-template-prompt";
+
+export type { wsOperation };
+
+export const aiOperationToWs = async (
+ operation: aiOperation
+): Promise<wsOperation> => operation;
diff --git a/packages/ai/src/chains/operations/generate-template-prompt.ts b/packages/ai/src/chains/operations/generate-template-prompt.ts
index 39e0f72cbc..b8a81e1426 100644
--- a/packages/ai/src/chains/operations/generate-template-prompt.ts
+++ b/packages/ai/src/chains/operations/generate-template-prompt.ts
@@ -38,7 +38,3 @@ export type aiOperation = z.infer<typeof aiOperation>;
export const wsOperation = aiOperation;
export type wsOperation = z.infer<typeof wsOperation>;
-
-export const aiOperationToWs = async (
- operation: aiOperation
-): Promise<wsOperation> => operation;
diff --git a/packages/ai/src/chains/operations/index.server.ts b/packages/ai/src/chains/operations/index.server.ts
deleted file mode 100644
index f904abf7fd..0000000000
--- a/packages/ai/src/chains/operations/index.server.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from "./chain";
-export * from "./shared";
-
-export * as editStyles from "./edit-styles";
-export * as generateTemplatePrompt from "./generate-template-prompt";
-export * as generateInsertTemplate from "./generate-insert-template";
-export * as deleteInstance from "./delete-instance";
diff --git a/packages/ai/src/chains/operations/index.ts b/packages/ai/src/chains/operations/index.ts
deleted file mode 100644
index 4e69e61627..0000000000
--- a/packages/ai/src/chains/operations/index.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-export { name, type Response, ResponseSchema } from "./chain";
-
-export {
- AiOperationsSchema,
- type AiOperations,
- WsOperationsSchema,
- type WsOperations,
-} from "./shared";
-
-// Operations.
-
-export {
- name as editStylesName,
- aiOperation as editStylesAiOperation,
- wsOperation as editStylesWsOperation,
-} from "./edit-styles";
-
-export {
- name as generateTemplatePromptName,
- aiOperation as generateTemplatePromptAiOperation,
- wsOperation as generateTemplatePromptWsOperation,
-} from "./generate-template-prompt";
-
-export {
- name as generateInsertTemplateName,
- aiOperation as generateInsertTemplateAiOperation,
- wsOperation as generateInsertTemplateWsOperation,
-} from "./generate-insert-template";
-
-export {
- name as deleteInstanceName,
- aiOperation as deleteInstanceAiOperation,
- wsOperation as deleteInstanceWsOperation,
-} from "./delete-instance";
diff --git a/packages/ai/src/chains/operations/shared.ts b/packages/ai/src/chains/operations/schema.ts
similarity index 57%
rename from packages/ai/src/chains/operations/shared.ts
rename to packages/ai/src/chains/operations/schema.ts
index 5213cd7ee5..dfd8ec8e77 100644
--- a/packages/ai/src/chains/operations/shared.ts
+++ b/packages/ai/src/chains/operations/schema.ts
@@ -1,10 +1,42 @@
import { z } from "zod";
-
import * as editStyles from "./edit-styles";
import * as generateTemplatePrompt from "./generate-template-prompt";
import * as generateInsertTemplate from "./generate-insert-template";
import * as deleteInstance from "./delete-instance";
+export {
+ name as editStylesName,
+ aiOperation as editStylesAiOperation,
+ wsOperation as editStylesWsOperation,
+} from "./edit-styles";
+
+export {
+ name as generateTemplatePromptName,
+ aiOperation as generateTemplatePromptAiOperation,
+ wsOperation as generateTemplatePromptWsOperation,
+} from "./generate-template-prompt";
+
+export {
+ name as generateInsertTemplateName,
+ aiOperation as generateInsertTemplateAiOperation,
+ wsOperation as generateInsertTemplateWsOperation,
+} from "./generate-insert-template";
+
+export {
+ name as deleteInstanceName,
+ aiOperation as deleteInstanceAiOperation,
+ wsOperation as deleteInstanceWsOperation,
+} from "./delete-instance";
+
+export const name = "operations";
+
+export const ContextSchema = z.object({
+ prompt: z.string().describe("Edit request from the user"),
+ components: z.array(z.string()).describe("Available Webstudio components"),
+ jsx: z.string().describe("Input JSX to edit"),
+});
+export type Context = z.infer<typeof ContextSchema>;
+
// AiOperations are supported LLM operations.
// A valid completion is then converted to WsOperations
// which is the final format that we send to the client.
@@ -25,27 +57,6 @@ export const AiOperationsSchema = z.array(
);
export type AiOperations = z.infer<typeof AiOperationsSchema>;
-export const aiToWs = (aiOperations: AiOperations) => {
- return aiOperations
- .map((aiOperation) => {
- if (aiOperation.operation === "editStylesWithTailwindCSS") {
- return editStyles.aiOperationToWs(aiOperation);
- }
- if (aiOperation.operation === "generateTemplatePrompt") {
- return generateTemplatePrompt.aiOperationToWs(aiOperation);
- }
- // if (aiOperation.operation === "generateInstanceWithTailwindStyles") {
- // return generateInsertTemplate.aiOperationToWs(aiOperation);
- // }
- if (aiOperation.operation === "deleteInstance") {
- return deleteInstance.aiOperationToWs(aiOperation);
- }
- })
- .filter(function <T>(value: T): value is NonNullable<T> {
- return value !== undefined;
- });
-};
-
export const WsOperationsSchema = z.array(
z.discriminatedUnion("operation", [
editStyles.wsOperation,
@@ -55,3 +66,6 @@ export const WsOperationsSchema = z.array(
])
);
export type WsOperations = z.infer<typeof WsOperationsSchema>;
+
+export const ResponseSchema = WsOperationsSchema;
+export type Response = z.infer<typeof ResponseSchema>;
diff --git a/packages/ai/src/chains/template-generator/chain.ts b/packages/ai/src/chains/template-generator/chain.server.ts
similarity index 87%
rename from packages/ai/src/chains/template-generator/chain.ts
rename to packages/ai/src/chains/template-generator/chain.server.ts
index 82e239c09e..3a55bc7627 100644
--- a/packages/ai/src/chains/template-generator/chain.ts
+++ b/packages/ai/src/chains/template-generator/chain.server.ts
@@ -1,4 +1,3 @@
-import { z } from "zod";
import type { Model as BaseModel, ModelMessage, Chain } from "../../types";
import { formatPrompt } from "../../utils/format-prompt";
import { prompt as promptSystemTemplate } from "./__generated__/template-generator.system.prompt";
@@ -10,6 +9,7 @@ import {
} from "../../utils/jsx-to-template.server";
import { createErrorResponse } from "../../utils/create-error-response";
import { getCode } from "../../utils/get-code";
+import { type Context, type Response, name } from "./schema";
/**
* Template Generator Chain.
@@ -17,17 +17,7 @@ import { getCode } from "../../utils/get-code";
* Given a UI section or widget description, this chain generates a Webstudio Embed Template representing the UI.
*/
-export const name = "template-generator";
-
-export const ContextSchema = z.object({
- // The prompt provides the original user request.
- prompt: z.string(),
- components: z.array(z.string()),
-});
-export type Context = z.infer<typeof ContextSchema>;
-
-export const ResponseSchema = WsEmbedTemplate;
-export type Response = z.infer<typeof ResponseSchema>;
+export { name };
export const createChain = <ModelMessageFormat>(): Chain<
BaseModel<ModelMessageFormat>,
diff --git a/packages/ai/src/chains/template-generator/index.server.ts b/packages/ai/src/chains/template-generator/index.server.ts
deleted file mode 100644
index c815182484..0000000000
--- a/packages/ai/src/chains/template-generator/index.server.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./chain";
diff --git a/packages/ai/src/chains/template-generator/index.ts b/packages/ai/src/chains/template-generator/index.ts
deleted file mode 100644
index 66fd813adf..0000000000
--- a/packages/ai/src/chains/template-generator/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { name, type Response, ResponseSchema } from "./chain";
diff --git a/packages/ai/src/chains/template-generator/schema.ts b/packages/ai/src/chains/template-generator/schema.ts
new file mode 100644
index 0000000000..af353bcbd7
--- /dev/null
+++ b/packages/ai/src/chains/template-generator/schema.ts
@@ -0,0 +1,14 @@
+import { z } from "zod";
+import { WsEmbedTemplate } from "@webstudio-is/react-sdk";
+
+export const name = "template-generator";
+
+export const ContextSchema = z.object({
+ // The prompt provides the original user request.
+ prompt: z.string(),
+ components: z.array(z.string()),
+});
+export type Context = z.infer<typeof ContextSchema>;
+
+export const ResponseSchema = WsEmbedTemplate;
+export type Response = z.infer<typeof ResponseSchema>;
diff --git a/packages/ai/src/image.ts b/packages/ai/src/image.ts
index f3b21a5d30..14684e45ad 100644
--- a/packages/ai/src/image.ts
+++ b/packages/ai/src/image.ts
@@ -1,4 +1,3 @@
-import { traverseTemplate } from "@webstudio-is/jsx-utils";
import type {
EmbedTemplateInstance,
EmbedTemplateProp,
@@ -133,6 +132,18 @@ const queryImageAndMutateInstance = async (
}
};
+const traverseTemplate = (
+ template: WsEmbedTemplate,
+ fn: (node: WsEmbedTemplate[number]) => void
+) => {
+ for (const node of template) {
+ fn(node);
+ if (node.type === "instance") {
+ traverseTemplate(node.children, fn);
+ }
+ }
+};
+
export const queryImagesAndMutateTemplate = async ({
template,
apiKey,
diff --git a/packages/ai/src/index.server.ts b/packages/ai/src/index.server.ts
index 3224348835..6f484fa1a0 100644
--- a/packages/ai/src/index.server.ts
+++ b/packages/ai/src/index.server.ts
@@ -1,8 +1,8 @@
/** Chains */
-export * as commandDetect from "./chains/command-detect/index.server";
-export * as copywriter from "./chains/copywriter/index.server";
-export * as operations from "./chains/operations/index.server";
-export * as templateGenerator from "./chains/template-generator/index.server";
+export * as commandDetect from "./chains/command-detect/chain.server";
+export * as copywriter from "./chains/copywriter/chain.server";
+export * as operations from "./chains/operations/chain.server";
+export * as templateGenerator from "./chains/template-generator/chain.server";
/** Models */
export {
diff --git a/packages/ai/src/index.ts b/packages/ai/src/index.ts
index c8beb55525..3105f5f932 100644
--- a/packages/ai/src/index.ts
+++ b/packages/ai/src/index.ts
@@ -1,8 +1,8 @@
/** Chains */
-export * as commandDetect from "./chains/command-detect/index";
-export * as copywriter from "./chains/copywriter/index";
-export * as operations from "./chains/operations/index";
-export * as templateGenerator from "./chains/template-generator/index";
+export * as commandDetect from "./chains/command-detect/schema";
+export * as copywriter from "./chains/copywriter/schema";
+export * as operations from "./chains/operations/schema";
+export * as templateGenerator from "./chains/template-generator/schema";
/** Utils */
export * from "./utils/handle-ai-request";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6f7e853a3e..149ea287d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -200,9 +200,6 @@ importers:
'@webstudio-is/image':
specifier: workspace:*
version: link:../../packages/image
- '@webstudio-is/jsx-utils':
- specifier: workspace:*
- version: link:../../packages/jsx-utils
'@webstudio-is/prisma-client':
specifier: workspace:*
version: link:../../packages/prisma-client