@purpleschool/gptbot 0.19.15-stage-2 → 0.19.16

package/build/commands/ai-studio/canvas-node/find-canvas-node-definitions-with-configs.query.d.ts

@@ -229,6 +229,7 @@ export declare namespace FindCanvasNodeDefinitionsWithConfigsQuery {
                             condition: z.ZodObject<{
                                 withoutSub: z.ZodOptional<z.ZodBoolean>;
                                 resolution: z.ZodOptional<z.ZodString>;
+                                perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                             }, z.core.$strip>;
                             value: z.ZodNumber;
                         }, z.core.$strip>>;

package/build/commands/photo-studio/get-photo-studio-config.query.d.ts

@@ -100,6 +100,7 @@ export declare namespace GetPhotoStudioConfigQuery {
                     condition: z.ZodObject<{
                         withoutSub: z.ZodOptional<z.ZodBoolean>;
                         resolution: z.ZodOptional<z.ZodString>;
+                        perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                     }, z.core.$strip>;
                     value: z.ZodNumber;
                 }, z.core.$strip>>;
@@ -249,6 +250,7 @@ export declare namespace GetPhotoStudioConfigQuery {
                         condition: z.ZodObject<{
                             withoutSub: z.ZodOptional<z.ZodBoolean>;
                             resolution: z.ZodOptional<z.ZodString>;
+                            perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                         }, z.core.$strip>;
                         value: z.ZodNumber;
                     }, z.core.$strip>>;

package/build/commands/tools/image-editor/get-image-editor-tool-config.command.d.ts

@@ -39,6 +39,7 @@ export declare namespace GetImageEditorToolConfigCommand {
                     condition: z.ZodObject<{
                         withoutSub: z.ZodOptional<z.ZodBoolean>;
                         resolution: z.ZodOptional<z.ZodString>;
+                        perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                     }, z.core.$strip>;
                     value: z.ZodNumber;
                 }, z.core.$strip>>;

package/build/helpers/image-editor/calculate-image-editor-price.helper.d.ts

@@ -1,7 +1,8 @@
 import { ImageEditorModelPricingRules } from '../../models';
-export declare function calculateImageEditorPrice({ basePrice, userHasActiveSubscriptionOrProduct, resolution, rules, }: {
+export declare function calculateImageEditorPrice({ basePrice, userHasActiveSubscriptionOrProduct, resolution, attachedFilesCount, rules, }: {
     basePrice: number;
     userHasActiveSubscriptionOrProduct: boolean;
     resolution?: string;
+    attachedFilesCount?: number;
     rules: ImageEditorModelPricingRules;
 }): number;

package/build/helpers/image-editor/calculate-image-editor-price.helper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateImageEditorPrice = calculateImageEditorPrice;
-function calculateImageEditorPrice({ basePrice, userHasActiveSubscriptionOrProduct, resolution, rules, }) {
+function calculateImageEditorPrice({ basePrice, userHasActiveSubscriptionOrProduct, resolution, attachedFilesCount = 0, rules, }) {
     let price = basePrice;
     for (const rule of rules !== null && rules !== void 0 ? rules : []) {
         const condition = rule.condition;
@@ -11,6 +11,9 @@ function calculateImageEditorPrice({ basePrice, userHasActiveSubscriptionOrProdu
         if (condition.resolution && condition.resolution === resolution) {
             price += rule.value;
         }
+        if (condition.perAttachedImage) {
+            price += rule.value * attachedFilesCount;
+        }
     }
     return price;
 }

package/build/helpers/image-generation/calculate-image-generation-price.helper.d.ts

@@ -1,7 +1,8 @@
-import { ImageGenerationJobParams, ImageModelPricingRules } from '../../models';
-export declare function calculateImageGenerationPrice({ basePrice, params, userHasActiveSubscriptionOrProduct, rules, }: {
+import { ImageModelPricingRules } from '../../models';
+export declare function calculateImageGenerationPrice({ basePrice, resolution, attachedFilesCount, userHasActiveSubscriptionOrProduct, rules, }: {
     basePrice: number;
-    params: Pick<ImageGenerationJobParams, 'resolution' | 'attachedFiles'>;
+    resolution?: string;
+    attachedFilesCount?: number;
     userHasActiveSubscriptionOrProduct: boolean;
     rules: ImageModelPricingRules;
 }): number;

package/build/helpers/image-generation/calculate-image-generation-price.helper.js

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateImageGenerationPrice = calculateImageGenerationPrice;
-function calculateImageGenerationPrice({ basePrice, params, userHasActiveSubscriptionOrProduct, rules, }) {
-    var _a;
-    var _b;
+function calculateImageGenerationPrice({ basePrice, resolution, attachedFilesCount = 0, userHasActiveSubscriptionOrProduct, rules, }) {
     let price = basePrice;
     for (const rule of rules !== null && rules !== void 0 ? rules : []) {
         const condition = rule.condition;
-        if (condition.resolution && condition.resolution === params.resolution) {
+        if (condition.resolution && condition.resolution === resolution) {
             price += rule.value;
         }
         if (condition.withoutSub && userHasActiveSubscriptionOrProduct === false) {
             price += rule.value;
         }
         if (condition.perAttachedImage) {
-            price += rule.value * ((_b = (_a = params.attachedFiles) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0);
+            price += rule.value * attachedFilesCount;
         }
     }
     return price;

package/build/helpers/image-generation/index.d.ts

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

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

@@ -15,4 +15,3 @@ 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/canvas-node-definition.schema.d.ts

@@ -438,6 +438,7 @@ export declare const CanvasNodeDefinitionToolConfigSchema: z.ZodDiscriminatedUni
                 condition: z.ZodObject<{
                     withoutSub: z.ZodOptional<z.ZodBoolean>;
                     resolution: z.ZodOptional<z.ZodString>;
+                    perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                 }, z.core.$strip>;
                 value: z.ZodNumber;
             }, z.core.$strip>>;
@@ -1312,6 +1313,7 @@ export declare const CanvasNodeDefinitionWithConfigSchema: z.ZodObject<{
                     condition: z.ZodObject<{
                         withoutSub: z.ZodOptional<z.ZodBoolean>;
                         resolution: z.ZodOptional<z.ZodString>;
+                        perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                     }, z.core.$strip>;
                     value: z.ZodNumber;
                 }, z.core.$strip>>;
@@ -2144,6 +2146,7 @@ export declare const CanvasNodeDefinitionsWithConfigsSchema: z.ZodRecord<z.ZodEn
                     condition: z.ZodObject<{
                         withoutSub: z.ZodOptional<z.ZodBoolean>;
                         resolution: z.ZodOptional<z.ZodString>;
+                        perAttachedImage: z.ZodOptional<z.ZodBoolean>;
                     }, z.core.$strip>;
                     value: z.ZodNumber;
                 }, z.core.$strip>>;

package/build/models/tools/image-editor/image-editor-config.schema.d.ts

@@ -99,6 +99,7 @@ export declare const ImageEditorConfigSchema: z.ZodObject<{
             condition: z.ZodObject<{
                 withoutSub: z.ZodOptional<z.ZodBoolean>;
                 resolution: z.ZodOptional<z.ZodString>;
+                perAttachedImage: z.ZodOptional<z.ZodBoolean>;
             }, z.core.$strip>;
             value: z.ZodNumber;
         }, z.core.$strip>>;

package/build/models/tools/image-editor/image-editor-model.schema.d.ts

@@ -17,12 +17,14 @@ export type ImageEditorModelParams = z.infer<typeof ImageEditorModelParamsSchema
 export declare const ImageEditorModelPricingRuleConditionSchema: z.ZodObject<{
     withoutSub: z.ZodOptional<z.ZodBoolean>;
     resolution: z.ZodOptional<z.ZodString>;
+    perAttachedImage: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 export type ImageEditorModelPricingRuleCondition = z.infer<typeof ImageEditorModelPricingRuleConditionSchema>;
 export declare const ImageEditorModelPricingRulesSchema: z.ZodArray<z.ZodObject<{
     condition: z.ZodObject<{
         withoutSub: z.ZodOptional<z.ZodBoolean>;
         resolution: z.ZodOptional<z.ZodString>;
+        perAttachedImage: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strip>;
     value: z.ZodNumber;
 }, z.core.$strip>>;
@@ -64,6 +66,7 @@ export declare const ImageEditorModelSchema: z.ZodObject<{
         condition: z.ZodObject<{
             withoutSub: z.ZodOptional<z.ZodBoolean>;
             resolution: z.ZodOptional<z.ZodString>;
+            perAttachedImage: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strip>;
         value: z.ZodNumber;
     }, z.core.$strip>>;

package/build/models/tools/image-editor/image-editor-model.schema.js

@@ -28,6 +28,7 @@ exports.ImageEditorModelParamsSchema = zod_1.z.object({
 exports.ImageEditorModelPricingRuleConditionSchema = zod_1.z.object({
     withoutSub: zod_1.z.boolean().optional(),
     resolution: zod_1.z.string().optional(),
+    perAttachedImage: zod_1.z.boolean().optional(),
 });
 exports.ImageEditorModelPricingRulesSchema = zod_1.z.array(zod_1.z.object({
     condition: exports.ImageEditorModelPricingRuleConditionSchema,

package/package.json

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

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

@@ -1,62 +0,0 @@
-import { ImageModelPricingRules } from '../../models';
-export type GptImage2Quality = 'low' | 'medium' | 'high';
-export type GptImage2AspectRatio = '1:1' | '4:3' | '5:4' | '16:9' | '21:9' | '3:4' | '4:5' | '9:16' | '9:21';
-export type GptImage2ResolutionTier = '1K' | '2K' | '4K';
-export type GptImage2Size = {
-    width: number;
-    height: number;
-};
-export declare const GPT_IMAGE_2_DEFAULT_OUTPUT_PRICE_PER_1M_USD = 30;
-export declare const DEFAULT_STAR_PRICE_USD = 0.018;
-export declare const DEFAULT_TARGET_MARGIN = 0.6;
-export declare const GPT_IMAGE_2_INPUT_IMAGE_SURCHARGE_STARS = 2;
-export declare function getGptImage2OutputTokensByTier(params: {
-    quality: GptImage2Quality;
-    aspectRatio: GptImage2AspectRatio;
-    resolutionTier: GptImage2ResolutionTier;
-}): number;
-export declare function normalizeGptImage2SizeToOpenAILimits(size: GptImage2Size): GptImage2Size;
-export declare function calculateGptImage2OutputTokensFromSize(params: {
-    quality: GptImage2Quality;
-    width: number;
-    height: number;
-}): number;
-export declare function estimateGptImage2OutputCostUsdFromTokens(params: {
-    outputTokens: number;
-    outputPricePer1MUsd?: number;
-}): number;
-export declare function applyTargetMargin(params: {
-    cost: number;
-    targetMargin?: number;
-}): number;
-export declare function convertUsdToStarsCeil(params: {
-    usd: number;
-    starPriceUsd?: number;
-}): number;
-export declare function calculateGptImage2PriceInStarsFromTokens(params: {
-    outputTokens: number;
-    hasAttachedImage?: boolean;
-    outputPricePer1MUsd?: number;
-    targetMargin?: number;
-    starPriceUsd?: number;
-}): {
-    costUsd: number;
-    sellUsd: number;
-    costStars: number;
-    sellStars: number;
-};
-export declare function calculateGptImage2PriceInStarsByTier(params: {
-    quality: GptImage2Quality;
-    aspectRatio: GptImage2AspectRatio;
-    resolutionTier: GptImage2ResolutionTier;
-    hasAttachedImage?: boolean;
-    outputPricePer1MUsd?: number;
-    targetMargin?: number;
-    starPriceUsd?: number;
-}, rules: ImageModelPricingRules, userHasActiveSubscriptionOrProduct: boolean): {
-    outputTokens: number;
-    costUsd: number;
-    sellUsd: number;
-    costStars: number;
-    sellStars: number;
-};

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

@@ -1,137 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GPT_IMAGE_2_INPUT_IMAGE_SURCHARGE_STARS = 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.normalizeGptImage2SizeToOpenAILimits = normalizeGptImage2SizeToOpenAILimits;
-exports.calculateGptImage2OutputTokensFromSize = calculateGptImage2OutputTokensFromSize;
-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;
-exports.GPT_IMAGE_2_INPUT_IMAGE_SURCHARGE_STARS = 2;
-const GPT_IMAGE_2_BASE_SIZE_BY_ASPECT_RATIO = {
-    '1:1': { width: 1024, height: 1024 },
-    '4:3': { width: 1344, height: 1024 },
-    '5:4': { width: 1280, height: 1024 },
-    '16:9': { width: 1280, height: 720 },
-    '21:9': { width: 1680, height: 720 },
-    '3:4': { width: 1024, height: 1344 },
-    '4:5': { width: 1024, height: 1280 },
-    '9:16': { width: 720, height: 1280 },
-    '9:21': { width: 720, height: 1680 },
-};
-const GPT_IMAGE_2_QUALITY_BASE_TOKENS = {
-    low: 16,
-    medium: 48,
-    high: 96,
-};
-const GPT_IMAGE_2_RESOLUTION_MULTIPLIER = {
-    '1K': 1,
-    '2K': 2,
-    '4K': 4,
-};
-const GPT_IMAGE_2_MAX_EDGE = 3840;
-const GPT_IMAGE_2_MAX_PIXEL_BUDGET = 8294400;
-const GPT_IMAGE_2_SIZE_STEP = 16;
-function getGptImage2OutputTokensByTier(params) {
-    const { quality, aspectRatio, resolutionTier } = params;
-    const baseSize = GPT_IMAGE_2_BASE_SIZE_BY_ASPECT_RATIO[aspectRatio];
-    const multiplier = GPT_IMAGE_2_RESOLUTION_MULTIPLIER[resolutionTier];
-    const normalizedSize = normalizeGptImage2SizeToOpenAILimits({
-        width: Math.round(baseSize.width * multiplier),
-        height: Math.round(baseSize.height * multiplier),
-    });
-    return calculateGptImage2OutputTokensFromSize(Object.assign({ quality }, normalizedSize));
-}
-function normalizeGptImage2SizeToOpenAILimits(size) {
-    let scale = 1;
-    const longestEdge = Math.max(size.width, size.height);
-    if (longestEdge > GPT_IMAGE_2_MAX_EDGE) {
-        scale = Math.min(scale, GPT_IMAGE_2_MAX_EDGE / longestEdge);
-    }
-    const pixelCount = size.width * size.height;
-    if (pixelCount > GPT_IMAGE_2_MAX_PIXEL_BUDGET) {
-        scale = Math.min(scale, Math.sqrt(GPT_IMAGE_2_MAX_PIXEL_BUDGET / pixelCount));
-    }
-    const normalizedWidth = Math.floor((size.width * scale) / GPT_IMAGE_2_SIZE_STEP) * GPT_IMAGE_2_SIZE_STEP;
-    const normalizedHeight = Math.floor((size.height * scale) / GPT_IMAGE_2_SIZE_STEP) * GPT_IMAGE_2_SIZE_STEP;
-    return {
-        width: Math.max(GPT_IMAGE_2_SIZE_STEP, normalizedWidth),
-        height: Math.max(GPT_IMAGE_2_SIZE_STEP, normalizedHeight),
-    };
-}
-function calculateGptImage2OutputTokensFromSize(params) {
-    const { quality, width, height } = params;
-    const longestEdge = Math.max(width, height);
-    const shortestEdge = Math.min(width, height);
-    const qualityBaseTokens = GPT_IMAGE_2_QUALITY_BASE_TOKENS[quality];
-    const scaledShortEdgeTokens = Math.round((qualityBaseTokens * shortestEdge) / longestEdge);
-    const widthTokens = width >= height ? qualityBaseTokens : scaledShortEdgeTokens;
-    const heightTokens = width >= height ? scaledShortEdgeTokens : qualityBaseTokens;
-    return Math.ceil((widthTokens * heightTokens * (2000000 + width * height)) / 4000000);
-}
-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,
-    });
-    const sellStars = convertUsdToStarsCeil({ usd: sellUsd, starPriceUsd: params.starPriceUsd });
-    const finalSellStars = sellStars + (params.hasAttachedImage ? exports.GPT_IMAGE_2_INPUT_IMAGE_SURCHARGE_STARS : 0);
-    return {
-        costUsd,
-        sellUsd,
-        costStars: convertUsdToStarsCeil({ usd: costUsd, starPriceUsd: params.starPriceUsd }),
-        sellStars: finalSellStars,
-    };
-}
-function calculateGptImage2PriceInStarsByTier(params, rules, userHasActiveSubscriptionOrProduct) {
-    const outputTokens = getGptImage2OutputTokensByTier({
-        quality: params.quality,
-        aspectRatio: params.aspectRatio,
-        resolutionTier: params.resolutionTier,
-    });
-    const priced = calculateGptImage2PriceInStarsFromTokens({
-        outputTokens,
-        hasAttachedImage: params.hasAttachedImage,
-        outputPricePer1MUsd: params.outputPricePer1MUsd,
-        targetMargin: params.targetMargin,
-        starPriceUsd: params.starPriceUsd,
-    });
-    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 });
-}