audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/16.0' into 16.0

Browse Source
This commit is contained in:
ivan deng
2023-07-23 22:22:10 +08:00
parent 7eeee55ff6 0ddfc7e4d3
commit 2fd84c129a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app_chatgpt/models/mail_channel.py
View File

@@ -6,6 +6,7 @@ import datetime
# from transformers import TextDavinciTokenizer, TextDavinciModel # from transformers import TextDavinciTokenizer, TextDavinciModel
from odoo import api, fields, models, tools, _ from odoo import api, fields, models, tools, _
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.osv import expression
from odoo.addons.app_common.models.base import get_ua_type from odoo.addons.app_common.models.base import get_ua_type
import logging import logging
@@ -30,13 +31,14 @@ class Channel(models.Model):
('model', '=', 'mail.channel'), ('model', '=', 'mail.channel'),
('message_type', '!=', 'user_notification'), ('message_type', '!=', 'user_notification'),
('parent_id', '!=', False), ('parent_id', '!=', False),
('author_id', '=', answer_id.id),
('body', '!=', '<p>%s</p>' % _('Response Timeout, please speak again.')), ('body', '!=', '<p>%s</p>' % _('Response Timeout, please speak again.')),
('body', '!=', _('温馨提示：您发送的内容含有敏感词，请修改内容后再向我发送。'))] ('body', '!=', _('温馨提示：您发送的内容含有敏感词，请修改内容后再向我发送。'))]
if self.channel_type in ['group', 'channel']: if self.channel_type in ['group', 'channel']:
# 群聊增加时间限制，当前找所有人，不限制 author_id # 群聊增加时间限制，当前找所有人，不限制 author_id
domain += [('date', '>=', afterTime)] domain = expression.AND([domain, [('date', '>=', afterTime)]])
else:
domain = expression.AND([domain, [('author_id', '=', answer_id.id)]])
ai_msg_list = message_model.with_context(tz='UTC').search(domain, order="id desc", limit=chat_count) ai_msg_list = message_model.with_context(tz='UTC').search(domain, order="id desc", limit=chat_count)
for ai_msg in ai_msg_list: for ai_msg in ai_msg_list:
# 判断这个 ai_msg 是不是ai发，有才 insert。 判断 user_msg 是不是 user发的，有才 insert # 判断这个 ai_msg 是不是ai发，有才 insert。 判断 user_msg 是不是 user发的，有才 insert