diff --git a/app_chatgpt/__manifest__.py b/app_chatgpt/__manifest__.py index 5e5760f0..bd9c0824 100644 --- a/app_chatgpt/__manifest__.py +++ b/app_chatgpt/__manifest__.py @@ -10,7 +10,7 @@ { 'name': 'ChatGPT4, China Ali,AiGC Center.Ai服务中心，聚合全网Ai', - 'version': '17.0.25.02.10', + 'version': '17.0.25.02.11', 'author': 'odooai.cn', 'company': 'odooai.cn', 'maintainer': 'odooai.cn', diff --git a/app_chatgpt/models/ai_robot.py b/app_chatgpt/models/ai_robot.py index 49b7ba83..27a2f4c0 100644 --- a/app_chatgpt/models/ai_robot.py +++ b/app_chatgpt/models/ai_robot.py @@ -132,13 +132,17 @@ GPT-3 A set of models that can understand and generate natural language # hook，都正常 return False + def get_msg_file_content(self, message): + # hook + return False + def get_ai(self, data, author_id=False, answer_id=False, param={}): # 通用方法 # author_id: 请求的 partner_id 对象 # answer_id: 回答的 partner_id 对象 # param，dict 形式的参数 # 调整输出为2个参数：res_post详细内容，is_ai是否ai的响应 - + self.ensure_one() # 前置勾子，一般返回 False，有问题返回响应内容，用于处理敏感词等 res_pre = self.get_ai_pre(data, author_id, answer_id, param) @@ -148,7 +152,7 @@ GPT-3 A set of models that can understand and generate natural language if not hasattr(self, 'get_%s' % self.provider): res = _('No robot provider found') return res, {}, False - + res = getattr(self, 'get_%s' % self.provider)(data, author_id, answer_id, param) # 后置勾子，返回处理后的内容 res_post, usage, is_ai = self.get_ai_post(res, author_id, answer_id, param) @@ -175,7 +179,7 @@ GPT-3 A set of models that can understand and generate natural language # 后置勾子，返回处理后的内容 res_post, usage, is_ai = self.get_ai_post(res, author_id, answer_id, param) return res - + def get_ai_post(self, res, author_id=False, answer_id=False, param=None): # hook，高级版要替代 if param is None: @@ -202,14 +206,14 @@ GPT-3 A set of models that can understand and generate natural language except Exception as e: _logger.error('==========app_chatgpt get_ai_post Error: %s' % e) return res, False, False - + def get_ai_system(self, content=None): # 获取基础ai角色设定, role system sys_content = content or self.sys_content if sys_content: return {"role": "system", "content": sys_content} return {} - + def get_ai_model_info(self): self.ensure_one() headers = {"Content-Type": "application/json", "Authorization": f"Bearer {self.openapi_api_key}"} @@ -217,7 +221,7 @@ GPT-3 A set of models that can understand and generate natural language o_url = "https://api.openai.com/v1/models/%s" % self.ai_model if self.endpoint: o_url = self.endpoint.replace("/chat/completions", "") + "/models/%s" % self.ai_model - + response = requests.get(o_url, headers=headers, timeout=R_TIMEOUT) response.close() if response: @@ -259,7 +263,7 @@ GPT-3 A set of models that can understand and generate natural language frequency_penalty = param.get('frequency_penalty') if param.get('frequency_penalty') else self.frequency_penalty presence_penalty = param.get('presence_penalty') if param.get('presence_penalty') else self.presence_penalty request_timeout = param.get('request_timeout') if param.get('request_timeout') else self.ai_timeout - + if self.stop: stop = self.stop.split(',') else: @@ -299,7 +303,7 @@ GPT-3 A set of models that can understand and generate natural language return res else: _logger.warning('=====================openai output data: %s' % response.json()) - + return _("Response Timeout, please speak again.") def get_azure(self, data, author_id, answer_id, param={}): @@ -307,10 +311,10 @@ GPT-3 A set of models that can understand and generate natural language # only for azure if not self.endpoint: raise UserError(_("Please Set your AI robot's endpoint first.")) - + if not self.api_version: raise UserError(_("Please Set your AI robot's API Version first.")) - + if self.stop: stop = self.stop.split(',') else: @@ -334,7 +338,7 @@ GPT-3 A set of models that can understand and generate natural language if sys_content: messages.insert(0, sys_content) # 暂时不变 - + client = AzureOpenAI( api_version=self.api_version, azure_endpoint=self.endpoint, @@ -366,7 +370,7 @@ GPT-3 A set of models that can understand and generate natural language self.endpoint = 'https://api.openai.com/v1/chat/completions' elif self.provider == 'azure': self.endpoint = 'https://odoo.openai.azure.com' - + if self.provider: # 取头像 module_path = modules.get_module_path('app_chatgpt', display_warning=False) @@ -375,7 +379,7 @@ GPT-3 A set of models that can understand and generate natural language if path: image_file = tools.file_open(path, 'rb') self.image_avatar = base64.b64encode(image_file.read()) - + @api.onchange('set_ai_model') def _onchange_set_ai_model(self): if self.set_ai_model: diff --git a/app_chatgpt/models/discuss_channel.py b/app_chatgpt/models/discuss_channel.py index 6e53be36..4e4b2e90 100644 --- a/app_chatgpt/models/discuss_channel.py +++ b/app_chatgpt/models/discuss_channel.py @@ -241,7 +241,7 @@ class Channel(models.Model): if hasattr(ai, 'is_translator') and ai.is_translator and ai.ai_model == 'translator': return rdata chatgpt_channel_id = self.env.ref('app_chatgpt.channel_chatgpt') - + if message.body == _('
joined the channel
'): msg = _("Please warmly welcome our new partner %s and send him the best wishes.") % message.author_id.name else: @@ -277,7 +277,7 @@ class Channel(models.Model): chat_count = 1 else: chat_count = chat_count - + if author_id != answer_id.id and self.channel_type == 'chat': # 私聊 _logger.info(f'私聊:author_id:{author_id},partner_chatgpt.id:{answer_id.id}') @@ -291,24 +291,53 @@ class Channel(models.Model): channel = self.env[msg_vals.get('model')].browse(msg_vals.get('res_id')) if hasattr(channel, 'is_private') and channel.description: messages.append({"role": "system", "content": channel.description}) - + try: + # 处理提示词 + sys_content = '%s%s' % (channel.description if channel.description else "", add_sys_content if add_sys_content else "") + if len(sys_content): + messages.append({"role": "system", "content": sys_content}) c_history = self.get_openai_context(channel.id, author_id, answer_id, openapi_context_timeout, chat_count) if c_history: messages += c_history - messages.append({"role": "user", "content": msg}) + if message.attachment_ids: + attachment = message.attachment_ids[:1] + file_content = ai.get_msg_file_content(message) + if not file_content: + messages.append({"role": "user", "content": msg}) + if attachment.mimetype in ['image/jpeg', 'image/png', 'image/gif', 'image/bmp', 'image/webp']: + messages.append({ + "role": "user", + "content": [ + { + "type": "image_url", + "image_url": { + "url": file_content, + }, + }, + { + "type": "text", + "text": msg + } + ] + }) + else: + messages.append({"role": "system", "content": file_content}) + messages.append({"role": "user", "content": msg}) + else: + messages.append({"role": "user", "content": msg}) msg_len = sum(len(str(m)) for m in messages) # 接口最大接收 8430 Token - if msg_len * 2 > ai.max_send_char: - messages = [] - if hasattr(channel, 'is_private') and channel.description: - messages.append({"role": "system", "content": channel.description}) - messages.append({"role": "user", "content": msg}) - msg_len = sum(len(str(m)) for m in messages) - if msg_len * 2 > ai.max_send_char: - new_msg = channel.with_user(user_id).message_post(body=_('您所发送的提示词已超长。'), message_type='comment', - subtype_xmlid='mail.mt_comment', - parent_id=message.id) + # if msg_len * 2 > ai.max_send_char: + # messages = [] + # if hasattr(channel, 'is_private') and channel.description: + # messages.append({"role": "system", "content": channel.description}) + # messages.append({"role": "user", "content": msg}) + # msg_len = sum(len(str(m)) for m in messages) + # if msg_len * 2 > ai.max_send_char: + # new_msg = channel.with_user(user_id).message_post(body=_('您所发送的提示词已超长。'), message_type='comment', + # subtype_xmlid='mail.mt_comment', + # parent_id=message.id) # if msg_len * 2 >= 8000: # messages = [{"role": "user", "content": msg}] diff --git a/app_chatgpt/static/description/index.html b/app_chatgpt/static/description/index.html index 14366bca..67f55f99 100644 --- a/app_chatgpt/static/description/index.html +++ b/app_chatgpt/static/description/index.html @@ -11,7 +11,7 @@ -

Latest update: v17.25.02.10

+

Latest update: v17.25.02.11

diff --git a/app_deepseek/__manifest__.py b/app_deepseek/__manifest__.py index 103b596b..54a7c65f 100644 --- a/app_deepseek/__manifest__.py +++ b/app_deepseek/__manifest__.py @@ -53,7 +53,7 @@ 'data': [ 'data/ai_robot_data.xml', 'data/user_partner_data.xml', - 'data/mail_channel_data.xml', + 'data/discuss_channel_data.xml', 'views/ai_robot_views.xml', ], 'assets': {