@purpleschool/gptbot 0.8.87-stage-2 → 0.8.87

package/commands/tools/writer/update-writer-document-outline.command.ts

@@ -1,9 +1,14 @@
 import { z } from 'zod';
-import { WriterDocumentOutlineSchema, WriterDocumentOutlineSectionSchema } from '../../../models';
+import {
+    WriterDocumentOutlineSchema,
+    WriterDocumentOutlineSectionSchema,
+    WriterDocumentTitlePageSchema,
+} from '../../../models';
 
 export namespace UpdateWriterDocumentOutlineCommand {
     export const RequestBodySchema = z.object({
         data: WriterDocumentOutlineSchema,
+        titlePage: WriterDocumentTitlePageSchema.optional().nullable(),
     });
     export type RequestBody = z.infer<typeof RequestBodySchema>;
 

package/commands/user/cancel-user-product.command.ts

@@ -0,0 +1,21 @@
+import z from 'zod';
+
+export namespace CancelUserProductCommand {
+    export const RequestParamSchema = z.object({
+        uuid: z.string().uuid(),
+    });
+
+    export type RequestParam = z.infer<typeof RequestParamSchema>;
+
+    export const RequestSchema = z.object({
+        userToProductId: z.string().uuid(),
+    });
+
+    export const ResponseSchema = z.object({
+        data: z.object({
+            isCancelled: z.boolean(),
+        }),
+    });
+
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/user/index.ts

@@ -11,3 +11,4 @@ export * from './delete-account.command';
 export * from './get-aggregated-user-data.command';
 export * from './get-user-payments.command';
 export * from './cancel-user-subscription.command';
+export * from './cancel-user-product.command';

package/constants/errors/errors.ts

@@ -2645,129 +2645,49 @@ export const ERRORS = {
         message: 'Произошла ошибка при получении пользователя',
         httpCode: 500,
     },
-    FILE_CONTENT_EXCEEDS_CONTEXT_LIMIT: {
-        code: 'A538',
-        message: 'Размер файла превышает лимит контекста модели',
-        httpCode: 400,
-    },
     IMAGE_GENERATION_MODEL_FIND_ERROR: {
-        code: 'A539',
+        code: 'A538',
         message: 'Произошла ошибка при получении модели для генерации изображений',
         httpCode: 500,
     },
-    COMMUNITY_POST_TRACK_INDEX_REQUIRED: {
-        code: 'A540',
-        message: 'Индекс трека обязателен для музыкального поста',
-        httpCode: 400,
-    },
-    COMMUNITY_POST_TRACK_INDEX_OUT_OF_RANGE: {
-        code: 'A541',
-        message: 'Индекс трека выходит за пределы допустимого диапазона',
+    COMMUNITY_POST_TRACK_ID_REQUIRED: {
+        code: 'A539',
+        message: 'ID трека обязателен для музыкального поста',
         httpCode: 400,
     },
-    TOKEN_RESERVATION_CREATE_ERROR: {
-        code: 'A542',
-        message: 'Произошла ошибка при создании записи об удержании токенов',
-        httpCode: 500,
-    },
-    TOKEN_RESERVATION_NOT_FOUND: {
-        code: 'A543',
-        message: 'Запись об удержании токенов не найдена',
+    COMMUNITY_POST_TRACK_NOT_FOUND: {
+        code: 'A540',
+        message: 'Трек не найден',
         httpCode: 404,
     },
-    TOKEN_RESERVATION_COMMIT_ERROR: {
-        code: 'A544',
-        message: 'Произошла ошибка при подтверждении записи об удержании токенов',
-        httpCode: 500,
-    },
-    TOKEN_RESERVATION_RELEASE_ERROR: {
-        code: 'A545',
-        message: 'Произошла ошибка при освобождении записи об удержании токенов',
-        httpCode: 500,
-    },
-    TOKEN_RESERVATION_INSUFFICIENT_BALANCE: {
-        code: 'A546',
-        message: 'Недостаточно токенов для выполнения операции',
-        httpCode: 400,
-    },
-    TOKEN_RESERVATION_INVALID_STATUS: {
-        code: 'A547',
-        message: 'Запись об удержании токенов находится в недопустимом статусе',
-        httpCode: 400,
-    },
-    MUSIC_PRICE_ERROR: {
-        code: 'A548',
-        message: 'Произошла ошибка при получении цены для генерации музыки',
-        httpCode: 500,
-    },
-    IMAGE_GENERATION_PRICE_ERROR: {
-        code: 'A549',
-        message: 'Произошла ошибка при получении цены для генерации изображения',
-        httpCode: 500,
-    },
-    IMAGE_EDITOR_PRICE_ERROR: {
-        code: 'A550',
-        message: 'Произошла ошибка при получении цены для редактирования изображения',
-        httpCode: 500,
-    },
-    STT_PRICE_ERROR: {
-        code: 'A551',
-        message: 'Произошла ошибка при получении цены для транскрибации аудио',
-        httpCode: 500,
-    },
-    TTS_PRICE_ERROR: {
-        code: 'A552',
-        message: 'Произошла ошибка при получении цены для синтеза речи',
-        httpCode: 500,
-    },
-    VIDEO_PRICE_ERROR: {
-        code: 'A553',
-        message: 'Произошла ошибка при получении цены для генерации видео',
-        httpCode: 500,
-    },
-    VIDEO_EDITOR_PRICE_ERROR: {
-        code: 'A554',
-        message: 'Произошла ошибка при получении цены для редактирования видео',
-        httpCode: 500,
-    },
-    PARAPHRASE_PRICE_ERROR: {
-        code: 'A555',
-        message: 'Произошла ошибка при получении цены для парафразирования',
-        httpCode: 500,
-    },
-    PRESENTATION_SLIDES_GENERATION_PRICE_ERROR: {
-        code: 'A556',
-        message: 'Произошла ошибка при получении цены для генерации слайдов презентации',
-        httpCode: 500,
-    },
-    WRITER_CONTENT_GENERATION_PRICE_ERROR: {
-        code: 'A557',
-        message: 'Произошла ошибка при получении цены для генерации текста',
-        httpCode: 500,
-    },
     COMMUNITY_POST_EXISTANCE_CHECK_ERROR: {
-        code: 'A558',
+        code: 'A561',
         message: 'Произошла ошибка при проверке существования поста.',
         httpCode: 500,
     },
     COMMUNITY_POST_ALREADY_EXISTS_ERROR: {
-        code: 'A559',
+        code: 'A562',
         message: 'Данная работа уже опубликована в сообществе.',
         httpCode: 400,
     },
     MARK_JOB_PUBLISHED_STATUS_ERROR: {
-        code: 'A560',
+        code: 'A563',
         message: 'Произошла ошибка при отметке работы как опубликованной.',
         httpCode: 500,
     },
     TASK_COMMUNITY_POST_NOT_PUBLISHED: {
-        code: 'A561',
+        code: 'A564',
         message: 'Для получения награды опубликуйте работу в сообществе',
         httpCode: 400,
     },
-    TOKEN_RESERVATION_EXPIRED: {
-        code: 'A562',
-        message: 'Запись об удержании токенов устарела',
+    PRODUCT_OWNERSHIP_ERROR: {
+        code: 'A565',
+        message: 'Пользователь не является владельцем продукта',
+        httpCode: 400,
+    },
+    PRODUCT_CANCEL_ERROR: {
+        code: 'A566',
+        message: 'Нельзя отменить пакет, которым юзер начал пользоваться',
         httpCode: 400,
     },
 };

package/constants/file/enums/index.ts

@@ -1,2 +1 @@
 export * from './file-type.enum';
-export * from './file-usage-mode.enum';

package/constants/index.ts

@@ -44,4 +44,3 @@ export * from './tool-music';
 export * from './community';
 export * from './user-profile';
 export * from './model';
-export * from './token-reservation';

package/constants/tool/enums/tool-type.enum.ts

@@ -2,7 +2,4 @@ export enum TOOL_TYPE {
     PARAPHRASE = 'paraphrase',
     TTS = 'tts',
     STT = 'stt',
-    IMAGE_GENERATION = 'image_generation',
-    IMAGE_EDITOR = 'image_editor',
-    MUSIC = 'music',
 }

package/models/community/community-post-media-data.schema.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { COMMUNITY_POST_TYPE } from '../../constants';
-import { MusicTrackSchema } from '../tools/music/music-track.schema';
 import { VideoJobParamsSchema } from '../tools/video/video-job.schema';
 import { FileSchema } from '../file.schema';
 import { MusicJobParamsSchema } from '../tools';
@@ -23,6 +22,7 @@ export const VideoCommunityMediaSchema = z.object({
     title: z.string(),
     prompt: z.string(),
     videoUrl: z.string().nullable(),
+    previewUrl: z.string().nullable(),
     params: VideoJobParamsSchema,
 });
 
@@ -38,12 +38,13 @@ export const MusicCommunityMediaSchema = z.object({
     type: z.literal(COMMUNITY_POST_TYPE.MUSIC),
     params: MusicJobParamsSchema,
     prompt: z.string(),
-    track: MusicTrackSchema.pick({
-        audioUrl: true,
-        coverUrl: true,
-        duration: true,
-        title: true,
-        tags: true,
+    track: z.object({
+        uuid: z.string().optional(), // Опционально для backward compatibility
+        audioUrl: z.string(),
+        coverUrl: z.string(),
+        duration: z.number(),
+        title: z.string(),
+        tags: z.string(),
     }),
 });
 

package/models/index.ts

@@ -12,7 +12,6 @@ export * from './course.schema';
 export * from './date.schema';
 export * from './feedback.schema';
 export * from './file.schema';
-export * from './file-attachment.schema';
 export * from './key-value.schema';
 export * from './form-submission.schema';
 export * from './icon-variants.schema';

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

@@ -39,7 +39,6 @@ export const ImageEditorModelSchema = z.object({
     pricingRules: ImageEditorModelPricingRulesSchema,
     unlockedBy: UnlockedBySchema.nullable(),
     canUse: z.boolean(),
-    status: z.string(),
 });
 
 export type ImageEditorModel = z.infer<typeof ImageEditorModelSchema>;

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

@@ -1,6 +1,6 @@
 import { z } from 'zod';
-import { IMAGE_GENERATION_RESOLUTION } from '../../../constants';
 import { UnlockedBySchema } from '../../unlocked-by-subscription.schema';
+import { IMAGE_GENERATION_RESOLUTION } from '../../../constants';
 
 export const ImageGenerationModelParamsSchema = z.object({
     aspectRatio: z.record(

package/models/tools/music/music-job.schema.ts

@@ -37,8 +37,6 @@ export const MusicJobSchema = ToolJobSchema.extend({
     params: MusicJobParamsSchema,
     externalId: z.string().nullable(),
     modelId: z.string(),
-    isPublished: z.boolean(),
-    postId: z.string().nullable(),
 });
 
 export type MusicJob = z.infer<typeof MusicJobSchema>;

package/models/tools/music/music-model.schema.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-import { MUSIC_VOCAL_GENDER } from '../../../constants';
 import { IconVariantsSchema } from '../../icon-variants.schema';
 import { UnlockedBySchema } from '../../unlocked-by-subscription.schema';
+import { MUSIC_VOCAL_GENDER } from '../../../constants';
 
 export const MusicModelParamsSchema = z.object({
     vocalGender: z.object({
@@ -30,5 +30,4 @@ export const MusicModelSchema = z.object({
     params: MusicModelParamsSchema,
     unlockedBy: UnlockedBySchema.nullable(),
     canUse: z.boolean(),
-    status: z.string(),
 });

package/models/tools/music/music-track.schema.ts

@@ -9,6 +9,8 @@ export const MusicTrackSchema = z.object({
     prompt: z.string().nullable(),
     tags: z.string(),
     duration: z.number(),
+    isPublished: z.boolean(),
+    postId: z.string().nullable(),
 
     genJobId: z.string().nullable().optional(),
     editorJobId: z.string().nullable().optional(),

package/models/tools/stt/stt-model.schema.ts

@@ -13,7 +13,6 @@ export const STTModelSchema = z.object({
     maxSizeMB: z.number(),
     unlockedBy: UnlockedBySchema.nullable(),
     canUse: z.boolean(),
-    status: z.string(),
 });
 
 export type STTModel = z.infer<typeof STTModelSchema>;

package/models/tools/tts/tts-model.schema.ts

@@ -52,5 +52,4 @@ export const TTSModelSchema = z.object({
     voices: z.array(TTSVoiceSchema),
     unlockedBy: UnlockedBySchema.nullable(),
     canUse: z.boolean(),
-    status: z.string(),
 });

package/models/tools/video/video-job.schema.ts

@@ -23,6 +23,12 @@ export const VideoJobSchema = ToolJobSchema.extend({
             url: z.string(),
         })
         .nullable(),
+    preview: z
+        .object({
+            uuid: z.string(),
+            url: z.string(),
+        })
+        .nullable(),
     params: VideoJobParamsSchema,
     modelId: z.string(),
     isPublished: z.boolean(),

package/models/tools/video/video-model.schema.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { VIDEO_PRICING_RULE_TYPE } from '../../../constants';
-import { VIDEO_GENERATION_MODEL_LIMITATION } from '../../../constants/tool-video/enums/video-generation-model-limitation.enum';
 import { IconVariantsSchema } from '../../icon-variants.schema';
 import { UnlockedBySchema } from '../../unlocked-by-subscription.schema';
+import { VIDEO_PRICING_RULE_TYPE } from '../../../constants';
+import { VIDEO_GENERATION_MODEL_LIMITATION } from '../../../constants/tool-video/enums/video-generation-model-limitation.enum';
 
 export const VideoModelParamsSchema = z.object({
     imageAttachment: z.object({
@@ -23,6 +23,16 @@ export const VideoModelParamsSchema = z.object({
             options: z.array(z.string()),
         })
         .optional(),
+    sound: z
+        .object({
+            options: z.array(z.boolean()),
+        })
+        .optional(),
+    multiShots: z
+        .object({
+            options: z.array(z.boolean()),
+        })
+        .optional(),
 });
 
 export const VideoGenerationRequestParamsSchema = z.object({
@@ -31,12 +41,15 @@ export const VideoGenerationRequestParamsSchema = z.object({
     aspectRatio: z.string().optional(),
     quality: z.string().optional(),
     resolution: z.string().optional(),
+    sound: z.boolean().optional(),
+    multiShots: z.boolean().optional(),
 });
 export type VideoGenerationRequestParams = z.infer<typeof VideoGenerationRequestParamsSchema>;
 
 export const VideoModelPricingRuleConditionSchema = z.object({
     aspectRatio: z.string().optional(),
     resolution: z.string().optional(),
+    sound: z.boolean().optional(),
 });
 export type VideoModelPricingRuleCondition = z.infer<typeof VideoModelPricingRuleConditionSchema>;
 
@@ -63,5 +76,4 @@ export const VideoModelSchema = z.object({
     unlockedBy: UnlockedBySchema.nullable(),
     limitations: z.array(z.nativeEnum(VIDEO_GENERATION_MODEL_LIMITATION)),
     canUse: z.boolean(),
-    status: z.string(),
 });

package/models/tools/video-editor/video-editor-model.schema.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-import { VIDEO_EDITOR_MODEL_LIMITATION } from '../../../constants/tool-video-editor/enums/video-editor-model-limitation.enum';
 import { IconVariantsSchema } from '../../icon-variants.schema';
 import { UnlockedBySchema } from '../../unlocked-by-subscription.schema';
+import { VIDEO_EDITOR_MODEL_LIMITATION } from '../../../constants/tool-video-editor/enums/video-editor-model-limitation.enum';
 
 export const VideoEditorModelParamsSchema = z.object({
     supportedFormats: z.array(z.string()),
@@ -24,5 +24,4 @@ export const VideoEditorModelSchema = z.object({
     unlockedBy: UnlockedBySchema.nullable(),
     limitations: z.array(z.nativeEnum(VIDEO_EDITOR_MODEL_LIMITATION)),
     canUse: z.boolean(),
-    status: z.string(),
 });

package/models/tools/writer/index.ts

@@ -3,3 +3,4 @@ export * from './writer-ai-action.schema';
 export * from './writer-document-outline.schema';
 export * from './writer-document.schema';
 export * from './writer-document-type.schema';
+export * from './writer-document-title-page.schema';

package/models/tools/writer/writer-document-title-page.schema.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+export const WriterDocumentTitlePageSchema = z
+    .object({
+        fullName: z.string().min(1).max(200).optional().nullable(),
+        city: z.string().min(1).max(200).optional().nullable(),
+        institution: z.string().min(1).max(300).optional().nullable(),
+        faculty: z.string().min(1).max(200).optional().nullable(),
+        specialty: z.string().min(1).max(200).optional().nullable(),
+        group: z.string().min(1).max(100).optional().nullable(),
+        subject: z.string().min(1).max(200).optional().nullable(),
+    })
+    .nullable();
+
+export type WriterDocumentTitlePage = z.infer<typeof WriterDocumentTitlePageSchema>;

package/models/tools/writer/writer-document.schema.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { WriterDocumentOutlineSchema } from './writer-document-outline.schema';
 import { USER_REACTION, WRITER_DOCUMENT_STAGE } from '../../../constants';
+import { WriterDocumentTitlePageSchema } from './writer-document-title-page.schema';
 
 export const WriterDocumentSchema = z.object({
     uuid: z.string().uuid(),
@@ -9,6 +10,7 @@ export const WriterDocumentSchema = z.object({
     typeId: z.string(),
     stage: z.nativeEnum(WRITER_DOCUMENT_STAGE),
     outline: WriterDocumentOutlineSchema,
+    titlePage: WriterDocumentTitlePageSchema,
     sourceMd: z.string().nullable(),
     finalMd: z.string().nullable(),
     userId: z.string().nullable(),

package/package.json

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

package/build/constants/file/enums/file-usage-mode.enum.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FILE_USAGE_MODE = void 0;
-var FILE_USAGE_MODE;
-(function (FILE_USAGE_MODE) {
-    FILE_USAGE_MODE["SEARCH"] = "search";
-    FILE_USAGE_MODE["CONTEXT"] = "context";
-})(FILE_USAGE_MODE || (exports.FILE_USAGE_MODE = FILE_USAGE_MODE = {}));

package/build/constants/token-reservation/enums/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./token-reservation-status.enum"), exports);

package/build/constants/token-reservation/enums/token-reservation-status.enum.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TOKEN_RESERVATION_STATUS = void 0;
-var TOKEN_RESERVATION_STATUS;
-(function (TOKEN_RESERVATION_STATUS) {
-    TOKEN_RESERVATION_STATUS["PENDING"] = "pending";
-    TOKEN_RESERVATION_STATUS["COMMITTED"] = "committed";
-    TOKEN_RESERVATION_STATUS["RELEASED"] = "released";
-    TOKEN_RESERVATION_STATUS["EXPIRED"] = "expired";
-})(TOKEN_RESERVATION_STATUS || (exports.TOKEN_RESERVATION_STATUS = TOKEN_RESERVATION_STATUS = {}));

package/build/constants/token-reservation/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./enums"), exports);

package/build/models/file-attachment.schema.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileAttachmentSchema = exports.ImageFileAttachmentSchema = exports.TextFileAttachmentSchema = void 0;
-const zod_1 = require("zod");
-const constants_1 = require("../constants");
-exports.TextFileAttachmentSchema = zod_1.z.object({
-    fileId: zod_1.z.string().uuid(),
-    type: zod_1.z.enum([constants_1.FILE_TYPE.TEXT, constants_1.FILE_TYPE.DOCUMENT]),
-    usageMode: zod_1.z.nativeEnum(constants_1.FILE_USAGE_MODE),
-});
-exports.ImageFileAttachmentSchema = zod_1.z.object({
-    fileId: zod_1.z.string().uuid(),
-    type: zod_1.z.literal(constants_1.FILE_TYPE.IMAGE),
-});
-exports.FileAttachmentSchema = zod_1.z.discriminatedUnion('type', [
-    exports.TextFileAttachmentSchema,
-    exports.ImageFileAttachmentSchema,
-]);

package/constants/file/enums/file-usage-mode.enum.ts

@@ -1,4 +0,0 @@
-export enum FILE_USAGE_MODE {
-    SEARCH = 'search',
-    CONTEXT = 'context',
-}

package/constants/token-reservation/enums/index.ts

@@ -1 +0,0 @@
-export * from './token-reservation-status.enum';

package/constants/token-reservation/enums/token-reservation-status.enum.ts

@@ -1,6 +0,0 @@
-export enum TOKEN_RESERVATION_STATUS {
-    PENDING = 'pending',
-    COMMITTED = 'committed',
-    RELEASED = 'released',
-    EXPIRED = 'expired',
-}

package/constants/token-reservation/index.ts

@@ -1 +0,0 @@
-export * from './enums';

package/models/file-attachment.schema.ts

@@ -1,24 +0,0 @@
-import { z } from 'zod';
-import { FILE_TYPE, FILE_USAGE_MODE } from '../constants';
-
-export const TextFileAttachmentSchema = z.object({
-    fileId: z.string().uuid(),
-    type: z.enum([FILE_TYPE.TEXT, FILE_TYPE.DOCUMENT]),
-    usageMode: z.nativeEnum(FILE_USAGE_MODE),
-});
-
-export type TextFileAttachment = z.infer<typeof TextFileAttachmentSchema>;
-
-export const ImageFileAttachmentSchema = z.object({
-    fileId: z.string().uuid(),
-    type: z.literal(FILE_TYPE.IMAGE),
-});
-
-export type ImageFileAttachment = z.infer<typeof ImageFileAttachmentSchema>;
-
-export const FileAttachmentSchema = z.discriminatedUnion('type', [
-    TextFileAttachmentSchema,
-    ImageFileAttachmentSchema,
-]);
-
-export type FileAttachment = z.infer<typeof FileAttachmentSchema>;