@purpleschool/gptbot 0.12.99-stage → 0.13.2-stage

package/api/controllers/http/canvas-template.ts

@@ -5,6 +5,7 @@ export const CANVAS_TEMPLATE_ROUTES = {
     CREATE_CANVAS: (uuid: string) => `${uuid}`,
     CREATE_CANVAS_FROM_BODY: 'create-canvas',
     GENERATE: 'generate',
+    PRICE: 'price',
     GET_ALL: '',
     FIND_BY_UUID: (uuid: string) => `${uuid}`,
     UPDATE: (uuid: string) => `${uuid}`,

package/api/routes.ts

@@ -437,6 +437,7 @@ export const REST_API = {
 
     CANVAS_TEMPLATE_PRIVATE: {
         GENERATE: `${ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.GENERATE}`,
+        PRICE: `${ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.PRICE}`,
         CREATE_CANVAS: (uuid: string) =>
             `${ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.CREATE_CANVAS(uuid)}`,
         FIND_BY_UUID: (uuid: string) =>

package/build/api/controllers/http/canvas-template.js

@@ -7,6 +7,7 @@ exports.CANVAS_TEMPLATE_ROUTES = {
     CREATE_CANVAS: (uuid) => `${uuid}`,
     CREATE_CANVAS_FROM_BODY: 'create-canvas',
     GENERATE: 'generate',
+    PRICE: 'price',
     GET_ALL: '',
     FIND_BY_UUID: (uuid) => `${uuid}`,
     UPDATE: (uuid) => `${uuid}`,

package/build/api/routes.js

@@ -360,6 +360,7 @@ exports.REST_API = {
     },
     CANVAS_TEMPLATE_PRIVATE: {
         GENERATE: `${exports.ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.GENERATE}`,
+        PRICE: `${exports.ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.PRICE}`,
         CREATE_CANVAS: (uuid) => `${exports.ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.CREATE_CANVAS(uuid)}`,
         FIND_BY_UUID: (uuid) => `${exports.ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.FIND_BY_UUID(uuid)}`,
         GET_ALL: `${exports.ROOT}/${CONTROLLERS.CANVAS_TEMPLATE_PRIVATE_CONTROLLER}/${CONTROLLERS.CANVAS_TEMPLATE_ROUTES.GET_ALL}`,

package/build/commands/ai-studio/canvas-template/generate-canvas-template-by-prompt.command.js

@@ -7,8 +7,12 @@ var GenerateCanvasTemplateByPromptCommand;
 (function (GenerateCanvasTemplateByPromptCommand) {
     GenerateCanvasTemplateByPromptCommand.RequestSchema = zod_1.z.object({
         prompt: zod_1.z.string().trim().min(1),
+        canvasId: zod_1.z.string().uuid(),
     });
     GenerateCanvasTemplateByPromptCommand.ResponseSchema = zod_1.z.object({
-        data: models_1.GeneratedCanvasTemplateSchema,
+        data: models_1.CanvasSchema.extend({
+            nodes: zod_1.z.array(models_1.CanvasNodeSchema),
+            edges: zod_1.z.array(models_1.CanvasEdgeSchema),
+        }),
     });
 })(GenerateCanvasTemplateByPromptCommand || (exports.GenerateCanvasTemplateByPromptCommand = GenerateCanvasTemplateByPromptCommand = {}));

package/build/commands/ai-studio/canvas-template/get-canvas-template-price.command.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetCanvasTemplatePriceCommand = void 0;
+const zod_1 = require("zod");
+var GetCanvasTemplatePriceCommand;
+(function (GetCanvasTemplatePriceCommand) {
+    GetCanvasTemplatePriceCommand.RequestSchema = zod_1.z.object({
+        promptLength: zod_1.z.coerce.number().int().min(0),
+    });
+    GetCanvasTemplatePriceCommand.ResponseSchema = zod_1.z.object({
+        data: zod_1.z.object({
+            price: zod_1.z.number(),
+            charsUntilNextPriceIncrease: zod_1.z.number().nullable(),
+            charsUntilNextPriceDecrease: zod_1.z.number().nullable(),
+        }),
+    });
+})(GetCanvasTemplatePriceCommand || (exports.GetCanvasTemplatePriceCommand = GetCanvasTemplatePriceCommand = {}));

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

@@ -19,6 +19,7 @@ __exportStar(require("./create-canvas-from-generated-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("./get-canvas-template-price.command"), exports);
 __exportStar(require("./find-canvas-template-by-uuid.query"), exports);
 __exportStar(require("./find-canvas-templates.query"), exports);
 __exportStar(require("./update-canvas-template.command"), exports);

package/build/helpers/image-generation/calculate-gpt-image-2-price-with-margin.helper.js

@@ -71,7 +71,7 @@ function calculateGptImage2PriceInStarsFromTokens(params) {
         sellStars: finalSellStars,
     };
 }
-function calculateGptImage2PriceInStarsByTier(params) {
+function calculateGptImage2PriceInStarsByTier(params, rules, userHasActiveSubscriptionOrProduct) {
     const outputTokens = getGptImage2OutputTokensByTier({
         quality: params.quality,
         aspectRatio: params.aspectRatio,
@@ -84,5 +84,15 @@ function calculateGptImage2PriceInStarsByTier(params) {
         targetMargin: params.targetMargin,
         starPriceUsd: params.starPriceUsd,
     });
-    return Object.assign({ outputTokens }, priced);
+    let finalSellStars = priced.sellStars;
+    for (const rule of rules !== null && rules !== void 0 ? rules : []) {
+        const condition = rule.condition;
+        if (condition.withoutSub && userHasActiveSubscriptionOrProduct === false) {
+            finalSellStars += rule.value;
+        }
+    }
+    if (params.quality === 'low') {
+        finalSellStars += 2;
+    }
+    return Object.assign(Object.assign({ outputTokens }, priced), { sellStars: finalSellStars });
 }

package/build/models/canvas-node-definition.schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CanvasNodeDefinitionsWithConfigsSchema = exports.CanvasNodeDefinitionWithConfigSchema = exports.CanvasNodeDefinitionSchema = exports.CanvasNodeDefinitionToolConfigSchema = exports.CanvasTextGenerationConfigSchema = void 0;
+exports.CanvasNodeDefinitionsWithConfigsSchema = exports.CanvasNodeDefinitionWithConfigSchema = exports.CanvasNodeDefinitionSchema = exports.PortDescriptions = exports.CanvasNodeDefinitionToolConfigSchema = exports.CanvasTextGenerationConfigSchema = void 0;
 const zod_1 = require("zod");
 const constants_1 = require("../constants");
 const icon_variants_schema_1 = require("./icon-variants.schema");
@@ -67,12 +67,19 @@ exports.CanvasNodeDefinitionToolConfigSchema = zod_1.z.discriminatedUnion('nodeT
     createCanvasNodeDefinitionNoConfigSchema(constants_1.CANVAS_NODE_TYPE.varBlock),
     createCanvasNodeDefinitionNoConfigSchema(constants_1.CANVAS_NODE_TYPE.audioBlock),
 ]);
+exports.PortDescriptions = zod_1.z.object({
+    inputs: zod_1.z.record(zod_1.z.nativeEnum(constants_1.INPUT_OUTPUT_TYPE), zod_1.z.string()),
+    outputs: zod_1.z.record(zod_1.z.nativeEnum(constants_1.INPUT_OUTPUT_TYPE), zod_1.z.string()),
+});
 exports.CanvasNodeDefinitionSchema = zod_1.z.object({
     type: zod_1.z.nativeEnum(constants_1.CANVAS_NODE_TYPE),
     label: zod_1.z.string(),
+    description: zod_1.z.string(),
+    tags: zod_1.z.array(zod_1.z.string()),
     icons: icon_variants_schema_1.IconVariantCanvasSchema,
     inputPoints: zod_1.z.array(zod_1.z.nativeEnum(constants_1.INPUT_OUTPUT_TYPE)),
     outputPoints: zod_1.z.array(zod_1.z.nativeEnum(constants_1.INPUT_OUTPUT_TYPE)),
+    portDescriptions: exports.PortDescriptions,
     toolType: zod_1.z.nativeEnum(constants_1.TOOL_CONTENT_TYPE).nullable(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),

package/commands/ai-studio/canvas-template/generate-canvas-template-by-prompt.command.ts

@@ -1,15 +1,19 @@
 import { z } from 'zod';
-import { GeneratedCanvasTemplateSchema } from '../../../models';
+import { CanvasEdgeSchema, CanvasNodeSchema, CanvasSchema } from '../../../models';
 
 export namespace GenerateCanvasTemplateByPromptCommand {
     export const RequestSchema = z.object({
         prompt: z.string().trim().min(1),
+        canvasId: z.string().uuid(),
     });
 
     export type Request = z.infer<typeof RequestSchema>;
 
     export const ResponseSchema = z.object({
-        data: GeneratedCanvasTemplateSchema,
+        data: CanvasSchema.extend({
+            nodes: z.array(CanvasNodeSchema),
+            edges: z.array(CanvasEdgeSchema),
+        }),
     });
 
     export type Response = z.infer<typeof ResponseSchema>;

package/commands/ai-studio/canvas-template/get-canvas-template-price.command.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod';
+
+export namespace GetCanvasTemplatePriceCommand {
+    export const RequestSchema = z.object({
+        promptLength: z.coerce.number().int().min(0),
+    });
+
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = z.object({
+        data: z.object({
+            price: z.number(),
+            charsUntilNextPriceIncrease: z.number().nullable(),
+            charsUntilNextPriceDecrease: z.number().nullable(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/ai-studio/canvas-template/index.ts

@@ -3,6 +3,7 @@ export * from './create-canvas-from-generated-template.command';
 export * from './create-canvas-template.command';
 export * from './delete-canvas-template.command';
 export * from './generate-canvas-template-by-prompt.command';
+export * from './get-canvas-template-price.command';
 export * from './find-canvas-template-by-uuid.query';
 export * from './find-canvas-templates.query';
 export * from './update-canvas-template.command';

package/helpers/image-generation/calculate-gpt-image-2-price-with-margin.helper.ts

@@ -1,3 +1,5 @@
+import { ImageModelPricingRules } from '../../models';
+
 export type GptImage2Quality = 'low' | 'medium' | 'high';
 export type GptImage2AspectRatio = '1:1' | '16:9' | '9:16' | '21:9';
 export type GptImage2ResolutionTier = '1K' | '2K' | '4K';
@@ -111,7 +113,7 @@ export function calculateGptImage2PriceInStarsByTier(params: {
     outputPricePer1MUsd?: number;
     targetMargin?: number;
     starPriceUsd?: number;
-}): {
+}, rules: ImageModelPricingRules, userHasActiveSubscriptionOrProduct: boolean): {
     outputTokens: number;
     costUsd: number;
     sellUsd: number;
@@ -131,8 +133,22 @@ export function calculateGptImage2PriceInStarsByTier(params: {
         starPriceUsd: params.starPriceUsd,
     });
 
+    let finalSellStars = priced.sellStars;
+
+    for (const rule of rules ?? []) {
+        const condition = rule.condition;
+        if (condition.withoutSub && userHasActiveSubscriptionOrProduct === false) {
+            finalSellStars += rule.value;
+        }
+    }
+    
+    if (params.quality === 'low') {
+        finalSellStars += 2;
+    }
+
     return {
         outputTokens,
         ...priced,
+        sellStars: finalSellStars,
     };
 }

package/models/canvas-node-definition.schema.ts

@@ -81,12 +81,22 @@ export const CanvasNodeDefinitionToolConfigSchema = z.discriminatedUnion('nodeTy
 ]);
 export type CanvasNodeDefinitionToolConfig = z.infer<typeof CanvasNodeDefinitionToolConfigSchema>;
 
+export const PortDescriptions = z.object({
+    inputs: z.record(z.nativeEnum(INPUT_OUTPUT_TYPE), z.string()),
+    outputs: z.record(z.nativeEnum(INPUT_OUTPUT_TYPE), z.string()),
+});
+
+export type PortDescriptionsType = z.infer<typeof PortDescriptions>;
+
 export const CanvasNodeDefinitionSchema = z.object({
     type: z.nativeEnum(CANVAS_NODE_TYPE),
     label: z.string(),
+    description: z.string(),
+    tags: z.array(z.string()),
     icons: IconVariantCanvasSchema,
     inputPoints: z.array(z.nativeEnum(INPUT_OUTPUT_TYPE)),
     outputPoints: z.array(z.nativeEnum(INPUT_OUTPUT_TYPE)),
+    portDescriptions: PortDescriptions,
     toolType: z.nativeEnum(TOOL_CONTENT_TYPE).nullable(),
     createdAt: z.date(),
     updatedAt: z.date(),

package/package.json

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