@purpleschool/gptbot 0.12.70 → 0.12.71

package/models/canvas-node.schema.ts

@@ -59,6 +59,7 @@ export type AudioGenParams = z.infer<typeof AudioGenParamsSchema>;
 
 export const ColorPaletteParamsSchema = strictObject({
     prompt: z.string(),
+    colors: z.array(z.string().regex(/^#[0-9A-Fa-f]{6}$/)).optional(),
 });
 export type ColorPaletteParams = z.infer<typeof ColorPaletteParamsSchema>;
 
@@ -147,14 +148,7 @@ export const AudioGenSTTOutputSchema = strictObject({
 export type AudioGenSTTOutput = z.infer<typeof AudioGenSTTOutputSchema>;
 
 export const ColorPaletteOutputSchema = strictObject({
-    paletteName: z.string(),
-    colors: z.array(
-        strictObject({
-            hex: z.string(),
-            name: z.string(),
-            usage: z.string(),
-        }),
-    ),
+    colors: z.array(z.string().regex(/^#[0-9A-Fa-f]{6}$/)).max(7),
 });
 export type ColorPaletteOutput = z.infer<typeof ColorPaletteOutputSchema>;
 
@@ -173,24 +167,6 @@ export const HtmlGenOutputSchema = strictObject({
 });
 export type HtmlGenOutput = z.infer<typeof HtmlGenOutputSchema>;
 
-export const CanvasNodeParamsSchema = z.union([
-    TextGenParamsSchema,
-    ImageGenParamsSchema,
-    VideoGenParamsSchema,
-    AudioGenParamsSchema,
-    ColorPaletteParamsSchema,
-    MotionControlParamsSchema,
-    VarGenParamsSchema,
-    HtmlGenParamsSchema,
-    TextBlockParamsSchema,
-    ImageBlockParamsSchema,
-    VideoBlockParamsSchema,
-    FileBlockParamsSchema,
-    NoteParamsSchema,
-    VarBlockParamsSchema,
-]);
-export type CanvasNodeParams = z.infer<typeof CanvasNodeParamsSchema>;
-
 export const CanvasNodeParamsSchemaByType = {
     [CANVAS_NODE_TYPE.textGen]: TextGenParamsSchema,
     [CANVAS_NODE_TYPE.imageGen]: ImageGenParamsSchema,
@@ -211,18 +187,25 @@ export const CanvasNodeParamsSchemaByType = {
     [CANVAS_NODE_TYPE.htmlGen]: HtmlGenParamsSchema,
 } as const;
 
-export const CanvasNodeOutputSchema = z.union([
-    TextGenOutputSchema,
-    ImageGenOutputSchema,
-    VideoGenOutputSchema,
-    AudioGenTTSOutputSchema,
-    AudioGenSTTOutputSchema,
-    ColorPaletteOutputSchema,
-    MotionControlOutputSchema,
-    VarGenOutputSchema,
-    HtmlGenOutputSchema,
-]);
-export type CanvasNodeOutput = z.infer<typeof CanvasNodeOutputSchema>;
+export const CanvasNodeOutputSchemaByType = {
+    [CANVAS_NODE_TYPE.textGen]: TextGenOutputSchema,
+    [CANVAS_NODE_TYPE.imageGen]: ImageGenOutputSchema,
+    [CANVAS_NODE_TYPE.imageEdit]: ImageGenOutputSchema,
+    [CANVAS_NODE_TYPE.videoGen]: VideoGenOutputSchema,
+    [CANVAS_NODE_TYPE.videoEdit]: VideoGenOutputSchema,
+    [CANVAS_NODE_TYPE.ttsGen]: AudioGenTTSOutputSchema,
+    [CANVAS_NODE_TYPE.sttGen]: AudioGenSTTOutputSchema,
+    [CANVAS_NODE_TYPE.textBlock]: TextBlockParamsSchema,
+    [CANVAS_NODE_TYPE.imageBlock]: ImageBlockParamsSchema,
+    [CANVAS_NODE_TYPE.videoBlock]: VideoBlockParamsSchema,
+    [CANVAS_NODE_TYPE.fileBlock]: FileBlockParamsSchema,
+    [CANVAS_NODE_TYPE.note]: NoteParamsSchema,
+    [CANVAS_NODE_TYPE.colorPalette]: ColorPaletteOutputSchema,
+    [CANVAS_NODE_TYPE.motionControl]: MotionControlOutputSchema,
+    [CANVAS_NODE_TYPE.varGen]: VarGenOutputSchema,
+    [CANVAS_NODE_TYPE.varBlock]: VarBlockParamsSchema,
+    [CANVAS_NODE_TYPE.htmlGen]: HtmlGenOutputSchema,
+} as const;
 
 export const CanvasNodeErrorSchema = z.object({
     code: z.string(),
@@ -251,6 +234,7 @@ export type CanvasNodeParamsByType = {
     [CANVAS_NODE_TYPE.varBlock]: VarBlockParams;
     [CANVAS_NODE_TYPE.htmlGen]: HtmlGenParams;
 };
+export type CanvasNodeParams = CanvasNodeParamsByType[keyof CanvasNodeParamsByType];
 
 export type CanvasNodeOutputByType = {
     [CANVAS_NODE_TYPE.textGen]: TextGenOutput;
@@ -260,22 +244,164 @@ export type CanvasNodeOutputByType = {
     [CANVAS_NODE_TYPE.videoEdit]: VideoGenOutput;
     [CANVAS_NODE_TYPE.ttsGen]: AudioGenTTSOutput;
     [CANVAS_NODE_TYPE.sttGen]: AudioGenSTTOutput;
+    [CANVAS_NODE_TYPE.textBlock]: TextBlockParams;
+    [CANVAS_NODE_TYPE.imageBlock]: ImageBlockParams;
+    [CANVAS_NODE_TYPE.videoBlock]: VideoBlockParams;
+    [CANVAS_NODE_TYPE.fileBlock]: FileBlockParams;
+    [CANVAS_NODE_TYPE.note]: NoteParams;
     [CANVAS_NODE_TYPE.colorPalette]: ColorPaletteOutput;
     [CANVAS_NODE_TYPE.motionControl]: MotionControlOutput;
     [CANVAS_NODE_TYPE.varGen]: VarGenOutput;
+    [CANVAS_NODE_TYPE.varBlock]: VarBlockParams;
     [CANVAS_NODE_TYPE.htmlGen]: HtmlGenOutput;
 };
+export type CanvasNodeOutput = CanvasNodeOutputByType[keyof CanvasNodeOutputByType];
+
+export const validateCanvasNodeParamsByType = (
+    nodeDefinitionId: CANVAS_NODE_TYPE,
+    params: unknown,
+    ctx: z.RefinementCtx,
+): void => {
+    if (params === null || params === undefined) {
+        return;
+    }
+
+    const schema = CanvasNodeParamsSchemaByType[nodeDefinitionId];
+    const result = schema.safeParse(params);
+    if (result.success) {
+        return;
+    }
+
+    for (const issue of result.error.issues) {
+        ctx.addIssue({
+            ...issue,
+            path: ['params', ...issue.path],
+        });
+    }
+};
 
-export const CanvasNodeSchema = z.object({
+export const validateCanvasNodeOutputByType = (
+    nodeDefinitionId: CANVAS_NODE_TYPE,
+    output: unknown,
+    ctx: z.RefinementCtx,
+): void => {
+    if (output === null || output === undefined) {
+        return;
+    }
+
+    const schema = CanvasNodeOutputSchemaByType[nodeDefinitionId];
+    const result = schema.safeParse(output);
+    if (result.success) {
+        return;
+    }
+
+    for (const issue of result.error.issues) {
+        ctx.addIssue({
+            ...issue,
+            path: ['output', ...issue.path],
+        });
+    }
+};
+
+export const CanvasNodeBaseSchema = z.object({
     uuid: z.string().uuid(),
     canvasId: z.string().uuid(),
     nodeDefinitionId: z.nativeEnum(CANVAS_NODE_TYPE),
     position: CanvasNodePositionSchema,
     status: z.nativeEnum(NODE_RUN_STATUS),
     toolJobId: z.string().uuid().nullable(),
-    params: CanvasNodeParamsSchema.nullable(),
-    output: CanvasNodeOutputSchema.nullable(),
+    params: z.unknown().nullable(),
+    output: z.unknown().nullable(),
     error: CanvasNodeErrorSchema.nullable(),
     createdAt: z.date(),
     updatedAt: z.date(),
 });
+
+export const CanvasNodeSchema = z.discriminatedUnion('nodeDefinitionId', [
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.textGen),
+        params: TextGenParamsSchema.nullable(),
+        output: TextGenOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.imageGen),
+        params: ImageGenParamsSchema.nullable(),
+        output: ImageGenOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.imageEdit),
+        params: ImageGenParamsSchema.nullable(),
+        output: ImageGenOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.videoGen),
+        params: VideoGenParamsSchema.nullable(),
+        output: VideoGenOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.videoEdit),
+        params: VideoGenParamsSchema.nullable(),
+        output: VideoGenOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.ttsGen),
+        params: AudioGenParamsSchema.nullable(),
+        output: AudioGenTTSOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.sttGen),
+        params: AudioGenParamsSchema.nullable(),
+        output: AudioGenSTTOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.textBlock),
+        params: TextBlockParamsSchema.nullable(),
+        output: TextBlockParamsSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.imageBlock),
+        params: ImageBlockParamsSchema.nullable(),
+        output: ImageBlockParamsSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.videoBlock),
+        params: VideoBlockParamsSchema.nullable(),
+        output: VideoBlockParamsSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.fileBlock),
+        params: FileBlockParamsSchema.nullable(),
+        output: FileBlockParamsSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.note),
+        params: NoteParamsSchema.nullable(),
+        output: NoteParamsSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.colorPalette),
+        params: ColorPaletteParamsSchema.nullable(),
+        output: ColorPaletteOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.motionControl),
+        params: MotionControlParamsSchema.nullable(),
+        output: MotionControlOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.varGen),
+        params: VarGenParamsSchema.nullable(),
+        output: VarGenOutputSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.varBlock),
+        params: VarBlockParamsSchema.nullable(),
+        output: VarBlockParamsSchema.nullable(),
+    }),
+    CanvasNodeBaseSchema.extend({
+        nodeDefinitionId: z.literal(CANVAS_NODE_TYPE.htmlGen),
+        params: HtmlGenParamsSchema.nullable(),
+        output: HtmlGenOutputSchema.nullable(),
+    }),
+]);
+export type CanvasNode = z.infer<typeof CanvasNodeSchema>;

package/models/canvas-template.schema.ts

@@ -1,13 +1,17 @@
 import { z } from 'zod';
 import { INPUT_OUTPUT_TYPE, CANVAS_NODE_TYPE } from '../constants';
-import { CanvasNodeParamsSchema, CanvasNodePositionSchema } from './canvas-node.schema';
+import { CanvasNodePositionSchema, validateCanvasNodeParamsByType } from './canvas-node.schema';
 
-const CanvasTemplateGraphNodeSchema = z.object({
-    uuid: z.string().trim().min(1),
-    nodeDefinitionId: z.nativeEnum(CANVAS_NODE_TYPE),
-    position: CanvasNodePositionSchema,
-    params: CanvasNodeParamsSchema.nullable().optional(),
-});
+const CanvasTemplateGraphNodeSchema = z
+    .object({
+        uuid: z.string().trim().min(1),
+        nodeDefinitionId: z.nativeEnum(CANVAS_NODE_TYPE),
+        position: CanvasNodePositionSchema,
+        params: z.unknown().nullable().optional(),
+    })
+    .superRefine((node, ctx) => {
+        validateCanvasNodeParamsByType(node.nodeDefinitionId, node.params, ctx);
+    });
 
 const CanvasTemplateGraphEdgeSchema = z.object({
     sourceId: z.string().trim().min(1),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/gptbot",
-  "version": "0.12.70",
+  "version": "0.12.71",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/commands/canvas-node/create-canvas-node.command.ts

@@ -1,25 +0,0 @@
-import { z } from 'zod';
-import { CANVAS_NODE_TYPE } from '../../constants';
-import { CanvasNodeParamsSchema, CanvasNodePositionSchema, CanvasNodeSchema } from '../../models';
-
-export namespace CreateCanvasNodeCommand {
-    export const RequestParamSchema = z.object({
-        canvasId: z.string().uuid(),
-    });
-
-    export type RequestParam = z.infer<typeof RequestParamSchema>;
-
-    export const RequestSchema = z.object({
-        nodeDefinitionId: z.nativeEnum(CANVAS_NODE_TYPE),
-        position: CanvasNodePositionSchema,
-        params: CanvasNodeParamsSchema.nullable().optional(),
-    });
-
-    export type Request = z.infer<typeof RequestSchema>;
-
-    export const ResponseSchema = z.object({
-        data: CanvasNodeSchema,
-    });
-
-    export type Response = z.infer<typeof ResponseSchema>;
-}

package/commands/canvas-node/update-canvas-node.command.ts

@@ -1,26 +0,0 @@
-import { z } from 'zod';
-import { CANVAS_NODE_TYPE } from '../../constants';
-import { CanvasNodeParamsSchema, CanvasNodePositionSchema, CanvasNodeSchema } from '../../models';
-
-export namespace UpdateCanvasNodeCommand {
-    export const RequestParamSchema = CanvasNodeSchema.pick({
-        canvasId: true,
-        uuid: true,
-    });
-
-    export type RequestParam = z.infer<typeof RequestParamSchema>;
-
-    export const RequestSchema = z.object({
-        nodeDefinitionId: z.nativeEnum(CANVAS_NODE_TYPE).optional(),
-        position: CanvasNodePositionSchema.optional(),
-        params: CanvasNodeParamsSchema.nullable().optional(),
-    });
-
-    export type Request = z.infer<typeof RequestSchema>;
-
-    export const ResponseSchema = z.object({
-        data: CanvasNodeSchema,
-    });
-
-    export type Response = z.infer<typeof ResponseSchema>;
-}

package/build/commands/{canvas-template → ai-studio/canvas-template}/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./create-canvas-template.command"), exports);
 __exportStar(require("./create-canvas-from-template.command"), exports);
+__exportStar(require("./create-canvas-template.command"), exports);
 __exportStar(require("./delete-canvas-template.command"), exports);
 __exportStar(require("./generate-canvas-template-by-prompt.command"), exports);
 __exportStar(require("./find-canvas-template-by-uuid.query"), exports);

package/commands/{canvas-template → ai-studio/canvas-template}/index.ts

@@ -1,5 +1,5 @@
-export * from './create-canvas-template.command';
 export * from './create-canvas-from-template.command';
+export * from './create-canvas-template.command';
 export * from './delete-canvas-template.command';
 export * from './generate-canvas-template-by-prompt.command';
 export * from './find-canvas-template-by-uuid.query';