mirror of
https://github.com/guohuadeng/app-odoo.git
synced 2025-02-23 04:11:36 +02:00
update app_chatgpt
This commit is contained in:
@@ -82,17 +82,19 @@ class Channel(models.Model):
|
|||||||
# print(f'rdata:{rdata}')
|
# print(f'rdata:{rdata}')
|
||||||
|
|
||||||
chatgpt_channel_id = self.env.ref('app_chatgpt.channel_chatgpt')
|
chatgpt_channel_id = self.env.ref('app_chatgpt.channel_chatgpt')
|
||||||
user_chatgpt = self.env.ref("app_chatgpt.user_chatgpt")
|
user_chatgpt = False
|
||||||
partner_chatgpt = self.env.ref("app_chatgpt.partner_chatgpt")
|
partner_chatgpt = self.env['res.partner']
|
||||||
|
chatgpt_name = ''
|
||||||
author_id = msg_vals.get('author_id')
|
author_id = msg_vals.get('author_id')
|
||||||
# print('author_id:',author_id)
|
# print('author_id:',author_id)
|
||||||
|
|
||||||
gpt_id = self.env['gpt.robot']
|
gpt_id = self.env['gpt.robot']
|
||||||
# todo: 应该先确定 gpt_id,才处理对话黑名单。 黑名单是指是否允许与 gpt对话,不是是否允许绑定 gpt
|
# 应该先确定 gpt_id,才处理对话黑名单。 黑名单是指是否允许与 gpt对话,不是是否允许绑定 gpt
|
||||||
|
# partner_ids = @ ids
|
||||||
partner_ids = list(msg_vals.get('partner_ids'))
|
partner_ids = list(msg_vals.get('partner_ids'))
|
||||||
if partner_ids:
|
if partner_ids:
|
||||||
partners = self.env['res.partner'].search([('id', 'in', partner_ids)])
|
partners = self.env['res.partner'].search([('id', 'in', partner_ids)])
|
||||||
|
# user_id = user has binded gpt robot
|
||||||
user_id = partners.mapped('user_ids').filtered(lambda r: r.gpt_id)[:1]
|
user_id = partners.mapped('user_ids').filtered(lambda r: r.gpt_id)[:1]
|
||||||
if user_id:
|
if user_id:
|
||||||
gpt_policy = user_id.gpt_policy
|
gpt_policy = user_id.gpt_policy
|
||||||
@@ -104,14 +106,14 @@ class Channel(models.Model):
|
|||||||
gpt_id = user_id.gpt_id
|
gpt_id = user_id.gpt_id
|
||||||
|
|
||||||
# print('partner_chatgpt.id:',partner_chatgpt.id)
|
# print('partner_chatgpt.id:',partner_chatgpt.id)
|
||||||
chatgpt_name = str(partner_chatgpt.name or '') + ', '
|
|
||||||
# print('chatgpt_name:', chatgpt_name)
|
|
||||||
prompt = msg_vals.get('body')
|
prompt = msg_vals.get('body')
|
||||||
# print('prompt:', prompt)
|
# print('prompt:', prompt)
|
||||||
# print('-----')
|
# print('-----')
|
||||||
if not prompt:
|
if not prompt:
|
||||||
return rdata
|
return rdata
|
||||||
api_key = self.env['ir.config_parameter'].sudo().get_param('app_chatgpt.openapi_api_key')
|
# api_key = self.env['ir.config_parameter'].sudo().get_param('app_chatgpt.openapi_api_key')
|
||||||
|
api_key = ''
|
||||||
if gpt_id:
|
if gpt_id:
|
||||||
api_key = gpt_id.openapi_api_key
|
api_key = gpt_id.openapi_api_key
|
||||||
try:
|
try:
|
||||||
@@ -120,18 +122,13 @@ class Channel(models.Model):
|
|||||||
openapi_context_timeout = 600
|
openapi_context_timeout = 600
|
||||||
|
|
||||||
openai.api_key = api_key
|
openai.api_key = api_key
|
||||||
Partner = self.env['res.partner']
|
|
||||||
partner_name = ''
|
partner_name = ''
|
||||||
if author_id:
|
|
||||||
partner_id = Partner.browse(author_id)
|
|
||||||
if partner_id:
|
|
||||||
user_id = partner_id.user_ids[:1]
|
|
||||||
if user_id.gpt_id:
|
|
||||||
return rdata
|
|
||||||
partner_name = partner_id.name
|
|
||||||
# print(msg_vals)
|
# print(msg_vals)
|
||||||
# print(msg_vals.get('record_name', ''))
|
# print(msg_vals.get('record_name', ''))
|
||||||
# print('self.channel_type :',self.channel_type)
|
# print('self.channel_type :',self.channel_type)
|
||||||
|
if partner_chatgpt:
|
||||||
|
chatgpt_name = str(partner_chatgpt.name or '') + ', '
|
||||||
|
# print('chatgpt_name:', chatgpt_name)
|
||||||
if author_id != partner_chatgpt.id and (chatgpt_name in msg_vals.get('record_name', '') or 'ChatGPT,' in msg_vals.get('record_name', '') ) and self.channel_type == 'chat':
|
if author_id != partner_chatgpt.id and (chatgpt_name in msg_vals.get('record_name', '') or 'ChatGPT,' in msg_vals.get('record_name', '') ) and self.channel_type == 'chat':
|
||||||
_logger.info(f'私聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}')
|
_logger.info(f'私聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}')
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user