@purpleschool/gptbot-tools 0.2.16-stage → 0.2.18-stage

package/build/html-page-builder/commands/get-html-page-builder-price-calculation-data.command.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetHtmlPageBuilderPriceCalculationDataCommand = void 0;
+const zod_1 = require("zod");
+const command_response_schema_1 = require("../../common/models/command-response.schema");
+const enums_1 = require("../enums");
+var GetHtmlPageBuilderPriceCalculationDataCommand;
+(function (GetHtmlPageBuilderPriceCalculationDataCommand) {
+    GetHtmlPageBuilderPriceCalculationDataCommand.RequestSchema = zod_1.z.object({
+        modelId: zod_1.z.string().uuid(),
+        inputLength: zod_1.z.number().int().nonnegative(),
+        sessionId: zod_1.z.string().uuid().nullable().optional(),
+    });
+    GetHtmlPageBuilderPriceCalculationDataCommand.ResponseDataSchema = zod_1.z.object({
+        modelPricing: zod_1.z.object({
+            inputPrice: zod_1.z.number(),
+            outputPrice: zod_1.z.number(),
+        }),
+        effectivePromptLength: zod_1.z.number(),
+        breakdown: zod_1.z.object({
+            systemPromptLength: zod_1.z.number(),
+            inputLength: zod_1.z.number(),
+            currentHtmlLength: zod_1.z.number(),
+            userPromptTemplateOverheadLength: zod_1.z.number(),
+            modeHintLength: zod_1.z.number(),
+            userMessageLength: zod_1.z.number(),
+            attachmentsTextLength: zod_1.z.number(),
+        }),
+        metadata: zod_1.z.object({
+            mode: zod_1.z.nativeEnum(enums_1.HTML_PAGE_BUILDER_SESSION_STAGE),
+            modelId: zod_1.z.string().uuid(),
+            sessionId: zod_1.z.string().uuid().nullable(),
+        }),
+    });
+    GetHtmlPageBuilderPriceCalculationDataCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(GetHtmlPageBuilderPriceCalculationDataCommand.ResponseDataSchema);
+})(GetHtmlPageBuilderPriceCalculationDataCommand || (exports.GetHtmlPageBuilderPriceCalculationDataCommand = GetHtmlPageBuilderPriceCalculationDataCommand = {}));

package/build/html-page-builder/commands/html-page-builder-execute.command.js

@@ -6,8 +6,7 @@ const command_response_schema_1 = require("../../common/models/command-response.
 const models_1 = require("../models");
 var HtmlPageBuilderExecuteCommand;
 (function (HtmlPageBuilderExecuteCommand) {
-    HtmlPageBuilderExecuteCommand.RequestSchema = zod_1.z
-        .object({
+    HtmlPageBuilderExecuteCommand.RequestSchema = zod_1.z.object({
         userId: zod_1.z.string().uuid().nullable().optional(),
         unregisteredUserId: zod_1.z.string().uuid().nullable().optional(),
         sessionId: zod_1.z.string().uuid().optional(),
@@ -16,16 +15,6 @@ var HtmlPageBuilderExecuteCommand;
         params: models_1.HtmlPageBuilderJobParamsSchema,
         tokenReservationId: zod_1.z.string().uuid().optional(),
         precalculatedPrice: zod_1.z.number().optional(),
-    })
-        .refine((data) => {
-        return !(data.userId && data.unregisteredUserId);
-    }, {
-        message: 'userId and unregisteredUserId cannot be used together',
-        path: ['userId', 'unregisteredUserId'],
-    })
-        .refine((data) => { var _a; return Boolean((_a = data.userId) !== null && _a !== void 0 ? _a : data.unregisteredUserId); }, {
-        message: 'userId or unregisteredUserId is required',
-        path: ['userId', 'unregisteredUserId'],
     });
     HtmlPageBuilderExecuteCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(models_1.HtmlPageBuilderSessionSchema);
 })(HtmlPageBuilderExecuteCommand || (exports.HtmlPageBuilderExecuteCommand = HtmlPageBuilderExecuteCommand = {}));

package/build/html-page-builder/commands/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./create-html-page-builder-session.command"), exports);
-__exportStar(require("./get-html-page-builder-price.command"), exports);
+__exportStar(require("./get-html-page-builder-price-calculation-data.command"), exports);
 __exportStar(require("./html-page-builder-execute.command"), exports);
 __exportStar(require("./soft-delete-all-html-page-builder-sessions.command"), exports);
 __exportStar(require("./soft-delete-html-page-builder-session-by-uuid.command"), exports);

package/build/html-page-builder/routes/html-page-builder.amqp.routes.js

@@ -4,7 +4,7 @@ exports.HTML_PAGE_BUILDER_AMQP_ROUTES = void 0;
 exports.HTML_PAGE_BUILDER_AMQP_ROUTES = {
     CONFIG: 'tools.html-page-builder.config.rpc',
     EXECUTE: 'tools.html-page-builder.execute.rpc',
-    GET_PRICE: 'tools.html-page-builder.get-price.rpc',
+    GET_PRICE_CALCULATION_DATA: 'tools.html-page-builder.get-price-calculation-data.rpc',
     CREATE_SESSION: 'tools.html-page-builder.sessions.create.rpc',
     LIST_SESSIONS: 'tools.html-page-builder.sessions.list.rpc',
     GET_SESSION: 'tools.html-page-builder.sessions.get.rpc',

package/build/image-generation/enums/image-generation-model-strategy.enum.js

@@ -12,6 +12,7 @@ var IMAGE_GENERATION_MODEL_STRATEGY;
     // OpenAI
     IMAGE_GENERATION_MODEL_STRATEGY["DALLE_IMAGE_GENERATION"] = "DALLE_IMAGE_GENERATION";
     IMAGE_GENERATION_MODEL_STRATEGY["OPENAI_IMAGE_1_GENERATION"] = "OPENAI_IMAGE_1_GENERATION";
+    IMAGE_GENERATION_MODEL_STRATEGY["OPENAI_IMAGE_2_GENERATION"] = "OPENAI_IMAGE_2_GENERATION";
     // Google AI
     IMAGE_GENERATION_MODEL_STRATEGY["GEMINI_IMAGE_GENERATION"] = "GEMINI_IMAGE_GENERATION";
     IMAGE_GENERATION_MODEL_STRATEGY["IMAGEN_IMAGE_GENERATION"] = "IMAGEN_IMAGE_GENERATION";

package/html-page-builder/commands/get-html-page-builder-price-calculation-data.command.ts

@@ -0,0 +1,38 @@
+import { z } from 'zod';
+import { ICommandResponseSchema } from '../../common/models/command-response.schema';
+import { HTML_PAGE_BUILDER_SESSION_STAGE } from '../enums';
+
+export namespace GetHtmlPageBuilderPriceCalculationDataCommand {
+    export const RequestSchema = z.object({
+        modelId: z.string().uuid(),
+        inputLength: z.number().int().nonnegative(),
+        sessionId: z.string().uuid().nullable().optional(),
+    });
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseDataSchema = z.object({
+        modelPricing: z.object({
+            inputPrice: z.number(),
+            outputPrice: z.number(),
+        }),
+        effectivePromptLength: z.number(),
+        breakdown: z.object({
+            systemPromptLength: z.number(),
+            inputLength: z.number(),
+            currentHtmlLength: z.number(),
+            userPromptTemplateOverheadLength: z.number(),
+            modeHintLength: z.number(),
+            userMessageLength: z.number(),
+            attachmentsTextLength: z.number(),
+        }),
+        metadata: z.object({
+            mode: z.nativeEnum(HTML_PAGE_BUILDER_SESSION_STAGE),
+            modelId: z.string().uuid(),
+            sessionId: z.string().uuid().nullable(),
+        }),
+    });
+    export type ResponseData = z.infer<typeof ResponseDataSchema>;
+
+    export const ResponseSchema = ICommandResponseSchema(ResponseDataSchema);
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/html-page-builder/commands/html-page-builder-execute.command.ts

@@ -3,30 +3,16 @@ import { ICommandResponseSchema } from '../../common/models/command-response.sch
 import { HtmlPageBuilderJobParamsSchema, HtmlPageBuilderSessionSchema } from '../models';
 
 export namespace HtmlPageBuilderExecuteCommand {
-    export const RequestSchema = z
-        .object({
-            userId: z.string().uuid().nullable().optional(),
-            unregisteredUserId: z.string().uuid().nullable().optional(),
-            sessionId: z.string().uuid().optional(),
-            userPrompt: z.string(),
-            modelId: z.string().uuid(),
-            params: HtmlPageBuilderJobParamsSchema,
-            tokenReservationId: z.string().uuid().optional(),
-            precalculatedPrice: z.number().optional(),
-        })
-        .refine(
-            (data) => {
-                return !(data.userId && data.unregisteredUserId);
-            },
-            {
-                message: 'userId and unregisteredUserId cannot be used together',
-                path: ['userId', 'unregisteredUserId'],
-            },
-        )
-        .refine((data) => Boolean(data.userId ?? data.unregisteredUserId), {
-            message: 'userId or unregisteredUserId is required',
-            path: ['userId', 'unregisteredUserId'],
-        });
+    export const RequestSchema = z.object({
+        userId: z.string().uuid().nullable().optional(),
+        unregisteredUserId: z.string().uuid().nullable().optional(),
+        sessionId: z.string().uuid().optional(),
+        userPrompt: z.string(),
+        modelId: z.string().uuid(),
+        params: HtmlPageBuilderJobParamsSchema,
+        tokenReservationId: z.string().uuid().optional(),
+        precalculatedPrice: z.number().optional(),
+    });
     export type Request = z.infer<typeof RequestSchema>;
 
     export const ResponseSchema = ICommandResponseSchema(HtmlPageBuilderSessionSchema);

package/html-page-builder/commands/index.ts

@@ -1,5 +1,5 @@
 export * from './create-html-page-builder-session.command';
-export * from './get-html-page-builder-price.command';
+export * from './get-html-page-builder-price-calculation-data.command';
 export * from './html-page-builder-execute.command';
 export * from './soft-delete-all-html-page-builder-sessions.command';
 export * from './soft-delete-html-page-builder-session-by-uuid.command';

package/html-page-builder/routes/html-page-builder.amqp.routes.ts

@@ -1,7 +1,7 @@
 export const HTML_PAGE_BUILDER_AMQP_ROUTES = {
     CONFIG: 'tools.html-page-builder.config.rpc',
     EXECUTE: 'tools.html-page-builder.execute.rpc',
-    GET_PRICE: 'tools.html-page-builder.get-price.rpc',
+    GET_PRICE_CALCULATION_DATA: 'tools.html-page-builder.get-price-calculation-data.rpc',
     CREATE_SESSION: 'tools.html-page-builder.sessions.create.rpc',
     LIST_SESSIONS: 'tools.html-page-builder.sessions.list.rpc',
     GET_SESSION: 'tools.html-page-builder.sessions.get.rpc',

package/image-generation/enums/image-generation-model-strategy.enum.ts

@@ -10,6 +10,7 @@ export enum IMAGE_GENERATION_MODEL_STRATEGY {
     // OpenAI
     DALLE_IMAGE_GENERATION = 'DALLE_IMAGE_GENERATION',
     OPENAI_IMAGE_1_GENERATION = 'OPENAI_IMAGE_1_GENERATION',
+    OPENAI_IMAGE_2_GENERATION = 'OPENAI_IMAGE_2_GENERATION',
 
     // Google AI
     GEMINI_IMAGE_GENERATION = 'GEMINI_IMAGE_GENERATION',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purpleschool/gptbot-tools",
-  "version": "0.2.16-stage",
+  "version": "0.2.18-stage",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {

package/build/html-page-builder/commands/get-html-page-builder-price.command.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetHtmlPageBuilderPriceCommand = void 0;
-const zod_1 = require("zod");
-const command_response_schema_1 = require("../../common/models/command-response.schema");
-var GetHtmlPageBuilderPriceCommand;
-(function (GetHtmlPageBuilderPriceCommand) {
-    GetHtmlPageBuilderPriceCommand.RequestSchema = zod_1.z.object({
-        modelId: zod_1.z.string().uuid(),
-        userPrompt: zod_1.z.string(),
-        sessionId: zod_1.z.string().uuid().nullable().optional(),
-    });
-    GetHtmlPageBuilderPriceCommand.ResponseDataSchema = zod_1.z.object({
-        price: zod_1.z.number(),
-    });
-    GetHtmlPageBuilderPriceCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(GetHtmlPageBuilderPriceCommand.ResponseDataSchema);
-})(GetHtmlPageBuilderPriceCommand || (exports.GetHtmlPageBuilderPriceCommand = GetHtmlPageBuilderPriceCommand = {}));

package/html-page-builder/commands/get-html-page-builder-price.command.ts

@@ -1,19 +0,0 @@
-import { z } from 'zod';
-import { ICommandResponseSchema } from '../../common/models/command-response.schema';
-
-export namespace GetHtmlPageBuilderPriceCommand {
-    export const RequestSchema = z.object({
-        modelId: z.string().uuid(),
-        userPrompt: z.string(),
-        sessionId: z.string().uuid().nullable().optional(),
-    });
-    export type Request = z.infer<typeof RequestSchema>;
-
-    export const ResponseDataSchema = z.object({
-        price: z.number(),
-    });
-    export type ResponseData = z.infer<typeof ResponseDataSchema>;
-
-    export const ResponseSchema = ICommandResponseSchema(ResponseDataSchema);
-    export type Response = z.infer<typeof ResponseSchema>;
-}