chatgpt-mirai-qq-bot-web-search 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info → chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.2.3
+Version: 0.2.5
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir

chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/RECORD

@@ -0,0 +1,11 @@
+web_search/__init__.py,sha256=bpu1gpf9tq3mOAoaGMM-8S6GBw2GzRAG6ClHGlp-CVw,4607
+web_search/blocks.py,sha256=duMWavXLkUpoChZhA8NPj3EVqWaJR0TbDqYP8wwD5B4,9140
+web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
+web_search/web_searcher.py,sha256=760WTBGusxYntigGi5Wsbm2rRHEWq3sTwfNlf3ew3b0,20919
+web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
+chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/METADATA,sha256=NMPI_KliHYAFbH5uqNYKDTtO1j_tIrC9wRkycBttLDY,1734
+chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.2.5.dist-info/RECORD,,

web_search/blocks.py

@@ -8,7 +8,7 @@ from kirara_ai.llm.format.response import LLMChatResponse
 from kirara_ai.ioc.container import DependencyContainer
 import re
 from kirara_ai.im.message import IMMessage
-
+from kirara_ai.im.sender import ChatSender, ChatType
 def get_options_provider(container: DependencyContainer, block: Block) -> List[str]:
     return ["bing", "google", "baidu"]
 class WebSearchBlock(Block):
@@ -73,7 +73,7 @@ class WebSearchBlock(Block):
                     proxy = self.proxy,
                 )
             )
-            return {"results": "\n以下是联网搜索的结果:\n-- 搜索结果开始 --"+results+"\n-- 搜索结果结束 --"}
+            return {"results": "\n以下是联网搜索的结果:\n-- 搜索结果开始 --\n"+results+"\n-- 搜索结果结束 --\n"}
         except Exception as e:
             print(e)
             return {"results": f"搜索失败: {str(e)}"}
@@ -162,7 +162,7 @@ class AppendSystemPromptBlock(Block):
         results = kwargs["results"]
         messages: List[LLMChatMessage] = kwargs["messages"]
 
-        if messages and len(messages) > 0:
+        if messages and len(messages) > 0 and results and isinstance(content,str):
             # 在第一条消息内容后面附加搜索结果
             messages[0].content = messages[0].content + f"{results}"
 
@@ -214,14 +214,14 @@ class DouyinVideoSearchBlock(Block):
             except RuntimeError:
                 loop = asyncio.new_event_loop()
                 asyncio.set_event_loop(loop)
-
+            sender = self.container.resolve(IMMessage).sender
             results = loop.run_until_complete(
                 self.searcher.search_douyin_videos(
                     keyword=keyword,
                     count=count,
                     timeout=self.timeout,
                     proxy=self.proxy,
-                    sender =  self.container.resolve(IMMessage).sender.user_id
+                    sender = sender.group_id if sender.chat_type == ChatType.GROUP else sender.user_id
                 )
             )
             return {"results": f"\n以下是抖音视频搜索结果:\n{results}"}

web_search/web_searcher.py

@@ -72,7 +72,7 @@ class WebSearcher:
 
             # 合并所有选项到一个字典
             context_options = {
-                'headless': False,
+                'headless': True,
                 'chromium_sandbox': False,
                 'slow_mo': 50,  # 减慢操作速度，更像人类
                 'args': [

chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-web_search/__init__.py,sha256=bpu1gpf9tq3mOAoaGMM-8S6GBw2GzRAG6ClHGlp-CVw,4607
-web_search/blocks.py,sha256=NJqWOAp7X-WMM3c3Xn3qLb9IVV090W3MqELHZTAw8tk,8959
-web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
-web_search/web_searcher.py,sha256=d6sFvaMMcm0vXPDRjAVPAvUcrPN6fU7cxbxikFyE23w,20920
-web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
-chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/METADATA,sha256=vlaZCwGj4Rts9xD-zq7nabGU7MC0vDHDP4nqFmDKQec,1734
-chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.2.3.dist-info/RECORD,,