@purpleschool/gptbot-tools 0.0.114 → 0.0.116

package/build/common/errors/errors.js

@@ -1322,6 +1322,11 @@ exports.ERRORS = {
             message: 'Произошла ошибка при обновлении задания на генерацию изображения',
             httpCode: 500,
         },
+        NOT_IN_FAILED_STATE_TO_RETRY: {
+            code: 'IMAGE_GENERATION_JOB.NOT_IN_FAILED_STATE_TO_RETRY',
+            message: 'Задание на генерацию картинки не в состоянии "failed". Невозможно повторить',
+            httpCode: 400,
+        },
     },
     IMAGE_GENERATION_PRESET: {
         FIND_ERROR: {

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

@@ -22,3 +22,4 @@ __exportStar(require("./soft-delete-image-generation-jobs-by-criteria.command"),
 __exportStar(require("./set-reaction-to-image-generation-job.command"), exports);
 __exportStar(require("./update-image-generation-job-title.command"), exports);
 __exportStar(require("./image-generation-model"), exports);
+__exportStar(require("./retry-image-generation-job.command"), exports);

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RetryImageGenerationJobCommand = void 0;
+const zod_1 = require("zod");
+const command_response_schema_1 = require("../../common/models/command-response.schema");
+const models_1 = require("../models");
+var RetryImageGenerationJobCommand;
+(function (RetryImageGenerationJobCommand) {
+    RetryImageGenerationJobCommand.RequestSchema = zod_1.z.object({
+        uuid: zod_1.z.string().uuid(),
+        userId: zod_1.z.string().uuid().nullable().optional(),
+        unregisteredUserId: zod_1.z.string().uuid().nullable().optional(),
+        prompt: zod_1.z.string().optional(),
+        userBalance: zod_1.z.number(),
+        modelId: zod_1.z.string().uuid().optional(),
+        params: models_1.ImageGenerationRequestParamsSchema.optional(),
+        presetId: zod_1.z.string().uuid().nullable().optional(),
+        userHasActiveSubscriptionOrProduct: zod_1.z.boolean(),
+    });
+    RetryImageGenerationJobCommand.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(models_1.ImageGenerationJobSchema);
+})(RetryImageGenerationJobCommand || (exports.RetryImageGenerationJobCommand = RetryImageGenerationJobCommand = {}));

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

@@ -12,4 +12,5 @@ exports.IMAGE_GENERATION_AMQP_ROUTES = {
     SOFT_DELETE: 'tools.image-generation.jobs.soft-delete.rpc',
     SOFT_DELETE_ALL: 'tools.image-generation.jobs.soft-delete-all.rpc',
     GET_MODEL_BY_UUID: 'tools.image-generation.model.get-by-uuid.rpc',
+    RETRY: 'tools.image-generation.jobs.retry.rpc',
 };

package/build/video/queries/find-video-job-by-id.query.js

@@ -1,19 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindVideoJobByIdQuery = void 0;
-const zod_1 = require("zod");
 const command_response_schema_1 = require("../../common/models/command-response.schema");
 const video_job_schema_1 = require("../models/video-job.schema");
 var FindVideoJobByIdQuery;
 (function (FindVideoJobByIdQuery) {
-    FindVideoJobByIdQuery.RequestSchema = zod_1.z
-        .object({
-        uuid: zod_1.z.string(),
-        userId: zod_1.z.string().uuid().nullable().optional(),
-        unregisteredUserId: zod_1.z.string().uuid().nullable().optional(),
-    })
-        .refine((data) => data.userId || data.unregisteredUserId, {
-        message: 'Either userId or unregisteredUserId must be provided',
-    });
+    FindVideoJobByIdQuery.RequestSchema = video_job_schema_1.VideoJobSchema.pick({ uuid: true });
     FindVideoJobByIdQuery.ResponseSchema = (0, command_response_schema_1.ICommandResponseSchema)(video_job_schema_1.VideoJobSchema);
 })(FindVideoJobByIdQuery || (exports.FindVideoJobByIdQuery = FindVideoJobByIdQuery = {}));

package/common/errors/errors.ts

@@ -1332,6 +1332,11 @@ export const ERRORS = {
             message: 'Произошла ошибка при обновлении задания на генерацию изображения',
             httpCode: 500,
         },
+        NOT_IN_FAILED_STATE_TO_RETRY: {
+            code: 'IMAGE_GENERATION_JOB.NOT_IN_FAILED_STATE_TO_RETRY',
+            message: 'Задание на генерацию картинки не в состоянии "failed". Невозможно повторить',
+            httpCode: 400,
+        },
     },
     IMAGE_GENERATION_PRESET: {
         FIND_ERROR: {

package/image-generation/commands/index.ts

@@ -6,3 +6,4 @@ export * from './soft-delete-image-generation-jobs-by-criteria.command';
 export * from './set-reaction-to-image-generation-job.command';
 export * from './update-image-generation-job-title.command';
 export * from './image-generation-model';
+export * from './retry-image-generation-job.command';

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

@@ -0,0 +1,21 @@
+import { z } from 'zod';
+import { ICommandResponseSchema } from '../../common/models/command-response.schema';
+import { ImageGenerationJobSchema, ImageGenerationRequestParamsSchema } from '../models';
+
+export namespace RetryImageGenerationJobCommand {
+    export const RequestSchema = z.object({
+        uuid: z.string().uuid(),
+        userId: z.string().uuid().nullable().optional(),
+        unregisteredUserId: z.string().uuid().nullable().optional(),
+        prompt: z.string().optional(),
+        userBalance: z.number(),
+        modelId: z.string().uuid().optional(),
+        params: ImageGenerationRequestParamsSchema.optional(),
+        presetId: z.string().uuid().nullable().optional(),
+        userHasActiveSubscriptionOrProduct: z.boolean(),
+    });
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = ICommandResponseSchema(ImageGenerationJobSchema);
+    export type Response = z.infer<typeof ResponseSchema>;
+}

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

@@ -9,4 +9,5 @@ export const IMAGE_GENERATION_AMQP_ROUTES = {
     SOFT_DELETE: 'tools.image-generation.jobs.soft-delete.rpc',
     SOFT_DELETE_ALL: 'tools.image-generation.jobs.soft-delete-all.rpc',
     GET_MODEL_BY_UUID: 'tools.image-generation.model.get-by-uuid.rpc',
+    RETRY: 'tools.image-generation.jobs.retry.rpc',
 } as const;

package/package.json

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

package/video/queries/find-video-job-by-id.query.ts

@@ -3,15 +3,7 @@ import { ICommandResponseSchema } from '../../common/models/command-response.sch
 import { VideoJobSchema } from '../models/video-job.schema';
 
 export namespace FindVideoJobByIdQuery {
-    export const RequestSchema = z
-        .object({
-            uuid: z.string(),
-            userId: z.string().uuid().nullable().optional(),
-            unregisteredUserId: z.string().uuid().nullable().optional(),
-        })
-        .refine((data) => data.userId || data.unregisteredUserId, {
-            message: 'Either userId or unregisteredUserId must be provided',
-        });
+    export const RequestSchema = VideoJobSchema.pick({ uuid: true });
     export type Request = z.infer<typeof RequestSchema>;
 
     export const ResponseSchema = ICommandResponseSchema(VideoJobSchema);