@purpleschool/gptbot-tools 0.0.89 → 0.0.91

package/build/common/errors/errors.js

@@ -1238,6 +1238,16 @@ exports.ERRORS = {
             message: 'Превышено время ожидания генерации изображения',
             httpCode: 500,
         },
+        IMAGE_ATTACHMENT_NOT_SUPPORTED: {
+            code: 'IMAGE_GENERATION.IMAGE_ATTACHMENT_NOT_SUPPORTED',
+            message: 'Выбранная модель не поддерживает вложение изображений',
+            httpCode: 400,
+        },
+        TOO_MANY_ATTACHED_IMAGES: {
+            code: 'IMAGE_GENERATION.TOO_MANY_ATTACHED_IMAGES',
+            message: 'Слишком много вложенных изображений',
+            httpCode: 400,
+        },
     },
     IMAGE_GENERATION_MODEL: {
         SAVE_ERROR: {

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

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageGenerationJobSchema = void 0;
+exports.ImageGenerationJobSchema = exports.ImageGenerationJobParamsSchema = void 0;
 const zod_1 = require("zod");
 const tools_1 = require("../../tools");
 const common_1 = require("../../common");
+exports.ImageGenerationJobParamsSchema = zod_1.z.object({
+    aspectRatio: zod_1.z.string().optional(),
+    attachedImages: zod_1.z.string().array().optional(),
+});
 exports.ImageGenerationJobSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     prompt: zod_1.z.string(),
@@ -13,8 +17,9 @@ exports.ImageGenerationJobSchema = zod_1.z.object({
     price: zod_1.z.number(),
     reaction: zod_1.z.nativeEnum(common_1.USER_REACTION).nullable(),
     externalId: zod_1.z.string().nullable(),
-    params: zod_1.z.any(),
+    params: exports.ImageGenerationJobParamsSchema,
     output: zod_1.z.array(zod_1.z.string()),
+    presetId: zod_1.z.string().nullable().optional(),
     modelId: zod_1.z.string(),
     attempts: zod_1.z.array(zod_1.z.any()),
     userId: zod_1.z.string().nullable().optional(),

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageGenerationModelSchema = exports.ImageGenerationRequestParamsSchema = void 0;
+exports.ImageGenerationModelSchema = exports.ImageGenerationModelParamsSchema = exports.ImageGenerationRequestParamsSchema = void 0;
 const zod_1 = require("zod");
 const common_1 = require("../../common");
 const enums_1 = require("../enums");
@@ -9,6 +9,13 @@ exports.ImageGenerationRequestParamsSchema = zod_1.z.object({
     attachedImages: zod_1.z.array(zod_1.z.string()),
     enhancePrompt: zod_1.z.boolean(),
 });
+exports.ImageGenerationModelParamsSchema = zod_1.z.object({
+    aspectRatio: zod_1.z.record(zod_1.z.string(), zod_1.z.object({
+        width: zod_1.z.number(),
+        height: zod_1.z.number(),
+    })),
+    quality: zod_1.z.string().optional(),
+});
 exports.ImageGenerationModelSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     title: zod_1.z.string(),
@@ -16,11 +23,13 @@ exports.ImageGenerationModelSchema = zod_1.z.object({
     aiModel: zod_1.z.string(),
     price: zod_1.z.number(),
     order: zod_1.z.number(),
-    params: zod_1.z.any(),
+    params: exports.ImageGenerationModelParamsSchema,
     strategy: zod_1.z.nativeEnum(enums_1.IMAGE_GENERATION_MODEL_STRATEGY),
     status: zod_1.z.nativeEnum(common_1.TOOL_MODEL_STATUS),
     maxPromptLength: zod_1.z.number(),
     iconVariants: common_1.IconVariantsSchema,
+    supportsImageAttachment: zod_1.z.boolean(),
+    maxAttachedImages: zod_1.z.number(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),
 });

package/common/errors/errors.ts

@@ -1248,6 +1248,16 @@ export const ERRORS = {
             message: 'Превышено время ожидания генерации изображения',
             httpCode: 500,
         },
+        IMAGE_ATTACHMENT_NOT_SUPPORTED: {
+            code: 'IMAGE_GENERATION.IMAGE_ATTACHMENT_NOT_SUPPORTED',
+            message: 'Выбранная модель не поддерживает вложение изображений',
+            httpCode: 400,
+        },
+        TOO_MANY_ATTACHED_IMAGES: {
+            code: 'IMAGE_GENERATION.TOO_MANY_ATTACHED_IMAGES',
+            message: 'Слишком много вложенных изображений',
+            httpCode: 400,
+        },
     },
     IMAGE_GENERATION_MODEL: {
         SAVE_ERROR: {

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

@@ -2,6 +2,12 @@ import { z } from 'zod';
 import { JOB_STATUS } from '../../tools';
 import { USER_REACTION } from '../../common';
 
+export const ImageGenerationJobParamsSchema = z.object({
+    aspectRatio: z.string().optional(),
+    attachedImages: z.string().array().optional(),
+});
+export type ImageGenerationJobParams = z.infer<typeof ImageGenerationJobParamsSchema>;
+
 export const ImageGenerationJobSchema = z.object({
     uuid: z.string(),
     prompt: z.string(),
@@ -11,8 +17,9 @@ export const ImageGenerationJobSchema = z.object({
     price: z.number(),
     reaction: z.nativeEnum(USER_REACTION).nullable(),
     externalId: z.string().nullable(),
-    params: z.any(),
+    params: ImageGenerationJobParamsSchema,
     output: z.array(z.string()),
+    presetId: z.string().nullable().optional(),
     modelId: z.string(),
     attempts: z.array(z.any()),
     userId: z.string().nullable().optional(),

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

@@ -9,6 +9,18 @@ export const ImageGenerationRequestParamsSchema = z.object({
 });
 export type ImageGenerationRequestParams = z.infer<typeof ImageGenerationRequestParamsSchema>;
 
+export const ImageGenerationModelParamsSchema = z.object({
+    aspectRatio: z.record(
+        z.string(),
+        z.object({
+            width: z.number(),
+            height: z.number(),
+        }),
+    ),
+    quality: z.string().optional(),
+});
+export type ImageGenerationModelParams = z.infer<typeof ImageGenerationModelParamsSchema>;
+
 export const ImageGenerationModelSchema = z.object({
     uuid: z.string(),
     title: z.string(),
@@ -16,11 +28,13 @@ export const ImageGenerationModelSchema = z.object({
     aiModel: z.string(),
     price: z.number(),
     order: z.number(),
-    params: z.any(),
+    params: ImageGenerationModelParamsSchema,
     strategy: z.nativeEnum(IMAGE_GENERATION_MODEL_STRATEGY),
     status: z.nativeEnum(TOOL_MODEL_STATUS),
     maxPromptLength: z.number(),
     iconVariants: IconVariantsSchema,
+    supportsImageAttachment: z.boolean(),
+    maxAttachedImages: z.number(),
     createdAt: z.date(),
     updatedAt: z.date(),
 });

package/package.json

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