@purpleschool/gptbot-tools 0.0.96 → 0.0.98

package/build/image-editor/commands/image-editor.command.js

@@ -16,6 +16,7 @@ var ImageEditorCommand;
             imageUrls: zod_1.z.array(zod_1.z.string()),
             systemPromptId: zod_1.z.string().optional(),
         }),
+        userHasActiveSubscriptionOrProduct: zod_1.z.boolean(),
     });
     ImageEditorCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(models_1.ImageEditorJobSchema);
 })(ImageEditorCommand || (exports.ImageEditorCommand = ImageEditorCommand = {}));

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageEditorModelSchema = exports.ImageEditorModelParamsSchema = void 0;
+exports.ImageEditorModelSchema = exports.ImageEditorModelPricingRulesSchema = exports.ImageEditorModelPricingRuleConditionSchema = exports.ImageEditorModelParamsSchema = void 0;
 const zod_1 = require("zod");
 const common_1 = require("../../common");
 const enums_1 = require("../enums");
@@ -11,6 +11,13 @@ exports.ImageEditorModelParamsSchema = zod_1.z.object({
         acceptedTypes: zod_1.z.array(zod_1.z.string()),
     }),
 });
+exports.ImageEditorModelPricingRuleConditionSchema = zod_1.z.object({
+    withoutSub: zod_1.z.boolean().optional(),
+});
+exports.ImageEditorModelPricingRulesSchema = zod_1.z.array(zod_1.z.object({
+    condition: exports.ImageEditorModelPricingRuleConditionSchema,
+    value: zod_1.z.number(),
+}));
 exports.ImageEditorModelSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     title: zod_1.z.string(),
@@ -23,6 +30,7 @@ exports.ImageEditorModelSchema = zod_1.z.object({
     strategy: zod_1.z.nativeEnum(enums_1.IMAGE_EDITING_STRATEGY),
     maxInputLength: zod_1.z.number(),
     params: exports.ImageEditorModelParamsSchema,
+    pricingRules: exports.ImageEditorModelPricingRulesSchema,
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),
 });

package/build/image-generation/commands/execute-image-generation.command.js

@@ -14,6 +14,7 @@ var ExecuteImageGenerationCommand;
         modelId: zod_1.z.string().uuid(),
         params: models_1.ImageGenerationRequestParamsSchema,
         presetId: zod_1.z.string().uuid().nullable().optional(),
+        userHasActiveSubscriptionOrProduct: zod_1.z.boolean(),
     });
     ExecuteImageGenerationCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(models_1.ImageGenerationJobSchema);
 })(ExecuteImageGenerationCommand || (exports.ExecuteImageGenerationCommand = ExecuteImageGenerationCommand = {}));

package/build/image-generation/commands/forward-image-generation-job.command.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ForwardImageGenerationJobCommand = void 0;
+const zod_1 = require("zod");
+const command_response_schema_1 = require("../../common/models/command-response.schema");
+const models_1 = require("../models");
+const job_status_enum_1 = require("../../tools/enums/job-status.enum");
+const user_reaction_enum_1 = require("../../common/enums/user-reaction.enum");
+var ForwardImageGenerationJobCommand;
+(function (ForwardImageGenerationJobCommand) {
+    ForwardImageGenerationJobCommand.RequestSchema = zod_1.z.object({
+        uuid: zod_1.z.string().uuid(),
+        prompt: zod_1.z.string(),
+        title: zod_1.z.string(),
+        status: zod_1.z.nativeEnum(job_status_enum_1.JOB_STATUS),
+        error: zod_1.z.string().nullable(),
+        price: zod_1.z.number(),
+        reaction: zod_1.z.nativeEnum(user_reaction_enum_1.USER_REACTION).nullable(),
+        externalId: zod_1.z.string().nullable(),
+        output: zod_1.z.array(zod_1.z.string()),
+        params: models_1.ImageGenerationJobParamsSchema,
+        modelId: zod_1.z.string().uuid(),
+        presetId: zod_1.z.string().uuid().nullable().optional(),
+        userId: zod_1.z.string().uuid().nullable().optional(),
+        unregisteredUserId: zod_1.z.string().uuid().nullable().optional(),
+        isDeleted: zod_1.z.boolean(),
+        internalError: zod_1.z.string().nullable(),
+        createdAt: zod_1.z.coerce.date(),
+        updatedAt: zod_1.z.coerce.date(),
+    });
+    ForwardImageGenerationJobCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(models_1.ImageGenerationJobSchema);
+})(ForwardImageGenerationJobCommand || (exports.ForwardImageGenerationJobCommand = ForwardImageGenerationJobCommand = {}));

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

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./execute-image-generation.command"), exports);
+__exportStar(require("./forward-image-generation-job.command"), exports);
 __exportStar(require("./save-image-generation-job.command"), exports);
 __exportStar(require("./soft-delete-image-generation-job-by-uuid.command"), exports);
 __exportStar(require("./soft-delete-image-generation-jobs-by-criteria.command"), exports);

package/build/image-generation/models/image-generation-model.schema.js

@@ -23,6 +23,7 @@ exports.ImageGenerationModelParamsSchema = zod_1.z.object({
 });
 exports.ImageModelPricingRuleConditionSchema = zod_1.z.object({
     resolution: zod_1.z.string().optional(),
+    withoutSub: zod_1.z.boolean().optional(),
 });
 exports.ImageModelPricingRulesSchema = zod_1.z.array(zod_1.z.object({
     condition: exports.ImageModelPricingRuleConditionSchema,

package/build/image-generation/routes/image-generation.amqp.routes.js

@@ -4,6 +4,7 @@ exports.IMAGE_GENERATION_AMQP_ROUTES = void 0;
 exports.IMAGE_GENERATION_AMQP_ROUTES = {
     EXECUTE: 'tools.image-generation.execute.rpc',
     CONFIG: 'tools.image-generation.config.rpc',
+    FORWARD_JOB: 'tools.image-generation.jobs.forward.rpc',
     GET_JOB: 'tools.image-generation.jobs.get.rpc',
     LIST_JOBS: 'tools.image-generation.jobs.list.rpc',
     SET_REACTION: 'tools.image-generation.jobs.set-reaction.rpc',

package/build/tools/enums/tool-content-type.enum.js

@@ -4,6 +4,7 @@ exports.TOOL_CONTENT_TYPE = void 0;
 var TOOL_CONTENT_TYPE;
 (function (TOOL_CONTENT_TYPE) {
     TOOL_CONTENT_TYPE["IMAGE_EDITOR"] = "IMAGE_EDITOR";
+    TOOL_CONTENT_TYPE["IMAGE_GENERATION"] = "IMAGE_GENERATION";
     TOOL_CONTENT_TYPE["TEXT_TO_SPEECH"] = "TEXT_TO_SPEECH";
     TOOL_CONTENT_TYPE["SPEECH_TO_TEXT"] = "SPEECH_TO_TEXT";
     TOOL_CONTENT_TYPE["REPHRASE"] = "REPHRASE";

package/build/tools/models/global-tools-config.schema.js

@@ -7,6 +7,7 @@ const video_1 = require("../../video");
 const music_1 = require("../../music");
 const writer_1 = require("../../writer");
 const image_editor_1 = require("../../image-editor");
+const image_generation_1 = require("../../image-generation");
 const paraphrase_1 = require("../../paraphrase");
 const presentation_1 = require("../../presentation");
 const video_editor_1 = require("../../video-editor");
@@ -17,6 +18,7 @@ exports.GlobalToolsConfigSchema = zod_1.z.object({
     [enums_1.TOOL_CONTENT_TYPE.MUSIC]: music_1.MusicConfigSchema,
     [enums_1.TOOL_CONTENT_TYPE.WRITER]: writer_1.WriterConfigSchema,
     [enums_1.TOOL_CONTENT_TYPE.IMAGE_EDITOR]: image_editor_1.ImageEditorConfigSchema,
+    [enums_1.TOOL_CONTENT_TYPE.IMAGE_GENERATION]: image_generation_1.ImageGenerationConfigSchema,
     [enums_1.TOOL_CONTENT_TYPE.REPHRASE]: paraphrase_1.ParaphraseToolConfigSchema,
     [enums_1.TOOL_CONTENT_TYPE.PRESENTATION]: presentation_1.PresentationConfigSchema,
     [enums_1.TOOL_CONTENT_TYPE.VIDEO_EDITOR]: video_editor_1.VideoEditorConfigSchema,

package/build/tools/models/tools-with-configs.schema.js

@@ -7,6 +7,7 @@ const video_1 = require("../../video");
 const music_1 = require("../../music");
 const writer_1 = require("../../writer");
 const image_editor_1 = require("../../image-editor");
+const image_generation_1 = require("../../image-generation");
 const paraphrase_1 = require("../../paraphrase");
 const presentation_1 = require("../../presentation");
 const video_editor_1 = require("../../video-editor");
@@ -31,6 +32,10 @@ exports.ToolWithConfigSchema = zod_1.z.discriminatedUnion('contentType', [
         contentType: zod_1.z.literal(enums_1.TOOL_CONTENT_TYPE.IMAGE_EDITOR),
         config: image_editor_1.ImageEditorConfigSchema,
     })),
+    tool_schema_1.ToolSchema.merge(zod_1.z.object({
+        contentType: zod_1.z.literal(enums_1.TOOL_CONTENT_TYPE.IMAGE_GENERATION),
+        config: image_generation_1.ImageGenerationConfigSchema,
+    })),
     tool_schema_1.ToolSchema.merge(zod_1.z.object({
         contentType: zod_1.z.literal(enums_1.TOOL_CONTENT_TYPE.REPHRASE),
         config: paraphrase_1.ParaphraseToolConfigSchema,

package/image-editor/commands/image-editor.command.ts

@@ -13,6 +13,7 @@ export namespace ImageEditorCommand {
             imageUrls: z.array(z.string()),
             systemPromptId: z.string().optional(),
         }),
+        userHasActiveSubscriptionOrProduct: z.boolean(),
     });
     export type Request = z.infer<typeof RequestSchema>;
 

package/image-editor/models/image-editor-model.schema.ts

@@ -12,6 +12,21 @@ export const ImageEditorModelParamsSchema = z.object({
 
 export type ImageEditorModelParams = z.infer<typeof ImageEditorModelParamsSchema>;
 
+export const ImageEditorModelPricingRuleConditionSchema = z.object({
+    withoutSub: z.boolean().optional(),
+});
+export type ImageEditorModelPricingRuleCondition = z.infer<
+    typeof ImageEditorModelPricingRuleConditionSchema
+>;
+
+export const ImageEditorModelPricingRulesSchema = z.array(
+    z.object({
+        condition: ImageEditorModelPricingRuleConditionSchema,
+        value: z.number(),
+    }),
+);
+export type ImageEditorModelPricingRules = z.infer<typeof ImageEditorModelPricingRulesSchema>;
+
 export const ImageEditorModelSchema = z.object({
     uuid: z.string(),
     title: z.string(),
@@ -24,6 +39,7 @@ export const ImageEditorModelSchema = z.object({
     strategy: z.nativeEnum(IMAGE_EDITING_STRATEGY),
     maxInputLength: z.number(),
     params: ImageEditorModelParamsSchema,
+    pricingRules: ImageEditorModelPricingRulesSchema,
     createdAt: z.date(),
     updatedAt: z.date(),
 });

package/image-generation/commands/execute-image-generation.command.ts

@@ -11,6 +11,7 @@ export namespace ExecuteImageGenerationCommand {
         modelId: z.string().uuid(),
         params: ImageGenerationRequestParamsSchema,
         presetId: z.string().uuid().nullable().optional(),
+        userHasActiveSubscriptionOrProduct: z.boolean(),
     });
     export type Request = z.infer<typeof RequestSchema>;
 

package/image-generation/commands/forward-image-generation-job.command.ts

@@ -0,0 +1,32 @@
+import { z } from 'zod';
+import { ICommandResponseSchema } from '../../common/models/command-response.schema';
+import { ImageGenerationJobSchema, ImageGenerationJobParamsSchema } from '../models';
+import { JOB_STATUS } from '../../tools/enums/job-status.enum';
+import { USER_REACTION } from '../../common/enums/user-reaction.enum';
+
+export namespace ForwardImageGenerationJobCommand {
+    export const RequestSchema = z.object({
+        uuid: z.string().uuid(),
+        prompt: z.string(),
+        title: z.string(),
+        status: z.nativeEnum(JOB_STATUS),
+        error: z.string().nullable(),
+        price: z.number(),
+        reaction: z.nativeEnum(USER_REACTION).nullable(),
+        externalId: z.string().nullable(),
+        output: z.array(z.string()),
+        params: ImageGenerationJobParamsSchema,
+        modelId: z.string().uuid(),
+        presetId: z.string().uuid().nullable().optional(),
+        userId: z.string().uuid().nullable().optional(),
+        unregisteredUserId: z.string().uuid().nullable().optional(),
+        isDeleted: z.boolean(),
+        internalError: z.string().nullable(),
+        createdAt: z.coerce.date(),
+        updatedAt: z.coerce.date(),
+    });
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = ICommandResponseSchema(ImageGenerationJobSchema);
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/image-generation/commands/index.ts

@@ -1,4 +1,5 @@
 export * from './execute-image-generation.command';
+export * from './forward-image-generation-job.command';
 export * from './save-image-generation-job.command';
 export * from './soft-delete-image-generation-job-by-uuid.command';
 export * from './soft-delete-image-generation-jobs-by-criteria.command';

package/image-generation/models/image-generation-model.schema.ts

@@ -28,6 +28,7 @@ export type ImageGenerationModelParams = z.infer<typeof ImageGenerationModelPara
 
 export const ImageModelPricingRuleConditionSchema = z.object({
     resolution: z.string().optional(),
+    withoutSub: z.boolean().optional(),
 });
 export type ImageModelPricingRuleCondition = z.infer<typeof ImageModelPricingRuleConditionSchema>;
 

package/image-generation/routes/image-generation.amqp.routes.ts

@@ -1,6 +1,7 @@
 export const IMAGE_GENERATION_AMQP_ROUTES = {
     EXECUTE: 'tools.image-generation.execute.rpc',
     CONFIG: 'tools.image-generation.config.rpc',
+    FORWARD_JOB: 'tools.image-generation.jobs.forward.rpc',
     GET_JOB: 'tools.image-generation.jobs.get.rpc',
     LIST_JOBS: 'tools.image-generation.jobs.list.rpc',
     SET_REACTION: 'tools.image-generation.jobs.set-reaction.rpc',

package/package.json

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

package/tools/enums/tool-content-type.enum.ts

@@ -1,5 +1,6 @@
 export enum TOOL_CONTENT_TYPE {
     IMAGE_EDITOR = 'IMAGE_EDITOR',
+    IMAGE_GENERATION = 'IMAGE_GENERATION',
     TEXT_TO_SPEECH = 'TEXT_TO_SPEECH',
     SPEECH_TO_TEXT = 'SPEECH_TO_TEXT',
     REPHRASE = 'REPHRASE',

package/tools/models/global-tools-config.schema.ts

@@ -4,6 +4,7 @@ import { VideoConfigSchema } from '../../video';
 import { MusicConfigSchema } from '../../music';
 import { WriterConfigSchema } from '../../writer';
 import { ImageEditorConfigSchema } from '../../image-editor';
+import { ImageGenerationConfigSchema } from '../../image-generation';
 import { ParaphraseToolConfigSchema } from '../../paraphrase';
 import { PresentationConfigSchema } from '../../presentation';
 import { VideoEditorConfigSchema } from '../../video-editor';
@@ -15,6 +16,7 @@ export const GlobalToolsConfigSchema = z.object({
     [TOOL_CONTENT_TYPE.MUSIC]: MusicConfigSchema,
     [TOOL_CONTENT_TYPE.WRITER]: WriterConfigSchema,
     [TOOL_CONTENT_TYPE.IMAGE_EDITOR]: ImageEditorConfigSchema,
+    [TOOL_CONTENT_TYPE.IMAGE_GENERATION]: ImageGenerationConfigSchema,
     [TOOL_CONTENT_TYPE.REPHRASE]: ParaphraseToolConfigSchema,
     [TOOL_CONTENT_TYPE.PRESENTATION]: PresentationConfigSchema,
     [TOOL_CONTENT_TYPE.VIDEO_EDITOR]: VideoEditorConfigSchema,

package/tools/models/tools-with-configs.schema.ts

@@ -4,6 +4,7 @@ import { VideoConfigSchema } from '../../video';
 import { MusicConfigSchema } from '../../music';
 import { WriterConfigSchema } from '../../writer';
 import { ImageEditorConfigSchema } from '../../image-editor';
+import { ImageGenerationConfigSchema } from '../../image-generation';
 import { ParaphraseToolConfigSchema } from '../../paraphrase';
 import { PresentationConfigSchema } from '../../presentation';
 import { VideoEditorConfigSchema } from '../../video-editor';
@@ -37,6 +38,12 @@ export const ToolWithConfigSchema = z.discriminatedUnion('contentType', [
             config: ImageEditorConfigSchema,
         }),
     ),
+    ToolSchema.merge(
+        z.object({
+            contentType: z.literal(TOOL_CONTENT_TYPE.IMAGE_GENERATION),
+            config: ImageGenerationConfigSchema,
+        }),
+    ),
     ToolSchema.merge(
         z.object({
             contentType: z.literal(TOOL_CONTENT_TYPE.REPHRASE),