diff --git a/app_chatgpt/__manifest__.py b/app_chatgpt/__manifest__.py index 04bd7589..be6e03ac 100644 --- a/app_chatgpt/__manifest__.py +++ b/app_chatgpt/__manifest__.py @@ -10,7 +10,7 @@ { 'name': 'ChatGPT4, China Ali,AiGC Center.Ai服务中心，聚合全网Ai', - 'version': '16.0.25.02.08', + 'version': '16.0.25.02.09', 'author': 'odooai.cn', 'company': 'odooai.cn', 'maintainer': 'odooai.cn', diff --git a/app_chatgpt/i18n/zh_CN.po b/app_chatgpt/i18n/zh_CN.po index 903d9f96..a8febf7c 100644 --- a/app_chatgpt/i18n/zh_CN.po +++ b/app_chatgpt/i18n/zh_CN.po @@ -631,6 +631,16 @@ msgstr "Ai回答Token" msgid "AI Provider" msgstr "Ai服务商" +#. module: app_chatgpt +#: model:ir.model.fields,field_description:app_chatgpt.field_res_config_settings__ai_chat_padding_time +msgid "Ai Padding Time" +msgstr "Ai对话间隔(秒)" + +#. module: app_chatgpt +#: model:ir.model.fields,help:app_chatgpt.field_res_config_settings__ai_chat_padding_time +msgid "Amount of time (in seconds) between a conversation" +msgstr "每次与Ai对话的间隔时间，以秒为单位。一般的Ai接口不允许适时间太多请求。" + #. module: app_chatgpt #. odoo-javascript #: code:addons/app_chatgpt/static/src/models_data/emoji_data.js:0 @@ -2278,7 +2288,7 @@ msgstr "辅助Ai" #. module: app_chatgpt #: model:ir.model.fields.selection,name:app_chatgpt.selection__res_users__gpt_policy__limit msgid "Selected Users" -msgstr "" +msgstr "指定的用户" #. module: app_chatgpt #: model:ir.model.fields,field_description:app_chatgpt.field_ai_robot__sensitive_words diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py index 97e98ca8..ce186401 100644 --- a/app_chatgpt/models/mail_channel.py +++ b/app_chatgpt/models/mail_channel.py @@ -33,7 +33,7 @@ class Channel(models.Model): ('2000', 'Long'), ('3000', 'Overlength'), ('32000', '32K'), - ], string='Max Response', default='600', help="越大返回内容越多，计费也越多") + ], string='Max Response', default='1000', help="越大返回内容越多，计费也越多") set_chat_count = fields.Selection([ ('none', 'Ai Auto'), ('1', '1标准'), @@ -187,6 +187,7 @@ class Channel(models.Model): channel = self.env['mail.channel'] channel_type = self.channel_type messages = [] + add_sys_content = '' # 不处理 一般notify，但处理欢迎 if '
joined the channel
'): @@ -211,11 +212,13 @@ class Channel(models.Model): partner_ids = list(msg_vals.get('partner_ids')) if hasattr(self, 'ai_partner_id') and self.ai_partner_id: if self.is_ai_conversation and self.ext_ai_partner_id: - # 二人转模式时 + # 二人转模式时，处理回答ai，以及叠加角色的设定 if author_id == self.ai_partner_id.id: partner_ids = [self.ext_ai_partner_id.id] + add_sys_content = self.ext_ai_sys_content else: partner_ids = [self.ai_partner_id.id] + add_sys_content = self.ai_sys_content elif self.ai_partner_id.id in partner_ids: # 其它，普通Ai群。当有主id时，使用主id partner_ids = [self.ai_partner_id.id] @@ -279,6 +282,12 @@ class Channel(models.Model): sync_config = self._context.get('app_ai_sync_config') else: sync_config = self.env['ir.config_parameter'].sudo().get_param('app_chatgpt.openai_sync_config') + + if self._context.get('app_ai_chat_padding_time'): + padding_time = int(self._context.get('app_ai_chat_padding_time')) + else: + padding_time = int(self.env['ir.config_parameter'].sudo().get_param('app_chatgpt.ai_chat_padding_time')) + # api_key = self.env['ir.config_parameter'].sudo().get_param('app_chatgpt.openapi_api_key') # ai处理，不要自问自答 if ai and answer_id != message.author_id: @@ -292,14 +301,10 @@ class Channel(models.Model): openapi_context_timeout = 60 openai.api_key = api_key # 非4版本，取0次。其它取3 次历史 - chat_count = 3 if '4' in ai.ai_model or '4' in ai.name: chat_count = 1 - if hasattr(self, 'chat_count'): - if self.chat_count > 0: - chat_count = 1 else: - chat_count = chat_count + chat_count = self.chat_count or 3 if author_id != answer_id.id and self.channel_type == 'chat': # 私聊 @@ -312,10 +317,11 @@ class Channel(models.Model): elif author_id != answer_id.id and msg_vals.get('model', '') == 'mail.channel' and self.channel_type in ['group', 'channel']: # 高级用户自建的话题 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 = channel.description + add_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 @@ -324,8 +330,6 @@ class Channel(models.Model): # 接口最大接收 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: @@ -339,7 +343,7 @@ class Channel(models.Model): self.get_ai_response(ai, messages, channel, user_id, message) else: if hasattr(self, 'with_delay'): - self.with_delay().get_ai_response(ai, messages, channel, user_id, message) + self.with_delay(priority=30, eta=padding_time).get_ai_response(ai, messages, channel, user_id, message) else: self.get_ai_response(ai, messages, channel, user_id, message) except Exception as e: @@ -390,3 +394,8 @@ class Channel(models.Model): if self.ext_ai_partner_id and not self.ext_ai_sys_content: if self.ext_ai_partner_id.gpt_id: self.ai_sys_content = self.ext_ai_partner_id.gpt_id.sys_content + + @api.onchange('set_chat_count') + def _onchange_set_chat_count(self): + if self.set_chat_count: + self.chat_count = int(self.set_chat_count) if self.set_chat_count != 'none' else 0 diff --git a/app_chatgpt/models/res_config_settings.py b/app_chatgpt/models/res_config_settings.py index 32f708e9..f9452165 100644 --- a/app_chatgpt/models/res_config_settings.py +++ b/app_chatgpt/models/res_config_settings.py @@ -6,8 +6,13 @@ from odoo import fields, models class ResConfigSettings(models.TransientModel): _inherit = "res.config.settings" - openapi_context_timeout = fields.Integer(string="Connect Timout", help="群聊中多少分钟以内的聊天信息作为上下文继续", config_parameter="app_chatgpt.openapi_context_timeout") + openapi_context_timeout = fields.Integer(string="Connect Timout", help="群聊中多少分钟以内的聊天信息作为上下文继续", + config_parameter="app_chatgpt.openapi_context_timeout") openai_sync_config = fields.Selection([ ('sync', 'Synchronous'), ('async', 'Asynchronous') ], string='Sync Config', default='sync', config_parameter="app_chatgpt.openai_sync_config") + + ai_chat_padding_time = fields.Integer( + string="Ai Padding Time", default=0.0, config_parameter="app_chatgpt.ai_chat_padding_time", + help="Amount of time (in seconds) between a conversation")