@purpleschool/gptbot 0.12.55 → 0.12.56

package/build/commands/canvas/create-canvas.command.js

@@ -6,7 +6,7 @@ const models_1 = require("../../models");
 var CreateCanvasCommand;
 (function (CreateCanvasCommand) {
     CreateCanvasCommand.RequestSchema = zod_1.z.object({
-        name: zod_1.z.string().trim().min(1).optional()
+        name: zod_1.z.string().trim().min(1).optional(),
     });
     CreateCanvasCommand.ResponseSchema = zod_1.z.object({
         data: models_1.CanvasSchema,

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_TARGET_MARGIN = exports.DEFAULT_STAR_PRICE_USD = exports.GPT_IMAGE_2_DEFAULT_OUTPUT_PRICE_PER_1M_USD = void 0;
+exports.getGptImage2OutputTokensByTier = getGptImage2OutputTokensByTier;
+exports.estimateGptImage2OutputCostUsdFromTokens = estimateGptImage2OutputCostUsdFromTokens;
+exports.applyTargetMargin = applyTargetMargin;
+exports.convertUsdToStarsCeil = convertUsdToStarsCeil;
+exports.calculateGptImage2PriceInStarsFromTokens = calculateGptImage2PriceInStarsFromTokens;
+exports.calculateGptImage2PriceInStarsByTier = calculateGptImage2PriceInStarsByTier;
+exports.GPT_IMAGE_2_DEFAULT_OUTPUT_PRICE_PER_1M_USD = 30;
+exports.DEFAULT_STAR_PRICE_USD = 0.018;
+exports.DEFAULT_TARGET_MARGIN = 0.6;
+const GPT_IMAGE_2_OUTPUT_TOKENS_BY_QUALITY_RATIO_AND_TIER = {
+    low: {
+        '1:1': { '1K': 196, '2K': 397, '4K': 659 },
+        '16:9': { '1K': 106, '2K': 205, '4K': 371 },
+        '9:16': { '1K': 106, '2K': 205, '4K': 371 },
+        '21:9': { '1K': 90, '2K': 192, '4K': 234 },
+    },
+    medium: {
+        '1:1': { '1K': 1756, '2K': 3568, '4K': 5930 },
+        '16:9': { '1K': 947, '2K': 1843, '4K': 3336 },
+        '9:16': { '1K': 947, '2K': 1843, '4K': 3336 },
+        '21:9': { '1K': 809, '2K': 1724, '4K': 2099 },
+    },
+    high: {
+        '1:1': { '1K': 7024, '2K': 14272, '4K': 23719 },
+        '16:9': { '1K': 3787, '2K': 7370, '4K': 13342 },
+        '9:16': { '1K': 3787, '2K': 7370, '4K': 13342 },
+        '21:9': { '1K': 3159, '2K': 6729, '4K': 8196 },
+    },
+};
+function getGptImage2OutputTokensByTier(params) {
+    const { quality, aspectRatio, resolutionTier } = params;
+    return GPT_IMAGE_2_OUTPUT_TOKENS_BY_QUALITY_RATIO_AND_TIER[quality][aspectRatio][resolutionTier];
+}
+function estimateGptImage2OutputCostUsdFromTokens(params) {
+    const { outputTokens, outputPricePer1MUsd = exports.GPT_IMAGE_2_DEFAULT_OUTPUT_PRICE_PER_1M_USD } = params;
+    return (outputTokens / 1000000) * outputPricePer1MUsd;
+}
+function applyTargetMargin(params) {
+    const { cost, targetMargin = exports.DEFAULT_TARGET_MARGIN } = params;
+    if (targetMargin < 0 || targetMargin >= 1) {
+        throw new Error(`targetMargin must be in [0, 1), got ${targetMargin}`);
+    }
+    return cost / (1 - targetMargin);
+}
+function convertUsdToStarsCeil(params) {
+    const { usd, starPriceUsd = exports.DEFAULT_STAR_PRICE_USD } = params;
+    if (starPriceUsd <= 0) {
+        throw new Error(`starPriceUsd must be > 0, got ${starPriceUsd}`);
+    }
+    return Math.max(1, Math.ceil(usd / starPriceUsd));
+}
+function calculateGptImage2PriceInStarsFromTokens(params) {
+    const costUsd = estimateGptImage2OutputCostUsdFromTokens({
+        outputTokens: params.outputTokens,
+        outputPricePer1MUsd: params.outputPricePer1MUsd,
+    });
+    const sellUsd = applyTargetMargin({
+        cost: costUsd,
+        targetMargin: params.targetMargin,
+    });
+    return {
+        costUsd,
+        sellUsd,
+        costStars: convertUsdToStarsCeil({ usd: costUsd, starPriceUsd: params.starPriceUsd }),
+        sellStars: convertUsdToStarsCeil({ usd: sellUsd, starPriceUsd: params.starPriceUsd }),
+    };
+}
+function calculateGptImage2PriceInStarsByTier(params) {
+    const outputTokens = getGptImage2OutputTokensByTier({
+        quality: params.quality,
+        aspectRatio: params.aspectRatio,
+        resolutionTier: params.resolutionTier,
+    });
+    const priced = calculateGptImage2PriceInStarsFromTokens({
+        outputTokens,
+        outputPricePer1MUsd: params.outputPricePer1MUsd,
+        targetMargin: params.targetMargin,
+        starPriceUsd: params.starPriceUsd,
+    });
+    return Object.assign({ outputTokens }, priced);
+}

package/build/helpers/image-generation/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./calculate-image-generation-price.helper"), exports);
+__exportStar(require("./calculate-gpt-image-2-price-with-margin.helper"), exports);

package/build/models/tools/video/video-job.schema.js

@@ -6,12 +6,17 @@ const constants_1 = require("../../../constants");
 const tool_job_schema_1 = require("../../tool-job.schema");
 exports.VideoJobParamsSchema = zod_1.z.object({
     imageUrls: zod_1.z.string().array().optional(),
+    imageIds: zod_1.z.array(zod_1.z.string()).optional(),
+    firstFrameUrl: zod_1.z.string().optional(),
+    lastFrameUrl: zod_1.z.string().optional(),
+    firstFrameId: zod_1.z.string().optional(),
+    lastFrameId: zod_1.z.string().optional(),
     duration: zod_1.z.number().optional(),
     aspectRatio: zod_1.z.string().optional(),
-    imageIds: zod_1.z.array(zod_1.z.string()).optional(),
-    firstFrameImageId: zod_1.z.string().uuid().optional(),
-    lastFrameImageId: zod_1.z.string().uuid().optional(),
+    quality: zod_1.z.string().optional(),
     resolution: zod_1.z.string().optional(),
+    sound: zod_1.z.boolean().optional(),
+    multiShots: zod_1.z.boolean().optional(),
 });
 exports.VideoJobSchema = tool_job_schema_1.ToolJobSchema.extend({
     title: zod_1.z.string(),

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

@@ -3,7 +3,7 @@ import { CanvasSchema } from '../../models';
 
 export namespace CreateCanvasCommand {
     export const RequestSchema = z.object({
-        name: z.string().trim().min(1).optional()
+        name: z.string().trim().min(1).optional(),
     });
 
     export type Request = z.infer<typeof RequestSchema>;

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

@@ -0,0 +1,136 @@
+export type GptImage2Quality = 'low' | 'medium' | 'high';
+export type GptImage2AspectRatio = '1:1' | '16:9' | '9:16' | '21:9';
+export type GptImage2ResolutionTier = '1K' | '2K' | '4K';
+
+export const GPT_IMAGE_2_DEFAULT_OUTPUT_PRICE_PER_1M_USD = 30;
+export const DEFAULT_STAR_PRICE_USD = 0.018;
+export const DEFAULT_TARGET_MARGIN = 0.6;
+
+const GPT_IMAGE_2_OUTPUT_TOKENS_BY_QUALITY_RATIO_AND_TIER: Record<
+    GptImage2Quality,
+    Record<GptImage2AspectRatio, Record<GptImage2ResolutionTier, number>>
+> = {
+    low: {
+        '1:1': { '1K': 196, '2K': 397, '4K': 659 },
+        '16:9': { '1K': 106, '2K': 205, '4K': 371 },
+        '9:16': { '1K': 106, '2K': 205, '4K': 371 },
+        '21:9': { '1K': 90, '2K': 192, '4K': 234 },
+    },
+    medium: {
+        '1:1': { '1K': 1756, '2K': 3568, '4K': 5930 },
+        '16:9': { '1K': 947, '2K': 1843, '4K': 3336 },
+        '9:16': { '1K': 947, '2K': 1843, '4K': 3336 },
+        '21:9': { '1K': 809, '2K': 1724, '4K': 2099 },
+    },
+    high: {
+        '1:1': { '1K': 7024, '2K': 14272, '4K': 23719 },
+        '16:9': { '1K': 3787, '2K': 7370, '4K': 13342 },
+        '9:16': { '1K': 3787, '2K': 7370, '4K': 13342 },
+        '21:9': { '1K': 3159, '2K': 6729, '4K': 8196 },
+    },
+};
+
+export function getGptImage2OutputTokensByTier(params: {
+    quality: GptImage2Quality;
+    aspectRatio: GptImage2AspectRatio;
+    resolutionTier: GptImage2ResolutionTier;
+}): number {
+    const { quality, aspectRatio, resolutionTier } = params;
+    return GPT_IMAGE_2_OUTPUT_TOKENS_BY_QUALITY_RATIO_AND_TIER[quality][aspectRatio][
+        resolutionTier
+    ];
+}
+
+export function estimateGptImage2OutputCostUsdFromTokens(params: {
+    outputTokens: number;
+    outputPricePer1MUsd?: number;
+}): number {
+    const { outputTokens, outputPricePer1MUsd = GPT_IMAGE_2_DEFAULT_OUTPUT_PRICE_PER_1M_USD } =
+        params;
+
+    return (outputTokens / 1_000_000) * outputPricePer1MUsd;
+}
+
+export function applyTargetMargin(params: {
+    cost: number;
+    targetMargin?: number;
+}): number {
+    const { cost, targetMargin = DEFAULT_TARGET_MARGIN } = params;
+    if (targetMargin < 0 || targetMargin >= 1) {
+        throw new Error(`targetMargin must be in [0, 1), got ${targetMargin}`);
+    }
+
+    return cost / (1 - targetMargin);
+}
+
+export function convertUsdToStarsCeil(params: {
+    usd: number;
+    starPriceUsd?: number;
+}): number {
+    const { usd, starPriceUsd = DEFAULT_STAR_PRICE_USD } = params;
+    if (starPriceUsd <= 0) {
+        throw new Error(`starPriceUsd must be > 0, got ${starPriceUsd}`);
+    }
+
+    return Math.max(1, Math.ceil(usd / starPriceUsd));
+}
+
+export function calculateGptImage2PriceInStarsFromTokens(params: {
+    outputTokens: number;
+    outputPricePer1MUsd?: number;
+    targetMargin?: number;
+    starPriceUsd?: number;
+}): {
+    costUsd: number;
+    sellUsd: number;
+    costStars: number;
+    sellStars: number;
+} {
+    const costUsd = estimateGptImage2OutputCostUsdFromTokens({
+        outputTokens: params.outputTokens,
+        outputPricePer1MUsd: params.outputPricePer1MUsd,
+    });
+    const sellUsd = applyTargetMargin({
+        cost: costUsd,
+        targetMargin: params.targetMargin,
+    });
+
+    return {
+        costUsd,
+        sellUsd,
+        costStars: convertUsdToStarsCeil({ usd: costUsd, starPriceUsd: params.starPriceUsd }),
+        sellStars: convertUsdToStarsCeil({ usd: sellUsd, starPriceUsd: params.starPriceUsd }),
+    };
+}
+
+export function calculateGptImage2PriceInStarsByTier(params: {
+    quality: GptImage2Quality;
+    aspectRatio: GptImage2AspectRatio;
+    resolutionTier: GptImage2ResolutionTier;
+    outputPricePer1MUsd?: number;
+    targetMargin?: number;
+    starPriceUsd?: number;
+}): {
+    outputTokens: number;
+    costUsd: number;
+    sellUsd: number;
+    costStars: number;
+    sellStars: number;
+} {
+    const outputTokens = getGptImage2OutputTokensByTier({
+        quality: params.quality,
+        aspectRatio: params.aspectRatio,
+        resolutionTier: params.resolutionTier,
+    });
+    const priced = calculateGptImage2PriceInStarsFromTokens({
+        outputTokens,
+        outputPricePer1MUsd: params.outputPricePer1MUsd,
+        targetMargin: params.targetMargin,
+        starPriceUsd: params.starPriceUsd,
+    });
+
+    return {
+        outputTokens,
+        ...priced,
+    };
+}

package/helpers/image-generation/index.ts

@@ -1 +1,2 @@
 export * from './calculate-image-generation-price.helper';
+export * from './calculate-gpt-image-2-price-with-margin.helper';

package/models/tools/video/video-job.schema.ts

@@ -4,12 +4,17 @@ import { ToolJobSchema } from '../../tool-job.schema';
 
 export const VideoJobParamsSchema = z.object({
     imageUrls: z.string().array().optional(),
+    imageIds: z.array(z.string()).optional(),
+    firstFrameUrl: z.string().optional(),
+    lastFrameUrl: z.string().optional(),
+    firstFrameId: z.string().optional(),
+    lastFrameId: z.string().optional(),
     duration: z.number().optional(),
     aspectRatio: z.string().optional(),
-    imageIds: z.array(z.string()).optional(),
-    firstFrameImageId: z.string().uuid().optional(),
-    lastFrameImageId: z.string().uuid().optional(),
+    quality: z.string().optional(),
     resolution: z.string().optional(),
+    sound: z.boolean().optional(),
+    multiShots: z.boolean().optional(),
 });
 
 export type VideoJobParams = z.infer<typeof VideoJobParamsSchema>;

package/package.json

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