From 19ea5487dffeca1ede3b4755b23fd81a4779001e Mon Sep 17 00:00:00 2001
From: Changhua <lichanghua0821@gmail.com>
Date: Fri, 17 Nov 2023 16:32:04 +0800
Subject: [PATCH] Update conf

---
 func_chatgpt.py | 18 ++++++------------
 robot.py        |  6 ++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/func_chatgpt.py b/func_chatgpt.py
index 9fb6b55..39eb012 100644
--- a/func_chatgpt.py
+++ b/func_chatgpt.py
@@ -8,14 +8,15 @@ import openai
 
 class ChatGPT:
 
-    def __init__(self, key: str, api: str, proxy: str, prompt: str) -> None:
-        openai.api_key = key
+    def __init__(self, conf: dict) -> None:
+        openai.api_key = conf["key"]
         # 自己搭建或第三方代理的接口
-        openai.api_base = api
+        openai.api_base = conf["api"]
+        proxy = conf["proxy"]
         if proxy:
             openai.proxy = {"http": proxy, "https": proxy}
         self.conversation_list = {}
-        self.system_content_msg = {"role": "system", "content": prompt}
+        self.system_content_msg = {"role": "system", "content": conf["prompt"]}
 
     def __repr__(self):
         return 'ChatGPT'
@@ -44,8 +45,6 @@ class ChatGPT:
         except Exception as e0:
             rsp = "发生未知错误：" + str(e0)
 
-        # print(self.conversation_list[wxid])
-
         return rsp
 
     def updateMessage(self, wxid: str, question: str, role: str) -> None:
@@ -84,12 +83,7 @@ if __name__ == "__main__":
     if not config:
         exit(0)
 
-    key = config.get("key")
-    api = config.get("api")
-    proxy = config.get("proxy")
-    prompt = config.get("prompt")
-
-    chat = ChatGPT(key, api, proxy, prompt)
+    chat = ChatGPT(config)
 
     while True:
         q = input(">>> ")
diff --git a/robot.py b/robot.py
index ba2cf2e..12dde7b 100644
--- a/robot.py
+++ b/robot.py
@@ -35,8 +35,7 @@ class Robot(Job):
             if chat_type == ChatType.TIGER_BOT.value and self.value_check(self.config.TIGERBOT):
                 self.chat = TigerBot(self.config.TIGERBOT)
             elif chat_type == ChatType.CHATGPT.value and self.value_check(self.config.CHATGPT):
-                cgpt = self.config.CHATGPT
-                self.chat = ChatGPT(cgpt.get("key"), cgpt.get("api"), cgpt.get("proxy"), cgpt.get("prompt"))
+                self.chat = ChatGPT(self.config.CHATGPT)
             elif chat_type == ChatType.XINGHUO_WEB.value and self.value_check(self.config.XINGHUO_WEB):
                 self.chat = XinghuoWeb(self.config.XINGHUO_WEB)
             elif chat_type == ChatType.CHATGLM.value and self.value_check(self.config.CHATGLM):
@@ -48,8 +47,7 @@ class Robot(Job):
             if self.value_check(self.config.TIGERBOT):
                 self.chat = TigerBot(self.config.TIGERBOT)
             elif self.value_check(self.config.CHATGPT):
-                cgpt = self.config.CHATGPT
-                self.chat = ChatGPT(cgpt.get("key"), cgpt.get("api"), cgpt.get("proxy"), cgpt.get("prompt"))
+                self.chat = ChatGPT(self.config.CHATGPT)
             elif self.value_check(self.config.XINGHUO_WEB):
                 self.chat = XinghuoWeb(self.config.XINGHUO_WEB)
             elif self.value_check(self.config.CHATGLM):