@common_ch/common 1.0.306 → 1.0.308

package/build/enums/message.d.ts

@@ -1,5 +1,30 @@
+import { AiOptionDoc } from "../models/app/ai-option";
 export declare enum MessageRoleEnum {
     system = "system",
     user = "user",
     assistant = "assistant"
 }
+export declare enum ContentRoleGeminiEnum {
+    user = "user",
+    model = "model"
+}
+interface IPart {
+    text?: string;
+    fileData?: {
+        mimeType: string;
+        fileUri: string;
+    };
+}
+export type ContentGemini = {
+    role: ContentRoleGeminiEnum;
+    parts: IPart[];
+    aiOptionId: string | AiOptionDoc;
+    attachments?: Attachment[];
+    createdAt: string;
+};
+export type Attachment = {
+    contentType: string;
+    path: string;
+    name: string;
+};
+export {};

package/build/enums/message.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageRoleEnum = void 0;
+exports.ContentRoleGeminiEnum = exports.MessageRoleEnum = void 0;
 var MessageRoleEnum;
 (function (MessageRoleEnum) {
     MessageRoleEnum["system"] = "system";
     MessageRoleEnum["user"] = "user";
     MessageRoleEnum["assistant"] = "assistant";
 })(MessageRoleEnum || (exports.MessageRoleEnum = MessageRoleEnum = {}));
+var ContentRoleGeminiEnum;
+(function (ContentRoleGeminiEnum) {
+    ContentRoleGeminiEnum["user"] = "user";
+    ContentRoleGeminiEnum["model"] = "model";
+})(ContentRoleGeminiEnum || (exports.ContentRoleGeminiEnum = ContentRoleGeminiEnum = {}));

package/build/enums/plan.d.ts

@@ -4,7 +4,8 @@ export declare enum PlanStatusEnum {
 }
 export declare enum TypePayEnum {
     year = "Year",
-    season = "season"
+    season = "season",
+    month = "Month"
 }
 export declare enum PlanOrgStatusEnum {
     active = "active",

package/build/enums/plan.js

@@ -10,6 +10,7 @@ var TypePayEnum;
 (function (TypePayEnum) {
     TypePayEnum["year"] = "Year";
     TypePayEnum["season"] = "season";
+    TypePayEnum["month"] = "Month";
 })(TypePayEnum || (exports.TypePayEnum = TypePayEnum = {}));
 var PlanOrgStatusEnum;
 (function (PlanOrgStatusEnum) {

package/build/models/app/message.d.ts

@@ -1,6 +1,8 @@
 import mongoose from 'mongoose';
 import { AiAttrs, AiDoc } from './ai';
+import { ContentGemini } from '../../enums/message';
 import { AiOptionAttrs, AiOptionDoc } from './ai-option';
+import { FileReferenceGeminiDoc } from './fileReferenceGemini';
 export type Content = {
     type: 'input_image';
     file_id: string;
@@ -30,6 +32,7 @@ export type Messages = {
 };
 export interface MessageAttrs {
     userId: string;
+    ai: string | AiAttrs | AiDoc;
     messageName: string;
     planId?: string;
     threadChatgptId?: string;
@@ -45,6 +48,8 @@ export interface MessageAttrs {
     remainMessageForSummary?: number;
     isArchived?: boolean;
     messages: Messages[];
+    messagesGemini: ContentGemini[];
+    fileRefs: mongoose.Types.ObjectId[] | FileReferenceGeminiDoc[];
     createdAt?: string;
     updatedAt?: string;
 }
@@ -54,6 +59,7 @@ interface MessageModel extends mongoose.Model<MessageDoc> {
 export interface MessageDoc extends mongoose.Document {
     _id: string;
     userId: string;
+    ai: string | AiAttrs | AiDoc;
     messageName: string;
     planId?: string;
     threadChatgptId?: string;
@@ -69,6 +75,8 @@ export interface MessageDoc extends mongoose.Document {
     remainMessageForSummary?: number;
     isArchived?: boolean;
     messages: Messages[];
+    messagesGemini: ContentGemini[];
+    fileRefs: mongoose.Types.ObjectId[] | FileReferenceGeminiDoc[];
     version: number;
     createdAt?: string;
     updatedAt?: string;

package/build/models/app/message.js

@@ -37,6 +37,10 @@ const messageSchema = new mongoose_1.default.Schema({
         type: String,
         required: true,
     },
+    ai: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: 'Ai',
+    },
     messageName: {
         type: String,
         required: true,
@@ -72,6 +76,53 @@ const messageSchema = new mongoose_1.default.Schema({
         ref: 'Plan',
         required: false,
     },
+    messagesGemini: [
+        {
+            aiOptionId: {
+                type: mongoose_1.default.Schema.Types.ObjectId,
+                ref: 'AiOption',
+            },
+            role: {
+                type: String,
+                required: true,
+                enum: Object.values(message_1.ContentRoleGeminiEnum),
+            },
+            parts: [{
+                    text: {
+                        type: String,
+                        required: false,
+                    },
+                    fileData: {
+                        mimeType: {
+                            type: String,
+                            required: false,
+                        },
+                        fileUri: {
+                            type: String,
+                            required: false,
+                        }
+                    }
+                }],
+            attachments: [{
+                    contentType: {
+                        type: String,
+                        required: true,
+                    },
+                    path: {
+                        type: String,
+                        required: true,
+                    },
+                    name: {
+                        type: String,
+                        required: true,
+                    }
+                }],
+            createdAt: {
+                type: mongoose_1.default.Schema.Types.Date,
+                required: true,
+            },
+        },
+    ],
     threadChatgptId: {
         type: String,
         required: false,
@@ -137,6 +188,7 @@ const messageSchema = new mongoose_1.default.Schema({
             },
         },
     ],
+    fileRefs: [{ type: mongoose_1.default.Schema.Types.ObjectId, ref: 'FileReferenceGemini' }],
     createdAt: mongoose_1.default.Schema.Types.Date,
     updatedAt: mongoose_1.default.Schema.Types.Date,
 }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@common_ch/common",
-  "version": "1.0.306",
+  "version": "1.0.308",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [

package/build/models/app/messageGemini.d.ts

@@ -1,62 +0,0 @@
-import mongoose from 'mongoose';
-import { UserDoc } from './user';
-import { PlanDoc } from './plan';
-import { AiOptionDoc } from './ai-option';
-import { FileReferenceGeminiDoc } from './fileReferenceGemini';
-export declare enum ContentRoleGeminiEnum {
-    user = "user",
-    model = "model"
-}
-interface IPart {
-    text?: string;
-    fileData?: {
-        mimeType: string;
-        fileUri: string;
-    };
-}
-export type ContentGemini = {
-    role: ContentRoleGeminiEnum;
-    parts: IPart[];
-    aiOptionId: string | AiOptionDoc;
-    attachments?: Attachment[];
-    createdAt: string;
-};
-export type Attachment = {
-    contentType: string;
-    path: string;
-    name: string;
-};
-export interface MessageGeminiAttrs {
-    userId: string;
-    messageName: string;
-    planId?: string;
-    geminiTokenNumber?: number;
-    summary?: string;
-    summaryCheck?: boolean;
-    remainMessageForSummary?: number;
-    isArchived?: boolean;
-    contents: ContentGemini[];
-    fileRefs: mongoose.Types.ObjectId[] | FileReferenceGeminiDoc[];
-    createdAt?: string;
-    updatedAt?: string;
-}
-interface MessageGeminiModel extends mongoose.Model<MessageGeminiDoc> {
-    build(attrs: MessageGeminiAttrs): MessageGeminiDoc;
-}
-export interface MessageGeminiDoc extends mongoose.Document {
-    _id: string;
-    userId: string | UserDoc;
-    messageName: string;
-    planId?: string | PlanDoc;
-    geminiTokenNumber?: number;
-    summary?: string;
-    summaryCheck?: boolean;
-    remainMessageForSummary?: number;
-    isArchived?: boolean;
-    contents: ContentGemini[];
-    fileRefs: mongoose.Types.ObjectId[] | FileReferenceGeminiDoc[];
-    createdAt?: string;
-    updatedAt?: string;
-}
-declare const MessageGemini: MessageGeminiModel;
-export { MessageGemini };

package/build/models/app/messageGemini.js

@@ -1,108 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageGemini = exports.ContentRoleGeminiEnum = void 0;
-const mongoose_1 = __importDefault(require("mongoose"));
-var ContentRoleGeminiEnum;
-(function (ContentRoleGeminiEnum) {
-    ContentRoleGeminiEnum["user"] = "user";
-    ContentRoleGeminiEnum["model"] = "model";
-})(ContentRoleGeminiEnum || (exports.ContentRoleGeminiEnum = ContentRoleGeminiEnum = {}));
-const messageGeminiSchema = new mongoose_1.default.Schema({
-    userId: {
-        type: String,
-        required: true,
-    },
-    messageName: {
-        type: String,
-        required: true,
-    },
-    summary: {
-        type: String,
-        required: false,
-    },
-    summaryCheck: {
-        type: Boolean,
-        required: false,
-    },
-    remainMessageForSummary: {
-        type: Number,
-        required: false,
-    },
-    planId: {
-        type: mongoose_1.default.Schema.Types.ObjectId,
-        ref: 'Plan',
-        required: false,
-    },
-    geminiTokenNumber: {
-        type: Number,
-        required: false,
-    },
-    isArchived: {
-        type: Boolean,
-        required: false,
-        default: false,
-    },
-    contents: [
-        {
-            aiOptionId: {
-                type: mongoose_1.default.Schema.Types.ObjectId,
-                ref: 'AiOption',
-            },
-            role: {
-                type: String,
-                required: true,
-                enum: Object.values(ContentRoleGeminiEnum),
-            },
-            parts: [{
-                    text: {
-                        type: String,
-                        required: false,
-                    },
-                    fileData: {
-                        mimeType: {
-                            type: String,
-                            required: false,
-                        },
-                        fileUri: {
-                            type: String,
-                            required: false,
-                        }
-                    }
-                }],
-            attachments: [{
-                    contentType: {
-                        type: String,
-                        required: true,
-                    },
-                    path: {
-                        type: String,
-                        required: true,
-                    },
-                    name: {
-                        type: String,
-                        required: true,
-                    }
-                }],
-            createdAt: {
-                type: mongoose_1.default.Schema.Types.Date,
-                required: true,
-            },
-        },
-    ],
-    fileRefs: [{ type: mongoose_1.default.Schema.Types.ObjectId, ref: 'FileReferenceGemini' }],
-    createdAt: mongoose_1.default.Schema.Types.Date,
-    updatedAt: mongoose_1.default.Schema.Types.Date,
-}, {
-    timestamps: true,
-});
-messageGeminiSchema.index({ 'updatedAt': 1 });
-messageGeminiSchema.index({ 'planId': 1 });
-messageGeminiSchema.index({ 'userId': 1 });
-messageGeminiSchema.statics.build = (attrs) => {
-    return new MessageGemini(attrs);
-};
-const MessageGemini = mongoose_1.default.model('MessageGemini', messageGeminiSchema);
-exports.MessageGemini = MessageGemini;