chatgpt-mirai-qq-bot-web-search 0.1.15__py3-none-any.whl → 0.2.2__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info → chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.1.15
+Version: 0.2.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.2.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+web_search/__init__.py,sha256=cDyiTyQ4i-7brk3qfQrPBF5XQNpDacWmauzJwTlK6VI,4485
+web_search/blocks.py,sha256=S3RsV9CCTKAsKUNhewg__ejEpJRDz7DTawtH05WRgE8,6732
+web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
+web_search/web_searcher.py,sha256=0zLgMsWCK71gStyWpFjup5WfxHx3tBTf3rGwM7Ae7Zs,13332
+web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
+chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info/METADATA,sha256=Skc-om3-q2TH-RUte06VDlqyOD4QC17hpqaS2UanRCM,1738
+chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.2.2.dist-info/RECORD,,

web_search/__init__.py

@@ -6,7 +6,7 @@ from .config import WebSearchConfig
 from .web_searcher import WebSearcher
 from dataclasses import dataclass
 from kirara_ai.workflow.core.block import BlockRegistry
-from .blocks import WebSearchBlock
+from .blocks import WebSearchBlock,WebSearchByKeywordBlock
 from .blocks import AppendSystemPromptBlock
 from kirara_ai.ioc.inject import Inject
 from kirara_ai.ioc.container import DependencyContainer
@@ -30,6 +30,7 @@ class WebSearchPlugin(Plugin):
         # 注册Block
         try:
             self.block_registry.register("web_search", "search", WebSearchBlock)
+            self.block_registry.register("web_search_by_keyword", "search", WebSearchByKeywordBlock)
         except Exception as e:
             logger.warning(f"WebSearchPlugin failed: {e}")
         try:

web_search/blocks.py

@@ -12,7 +12,6 @@ def get_options_provider(container: DependencyContainer, block: Block) -> List[s
 class WebSearchBlock(Block):
     """Web搜索Block"""
     name = "web_search"
-
     inputs = {
         "llm_resp": Input(name="llm_resp",label="LLM 响应", data_type=LLMChatResponse, description="搜索关键词")
     }
@@ -21,7 +20,7 @@ class WebSearchBlock(Block):
         "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
+    def __init__(self, name: str = None, max_results: Optional[int] = 3, timeout: Optional[int] = 10, fetch_content: Optional[bool] = True
     ,engine: Annotated[Optional[str],ParamMeta(label="搜索引擎", description="要使用的搜索引擎", options_provider=get_options_provider),] = "bing", proxy: str = None,):
         super().__init__(name)
         self.searcher = None
@@ -54,6 +53,73 @@ class WebSearchBlock(Block):
         fetch_content = self.fetch_content
         self._ensure_searcher()
 
+        try:
+            # 在新线程中创建事件循环
+            try:
+                loop = asyncio.get_event_loop()
+            except RuntimeError:
+                loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(loop)
+
+            results = loop.run_until_complete(
+                self.searcher.search(
+                    query=query,
+                    max_results=max_results,
+                    timeout=timeout,
+                    fetch_content=fetch_content,
+                    engine=self.engine,
+                    proxy = self.proxy,
+                )
+            )
+            return {"results": "\n以下是联网搜索的结果:\n-- 搜索结果开始 --"+results+"\n-- 搜索结果结束 --"}
+        except Exception as e:
+            print(e)
+            return {"results": f"搜索失败: {str(e)}"}
+class WebSearchByKeywordBlock(Block):
+    """Web搜索Block"""
+    name = "web_search_by_keyword"
+    description = "网络搜索，通过关键词进行网络搜索"
+
+    inputs = {
+        "keyword": Input(name="keyword",label="搜索关键字", data_type=str, description="搜索关键词")
+    }
+
+    outputs = {
+        "results": Output(name="results",label="搜索结果",data_type= str, description="搜索结果")
+    }
+
+    def __init__(self, name: str = None, max_results: Optional[int] = 3, timeout: Optional[int] = 10, fetch_content: Optional[bool] = True
+    ,engine: Annotated[Optional[str],ParamMeta(label="搜索引擎", description="要使用的搜索引擎", options_provider=get_options_provider),] = "bing", proxy: str = None,):
+        super().__init__(name)
+        self.searcher = None
+        self.config = WebSearchConfig()
+        self.max_results = max_results
+        self.timeout = timeout
+        self.fetch_content = fetch_content
+        self.engine=engine
+        self.proxy = proxy
+
+    def _ensure_searcher(self):
+        """同步方式初始化searcher"""
+        if not self.searcher:
+            try:
+                loop = asyncio.get_event_loop()
+            except RuntimeError:
+                # 如果在新线程中没有事件循环，则创建一个新的
+                loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(loop)
+            self.searcher = loop.run_until_complete(WebSearcher.create())
+
+    def execute(self, **kwargs) -> Dict[str, Any]:
+        query = kwargs["keyword"]
+
+        if query == "" or query.startswith("无"):
+            return {"results": ""}
+        max_results = self.max_results
+        timeout = self.timeout
+        fetch_content = self.fetch_content
+        self._ensure_searcher()
+
         try:
             # 在新线程中创建事件循环
             try:

chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/RECORD

@@ -1,11 +0,0 @@
-web_search/__init__.py,sha256=zVZLb5A-im5XETwohgxyE-UCxjSvYl6I2OC3LnEQhdQ,4360
-web_search/blocks.py,sha256=I0nq2JzWi1whkJCO8aS76qus_V9Z-TSvL1kjd9AZKa4,4093
-web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
-web_search/web_searcher.py,sha256=0zLgMsWCK71gStyWpFjup5WfxHx3tBTf3rGwM7Ae7Zs,13332
-web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
-chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/METADATA,sha256=FE3NIJ3yYwk9bgVF55Q4vm8BnmAsqUkubuaOwY64XpU,1739
-chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.1.15.dist-info/RECORD,,