fix&update: web search fatal & updated README file

Author: ogios

Doc.md

@@ -1,4 +1,12 @@
+<details>
+
+<summary>
+
 # 消息格式
+
+</summary>
+
+
 为了可能被需要的流式传播，我是用的和之前 [Claude-in-slack-api]() 用的是相同的方法:  
 通过 `WebSocket` 传输内容，可以说，所有消息 (包括网络搜索的，每个步骤) 每一个字符都会经过Websocket传输，就如 `EventStream` 一样
 
@@ -78,8 +86,17 @@ openassistant.init()
 startWSApp(openassistant.wsurl)
 ```
 
+</details>
+
+
+<details>
+
+<summary>
+
 # API
 
+</summary>
+
 ## 登录
 ```python
 import requests.sessions
@@ -161,3 +178,4 @@ cookies: requests.sessions.RequestsCookieJar  = sign.loadCookies()
 #### removeConversation(index: int)
 删除对话
 
+</details>

Doc_en.md

@@ -1,4 +1,11 @@
+<details>
+
+<summary>
+
 # Message format
+
+</summary>
+
 For stream messages that may be needed, I am using the same method as before [Claude-in-slack-api]() :
 Content is transmitted through the `WebSocket`, every messages(on or two characters), including every step of web search will be transmitted through the Websocket
 ## Connect to Websocket
@@ -75,9 +82,16 @@ openassistant = OpenAssistant(u, cookies=cookies, tranlater=Translater(), mysql=
 openassistant.init()
 startWSApp(openassistant.wsurl)
 ```
+</details>
+
+<details>
+
+<summary>
 
 # API
 
+</summary>
+
 ## Login
 ```python
 import requests.sessions
@@ -160,3 +174,5 @@ save `conversation_id` and `title` in to `self.conversations` and returns the ti
 
 #### removeConversation(index: int)
 delete conversation
+
+</details>

README.md

@@ -24,6 +24,8 @@
 
 下面的视频介绍了如何使用: https://www.bilibili.com/video/BV12h4y1G7Zc
 
+或者查看 [介绍文档](./Doc.md)
+
 ## 有道翻译接口
 
 由于使用的语言模型不会返回中文，即便模型有一定能力可以处理中文输入。所以为其加上了翻译来方便阅读
@@ -95,7 +97,7 @@ python main_cmd.py -u <邮箱> -p
 
 | 命令         |                   |
 |------------|-------------------|
-| exit       | 退出程序              |
+| exit/q     | 退出程序              |
 | ls         | 查看所有对话            |
 | cd <index> | 进入某个对话            |
 | web        | 切换对话状态(普通/接入网络搜索) |

README_en.md

@@ -3,12 +3,6 @@
 > For now, i can only provide terminal version. fastapi and web's version are not done yet since i'm quite busy these days.  
 > but the interfaces are the same.
 
-[//]: # ()
-[//]: # (> 2023.6.4-22:46: 今天为之后的大更新铺垫了很多，重新构建了整个框架，但是调整说明明天再说，这会太晚了)
-
-[//]: # ()
-[//]: # (> 2023.6.6-00:30: 依旧，加的东西蛮多的，明个有时间再讲，还遇到了棘手的问题，不过暂时找到了缓解的方法)
-
 Leave a ⭐ if you like it🥺
 
 ## Instructions
@@ -17,6 +11,8 @@ Hugging-chat's web api. The current model is `OpenAssistant/oasst-sft-6-llama-30
 
 This video shows how to actually use it: https://www.bilibili.com/video/BV12h4y1G7Zc
 
+You can also check the [Documentation](./Doc_en.md) for how to use it
+
 ## Translator
 
 since the model only replies in english even if it's able to process chinese, i decided to add a plugin for it, which is a translator provided by Youdao.
@@ -89,7 +85,7 @@ Format: `/`+`command`
 
 | Command    |                                      |
 |------------|--------------------------------------|
-| exit       | exit the program                     |
+| exit/q     | exit the program                     |
 | ls         | list all conversations               |
 | cd <index> | cd into the chosen conversation      |
 | web        | activate `Search web` or not         |

Server/HuggingChat/OpenAssistant.py

@@ -216,7 +216,6 @@ def getReply(self, conversation_id, text, web_search_id: str = ""):
 
 		for i in range(3):
 			data = self.getData(text, web_search_id)
-			# print(data)
 			res = self.requestsPost(url, stream=True, data=json.dumps(data))
 			reply = self.parseData(res, conversation_id=conversation_id)
 			if reply != None:
@@ -307,6 +306,7 @@ def chat(self, text: str, conversation_id=None, web=False):
 			).getWebSearch()
 			web_search_id = js["messages"][-1]["id"] if js else ""
 		self.WSOut.sendMessage(status=True, msg=text, user="user", conversation_id=conversation_id)
+		print("web_search_id: ", web_search_id)
 		self.getReply(conversation_id, text, web_search_id)
 
 	# eng = self.getReply(conversation, text)

Server/HuggingChat/WebSearch.py

@@ -28,21 +28,21 @@ def parseData(self, data):
 			js = json.loads(data)
 			self.data = js
 			messages = js["messages"]
+			if messages[-1]["type"] == "result":
+				self.WSOut.sendWebSearch(messages[-1], conversation_id=self.conversation_id)
+				return 456
+			elif len(messages) - 1 > self.index:
+				if self.index == -1:
+					self.WSOut.sendWebSearch(messages[0], conversation_id=self.conversation_id)
+					self.index = 0
+				for message in messages[self.index + 1:]:
+					self.WSOut.sendWebSearch(message, conversation_id=self.conversation_id)
+					self.index += 1
 		except Exception as e:
-			logging.error("One error occurred when parsing WebSearch data, it's fine since it sometimes returns responses in a wrong json format")
-			# logging.error("WebSearch error:" + data)
-			# traceback.print_exc()
-			return
-		if messages[-1]["type"] == "result":
-			self.WSOut.sendWebSearch(messages[-1], conversation_id=self.conversation_id)
-			return 456
-		elif len(messages) - 1 > self.index:
-			if self.index == -1:
-				self.WSOut.sendWebSearch(messages[0], conversation_id=self.conversation_id)
-				self.index = 0
-			for message in messages[self.index + 1:]:
-				self.WSOut.sendWebSearch(message, conversation_id=self.conversation_id)
-				self.index += 1
+			logging.error(
+				"One error occurred when parsing WebSearch data, it's fine since it sometimes returns responses in a wrong json format")
+		# logging.error("WebSearch error:" + data)
+		# traceback.print_exc()
 
 	def getWebSearch(self):
 
@@ -63,7 +63,7 @@ def getWebSearch(self):
 		except Exception as e:
 			if e.args[0] != 23:
 				traceback.print_exc()
-		self.c.close()
+		# self.c.close()
 		return self.data
 
 

Server/main_cmd.py

@@ -216,7 +216,7 @@ def main():
 			command = text.strip()
 			if command[0] == "/":
 				command = command[1:].split(" ")
-				if command[0] == "exit":
+				if command[0] == "exit" or "q":
 					os._exit(0)
 				elif command[0] == "new":
 					newConversation(openassistant)