v3.3.3

dist/modules/chat/apiDataService.service.js

@@ -0,0 +1,153 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ApiDataService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiDataService = void 0;
+const common_1 = require("@nestjs/common");
+const axios_1 = require("axios");
+const uuid = require("uuid");
+const globalConfig_service_1 = require("../globalConfig/globalConfig.service");
+const upload_service_1 = require("../upload/upload.service");
+let ApiDataService = ApiDataService_1 = class ApiDataService {
+    constructor(uploadService, globalConfigService) {
+        this.uploadService = uploadService;
+        this.globalConfigService = globalConfigService;
+        this.logger = new common_1.Logger(ApiDataService_1.name);
+    }
+    async chatFree(prompt, systemMessage, messagesHistory) {
+        const { openaiBaseUrl = '', openaiBaseKey = '', openaiBaseModel, } = await this.globalConfigService.getConfigs([
+            'openaiBaseKey',
+            'openaiBaseUrl',
+            'openaiBaseModel',
+        ]);
+        const key = openaiBaseKey;
+        const proxyUrl = openaiBaseUrl;
+        let requestData = [];
+        if (systemMessage) {
+            requestData.push({
+                "role": "system",
+                "content": systemMessage
+            });
+        }
+        if (messagesHistory && messagesHistory.length > 0) {
+            requestData = requestData.concat(messagesHistory);
+        }
+        else {
+            requestData.push({
+                "role": "user",
+                "content": prompt
+            });
+        }
+        const options = {
+            method: 'POST',
+            url: `${proxyUrl}/v1/chat/completions`,
+            headers: {
+                "Content-Type": "application/json",
+                "Authorization": `Bearer ${key}`,
+            },
+            data: {
+                model: openaiBaseModel || 'gpt-3.5-turbo-0125',
+                messages: requestData,
+            },
+        };
+        try {
+            const response = await (0, axios_1.default)(options);
+            common_1.Logger.log(`全局模型调用成功, 返回结果: ${response === null || response === void 0 ? void 0 : response.data.choices[0].message.content}`);
+            return response === null || response === void 0 ? void 0 : response.data.choices[0].message.content;
+        }
+        catch (error) {
+            console.log('error: ', error);
+        }
+    }
+    async dalleDraw(inputs, messagesHistory) {
+        var _a, _b, _c, _d;
+        common_1.Logger.log('开始提交 Dalle 绘图任务 ', 'DrawService');
+        const { apiKey, model, proxyUrl, prompt, extraParam, timeout, onSuccess, onFailure } = inputs;
+        const size = (extraParam === null || extraParam === void 0 ? void 0 : extraParam.size) || '1024x1024';
+        let result = { answer: '', fileInfo: '', status: 2 };
+        try {
+            const options = {
+                method: 'POST',
+                url: `${proxyUrl}/v1/images/generations`,
+                timeout: timeout,
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${apiKey}`,
+                },
+                data: {
+                    model: model,
+                    prompt: prompt,
+                    size,
+                },
+            };
+            const response = await (0, axios_1.default)(options);
+            common_1.Logger.debug(`请求成功${JSON.stringify(response.data.data[0])}`);
+            common_1.Logger.debug(`请求状态${JSON.stringify(response.status)}`);
+            const url = response.data.data[0].url;
+            try {
+                const filename = `${Date.now()}-${uuid.v4().slice(0, 4)}.png`;
+                common_1.Logger.debug(`------> 开始上传图片！！！`, 'DrawService');
+                result.fileInfo = await this.uploadService.uploadFileFromUrl({ filename, url: url });
+                common_1.Logger.debug(`图片上传成功，URL: ${result.fileInfo}`, 'DrawService');
+            }
+            catch (error) {
+                common_1.Logger.error(`上传图片过程中出现错误: ${error}`, 'DrawService');
+            }
+            let revised_prompt_cn;
+            try {
+                revised_prompt_cn = await this.chatFree(`根据提示词{${response.data.data[0].revised_prompt}}, 模拟AI绘画机器人的语气，用中文回复，告诉用户已经画好了`);
+            }
+            catch (error) {
+                revised_prompt_cn = `${prompt} 绘制成功`;
+                common_1.Logger.error("翻译失败: ", error);
+            }
+            result.answer = revised_prompt_cn;
+            result.status = 3;
+            onSuccess(result);
+            return;
+        }
+        catch (error) {
+            result.status = 5;
+            onFailure(result);
+            const status = ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) || 500;
+            console.log('draw error: ', JSON.stringify(error), status);
+            const message = (_d = (_c = (_b = error === null || error === void 0 ? void 0 : error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.error) === null || _d === void 0 ? void 0 : _d.message;
+            if (status === 429) {
+                result.text = '当前请求已过载、请稍等会儿再试试吧！';
+                return result;
+            }
+            if (status === 400 && message.includes('This request has been blocked by our content filters')) {
+                result.text = '您的请求已被系统拒绝。您的提示可能存在一些非法的文本。';
+                return result;
+            }
+            if (status === 400 && message.includes('Billing hard limit has been reached')) {
+                result.text = '当前模型key已被封禁、已冻结当前调用Key、尝试重新对话试试吧！';
+                return result;
+            }
+            if (status === 500) {
+                result.text = '绘制图片失败，请检查你的提示词是否有非法描述！';
+                return result;
+            }
+            if (status === 401) {
+                result.text = '绘制图片失败，此次绘画被拒绝了！';
+                return result;
+            }
+            result.text = '绘制图片失败，请稍后试试吧！';
+            return result;
+        }
+    }
+};
+ApiDataService = ApiDataService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [upload_service_1.UploadService,
+        globalConfig_service_1.GlobalConfigService])
+], ApiDataService);
+exports.ApiDataService = ApiDataService;

dist/modules/chat/chat.controller.js

@@ -13,12 +13,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatController = void 0;
-const jwtAuth_guard_1 = require("../../common/auth/jwtAuth.guard");
 const swagger_1 = require("@nestjs/swagger");
+const jwtAuth_guard_1 = require("../../common/auth/jwtAuth.guard");
 const chat_service_1 = require("./chat.service");
 const common_1 = require("@nestjs/common");
 const chatProcess_dto_1 = require("./dto/chatProcess.dto");
-const chatDraw_dto_1 = require("./dto/chatDraw.dto");
 const adminAuth_guard_1 = require("../../common/auth/adminAuth.guard");
 const superAuth_guard_1 = require("../../common/auth/superAuth.guard");
 const globalConfig_service_1 = require("../globalConfig/globalConfig.service");
@@ -37,23 +36,10 @@ let ChatController = class ChatController {
         return this.chatService.ttsProcess(body, req, res);
     }
     async mjFanyi(body, req) {
-        const mjTranslatePrompt = await this.globalConfigService.getConfigs(['mjTranslatePrompt']);
-        body.model = 'translation-';
-        body.systemMessage =
-            mjTranslatePrompt ||
-                `接下来我会给你一些内容、我希望你帮我翻译成英文、不管我给你任何语言、你都回复我英文、如果给你了英文、依然回复我更加优化的英文、并且期望你不需要做任何多余的解释、给我英文即可、不要加任何东西、我只需要英文！`;
-        return this.chatService.chatProcess(Object.assign(Object.assign({}, body), { specialModel: true }), req);
+        return this.chatService.chatProcess(Object.assign(Object.assign({}, body), { specialModel: 'PromptOptimization' }), req);
     }
     async chatmind(body, req, res) {
-        const mindCustomPrompt = await this.globalConfigService.getConfigs(['mindCustomPrompt']);
-        body.model = 'mindmap-';
-        body.systemMessage =
-            mindCustomPrompt ||
-                `我希望你使用markdown格式回答我得问题、我的需求是得到一份markdown格式的大纲、尽量做的精细、层级多一点、不管我问你什么、都需要您回复我一个大纲出来、我想使用大纲做思维导图、除了大纲之外、不要无关内容和总结。`;
-        return this.chatService.chatProcess(Object.assign(Object.assign({}, body), { specialModel: true }), req, res);
-    }
-    async draw(body, req) {
-        return await this.chatService.draw(body, req);
+        return this.chatService.chatProcess(Object.assign(Object.assign({}, body), { specialModel: 'MindMap' }), req, res);
     }
     async setChatBoxType(req, body) {
         return await this.chatService.setChatBoxType(req, body);
@@ -156,17 +142,6 @@ __decorate([
     __metadata("design:paramtypes", [chatProcess_dto_1.ChatProcessDto, Object, Object]),
     __metadata("design:returntype", Promise)
 ], ChatController.prototype, "chatmind", null);
-__decorate([
-    (0, common_1.Post)('chat-draw'),
-    (0, swagger_1.ApiOperation)({ summary: 'gpt绘画' }),
-    (0, common_1.UseGuards)(jwtAuth_guard_1.JwtAuthGuard),
-    (0, swagger_1.ApiBearerAuth)(),
-    __param(0, (0, common_1.Body)()),
-    __param(1, (0, common_1.Req)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [chatDraw_dto_1.ChatDrawDto, Object]),
-    __metadata("design:returntype", Promise)
-], ChatController.prototype, "draw", null);
 __decorate([
     (0, common_1.Post)('setChatBoxType'),
     (0, swagger_1.ApiOperation)({ summary: '添加修改分类类型' }),

dist/modules/chat/chat.module.js

@@ -8,32 +8,34 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatModule = void 0;
 const common_1 = require("@nestjs/common");
-const chat_controller_1 = require("./chat.controller");
-const chat_service_1 = require("./chat.service");
-const userBalance_service_1 = require("../userBalance/userBalance.service");
 const typeorm_1 = require("@nestjs/typeorm");
-const balance_entity_1 = require("../userBalance/balance.entity");
-const user_service_1 = require("../user/user.service");
+const app_entity_1 = require("../app/app.entity");
+const chatGroup_entity_1 = require("../chatGroup/chatGroup.entity");
+const chatLog_entity_1 = require("../chatLog/chatLog.entity");
+const chatLog_service_1 = require("../chatLog/chatLog.service");
+const cramiPackage_entity_1 = require("../crami/cramiPackage.entity");
+const config_entity_1 = require("../globalConfig/config.entity");
+const mailer_service_1 = require("../mailer/mailer.service");
+const midjourney_entity_1 = require("../midjourney/midjourney.entity");
+const redisCache_service_1 = require("../redisCache/redisCache.service");
+const salesUsers_entity_1 = require("../sales/salesUsers.entity");
 const user_entity_1 = require("../user/user.entity");
+const user_service_1 = require("../user/user.service");
+const accountLog_entity_1 = require("../userBalance/accountLog.entity");
+const balance_entity_1 = require("../userBalance/balance.entity");
+const fingerprint_entity_1 = require("../userBalance/fingerprint.entity");
+const userBalance_entity_1 = require("../userBalance/userBalance.entity");
+const userBalance_service_1 = require("../userBalance/userBalance.service");
 const verification_service_1 = require("../verification/verification.service");
 const verifycation_entity_1 = require("../verification/verifycation.entity");
-const chatLog_service_1 = require("../chatLog/chatLog.service");
-const chatLog_entity_1 = require("../chatLog/chatLog.entity");
-const accountLog_entity_1 = require("../userBalance/accountLog.entity");
-const config_entity_1 = require("../globalConfig/config.entity");
-const whiteList_entity_1 = require("./whiteList.entity");
-const cramiPackage_entity_1 = require("../crami/cramiPackage.entity");
-const chatGroup_entity_1 = require("../chatGroup/chatGroup.entity");
-const app_entity_1 = require("../app/app.entity");
-const userBalance_entity_1 = require("../userBalance/userBalance.entity");
-const salesUsers_entity_1 = require("../sales/salesUsers.entity");
-const redisCache_service_1 = require("../redisCache/redisCache.service");
-const fingerprint_entity_1 = require("../userBalance/fingerprint.entity");
-const midjourney_entity_1 = require("../midjourney/midjourney.entity");
-const chatBoxType_entity_1 = require("./chatBoxType.entity");
+const apiDataService_service_1 = require("./apiDataService.service");
+const chat_controller_1 = require("./chat.controller");
+const chat_service_1 = require("./chat.service");
 const chatBox_entity_1 = require("./chatBox.entity");
-const chatPreType_entity_1 = require("./chatPreType.entity");
+const chatBoxType_entity_1 = require("./chatBoxType.entity");
 const chatPre_entity_1 = require("./chatPre.entity");
+const chatPreType_entity_1 = require("./chatPreType.entity");
+const whiteList_entity_1 = require("./whiteList.entity");
 let ChatModule = class ChatModule {
 };
 ChatModule = __decorate([
@@ -59,11 +61,11 @@ ChatModule = __decorate([
                 chatBoxType_entity_1.ChatBoxTypeEntity,
                 chatBox_entity_1.ChatBoxEntity,
                 chatPreType_entity_1.ChatPreTypeEntity,
-                chatPre_entity_1.ChatPreEntity
+                chatPre_entity_1.ChatPreEntity,
             ]),
         ],
         controllers: [chat_controller_1.ChatController],
-        providers: [chat_service_1.ChatService, userBalance_service_1.UserBalanceService, user_service_1.UserService, verification_service_1.VerificationService, chatLog_service_1.ChatLogService, redisCache_service_1.RedisCacheService],
+        providers: [chat_service_1.ChatService, userBalance_service_1.UserBalanceService, user_service_1.UserService, verification_service_1.VerificationService, chatLog_service_1.ChatLogService, redisCache_service_1.RedisCacheService, apiDataService_service_1.ApiDataService, mailer_service_1.MailerService],
         exports: [chat_service_1.ChatService]
     })
 ], ChatModule);

dist/modules/chat/store.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NineStore = void 0;
-const uuid_1 = require("uuid");
 const tiktoken_1 = require("@dqbd/tiktoken");
+const uuid_1 = require("uuid");
 const tokenizer = (0, tiktoken_1.get_encoding)('cl100k_base');
 class NineStore {
     constructor(options) {
@@ -29,10 +29,14 @@ class NineStore {
         let { systemMessage = '', fileInfo, model, groupId, maxRounds = 5, maxModelTokens = 4000, isFileUpload = 0 } = options;
         let messages = [];
         if (systemMessage) {
+            console.log('Adding system message:', systemMessage);
             messages.push({ role: 'system', content: systemMessage });
         }
         if (groupId) {
+            console.log('Querying chat history for groupId:', groupId, 'with maxRounds:', maxRounds);
             const history = await chatLogService.chatHistory(groupId, maxRounds);
+            console.log('Received history records:', history.length);
+            let tempUserMessage = null;
             history.forEach((record) => {
                 let content;
                 if (isFileUpload === 2 && record.fileInfo) {
@@ -47,7 +51,14 @@ class NineStore {
                 else {
                     content = record.text;
                 }
-                messages.push({ role: record.role, content });
+                if (record.role === 'user') {
+                    tempUserMessage = { role: record.role, content };
+                }
+                else if (record.role === 'assistant' && tempUserMessage && content.trim() !== '') {
+                    messages.push(tempUserMessage);
+                    messages.push({ role: record.role, content });
+                    tempUserMessage = null;
+                }
             });
         }
         let currentMessageContent;
@@ -66,18 +77,29 @@ class NineStore {
         messages.push({ role: 'user', content: currentMessageContent });
         let totalTokens = await this._getTokenCount(messages);
         while (totalTokens > maxModelTokens / 2) {
-            let foundNonSystemMessage = false;
+            if (messages.length === 2 && messages[0].role === 'system' && messages[1].role === 'user') {
+                break;
+            }
+            let foundPairToDelete = false;
             for (let i = 0; i < messages.length; i++) {
-                if (messages[i].role !== 'system') {
+                if (messages[i].role !== 'system' && messages[i + 1] && messages[i + 1].role === 'assistant') {
                     messages.splice(i, 2);
-                    foundNonSystemMessage = true;
+                    foundPairToDelete = true;
                     break;
                 }
             }
-            if (!foundNonSystemMessage) {
-                break;
+            if (!foundPairToDelete) {
+                for (let i = 0; i < messages.length; i++) {
+                    if (messages[i].role === 'user') {
+                        messages.splice(i, 1);
+                        break;
+                    }
+                }
             }
             totalTokens = await this._getTokenCount(messages);
+            if (messages.length <= 2) {
+                break;
+            }
         }
         return {
             messagesHistory: messages,