chatgpt-mirai-qq-bot-web-search 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info → chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.1.1
+Version: 0.1.2
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir
@@ -40,9 +40,9 @@ pip install chatgpt-mirai-qq-bot-web-search
 
 ## 使用
 
-在 chatgpt-mirai-qq-bot的web_ui中配置
-```
-
+在 chatgpt-mirai-qq-bot的web_ui中配置  
+使用示例请参考 [example/normal.yml](example/normal.yml)    
+工作流请参考 [示例图片](example/workflow.png)
 
 ## 开源协议
 

chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+web_search/__init__.py,sha256=PrzhpRF8sNgqQohDWxZLvtSdjpg1wUQqHQ6osk5S_lw,3438
+web_search/blocks.py,sha256=bVLn5kg-OMqWQsDrJLvA43AoV_eMEcZ3nrjqponHHX4,3611
+web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
+web_search/web_searcher.py,sha256=dmN1R4iyFvaPNpyBjFLWujvQ6_I3oD1GRlRyC03egpo,9707
+chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/METADATA,sha256=XYlA28-QArWVBBWfwcH0Um223uO-tJuzfFhHnS5wBTE,1902
+chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/RECORD,,

web_search/__init__.py

@@ -9,16 +9,20 @@ from framework.workflow.core.block import BlockRegistry
 from .blocks import WebSearchBlock
 from .blocks import AppendSystemPromptBlock
 from framework.ioc.inject import Inject
-
+from framework.ioc.container import DependencyContainer
+from framework.workflow.core.workflow.builder import WorkflowBuilder
+from framework.workflow.core.workflow.registry import WorkflowRegistry
 logger = get_logger("WebSearch")
-
+import os
+import os
 class WebSearchPlugin(Plugin):
-    def __init__(self, block_registry: BlockRegistry = Inject()):
+    def __init__(self, block_registry: BlockRegistry , container: DependencyContainer):
         super().__init__()
         self.web_search_config = WebSearchConfig()
         self.searcher = None
         self.block_registry = block_registry
-
+        self.workflow_registry = container.resolve(WorkflowRegistry)
+        self.container=container
     def on_load(self):
         logger.info("WebSearchPlugin loading")
 
@@ -31,7 +35,23 @@ class WebSearchPlugin(Plugin):
             self.block_registry.register("append_systemPrompt", "internal", AppendSystemPromptBlock)
         except Exception as e:
             logger.warning(f"WebSearchPlugin failed: {e}")
+        # 获取当前文件的绝对路径
+        current_file = os.path.abspath(__file__)
+
+        # 获取当前文件所在目录
+        current_dir = os.path.dirname(current_file)
+
+        # 获取上级目录
+        parent_dir = os.path.dirname(current_dir)
 
+        # 构建 example 目录的路径
+        example_dir = os.path.join(parent_dir, 'example')
+        # 获取 example 目录下所有的 yaml 文件
+        yaml_files = [f for f in os.listdir(example_dir) if f.endswith('.yaml') or f.endswith('.yml')]
+
+        for yaml in yaml_files:
+            logger.info(os.path.join(example_dir, yaml))
+            self.workflow_registry.register("search", os.path.splitext(yaml)[0], WorkflowBuilder.load_from_yaml(os.path.join(example_dir, yaml), self.container))
         @dataclass
         class WebSearchEvent:
             """Web搜索事件"""
@@ -61,48 +81,6 @@ class WebSearchPlugin(Plugin):
 
         logger.info("WebSearchPlugin stopped")
 
-    def get_actions(self) -> List[str]:
-        return ["web_search"]
-
-    def get_action_params(self, action: str) -> Dict[str, Any]:
-        if action == "web_search":
-            return {
-                "query": "搜索关键词"
-            }
-        raise ValueError(f"Unknown action: {action}")
-
-    async def execute(self, action: str, params: Dict[str, Any]) -> Dict[str, Any]:
-        if action == "web_search":
-            return await self._do_search(params)
-        raise ValueError(f"Unknown action: {action}")
-
-    async def _do_search(self, params: Dict[str, Any]) -> Dict[str, Any]:
-        query = params.get("query")
-        if not query:
-            return {
-                "success": False,
-                "message": "搜索关键词为空"
-            }
-
-        try:
-            await self._initialize_searcher()
-            results = await self.searcher.search(
-                query,
-                max_results=self.web_search_config.max_results,
-                timeout=self.web_search_config.timeout,
-                fetch_content=self.web_search_config.fetch_content
-            )
-            return {
-                "success": True,
-                "results": results
-            }
-        except Exception as e:
-            logger.error(f"Search failed: {e}")
-            return {
-                "success": False,
-                "message": f"搜索失败: {str(e)}"
-            }
-
     async def _initialize_searcher(self):
         """初始化搜索器"""
         if self.searcher is None:

web_search/blocks.py

@@ -12,11 +12,11 @@ class WebSearchBlock(Block):
     name = "web_search"
 
     inputs = {
-        "llm_resp": Input("llm_resp", LLMChatResponse, "搜索关键词")
+        "llm_resp": Input(name="llm_resp",label="LLM 响应", data_type=LLMChatResponse, description="搜索关键词")
     }
 
     outputs = {
-        "results": Output("results", str, "搜索结果")
+        "results": Output(name="results",label="搜索结果",data_type= str, description="搜索结果")
     }
 
     def __init__(self, name: str = None, max_results: Optional[int] = None, timeout: Optional[int] = None, fetch_content: Optional[bool] = None):
@@ -74,12 +74,12 @@ class AppendSystemPromptBlock(Block):
     name = "append_system_prompt"
 
     inputs = {
-        "results": Input("results", str, "搜索结果"),
-        "messages": Input("messages", List[LLMChatMessage], "消息列表")
+        "results": Input(name="results",label="工具结果", data_type=str, description ="搜索结果"),
+        "messages": Input(name="messages",label="LLM 响应", data_type=List[LLMChatMessage],description = "消息列表")
     }
 
     outputs = {
-        "messages": Output("messages", List[LLMChatMessage], "更新后的消息列表")
+        "messages": Output(name="messages", label="拼装后的 llm 响应",data_type=List[LLMChatMessage], description = "更新后的消息列表")
     }
 
     def execute(self, **kwargs) -> Dict[str, Any]:

chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-web_search/__init__.py,sha256=ccgh1E66PTLOIPMPqb70dbEQ7ghkBlW8WOmtip7Vnmc,3741
-web_search/blocks.py,sha256=uQVOlpuYpWKoAawT9r0MwOWxH2wS5JfQSFpkUjoNEwU,3360
-web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
-web_search/web_searcher.py,sha256=dmN1R4iyFvaPNpyBjFLWujvQ6_I3oD1GRlRyC03egpo,9707
-chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/METADATA,sha256=JTDtUxDOc5L71KbW3Zfo32TF5tE5XntkBSQ86dKLfVw,1782
-chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.1.1.dist-info/RECORD,,