web修复机器人没有记忆的Issue

web提供连续对话的接口，每次调用都会返回连续对话结果

conf/keys.json

@@ -1,5 +1,5 @@
 {
-  "fd": "xxxxxx",
-  "GtToken": "xxxxxx==",
-  "Cookie": "xxxxxx=="
+  "fd": "912379",
+  "GtToken": "GEE 021ab6638803ca625161214154649bd4b2af6a8ebd9c7d743a08919feecf45a0441c3b51f2490595aadf6736ef706800a0899e9011239804dced167e3e7fdf9f194ba8134d5d4812a17abfb94f76f2a98a41c18b6860446f6f43c84713cfe3f9aa37bf019f70453dc57dc616f82a1933cc2c6b4720e90a1f40a189118fe47060a504fab83dd0349c1d52ae3339d7d9bee85488be4658a5d4859232a6fbfc147ed9e51b4b27e19502dc7e2a0679292aaea767e35d9e463ed9915c83c30603b3fe34991430e336adf1d136d5d24596ce147f9fb4eb59d9638ebd924d85fa379bc81a859143dc0bab5104ce15bd9a346015c093d7965596df464993a8d8a96a136a515bbedf72ed45990964e70ef011e3b4b34ecc9475b381836a2f1a47d7fdea8015c445eff943f2ca41bf42e9974f10b28b6fe45c21ab5a14fdf15aa1dd78bc20d392a6419f154f6aaad3948628908cc33e8399bcd149ad6db95ee182c6dab7eaba061e0aae45cdd208e9e2e76d8010353d776a0b07ff8b1d6d748528b742b0da153a58f9ab524292c0efe082e213cd5cf2d5882392f6b142b636e0026a8a13d63979332e294ad082f426600a5e642d7589221ed487dfe7b85360705b3bdb02df51b1dfb6dc9ba68f4d1a7359655fe55a701d519ed7e175307d173809fdb9d2a4afead123bca554e3084af49c6bd2e32b6bd7a879121f3cc6a1c10c6ec5e2c5f141977cd9ab279dae5753c0dc32edb439e0a8eb253f62e8a7f7f2b4a9f95da9e3cbae1acb1dd75f1cca4f39448cba60250c19c21bcb4f728ee9f8bbda17ac6d59626c1d8c9da9a7d653e2b638b840243ad7d3d0f7bfb38da7f41dc739fb69e2a3622e394deafd6ef2b222c34e97ae0d6c40f4910eadd50be90aa4f1ce51abf6bae60fdeac15604d1e4172fafbf6fa1549c375585243383cb24c202db8f865dec80b8375efc80643930624435f23024fd660ee363c9d09306f79d8c981c8607116951a2b1f605648560ff94d63711bb448f6cb6dd237303686170df59e419ad6f079bb2cdfba5842c0bc82277692a4e9c76ba6b644800dd5131a0c59f606e391cce7ce9be97ec052d6ac59d928d3ca13f727ca1dc67feca69bb62170258bb147c279de1571c934a6000aa73e72683728981bcd62fc0567214156f4e8d4371aba90aa8686c3f81bc4ddd6a6f879e3ffd2ea52729fad0ecc82d6263f6f9a078c09e20156a8c4602553a561120a4a0f36bfb05b695b29eda183f147d6bb25321335e2270713dcfe8f0c16d6da96d2b724018859b116397de51ae517e4f23d13b7d88ab89425bd279e9f64fc0cd8776cc70b31182cf2fab96a35e5a1daa72a4feef8faeea6f59a69d574293c9a9d522ec4222e31c528eda3dc99c4b6996384097af456a1fa9b3f6aa7f7061c9ed07e7f0791b306f8fac11251694b3715283eedd90f3f30cb38c3e450676e90a7f5e95b8e21950dc7de1e4c090b034ca13c887b584527299929dd590849896e7c5ef68723efa3f72f6d43af0b26020e99a1df3dc80b4509063387494889fec4550e1a0ef4c4f82ac8a17318e6ea8b68405427c558ac41ae64332a1275487f87b2b9338c09dbde488d58d9855d0e1669c34294d3aea8e3fbacbf833173012de40c396575d5a67d3a239f688bae4c154ccdc427b46b86e39864b009e31f3aa2f91fc52fe0594c867ce18098cead887f8684fcb0ed929c6cb42d36df3b5cc0d2975ca771cbc787f1d6c6fee64af3c12ff1ea9460c2f2d0cc1cba947e4dce11a3fbbb639e006226cdbcbd310f9a17a9721f761a60139df46c8efbb5031fd44e040819852cd788954baaa27e1eafda6deb78202cb0e72de87a9566891e02ddd9cba79ded9838d394d2ce992aa501192810af8ef1a0d9f08cb6e390f1dcd82a7ed33836d0d78bb81f766c5d2d43c513532bca16b3eebbd3974f89af201795f56c8010cc879606174fc0e02e1251291ea10328614955148bc5b74adc98f49e73a279678b0eb761877752af1864d34dce30568842cdb508aebb806198d8b59660efd45f47a5214646e669c8c46a21ae07a18a122f6342443f319cc2ec19c82c4da90ba377e4fcc5eb544fadb50db214a5b8e55a2024dfcff1dbd8f522565fba97d5fe9a53e532b99ed52b9279aff22d37f5932fcfbb4a7e6e3707165c0e2f3cd0e6e1d030ba45da8c79eb8a19794346862a3c50250698db6227f64ea3afd5c1aa41cb06893dfbf7ddc99d6ed7759c62a890644eb04dcad1ba9c73c8c354301ac4ada5c8621962418dedb7f1bb4dbed3f53dbeab55356ac4ce8e70fb47983dfc48c2baafe8f666cb325d38999c84451d09eacbdbfaab6c62347153bb5c2fcde4e3a5c973534586b19b1536e69d122bdddcffbac24a2596e328b34170836089829030b461288904abb84905e4cc0a0a8cb47fa1f613914e4f7bef1e7f47ed1f10695688eee6832af43597d5f8eafb606e57d6c2f02f1b18d82090b6795c81f024935012358e9883dc41c47d028b62ea7d19b574a16f029bba86c023a324059e999c0b5b2d10592611836a5ac8883448b6288f2131ca14c18b2d86fe9bdf741ddf9b1886b09f0dac552a54dfd2e248ff1edb40429b4fcf27ed131e7532e030f966ef6bc1edfb6d43c6d106173e0b490d8074b62ddf0e26113a155646402c38c681179405b76ee86ceabed0d551ab948010842698f473cbfb5877baf8ba881a699fba6cccc7d2dda9d4d0d9863a1992c0eafea67e47d5dbf88ee28378931146d6a8525b2fa91fb3c810a768eb54423e9b68ffc639439f7a2c4acff4ea8ca3307bd90d5bdf5d99cc6e0f94b0093bfa2fe69a0041fa91922d9a3257f24f01cda5af8aed957e4cfe7a89ff3217b1f6de92a157a317e984ddcf70e5508b632a581052fa95e95766f72f466f9e51a24fbeb689c9356db8de0cc8b5316838504d22f652b985af73b4b634e8bfdcfe9d6d5ad88f2e333f5f5a9ea275cfe4c23e05b588c32ba717956988458433d781f145d26cffcb35fdf61ab05bf82784a9b25afae23d354bacd5aa4cc70f74a9d395f87e68e58306c5619a1d354e102cae8f171972b16698cdfc34bd71d9c7c2d790e9e81ef4cbe593d151ccb39d00f65029206bfe8e80ed9b867a96af766e8533301fc7f87d618a659c8db3b8a7f4bf3596099b2cef669e935e4f6c7f4649747a3cc2d33e3245cdffc02907a85a7caa21c20f390c6a632e9c0ef82a18a14d7e2456967719889d214540ffd71743c24550f88ec63a2c8164d694e67c5fe3b39a859f42d222c82a015ef9304a58d55e02368237ef54c844a9a80f3d8f4040661058b55a7a9a8a0cda19d9d455e77f658f03990398145628c09735303f2ca29d1e2c350db3d5cf6dcf6f56a514326628a9127d033f29963b6a66a2a70d0a2f8df4decb4073df8999db9d409f2d070074e5b1bb24140085ee3816ba93681ec129fd372d2c4e848465ca4a0080cd1f7fddab4fa187e3b7418eb07a051dc9c6c5e51d0b2af11dbfac5130685f0266adf9da40729b0ce0c1aa69a6f812bdbbda248c9b73170ac013ec75e39938e215441f96fecbfd4ec78322601c1fa5b120ff98b0214d7fe37da7c8f6e023edcd4ae3b9d4c63eb7b85534b04d40848585bec6bd7806d721bfd6410ce6bd624e61297e2fe1fc436c9c601260366ac50295789003cc1e2c23a8be2ec36a8f443227c1511e8055e3c55d785c448ceece4debb1a42bcb3f3b2cf940d0b973d8f9bf34091b41094f6abd19b55af1c3bfe019c944ff967092f58aec8c8475c2a8163ee2591b051179df3ad8f606cdc98bfff01931c225fff489067c4b18b8c9af0de9be24e2ecfa53ad70cd4e083be86c079e68b495bcd5856e78d48bbb8cbf4865f050fe00979e40f083cf802413c5a0e2f486704546cf5c1e5154187ab97dbaf25531513fa73cb2732a7562ef0995dacdd9b8c91c75947f5288056984558d593d0b975ca6fde318bad828e53bf5e435ebd0dba8a6aeec1e262064315ff38a684a27826c22e4a6127f8bad7dfd99434c9f7445d197eb55fa489d31376657d42a087a82ca386cd5a59934bbb2dbb0bf0970b018c869426665a7d6db7c61744a8d8e21100f34fc8fdb700baed74b6d7e6aff88ef7da9710473df23fcf97fed5a0094ccac94c0d882f181b79df296365c93a1a4c39e221633b5b601f8374998083b21a6e9095fd6ea8c4dc950c47969ffdab4580fac3465d3536a1bf6b20b6753db9b45f82e78d4ce7c0e3f",
+  "Cookie": "di_c_mti=7b9cd2eb-2c67-666f-8a02-95de1e23fb58; d_d_app_ver=1.4.0; d_d_ci=f5be0039-49de-63a0-a017-4b790f7a2f91; ssoSessionId=3a95fd4d-ca36-4031-a0de-4cda9b7669ec; account_id=17461758422; aliyungf_tc=17e7336e55820c28c1241ca35e122e350e07de004dd41c8a4f76591fb5e71d6d; daas_st={%22sdk_ver%22:%221.3.9%22%2C%22status%22:%220%22}; appid=150b4dfebe; gt_local_id=bT4FmoamHE5EumB06WicQbqbfecs+hL96Z0VLLX+ihjd2a1UuNMIwA=="
 }

sparkdesk_web/core.py

@@ -67,13 +67,31 @@ def __create_chat(self, chat_name):
         self.__chat_id = self.__generate_chat_id()
         self.__set_name(chat_name)
 
+    #获取最近一次的sid用于延续对话，否则对话无记忆
+    def __get_chat_sid(self) -> str:
+        try:
+            response= self.__get_chat_history()
+            data = json.loads(response.text)
+            return data['data'][-1]["historyList"][-1]["sid"]
+        except:
+            return ''
+
+    def __get_chat_history(self):
+
+        url = f'https://xinghuo.xfyun.cn/iflygpt/u/chat_history/all/{self.__chat_id}'
+        response = requests.request("GET", url, headers=self.__request_header)
+        return response
+
     def __get_resp(self, question):
+
+        sid = self.__get_chat_sid()
         url = "https://xinghuo.xfyun.cn/iflygpt-chat/u/chat_message/chat"
         payload = {
             'fd': self.__fd,
             'chatId': self.__chat_id,
             'text': question,
             'GtToken': self.__GtToken,
+            'sid': sid,
             'clientType': '1'
         }
         response = requests.request("POST", url, headers=self.__cha_header, data=payload, stream=True)
@@ -144,3 +162,32 @@ def chat_stream(self, history: bool = False, history_path: str = './data/'):
             if history:
                 FileUtils.write2json(history_file_path, self.__chat_history)
             print("\nThank you for using the SparkDesk AI. Welcome to use it again!")
+
+    #提供连续对话
+    def create_continuous_chat(self):
+        #生成器包装，提供预激服务
+        class ContextGenWrapper:
+            def __init__(self, spark, gen):
+                self._gen = gen
+                self._spark = spark
+                #第一次构建生成器 进行预激
+                next(gen)
+            def chat(self, question):
+                result = self._gen.send(question)
+                #将生成器执行到接受question的位置
+                self._gen.send(None)
+                return result
+        return ContextGenWrapper(self, self.continuous_chat_gen())
+
+    #连续对话生成器
+    def continuous_chat_gen(self):
+        self.__create_chat(NEW_CHAT)
+        count = 0
+        while True:
+            count += 1
+            question = yield
+            resp = self.__streaming_output(question)
+            # If False, regenerate the chat
+            if resp[1] is False:
+                print("WARNING: 可能触发敏感词监控，对话已被重置，请前往Web页面更新Cookie、fd、GtToken！")
+            yield resp[0]

sparkdesk_web_cli.py

@@ -22,5 +22,10 @@
     # single chat
     # print(sparkWeb.chat("repeat: hello world"))
 
+    # stream input chat
+    #sparkWeb.chat_stream(history=True)
+
     # continue chat
-    sparkWeb.chat_stream(history=True)
+    chat = sparkWeb.create_continuous_chat()
+    print(chat.chat("请介绍一下西安"))
+    print(chat.chat("刚才你说的是哪个城市？"))