chatgpt-mirai-qq-bot-web-search 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info → chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.3.0
+Version: 0.3.2
 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.3.0.dist-info → chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 web_search/__init__.py,sha256=_vfIxeLqXc53QoZ8sHzw_SbGkxb2CTRQdd1phQmC8GM,6147
-web_search/blocks.py,sha256=MwOLqQfZKzrepYn8zOvecWtna0PNJmTEEHOr1wM1jT4,9167
+web_search/blocks.py,sha256=r6dPTYmGMCGy4XteQ0rNfSXNAYNHGYEBVnJMDRknUII,9117
 web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
 web_search/web_searcher.py,sha256=gYfD0K4_zTIn0pDbB2BABpw7poFuAC4mohJmQWL-3I4,21285
 web_search/example/roleplayWithWebSearch.yaml,sha256=5KsQ3JHg3J0AlB997Zy337Z2TAZ9hZd4Nsni7sP0BKQ,5188
-chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info/METADATA,sha256=95IjyGxiEOuiJuLCu09pPi2qVEa8lGLv8ZPksEPg4tc,1767
-chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.3.0.dist-info/RECORD,,
+chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info/METADATA,sha256=TcYyooVPC9iPZOl1pyElNc1wm4KvrQwBjve8rScUI5I,1767
+chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.3.2.dist-info/RECORD,,

web_search/blocks.py

@@ -3,7 +3,7 @@ import asyncio
 from kirara_ai.workflow.core.block import Block, Input, Output, ParamMeta
 from .web_searcher import WebSearcher
 from .config import WebSearchConfig
-from kirara_ai.llm.format.message import LLMChatMessage
+from kirara_ai.llm.format.message import LLMChatMessage,LLMChatTextContent
 from kirara_ai.llm.format.response import LLMChatResponse
 from kirara_ai.ioc.container import DependencyContainer
 import re
@@ -161,11 +161,8 @@ class AppendSystemPromptBlock(Block):
     def execute(self, **kwargs) -> Dict[str, Any]:
         results = kwargs["results"]
         messages: List[LLMChatMessage] = kwargs["messages"]
-
-        if messages and len(messages) > 0 and results and isinstance(messages[0].content,str):
-            # 在第一条消息内容后面附加搜索结果
-            messages[0].content = messages[0].content + f"{results}"
-
+        if messages and len(messages) > 0 and results:
+            messages.insert(-2,LLMChatMessage(role = "user",content=[LLMChatTextContent(text=results)]))
         return {"messages": messages}
 
 class DouyinVideoSearchBlock(Block):