chatgpt-mirai-qq-bot-web-search 0.1.8__tar.gz → 0.1.10__tar.gz

{chatgpt_mirai_qq_bot_web_search-0.1.8 → chatgpt-mirai-qq-bot-web-search-0.1.10}/PKG-INFO

@@ -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
@@ -14,19 +14,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 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
 
 # OneBot-adapter for ChatGPT-Mirai-QQ-Bot
 
@@ -41,7 +28,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.8 → chatgpt-mirai-qq-bot-web-search-0.1.10}/README.md

@@ -11,7 +11,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.8 → chatgpt-mirai-qq-bot-web-search-0.1.10}/chatgpt_mirai_qq_bot_web_search.egg-info/PKG-INFO

@@ -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
@@ -14,19 +14,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 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
 
 # OneBot-adapter for ChatGPT-Mirai-QQ-Bot
 
@@ -41,7 +28,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.8 → chatgpt-mirai-qq-bot-web-search-0.1.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import io
 import os
 
-version = os.environ.get('RELEASE_VERSION', '0.1.8'
+version = os.environ.get('RELEASE_VERSION', '0.1.10'
 '').lstrip('v')
 
 setup(

{chatgpt_mirai_qq_bot_web_search-0.1.8 → chatgpt-mirai-qq-bot-web-search-0.1.10}/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搜索事件"""