Upload 16 files

chat/openai/open_ai_utils.py

@@ -45,7 +45,6 @@ class OpenAiApi:
             temperature=0,
         )
 
-        print(response)
         story = response['choices'][0]['message']['content']
         t = time.time() - startTime
         print("------------")

chat/spark/SparkApi.py

@@ -10,9 +10,14 @@ from datetime import datetime
 from time import mktime
 from urllib.parse import urlencode
 from wsgiref.handlers import format_date_time
-
+import time
 import websocket  # 使用websocket_client
-answer = ""
+
+models = {
+    "Spark1":{"Spark_url":"ws://spark-api.xf-yun.com/v1.1/chat","domain":"general" },
+    "Spark2":{"Spark_url":"ws://spark-api.xf-yun.com/v2.1/chat","domain":"generalv2" },
+    "Spark3":{"Spark_url":"ws://spark-api.xf-yun.com/v3.1/chat","domain":"generalv3" }
+}
 
 class Ws_Param(object):
     # 初始化
@@ -23,6 +28,7 @@ class Ws_Param(object):
         self.host = urlparse(Spark_url).netloc
         self.path = urlparse(Spark_url).path
         self.Spark_url = Spark_url
+        self.answer = ""
 
     # 生成url
     def create_url(self):
@@ -57,80 +63,111 @@ class Ws_Param(object):
         return url
 
 
-# 收到websocket错误的处理
-def on_error(ws, error):
-    print("### error:", error)
+class SparkApi(object):
+    # 收到websocket错误的处理
+    def __init__(self):
+        self.ws_close = True
 
+    def on_error(self,ws, error):
+        print("### error:", error)
 
-# 收到websocket关闭的处理
-def on_close(ws,one,two):
-    print(" ")
 
+    # 收到websocket关闭的处理
+    def on_close(self,ws,one,two):
+        print(" ")
 
-# 收到websocket连接建立的处理
-def on_open(ws):
-    thread.start_new_thread(run, (ws,))
 
+    # 收到websocket连接建立的处理
+    def on_open(self,ws):
+        thread.start_new_thread(self.run, (ws,))
+        self.ws_close = False
 
-def run(ws, *args):
-    data = json.dumps(gen_params(appid=ws.appid, domain= ws.domain,question=ws.question))
-    ws.send(data)
 
-
-# 收到websocket消息的处理
-def on_message(ws, message):
-    # print(message)
-    data = json.loads(message)
-    code = data['header']['code']
-    if code != 0:
-        print(f'请求错误: {code}, {data}')
-        ws.close()
-    else:
-        choices = data["payload"]["choices"]
-        status = choices["status"]
-        content = choices["text"][0]["content"]
-        print(content,end ="")
-        global answer
-        answer += content
-        # print(1)
-        if status == 2:
-            ws.close()
+    def run(self,ws, *args):
+        data = json.dumps(self.gen_params(appid=ws.appid, domain= ws.domain,question=ws.question))
+        ws.send(data)
 
 
-def gen_params(appid, domain,question):
-    """
-    通过appid和用户的提问来生成请参数
-    """
-    data = {
-        "header": {
-            "app_id": appid,
-            "uid": "1234"
-        },
-        "parameter": {
-            "chat": {
-                "domain": domain,
-                "temperature": 0.5,
-                "max_tokens": 2048
-            }
-        },
-        "payload": {
-            "message": {
-                "text": question
+    # 收到websocket消息的处理
+    def on_message(self,ws, message):
+        # print(message)
+        data = json.loads(message)
+        code = data['header']['code']
+        if code != 0:
+            print(f'请求错误: {code}, {data}')
+            ws.close()
+        else:
+            choices = data["payload"]["choices"]
+            status = choices["status"]
+            content = choices["text"][0]["content"]
+            # print(content,end ="")
+
+            self.answer += content
+            # print(1)
+            if status == 2:
+                ws.close()
+                self.ws_close = True
+
+
+    def gen_params(self,appid, domain,question):
+        """
+        通过appid和用户的提问来生成请参数
+        """
+        data = {
+            "header": {
+                "app_id": appid,
+                "uid": "1234"
+            },
+            "parameter": {
+                "chat": {
+                    "domain": domain,
+                    "temperature": 0.5,
+                    "max_tokens": 2048
+                }
+            },
+            "payload": {
+                "message": {
+                    "text": question
+                }
             }
         }
-    }
-    return data
-
-
-def main(appid, api_key, api_secret, Spark_url,domain, question):
-    # print("星火:")
-    wsParam = Ws_Param(appid, api_key, api_secret, Spark_url)
-    websocket.enableTrace(False)
-    wsUrl = wsParam.create_url()
-    ws = websocket.WebSocketApp(wsUrl, on_message=on_message, on_error=on_error, on_close=on_close, on_open=on_open)
-    ws.appid = appid
-    ws.question = question
-    ws.domain = domain
-    ws.run_forever(sslopt={"cert_reqs": ssl.CERT_NONE})
+        return data
+
+    def getText(self,role, content,text=[]):
+
+        jsoncon = {}
+        jsoncon["role"] = role
+        jsoncon["content"] = content
+        text.append(jsoncon)
+        return text
+
+    def main(self,appid="761ef9bd",
+             api_key="YmMzYThlNmU1MTA0OTAyNjQ4ZjU0NmM5",
+             api_secret="fce82992c44dd00fcb968a658f39187e",
+             model="Spark1",
+             question=None):
+        # print("星火:")
+        m = models[model]
+        wsParam = Ws_Param(appid, api_key, api_secret, m.get("Spark_url"))
+        websocket.enableTrace(False)
+        wsUrl = wsParam.create_url()
+        startTime = time.time()
+        ws = websocket.WebSocketApp(wsUrl, on_message=self.on_message, on_error=self.on_error, on_close=self.on_close, on_open=self.on_open)
+        ws.appid = appid
+        ws.question = question
+        ws.domain = m.get("domain")
+        self.answer = ""
+        ws.run_forever(sslopt={"cert_reqs": ssl.CERT_NONE})
+        while True:
+            if self.ws_close:
+                break
+            time.sleep(1)
+        t = time.time() - startTime
+        print("------------")
+        print("%s 生成完成\n使用时间：%s" % (model, t))
+        print("------------")
+        return {"content": self.answer, "model_name": model, "executeTime": t}
+
+
 
 

chat/spark/test.py

@@ -1,4 +1,5 @@
 import SparkApi
+
 #以下密钥信息从控制台获取
 appid = "761ef9bd"     #填写控制台中获取的 APPID 信息
 api_secret = "YmMzYThlNmU1MTA0OTAyNjQ4ZjU0NmM5"   #填写控制台中获取的 APISecret 信息
@@ -41,13 +42,16 @@ def checklen(text):
 
 
 if __name__ == '__main__':
-    text.clear()
-    while(1):
-        Input = input("\n" +"我:")
-        question = checklen(getText("user",Input))
-        SparkApi.answer =""
-        print("星火:",end = "")
-        SparkApi.main(appid,api_key,api_secret,Spark_url,domain,question)
-        getText("assistant",SparkApi.answer)
-        # print(str(text))
+    api  = SparkApi.SparkApi()
+    print(api.main(appid, api_key, api_secret, "Spark2", getText("user", "今天上海的天气是什么？")))
+
+    # text.clear()
+    # while(1):
+    #     Input = input("\n" +"我:")
+    #     question = checklen(getText("user",Input))
+    #     SparkApi.answer =""
+    #     print("星火:",end = "")
+    #     SparkApi.main(appid,api_key,api_secret,Spark_url,domain,question)
+    #     getText("assistant",SparkApi.answer)
+    #     # print(str(text))