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

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

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

@@ -0,0 +1,10 @@
+web_search/__init__.py,sha256=5du-gZfOH1TV8FjhBPFCB7GTAX0fZl7jl_9JqDxMVXI,3485
+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.4.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.1.4.dist-info/METADATA,sha256=kFzetPmWgRZ_WtbNecn1Q-XmYiMVWLr9sPuydtS85vY,1902
+chatgpt_mirai_qq_bot_web_search-0.1.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+chatgpt_mirai_qq_bot_web_search-0.1.4.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.1.4.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.1.4.dist-info/RECORD,,

web_search/__init__.py

@@ -13,8 +13,9 @@ 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 importlib.resources
 import os
-import os
+from pathlib import Path
 class WebSearchPlugin(Plugin):
     def __init__(self, block_registry: BlockRegistry , container: DependencyContainer):
         super().__init__()
@@ -36,22 +37,20 @@ class WebSearchPlugin(Plugin):
         except Exception as e:
             logger.warning(f"WebSearchPlugin failed: {e}")
         # 获取当前文件的绝对路径
-        current_file = os.path.abspath(__file__)
-
-        # 获取当前文件所在目录
-        current_dir = os.path.dirname(current_file)
+        with importlib.resources.path('chatgpt-mirai-qq-bot-web-search', '__init__.py') as p:
+            package_path = p.parent
+            example_dir = package_path / 'example'
 
-        # 获取上级目录
-        parent_dir = os.path.dirname(current_dir)
+            # 确保目录存在
+            if not example_dir.exists():
+                raise FileNotFoundError(f"Example directory not found at {example_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')]
+            # 获取所有yaml文件
+            yaml_files = list(example_dir.glob('*.yaml')) + list(example_dir.glob('*.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))
+            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搜索事件"""

chatgpt_mirai_qq_bot_web_search-0.1.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-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,,