chatgpt-mirai-qq-bot-web-search 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info → chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.1.8
+Version: 0.1.10
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
 Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir
@@ -16,17 +16,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: playwright
 Requires-Dist: trafilatura
-Requires-Dist: lxml_html_clean
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+Requires-Dist: lxml-html-clean
 
 # OneBot-adapter for ChatGPT-Mirai-QQ-Bot
 
@@ -41,7 +31,7 @@ pip install chatgpt-mirai-qq-bot-web-search
 ## 使用
 
 在 chatgpt-mirai-qq-bot的web_ui中配置  
-使用示例请参考 [web_search/example/normal.yml](web_search/example/roleplayWithWebSearch.yaml)    
+使用示例请参考 [web_search/example/roleplayWithWebSearch.yml](web_search/example/roleplayWithWebSearch.yaml)    
 工作流请参考 [示例图片](web_search/example/workflow.png)
 
 ## 开源协议

chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/RECORD

@@ -0,0 +1,11 @@
+web_search/__init__.py,sha256=MtbzSr02EekF2lW2W0EBWWzsT5GUWj5cYx6rcEh4spA,4360
+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
+web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
+chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/METADATA,sha256=BnpMaWu2TaTqTGyBcuQA8VllnpO5gV0jdCKPEX9Reec,1739
+chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info/RECORD,,

{chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info → chatgpt_mirai_qq_bot_web_search-0.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

web_search/__init__.py

@@ -36,21 +36,40 @@ class WebSearchPlugin(Plugin):
             self.block_registry.register("append_systemPrompt", "internal", AppendSystemPromptBlock)
         except Exception as e:
             logger.warning(f"WebSearchPlugin failed: {e}")
-        # 获取当前文件的绝对路径
-        with importlib.resources.path('web_search', '__init__.py') as p:
-            package_path = p.parent
-            example_dir = package_path / 'example'
+        try:
+            # 获取当前文件的绝对路径
+            with importlib.resources.path('web_search', '__init__.py') as p:
+                package_path = p.parent
+                example_dir = package_path / 'example'
+
+                # 确保目录存在
+                if not example_dir.exists():
+                    raise FileNotFoundError(f"Example directory not found at {example_dir}")
+
+                # 获取所有yaml文件
+                yaml_files = list(example_dir.glob('*.yaml')) + list(example_dir.glob('*.yml'))
+
+                for yaml in yaml_files:
+                    logger.info(yaml)
+                    self.workflow_registry.register("chat", yaml.stem, WorkflowBuilder.load_from_yaml(os.path.join(example_dir, yaml), self.container))
+        except Exception as e:
+            try:
+                current_file = os.path.abspath(__file__)
+
+                # 获取当前文件所在目录
+                parent_dir = os.path.dirname(current_file)
 
-            # 确保目录存在
-            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", "roleplayWithWebSearch", WorkflowBuilder.load_from_yaml(os.path.join(example_dir, yaml), self.container))
+            except Exception as e:
+                logger.warning(f"workflow_registry failed: {e}")
 
-            for yaml in yaml_files:
-                logger.info(yaml)
-                self.workflow_registry.register("chat", yaml.stem, WorkflowBuilder.load_from_yaml(os.path.join(example_dir, yaml), self.container))
         @dataclass
         class WebSearchEvent:
             """Web搜索事件"""

chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/RECORD

@@ -1,11 +0,0 @@
-web_search/__init__.py,sha256=bdinhnZOl-5t9LV-UT3-Tdfc5ylb-E3t-g9uhYyhunc,3419
-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
-web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
-chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/METADATA,sha256=T2hl3dW__kL5KSrIG-9HwX6WeLpP_X6yB82lhyHAH5U,1951
-chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
-chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
-chatgpt_mirai_qq_bot_web_search-0.1.8.dist-info/RECORD,,