From 4a7d48a726e4194dc72aeee9553dcfb692aa2e7e Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Tue, 21 Feb 2023 21:32:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20data=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_chatgpt/data/gpt_robot_data.xml    | 10 ++++++++--
 app_chatgpt/data/mail_channel_data.xml |  8 ++++----
 app_chatgpt/data/user_partner_data.xml |  9 ++++-----
 app_chatgpt/models/gpt_robot.py        |  5 ++++-
 app_chatgpt/models/mail_channel.py     |  1 +
 app_chatgpt/views/gpt_robot_views.xml  | 10 ++++++----
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app_chatgpt/data/gpt_robot_data.xml b/app_chatgpt/data/gpt_robot_data.xml
index 2a524e56..4f2be514 100644
--- a/app_chatgpt/data/gpt_robot_data.xml
+++ b/app_chatgpt/data/gpt_robot_data.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
+    <record id="chatgpt_robot" model="gpt.robot">
+        <field name="name">ChatGPT odoo</field>
+        <field name="sequence">1</field>
+    </record>
     <record id="chatgpt_robot1" model="gpt.robot">
-        <field name="name">ChatGPT Robot 1</field>
+        <field name="name">ChatGPT Coding</field>
+        <field name="sequence">6</field>
     </record>
     <record id="chatgpt_robot2" model="gpt.robot">
-        <field name="name">ChatGPT Robot 2</field>
+        <field name="name">ChatGPT Finance</field>
+        <field name="sequence">7</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/app_chatgpt/data/mail_channel_data.xml b/app_chatgpt/data/mail_channel_data.xml
index f56b40d1..4ead11e7 100644
--- a/app_chatgpt/data/mail_channel_data.xml
+++ b/app_chatgpt/data/mail_channel_data.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
         <record model="mail.channel" id="channel_chatgpt">
-            <field name="name">ChatGPT群聊</field>
+            <field name="name">ChatGPT Group Chat</field>
             <field name="description">ChatGPT企业内部频道</field>
             <field name="image_128" type="base64" file="app_chatgpt/static/description/chatgpt.png"/>
         </record>
@@ -12,9 +12,9 @@
             <field name="res_id" ref="app_chatgpt.channel_chatgpt"/>
             <field name="message_type">email</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
-            <field name="subject">欢迎来到ChatGPT的odoo群聊频道!</field>
-            <field name="body"><![CDATA[<p>欢迎进行 #ChatGPT 群聊.</p>
-            <p>向ChatGPT咨询你的问题</b>.</p>]]></field>
+            <field name="subject">Welcome to ChatGPT Group Chat</field>
+            <field name="body"><![CDATA[<p>Welcome to ChatGPT Group Chat.</p>
+            <p>Pleas answer me any question.</p>]]></field>
         </record>
 
         <record model="mail.channel.member" id="channel_member_chatgtp_channel_for_admin">
diff --git a/app_chatgpt/data/user_partner_data.xml b/app_chatgpt/data/user_partner_data.xml
index 2c4ae20e..b36a5c50 100644
--- a/app_chatgpt/data/user_partner_data.xml
+++ b/app_chatgpt/data/user_partner_data.xml
@@ -2,25 +2,25 @@
 <odoo>
     <data noupdate="1">
         <record id="partner_chatgpt" model="res.partner">
-            <field name="name">ChatGPT的odoo机器人</field>
+            <field name="name">ChatGPT odoo</field>
             <field name="image_1920" type="base64" file="app_chatgpt/static/description/chatgpt.png"/>
         </record>
         <record id="user_chatgpt" model="res.users">
             <field name="login">chatgpt@sunpop.cn</field>
             <field name="password">chatgpt</field>
             <field name="partner_id" ref="app_chatgpt.partner_chatgpt"/>
+            <field name="gpt_id" ref="app_chatgpt.chatgpt_robot"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="company_ids" eval="[Command.link(ref('base.main_company'))]"/>
             <field name="groups_id" eval="[Command.link(ref('base.group_user'))]"/>
         </record>
 
         <record id="partner_chatgpt1" model="res.partner">
-            <field name="name">ChatGPT机器人1</field>
+            <field name="name">ChatGPT Coding</field>
             <field name="image_1920" type="base64" file="app_chatgpt/static/description/chatgpt.png"/>
         </record>
 
         <record id="user_chatgpt1" model="res.users">
-            <field name="name">ChatGPT1</field>
             <field name="login">chatgpt1@sunpop.cn</field>
             <field name="email">chatgpt1@sunpop.cn</field>
             <field name="password">chatgpt</field>
@@ -32,12 +32,11 @@
         </record>
 
         <record id="partner_chatgpt2" model="res.partner">
-            <field name="name">ChatGPT机器人2</field>
+            <field name="name">ChatGPT Finance</field>
             <field name="image_1920" type="base64" file="app_chatgpt/static/description/chatgpt.png"/>
         </record>
 
         <record id="user_chatgpt2" model="res.users">
-            <field name="name">ChatGPT2</field>
             <field name="login">chatgpt2@sunpop.cn</field>
             <field name="email">chatgpt2@sunpop.cn</field>
             <field name="password">chatgpt</field>
diff --git a/app_chatgpt/models/gpt_robot.py b/app_chatgpt/models/gpt_robot.py
index fbb4a418..19128489 100644
--- a/app_chatgpt/models/gpt_robot.py
+++ b/app_chatgpt/models/gpt_robot.py
@@ -6,7 +6,10 @@ from odoo import api, fields, models, _
 class GptRobot(models.Model):
     _name = 'gpt.robot'
     _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')
+    temperature = fields.Float(string='Temperature', default=0.9)
+    sequence = fields.Integer('Sequence', help="Determine the display order", default=10)
diff --git a/app_chatgpt/models/mail_channel.py b/app_chatgpt/models/mail_channel.py
index f635dce6..5def8390 100644
--- a/app_chatgpt/models/mail_channel.py
+++ b/app_chatgpt/models/mail_channel.py
@@ -89,6 +89,7 @@ class Channel(models.Model):
         # print('author_id:',author_id)
 
         gpt_id = self.env['gpt.robot']
+        # todo: 应该先确定 gpt_id，才处理对话黑名单。 黑名单是指是否允许与 gpt对话，不是是否允许绑定 gpt
         partner_ids = list(msg_vals.get('partner_ids'))
         if partner_ids:
             partners = self.env['res.partner'].search([('id', 'in', partner_ids)])
diff --git a/app_chatgpt/views/gpt_robot_views.xml b/app_chatgpt/views/gpt_robot_views.xml
index dba7be92..49b5b373 100644
--- a/app_chatgpt/views/gpt_robot_views.xml
+++ b/app_chatgpt/views/gpt_robot_views.xml
@@ -5,8 +5,9 @@
         <field name="model">gpt.robot</field>
         <field name="arch" type="xml">
             <tree>
+                <field name="sequence" widget="handle"/>
                 <field name="name"/>
-                <field name="openapi_api_key"/>
+                <field name="openapi_api_key" password="True"/>
                 <field name="temperature"/>
             </tree>
         </field>
@@ -21,8 +22,9 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="openapi_api_key"/>
+                            <field name="openapi_api_key" password="True"/>
                             <field name="temperature"/>
+                            <field name="sequence"/>
                         </group>
                     </group>
                 </sheet>
@@ -44,8 +46,8 @@
     <menuitem
             id="menu_gpt_robot"
             name="GPT Robot"
-            parent="base.menu_administration"
-            sequence="90"
+            parent="base.menu_users"
+            sequence="2"
             action="action_gpt_robot"
             groups="base.group_system"/>