Merge remote-tracking branch 'refs/remotes/origin/master'

model/command/command.py

@@ -91,6 +91,10 @@ class Command:
             return True, self.web_search(message)
         if self.command_start_with(message, "keyword"):
             return True, self.keyword(message_obj, role)
+        if self.command_start_with(message, "ip"):
+            ip = requests.get("https://myip.ipip.net", timeout=5).text
+            return True, f"机器人 IP 信息：{ip}", "ip"
+            
         
         return False, None
     

requirements.txt

@@ -1,7 +1,7 @@
 pydantic~=1.10.4
 requests~=2.28.1
 openai~=1.2.3
-qq-botpy
+qq-botpy==1.1.2
 chardet~=5.1.0
 Pillow~=9.4.0
 GitPython~=3.1.31
@@ -12,4 +12,4 @@ tiktoken
 readability-lxml
 revChatGPT~=6.8.6
 baidu-aip~=4.16.9
-websockets
+websockets

util/gplugin.py

@@ -125,7 +125,7 @@ def web_keyword_search_via_bing(keyword) -> str:
             time.sleep(1)
             
     gu.log("fail to fetch bing info, using sougou.")
-    return google_web_search(keyword)
+    return web_keyword_search_via_sougou(keyword)
 
 def web_keyword_search_via_sougou(keyword) -> str:
     headers = {