From c4c0ac4557fc0997385aac661f80879c0426f4b0 Mon Sep 17 00:00:00 2001 From: Chill Date: Wed, 22 Feb 2023 12:24:48 +0800 Subject: [PATCH 1/4] update app_chatgpt --- app_chatgpt/models/mail_channel.py | 89 +++++++++++++++--------------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py index 5def8390..c11c933a 100644 --- a/app_chatgpt/models/mail_channel.py +++ b/app_chatgpt/models/mail_channel.py @@ -82,17 +82,19 @@ class Channel(models.Model): # print(f'rdata:{rdata}') chatgpt_channel_id = self.env.ref('app_chatgpt.channel_chatgpt') - user_chatgpt = self.env.ref("app_chatgpt.user_chatgpt") - partner_chatgpt = self.env.ref("app_chatgpt.partner_chatgpt") - + user_chatgpt = False + partner_chatgpt = self.env['res.partner'] + chatgpt_name = '' author_id = msg_vals.get('author_id') # print('author_id:',author_id) 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')) if 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] if user_id: gpt_policy = user_id.gpt_policy @@ -104,14 +106,14 @@ class Channel(models.Model): gpt_id = user_id.gpt_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') # print('prompt:', prompt) # print('-----') if not prompt: 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: api_key = gpt_id.openapi_api_key try: @@ -120,49 +122,44 @@ class Channel(models.Model): openapi_context_timeout = 600 openai.api_key = api_key - Partner = self.env['res.partner'] 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.get('record_name', '')) # print('self.channel_type :',self.channel_type) - 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}') - try: - channel = self.env[msg_vals.get('model')].browse(msg_vals.get('res_id')) - prompt = self.get_openai_context(channel.id, partner_chatgpt.id, prompt,openapi_context_timeout) - print(prompt) - # res = self.get_chatgpt_answer(prompt,partner_name) - res = self.get_openai(api_key, prompt, partner_name) - # print('res:',res) - # print('channel:',channel) - channel.with_user(user_chatgpt).message_post(body=res, message_type='comment',subtype_xmlid='mail.mt_comment',parent_id=message.id) - # channel.with_user(user_chatgpt).message_post(body=res, message_type='notification', subtype_xmlid='mail.mt_comment') - # channel.sudo().message_post( - # body=res, - # author_id=partner_chatgpt.id, - # message_type="comment", - # subtype_xmlid="mail.mt_comment", - # ) - # self.with_user(user_chatgpt).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment') - except Exception as e: - raise UserError(_(e)) + 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': + _logger.info(f'私聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}') + try: + channel = self.env[msg_vals.get('model')].browse(msg_vals.get('res_id')) + prompt = self.get_openai_context(channel.id, partner_chatgpt.id, prompt,openapi_context_timeout) + print(prompt) + # res = self.get_chatgpt_answer(prompt,partner_name) + res = self.get_openai(api_key, prompt, partner_name) + # print('res:',res) + # print('channel:',channel) + channel.with_user(user_chatgpt).message_post(body=res, message_type='comment',subtype_xmlid='mail.mt_comment',parent_id=message.id) + # channel.with_user(user_chatgpt).message_post(body=res, message_type='notification', subtype_xmlid='mail.mt_comment') + # channel.sudo().message_post( + # body=res, + # author_id=partner_chatgpt.id, + # message_type="comment", + # subtype_xmlid="mail.mt_comment", + # ) + # self.with_user(user_chatgpt).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment') + except Exception as e: + raise UserError(_(e)) - elif author_id != partner_chatgpt.id and msg_vals.get('model', '') == 'mail.channel' and msg_vals.get('res_id', 0) == chatgpt_channel_id.id: - _logger.info(f'频道群聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}') - try: - prompt = self.get_openai_context(chatgpt_channel_id.id, partner_chatgpt.id, prompt,openapi_context_timeout) - # print(prompt) - # res = self.get_chatgpt_answer(prompt, partner_name) - res = self.get_openai(api_key, prompt, partner_name) - chatgpt_channel_id.with_user(user_chatgpt).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment',parent_id=message.id) - except Exception as e: - raise UserError(_(e)) + elif author_id != partner_chatgpt.id and msg_vals.get('model', '') == 'mail.channel' and msg_vals.get('res_id', 0) == chatgpt_channel_id.id: + _logger.info(f'频道群聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}') + try: + prompt = self.get_openai_context(chatgpt_channel_id.id, partner_chatgpt.id, prompt,openapi_context_timeout) + # print(prompt) + # res = self.get_chatgpt_answer(prompt, partner_name) + res = self.get_openai(api_key, prompt, partner_name) + chatgpt_channel_id.with_user(user_chatgpt).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment',parent_id=message.id) + except Exception as e: + raise UserError(_(e)) return rdata From 735e41d059f0ac4d16f6233e73d0c02fbd16e3ef Mon Sep 17 00:00:00 2001 From: Chill Date: Wed, 22 Feb 2023 15:26:33 +0800 Subject: [PATCH 2/4] update app_chatgpt --- app_chatgpt/models/gpt_robot.py | 1 - app_chatgpt/models/mail_channel.py | 63 ++++++++++++++++++------------ 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/app_chatgpt/models/gpt_robot.py b/app_chatgpt/models/gpt_robot.py index 19128489..b9faa5dc 100644 --- a/app_chatgpt/models/gpt_robot.py +++ b/app_chatgpt/models/gpt_robot.py @@ -8,7 +8,6 @@ class GptRobot(models.Model): _description = 'Gpt Robot' _order = 'sequence, name' - name = fields.Char(string='Name') openapi_api_key = fields.Char(string="API Key", help="Provide the API key here") temperature = fields.Float(string='Temperature', default=0.9) diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py index c11c933a..12ca72e0 100644 --- a/app_chatgpt/models/mail_channel.py +++ b/app_chatgpt/models/mail_channel.py @@ -80,31 +80,41 @@ class Channel(models.Model): def _notify_thread(self, message, msg_vals=False, **kwargs): rdata = super(Channel, self)._notify_thread(message, msg_vals=msg_vals, **kwargs) # print(f'rdata:{rdata}') - - chatgpt_channel_id = self.env.ref('app_chatgpt.channel_chatgpt') - user_chatgpt = False - partner_chatgpt = self.env['res.partner'] - chatgpt_name = '' + to_partner_id = self.env['res.partner'] + user_id = self.env['res.users'] author_id = msg_vals.get('author_id') - # print('author_id:',author_id) - gpt_id = self.env['gpt.robot'] - # 应该先确定 gpt_id，才处理对话黑名单。 黑名单是指是否允许与 gpt对话，不是是否允许绑定 gpt - # partner_ids = @ ids - partner_ids = list(msg_vals.get('partner_ids')) - if 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] + channel_type = self.channel_type + if channel_type == 'chat': + channel_partner_ids = self.channel_partner_ids + to_partner_id = channel_partner_ids - message.author_id + user_id = to_partner_id.mapped('user_ids').filtered(lambda r: r.gpt_id)[:1] if user_id: gpt_policy = user_id.gpt_policy gpt_wl_users = user_id.gpt_wl_users is_allow = message.create_uid.id in gpt_wl_users.ids if gpt_policy == 'all' or (gpt_policy == 'limit' and is_allow): - user_chatgpt = user_id - partner_chatgpt = user_id.partner_id gpt_id = user_id.gpt_id + elif channel_type in ['group', 'channel']: + # partner_ids = @ ids + partner_ids = list(msg_vals.get('partner_ids')) + if 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] + if user_id: + gpt_policy = user_id.gpt_policy + gpt_wl_users = user_id.gpt_wl_users + is_allow = message.create_uid.id in gpt_wl_users.ids + to_partner_id = user_id.partner_id + if gpt_policy == 'all' or (gpt_policy == 'limit' and is_allow): + gpt_id = user_id.gpt_id + + chatgpt_channel_id = self.env.ref('app_chatgpt.channel_chatgpt') + + # print('author_id:',author_id) + # print('partner_chatgpt.id:',partner_chatgpt.id) prompt = msg_vals.get('body') @@ -126,20 +136,21 @@ class Channel(models.Model): # print(msg_vals) # print(msg_vals.get('record_name', '')) # print('self.channel_type :',self.channel_type) - if partner_chatgpt: - chatgpt_name = str(partner_chatgpt.name or '') + ', ' + if gpt_id: + chatgpt_name = str(gpt_id.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': - _logger.info(f'私聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}') + # if author_id != to_partner_id.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 != to_partner_id.id and self.channel_type == 'chat': + _logger.info(f'私聊:author_id:{author_id},partner_chatgpt.id:{to_partner_id.id}') try: channel = self.env[msg_vals.get('model')].browse(msg_vals.get('res_id')) - prompt = self.get_openai_context(channel.id, partner_chatgpt.id, prompt,openapi_context_timeout) + prompt = self.get_openai_context(channel.id, to_partner_id.id, prompt,openapi_context_timeout) print(prompt) # res = self.get_chatgpt_answer(prompt,partner_name) res = self.get_openai(api_key, prompt, partner_name) # print('res:',res) # print('channel:',channel) - channel.with_user(user_chatgpt).message_post(body=res, message_type='comment',subtype_xmlid='mail.mt_comment',parent_id=message.id) + channel.with_user(user_id).message_post(body=res, message_type='comment',subtype_xmlid='mail.mt_comment',parent_id=message.id) # channel.with_user(user_chatgpt).message_post(body=res, message_type='notification', subtype_xmlid='mail.mt_comment') # channel.sudo().message_post( # body=res, @@ -151,14 +162,14 @@ class Channel(models.Model): except Exception as e: raise UserError(_(e)) - elif author_id != partner_chatgpt.id and msg_vals.get('model', '') == 'mail.channel' and msg_vals.get('res_id', 0) == chatgpt_channel_id.id: - _logger.info(f'频道群聊:author_id:{author_id},partner_chatgpt.id:{partner_chatgpt.id}') + elif author_id != to_partner_id.id and msg_vals.get('model', '') == 'mail.channel' and msg_vals.get('res_id', 0) == chatgpt_channel_id.id: + _logger.info(f'频道群聊:author_id:{author_id},partner_chatgpt.id:{to_partner_id.id}') try: - prompt = self.get_openai_context(chatgpt_channel_id.id, partner_chatgpt.id, prompt,openapi_context_timeout) + prompt = self.get_openai_context(chatgpt_channel_id.id, to_partner_id.id, prompt,openapi_context_timeout) # print(prompt) # res = self.get_chatgpt_answer(prompt, partner_name) res = self.get_openai(api_key, prompt, partner_name) - chatgpt_channel_id.with_user(user_chatgpt).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment',parent_id=message.id) + chatgpt_channel_id.with_user(user_id).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment',parent_id=message.id) except Exception as e: raise UserError(_(e)) From 4c731b5b1860e11ef8bda0c210f75365aeedbdca Mon Sep 17 00:00:00 2001 From: Chill Date: Wed, 22 Feb 2023 17:16:59 +0800 Subject: [PATCH 3/4] update app_chatgpt --- app_chatgpt/models/mail_channel.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py index 12ca72e0..05ddf88a 100644 --- a/app_chatgpt/models/mail_channel.py +++ b/app_chatgpt/models/mail_channel.py @@ -126,6 +126,9 @@ class Channel(models.Model): api_key = '' if gpt_id: api_key = gpt_id.openapi_api_key + if not api_key: + _logger.warning(_("ChatGPT Robot【%s】have not set open api key.")) + return rdata try: openapi_context_timeout = int(self.env['ir.config_parameter'].sudo().get_param('app_chatgpt.openapi_context_timeout')) or 600 except: @@ -148,6 +151,7 @@ class Channel(models.Model): print(prompt) # res = self.get_chatgpt_answer(prompt,partner_name) res = self.get_openai(api_key, prompt, partner_name) + res = res.replace('\n', '
') # print('res:',res) # print('channel:',channel) channel.with_user(user_id).message_post(body=res, message_type='comment',subtype_xmlid='mail.mt_comment',parent_id=message.id) @@ -169,6 +173,7 @@ class Channel(models.Model): # print(prompt) # res = self.get_chatgpt_answer(prompt, partner_name) res = self.get_openai(api_key, prompt, partner_name) + res = res.replace('\n', '
') chatgpt_channel_id.with_user(user_id).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment',parent_id=message.id) except Exception as e: raise UserError(_(e)) From 634e772d3a9953619943bb15db0159d740efc980 Mon Sep 17 00:00:00 2001 From: Chill Date: Wed, 22 Feb 2023 18:59:12 +0800 Subject: [PATCH 4/4] update app_chatgpt disconnect --- app_chatgpt/models/__init__.py | 1 + app_chatgpt/models/gpt_robot.py | 5 +++++ app_chatgpt/models/mail_channel.py | 4 +++- app_chatgpt/models/mail_message.py | 13 +++++++++++++ app_chatgpt/views/gpt_robot_views.xml | 9 +++++++++ 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 app_chatgpt/models/mail_message.py diff --git a/app_chatgpt/models/__init__.py b/app_chatgpt/models/__init__.py index e650dfe1..74223a16 100644 --- a/app_chatgpt/models/__init__.py +++ b/app_chatgpt/models/__init__.py @@ -5,3 +5,4 @@ from . import mail_channel from . import res_config_settings from . import gpt_robot from . import res_users +from . import mail_message diff --git a/app_chatgpt/models/gpt_robot.py b/app_chatgpt/models/gpt_robot.py index b9faa5dc..62f9b5fe 100644 --- a/app_chatgpt/models/gpt_robot.py +++ b/app_chatgpt/models/gpt_robot.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import requests from odoo import api, fields, models, _ @@ -12,3 +13,7 @@ class GptRobot(models.Model): openapi_api_key = fields.Char(string="API Key", help="Provide the API key here") temperature = fields.Float(string='Temperature', default=0.9) sequence = fields.Integer('Sequence', help="Determine the display order", default=10) + + def action_disconnect(self): + requests.delete('https://chatgpt.com/v1/disconnect') + diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py index 05ddf88a..86e2e0b2 100644 --- a/app_chatgpt/models/mail_channel.py +++ b/app_chatgpt/models/mail_channel.py @@ -8,6 +8,8 @@ from odoo import api, fields, models, _ from odoo.exceptions import UserError import logging _logger = logging.getLogger(__name__) + + class Channel(models.Model): _inherit = 'mail.channel' @@ -18,7 +20,7 @@ class Channel(models.Model): "model": "text-davinci-003", "prompt": data, "temperature": 0.9, - "max_tokens": 1000, + "max_tokens": 2000, "top_p": 1, "frequency_penalty": 0.0, "presence_penalty": 0.6, diff --git a/app_chatgpt/models/mail_message.py b/app_chatgpt/models/mail_message.py new file mode 100644 index 00000000..a93541d1 --- /dev/null +++ b/app_chatgpt/models/mail_message.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +from odoo import fields, models + + +class Message(models.Model): + _inherit = "mail.message" + + def _message_add_reaction(self, content): + super(Message, self)._message_add_reaction(content) + if self.create_uid.gpt_id: + # 处理反馈 + pass diff --git a/app_chatgpt/views/gpt_robot_views.xml b/app_chatgpt/views/gpt_robot_views.xml index 49b5b373..0a4c14a2 100644 --- a/app_chatgpt/views/gpt_robot_views.xml +++ b/app_chatgpt/views/gpt_robot_views.xml @@ -43,6 +43,15 @@ + + Disconnect + + + list,form + code + action = records.action_disconnect() + +