Merge pull request lich0821#2 from yudong521/develop

补充requirements.txt，优化代码

base/func_zhipu.py

@@ -1,19 +1,15 @@
-from pyexpat import model
 from zhipuai import ZhipuAI
 
 class ZhiPu():
     def __init__(self, conf: dict) -> None:
-        api_key = conf.get("api_key")
-        model = conf.get("model", "glm-4") # 默认使用 glm-4 模型
-        self.api_key = api_key
-        self.model = model
-        self.client = ZhipuAI(api_key=api_key)
+        self.api_key = conf.get("api_key")
+        self.model = conf.get("model", "glm-4") # 默认使用 glm-4 模型
+        self.client = ZhipuAI(api_key=self.api_key)
         self.converstion_list = {}
 
     @staticmethod
     def value_check(conf: dict) -> bool:
-        if conf:
-            if conf.get("api_key") : 
+        if conf and conf.get("api_key") : 
                 return True
         return False
 

config.yaml.template

@@ -81,4 +81,4 @@ bard: # -----bard配置这行不填-----
 
 zhipu:  # -----zhipu配置这行不填-----
   api_key:  #api key
-  model: glm-4  # 模型类型
+  model:   # 模型类型

requirements.txt

@@ -14,3 +14,4 @@ jupyter_client
 zhdate
 ipykernel
 google-generativeai
+zhipuai