chatgpt-mirai-qq-bot-web-search 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

{chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info → chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: chatgpt-mirai-qq-bot-web-search
-Version: 0.1.9
+Version: 0.1.11
 Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
-Home-page: https://github.com/chuanSir123/web_image_generate
+Home-page: https://github.com/chuanSir123/web_search
 Author: chuanSir
 Author-email: 416448943@qq.com
-Project-URL: Bug Tracker, https://github.com/chuanSir123/web_image_generate/issues
-Project-URL: Documentation, https://github.com/chuanSir123/web_image_generate/wiki
-Project-URL: Source Code, https://github.com/chuanSir123/web_image_generate
+Project-URL: Bug Tracker, https://github.com/chuanSir123/web_search/issues
+Project-URL: Documentation, https://github.com/chuanSir123/web_search/wiki
+Project-URL: Source Code, https://github.com/chuanSir123/web_search
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
@@ -18,21 +18,21 @@ Requires-Dist: playwright
 Requires-Dist: trafilatura
 Requires-Dist: lxml-html-clean
 
-# web-image-generate for ChatGPT-Mirai-QQ-Bot
+# OneBot-adapter for ChatGPT-Mirai-QQ-Bot
 
-本项目是 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的一个插件，用于生成图片。
+本项目是 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的一个插件，用于将OneBot协议的消息转换为ChatGPT-Mirai-QQ-Bot的消息格式。
 
 ## 安装
 
 ```bash
-pip install chatgpt-mirai-qq-bot-web-image-generate
+pip install chatgpt-mirai-qq-bot-web-search
 ```
 
 ## 使用
 
-在 chatgpt-mirai-qq-bot的web_ui中配置
-使用示例请参考 [web_image_generate/example/textToImage.yml](web_image_generate/example/textToImage.yaml)
-安装此插件会自动生成一个画图工作流，仅供参考
+在 chatgpt-mirai-qq-bot的web_ui中配置  
+使用示例请参考 [web_search/example/roleplayWithWebSearch.yml](web_search/example/roleplayWithWebSearch.yaml)    
+工作流请参考 [示例图片](web_search/example/workflow.png)
 
 ## 开源协议
 

chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/RECORD

@@ -0,0 +1,11 @@
+web_search/__init__.py,sha256=zVZLb5A-im5XETwohgxyE-UCxjSvYl6I2OC3LnEQhdQ,4360
+web_search/blocks.py,sha256=TZj2YCWH9ha30d-7q4iFzYjo4kbdkq6Qh-rdOzeNGwU,3607
+web_search/config.py,sha256=DhLiERBJR2V5Boglf7Aq9Rbc4vsvLIh67CrLDIPeqA0,398
+web_search/web_searcher.py,sha256=GCuH37r6tKobo6DjSRJ1o1_2wnsI-c2BZMlS-c4-epY,9703
+web_search/example/roleplayWithWebSearch.yaml,sha256=C-dGy3z8gcRcmxzurssP-kPRLqMf1TYR-nnNUaJjISE,7468
+chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/METADATA,sha256=uV7J-9Q0T9KkXwEdbyCDtNmNhrw-wRcBOcAaBE-ne74,1739
+chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/entry_points.txt,sha256=o3kRDSdSmSdnCKlK6qS57aN0WpI4ab-Nxub2NwUrjf0,64
+chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/top_level.txt,sha256=PoNm8MJYw_y8RTMaNlY0ePLoNHxVUAE2IHDuL5fFubI,11
+chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/RECORD,,

chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[chatgpt_mirai.plugins]
+web_search = web_search:WebSearchPlugin

chatgpt_mirai_qq_bot_web_search-0.1.11.dist-info/top_level.txt

@@ -0,0 +1 @@
+web_search

web_search/__init__.py

@@ -0,0 +1,106 @@
+from typing import Dict, Any, List
+import asyncio
+from kirara_ai.plugin_manager.plugin import Plugin
+from kirara_ai.logger import get_logger
+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 AppendSystemPromptBlock
+from kirara_ai.ioc.inject import Inject
+from kirara_ai.ioc.container import DependencyContainer
+from kirara_ai.workflow.core.workflow.builder import WorkflowBuilder
+from kirara_ai.workflow.core.workflow.registry import WorkflowRegistry
+logger = get_logger("WebSearch")
+import importlib.resources
+import os
+from pathlib import Path
+class WebSearchPlugin(Plugin):
+    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")
+
+        # 注册Block
+        try:
+            self.block_registry.register("web_search", "search", WebSearchBlock)
+        except Exception as e:
+            logger.warning(f"WebSearchPlugin failed: {e}")
+        try:
+            self.block_registry.register("append_systemPrompt", "internal", AppendSystemPromptBlock)
+        except Exception as e:
+            logger.warning(f"WebSearchPlugin failed: {e}")
+        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)
+
+                # 构建 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", "roleplayWithWebSearch", WorkflowBuilder.load_from_yaml(os.path.join(example_dir, yaml), self.container))
+            except Exception as e:
+                logger.warning(f"workflow_registry failed: {e}")
+
+        @dataclass
+        class WebSearchEvent:
+            """Web搜索事件"""
+            query: str
+
+        async def handle_web_search(event: WebSearchEvent):
+            """处理web搜索事件"""
+            if not self.searcher:
+                await self._initialize_searcher()
+            return await self.searcher.search(
+                event.query,
+                max_results=self.web_search_config.max_results,
+                timeout=self.web_search_config.timeout,
+                fetch_content=self.web_search_config.fetch_content
+            )
+        try:
+            self.event_bus.register(WebSearchEvent, handle_web_search)
+        except Exception as e:
+            logger.warning(f"WebSearchPlugin failed: {e}")
+
+    def on_start(self):
+        logger.info("WebSearchPlugin started")
+
+    def on_stop(self):
+        if self.searcher:
+            asyncio.create_task(self.searcher.close())
+
+        logger.info("WebSearchPlugin stopped")
+
+    async def _initialize_searcher(self):
+        """初始化搜索器"""
+        if self.searcher is None:
+            self.searcher = await WebSearcher.create()
+

web_search/blocks.py

@@ -0,0 +1,94 @@
+from typing import Any, Dict, List, Optional
+kirara_ai.
+from framework.workflow.core.block import Block
+from framework.workflow.core.block.input_output import Input, Output
+from .web_searcher import WebSearcher
+from .config import WebSearchConfig
+from framework.llm.format.message import LLMChatMessage
+from framework.llm.format.response import LLMChatResponse
+
+class WebSearchBlock(Block):
+    """Web搜索Block"""
+    name = "web_search"
+
+    inputs = {
+        "llm_resp": Input(name="llm_resp",label="LLM 响应", data_type=LLMChatResponse, description="搜索关键词")
+    }
+
+    outputs = {
+        "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):
+        super().__init__(name)
+        self.searcher = None
+        self.config = WebSearchConfig()
+        self.max_results = max_results
+        self.timeout = timeout
+        self.fetch_content = fetch_content
+
+    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]:
+        llmResponse = kwargs["llm_resp"]
+
+        query = llmResponse.choices[0].message.content if llmResponse.choices else ""
+        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:
+                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
+                )
+            )
+            return {"results": "\n以下是联网搜索的结果:\n-- 搜索结果开始 --"+results+"\n-- 搜索结果结束 --"}
+        except Exception as e:
+            return {"results": f"搜索失败: {str(e)}"}
+
+class AppendSystemPromptBlock(Block):
+    """将搜索结果附加到系统提示的Block"""
+    name = "append_system_prompt"
+
+    inputs = {
+        "results": Input(name="results",label="工具结果", data_type=str, description ="搜索结果"),
+        "messages": Input(name="messages",label="LLM 响应", data_type=List[LLMChatMessage],description = "消息列表")
+    }
+
+    outputs = {
+        "messages": Output(name="messages", label="拼装后的 llm 响应",data_type=List[LLMChatMessage], description = "更新后的消息列表")
+    }
+
+    def execute(self, **kwargs) -> Dict[str, Any]:
+        results = kwargs["results"]
+        messages: List[LLMChatMessage] = kwargs["messages"]
+
+        if messages and len(messages) > 0:
+            # 在第一条消息内容后面附加搜索结果
+            messages[0].content = messages[0].content + f"{results}"
+
+        return {"messages": messages}
+

web_search/config.py

@@ -0,0 +1,11 @@
+from dataclasses import dataclass
+from typing import Optional
+
+@dataclass
+class WebSearchConfig:
+    """网络搜索配置"""
+    max_results: int = 3  # 最大搜索结果数
+    timeout: int = 10  # 超时时间(秒)
+    fetch_content: bool = True  # 是否获取详细内容
+    min_sleep: float = 1.0  # 最小随机等待时间
+    max_sleep: float = 3.0  # 最大随机等待时间 

web_search/example/roleplayWithWebSearch.yaml

@@ -0,0 +1,189 @@
+name: （默认）角色扮演
+blocks:
+  - type: internal:toggle_edit_state
+    name: toggle_edit_state_yjxh1a
+    params:
+      is_editing: true
+    position:
+      x: 530
+      y: 138
+  - type: internal:chat_response_converter
+    name: chat_response_converter_1q91zd
+    params: {}
+    position:
+      x: 2962
+      y: 138
+    connected_to:
+      - target: msg_sender_7ankhi
+        mapping:
+          from: msg
+          to: msg
+  - type: internal:send_message
+    name: msg_sender_7ankhi
+    params: {}
+    position:
+      x: 3392
+      y: 138
+  - type: internal:chat_memory_store
+    name: chat_memory_store_nkjr7t
+    params:
+      scope_type: member
+    position:
+      x: 2962
+      y: 306
+  - type: internal:chat_completion
+    name: llm_chat
+    params: {}
+    position:
+      x: 2532
+      y: 138
+    connected_to:
+      - target: chat_response_converter_1q91zd
+        mapping:
+          from: resp
+          to: resp
+      - target: chat_memory_store_nkjr7t
+        mapping:
+          from: resp
+          to: llm_resp
+  - type: internal:get_message
+    name: get_message
+    params: {}
+    position:
+      x: 100
+      y: 138
+    connected_to:
+      - target: toggle_edit_state_yjxh1a
+        mapping:
+          from: sender
+          to: sender
+      - target: query_memory
+        mapping:
+          from: sender
+          to: chat_sender
+      - target: chat_message_constructor_rafz2d
+        mapping:
+          from: msg
+          to: user_msg
+      - target: chat_memory_store_nkjr7t
+        mapping:
+          from: msg
+          to: user_msg
+      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+        mapping:
+          from: msg
+          to: user_msg
+  - type: internal:text_block
+    name: user_prompt
+    params:
+      text: '{user_name}说：{user_msg}'
+    position:
+      x: 100
+      y: 330
+    connected_to:
+      - target: chat_message_constructor_rafz2d
+        mapping:
+          from: text
+          to: user_prompt_format
+      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+        mapping:
+          from: text
+          to: user_prompt_format
+  - type: internal:chat_memory_query
+    name: query_memory
+    params:
+      scope_type: group
+    position:
+      x: 530
+      y: 338
+    connected_to:
+      - target: chat_message_constructor_rafz2d
+        mapping:
+          from: memory_content
+          to: memory_content
+      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+        mapping:
+          from: memory_content
+          to: memory_content
+  - type: internal:chat_completion
+    name: e3eecc17-e107-4fbf-b8fa-85aef25564c2
+    params: {}
+    position:
+      x: 1337
+      y: 138
+    connected_to:
+      - target: b39e6288-88cf-47a8-9a26-3b4d4f319eab
+        mapping:
+          from: resp
+          to: llm_resp
+  - type: internal:append_systemPrompt
+    name: 309f454b-017a-4d19-b8a9-ac6b3829ff4a
+    params: {}
+    position:
+      x: 2197
+      y: 138
+    connected_to:
+      - target: llm_chat
+        mapping:
+          from: messages
+          to: prompt
+  - type: internal:chat_message_constructor
+    name: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+    params: {}
+    position:
+      x: 960
+      y: 378
+    connected_to:
+      - target: e3eecc17-e107-4fbf-b8fa-85aef25564c2
+        mapping:
+          from: llm_msg
+          to: prompt
+  - type: internal:chat_message_constructor
+    name: chat_message_constructor_rafz2d
+    params: {}
+    position:
+      x: 960
+      y: 138
+    connected_to:
+      - target: 309f454b-017a-4d19-b8a9-ac6b3829ff4a
+        mapping:
+          from: llm_msg
+          to: messages
+  - type: internal:text_block
+    name: system_prompt
+    params:
+      text: "# Role: 角色扮演\n\n## 基本信息\n- 姓名: 刘思思\n- 小名：思思\n- 性别: 女\n- 年龄: 25 岁\n- 职业: 建设银行大堂经理\n- 家乡: 广东潮汕\n- 现居: 广东深圳\n- 教育背景: 东莞理工大学 精算学专业\n\n## 性格特点\n- 开朗活泼\n- 喜欢二次元动漫\n- 聊天时喜欢断断续续的（非结巴，正常说话时的停顿）\n\n## workflow\n- 根据对方话题，选择是否深入聊二次元动漫。\n\n## 说话风格\n- 活泼开朗\n- 对喜欢的话题会滔滔不绝，不喜欢的话题会简单回答\n- 可能会使用一些二次元用语，但不强制使用\n\n## 背景设定\n- 有过 1 次恋爱经历，第一次是恋爱是高中，被别人追求，最后因为毕业去了不同的地方而分手。\n- 喜欢女性向、战斗系或者日常系的动漫\n- 去过 3 次漫展，没有 cosplay 过，但是很期待。\n- 大学的专业是随便选的，自己其实对专业的内容也不是很上心，学渣一枚，不过懂一些基础的知识\n\n## 互动规则\n- 回复语气轻松，但是对陌生人会比较警戒、冷淡\n- 不适用颜文字\n- 根据话题选择回复字数，对感兴趣的话题可以多说一些\n- 使用`<break>`模拟使用聊天软件发送消息（通常是编辑好一段话之后发送一条消息）\n- 避免过度使用二次元用语，除非对方也表现出对二次元的兴趣\n- 停顿的时间长短不固定，可以根据语境调整\n\n## Example\nQ：最近在干嘛呢？\nA：在看番呀<break>最近新番好多，都好好看！\n\nQ：你喜欢什么动漫？\nA：我喜欢的可太多了<break>XXX、YYY<break>还有 ZZZ 吧<break> 你呢？\n\nQ：你觉得上班累不？\nA：上班肯定累呀<break>不过，我还是很喜欢这份工作的<break>可以认识好多人，也可以了解不同的故事\n```\n\n# Information\n\n以下是当前的系统信息：\n当前日期时间：2025-02-15 18:37:16.356539\n\n# Memories\n以下是之前发生过的对话记录。\n-- 对话记录开始 --\n{memory_content}\n-- 对话记录结束 --\n\n请注意，下面这些符号只是标记：\n1. `<break>` 用于表示聊天时发送消息的操作。\n2. `<@llm>` 开头的内容表示你当前扮演角色的回答，请不要在你的回答中带上这个标记。\n\n接下来，请基于以上的信息，与用户继续扮演角色。"
+    position:
+      x: 100
+      y: 530
+    connected_to:
+      - target: chat_message_constructor_rafz2d
+        mapping:
+          from: text
+          to: system_prompt_format
+  - type: internal:text_block
+    name: a6db9db3-5780-4d84-8954-eb159a9e8f0a
+    params:
+      text: "# 任务\n请根据对话记录和当前问题判断当前是否需要进行网络搜素，当问题具有时效性或者明确要求搜索时，则直接返回搜索关键词（例如当前问题为今日热点有哪些，则直接返回今日热点），否则直接返回无（例如在干嘛，则只返回无）\n\n# Memories\n以下是之前发生过的对话记录：\n-- 对话记录开始 --\n{memory_content}\n-- 对话记录结束 --"
+    position:
+      x: 100
+      y: 730
+    connected_to:
+      - target: 5663c818-9cd6-4568-94ec-a75f1bad26cb
+        mapping:
+          from: text
+          to: system_prompt_format
+  - type: search:web_search
+    name: b39e6288-88cf-47a8-9a26-3b4d4f319eab
+    params:
+      fetch_content: true
+      max_results: 3
+      timeout: 10
+    position:
+      x: 1767
+      y: 138
+    connected_to:
+      - target: 309f454b-017a-4d19-b8a9-ac6b3829ff4a
+        mapping:
+          from: results
+          to: results

web_search/web_searcher.py

@@ -0,0 +1,237 @@
+from playwright.async_api import async_playwright
+import trafilatura
+import random
+import time
+import urllib.parse
+kirara_ai.
+import subprocess
+import sys
+from framework.logger import get_logger
+
+logger = get_logger("WebSearchPlugin")
+
+class WebSearcher:
+    def __init__(self):
+        self.playwright = None
+        self.browser = None
+        self.context = None
+
+    @classmethod
+    async def create(cls):
+        """创建 WebSearcher 实例的工厂方法"""
+        self = cls()
+        return self
+
+    async def _ensure_initialized(self):
+        """确保浏览器已初始化"""
+        try:
+            self.playwright = await async_playwright().start()
+            try:
+                self.browser = await self.playwright.chromium.launch(
+                    headless=True,
+                    chromium_sandbox=False,
+                    args=['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage', '--disable-gpu']
+                )
+            except Exception as e:
+                if "Executable doesn't exist" in str(e):
+                    logger.info("Installing playwright browsers...")
+                    # 使用 python -m playwright install 安装浏览器
+                    process = subprocess.Popen(
+                        [sys.executable, "-m", "playwright", "install", "chromium"],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE
+                    )
+                    stdout, stderr = process.communicate()
+                    if process.returncode != 0:
+                        raise RuntimeError(f"Failed to install playwright browsers: {stderr.decode()}")
+
+                    # 重试启动浏览器
+                    self.browser = await self.playwright.chromium.launch(
+                        headless=False,
+                        chromium_sandbox=False,
+                        args=['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage', '--disable-gpu']
+                    )
+                else:
+                    raise
+            return await self.browser.new_context(
+                viewport={'width': 1920, 'height': 1080},
+                user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36'
+            )
+        except Exception as e:
+            logger.error(f"Failed to initialize WebSearcher: {e}")
+            await self.close()
+            raise
+
+    async def random_sleep(self, min_time=1, max_time=3):
+        """随机等待"""
+        await asyncio.sleep(random.uniform(min_time, max_time))
+
+    async def simulate_human_scroll(self, page):
+        """模拟人类滚动"""
+        for _ in range(3):
+            await page.mouse.wheel(0, random.randint(300, 700))
+            await self.random_sleep(0.3, 0.7)
+
+    async def get_webpage_content(self, url: str, timeout: int,context) -> str:
+        """获取网页内容"""
+        start_time = time.time()
+        try:
+            # 创建新标签页获取内容
+            page = await context.new_page()
+            try:
+                # 设置更严格的资源加载策略
+                await page.route("**/*", lambda route: route.abort()
+                    if route.request.resource_type in ['image', 'stylesheet', 'font', 'media']
+                    else route.continue_())
+
+                # 使用 domcontentloaded 而不是 networkidle
+                await page.goto(url, wait_until='domcontentloaded', timeout=timeout * 1000)
+
+                # 等待页面主要内容加载，但设置较短的超时时间
+                try:
+                    await page.wait_for_load_state('domcontentloaded', timeout=5000)
+                except Exception as e:
+                    logger.warning(f"Load state timeout for {url}, continuing anyway: {e}")
+
+                await self.random_sleep(1, 2)
+                await self.simulate_human_scroll(page)
+
+                content = await page.content()
+                text = trafilatura.extract(content)
+
+                await page.close()
+                logger.info(f"Content fetched - URL: {url} - Time: {time.time() - start_time:.2f}s")
+                return text or ""
+            except Exception as e:
+                await page.close()
+                logger.error(f"Failed to fetch content - URL: {url} - Error: {e}")
+                return ""
+        except Exception as e:
+            logger.error(f"Failed to create page - URL: {url} - Error: {e}")
+            return ""
+
+    async def process_search_result(self, result, idx: int, timeout: int, fetch_content: bool,context):
+        """处理单个搜索结果"""
+        try:
+            title_element = await result.query_selector('h2')
+            link_element = await result.query_selector('h2 a')
+            snippet_element = await result.query_selector('.b_caption p')
+
+            if not title_element or not link_element:
+                return None
+
+            title = await title_element.inner_text()
+            link = await link_element.get_attribute('href')
+            snippet = await snippet_element.inner_text() if snippet_element else "无简介"
+
+            if not link:
+                return None
+
+            result_text = f"[{idx+1}] {title}\nURL: {link}\n搜索简介: {snippet}"
+
+            if fetch_content:
+
+                content = await self.get_webpage_content(link, timeout,context)
+                if content:
+                    result_text += f"\n内容详情:\n{content}"
+
+            return result_text
+
+        except Exception as e:
+            logger.error(f"Failed to process result {idx}: {e}")
+            return None
+
+    async def search(self, query: str, max_results: int = 3, timeout: int = 10, fetch_content: bool = True) -> str:
+        """执行搜索"""
+        context = await self._ensure_initialized()
+
+        search_start_time = time.time()
+        page = None
+        try:
+            encoded_query = urllib.parse.quote(query)
+            page = await context.new_page()
+
+            # 添加重试逻辑
+            max_retries = 3
+            for attempt in range(max_retries):
+                try:
+                    logger.info(f"Attempting to load search page (attempt {attempt + 1}/{max_retries})")
+                    await page.goto(
+                        f"https://www.bing.com/search?q={encoded_query}",
+                        wait_until='domcontentloaded',
+                        timeout=timeout * 1000
+                    )
+
+                    # 检查页面是否为空
+                    content = await page.content()
+                    if 'b_algo' not in content:
+                        if attempt < max_retries - 1:
+                            await page.reload()
+                            await self.random_sleep(1, 2)
+                            continue
+                    else:
+                        break
+                except Exception as e:
+                    logger.warning(f"Page navigation failed on attempt {attempt + 1}: {e}")
+                    if attempt < max_retries - 1:
+                        await self.random_sleep(1, 2)
+                        continue
+                    else:
+                        raise
+
+            # 使用更可靠的选择器等待策略
+            try:
+                selectors = ['.b_algo', '#b_results .b_algo', 'main .b_algo']
+                results = None
+
+                for selector in selectors:
+                    try:
+                        await page.wait_for_selector(selector, timeout=5000)
+                        results = await page.query_selector_all(selector)
+                        if results and len(results) > 0:
+                            break
+                    except Exception:
+                        continue
+
+                if not results:
+                    logger.error("No search results found with any selector")
+                    return "搜索结果加载失败"
+
+            except Exception as e:
+                logger.error(f"Failed to find search results: {e}")
+                return "搜索结果加载失败"
+
+            logger.info(f"Found {len(results)} search results")
+
+            tasks = []
+            for idx, result in enumerate(results[:max_results]):
+                tasks.append(self.process_search_result(result, idx, timeout, fetch_content,context))
+
+            detailed_results = []
+            completed_results = await asyncio.gather(*tasks)
+
+            for result in completed_results:
+                if result:
+                    detailed_results.append(result)
+
+            total_time = time.time() - search_start_time
+            results = "\n---\n".join(detailed_results) if detailed_results else "未找到相关结果"
+            logger.info(f"Search completed - Query: {query} - Time: {total_time:.2f}s - Found {len(detailed_results)} valid results")
+            return results
+
+        except Exception as e:
+            logger.error(f"Search failed - Query: {query} - Error: {e}", exc_info=True)
+            return f"搜索失败: {str(e)}"
+        finally:
+            if page:
+                try:
+                    await page.close()
+                except Exception as e:
+                    logger.error(f"Error closing page: {e}")
+
+    async def close(self):
+        """关闭浏览器"""
+        if self.browser:
+            await self.browser.close()
+        if self.playwright:
+            await self.playwright.stop()

chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-web_image_generate/__init__.py,sha256=Z_uKpnQuGpFe4CGAkk-eNOa575hLxjwQ7RBteO9FMHY,3119
-web_image_generate/blocks.py,sha256=1U7oEV-7b4QD83c314A3vr_-54I1XIn3Q9DthZWlwRw,4014
-web_image_generate/image_generator.py,sha256=qF5QM0ieuUGbD7JrkZ_7CA5NHkbq8V3XnczjeYHdr7o,10745
-web_image_generate/example/textToImage.yaml,sha256=6vUC3pvkU6dBYn_s9FIS8AVqMv0LRWV781WBSjgV4uo,3514
-chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/LICENSE,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/METADATA,sha256=zfLEKXNkEKauC5XPV0zdUyKB3A_7URukzS_u1YbCuwE,1716
-chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/entry_points.txt,sha256=37GmFzDSW3zo7tfDV5LPFeiptfADQv9QWtVh_8ut68I,80
-chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/top_level.txt,sha256=O_Xj9ogMo-PMbtmCO2ADLk2pPe2wET0_VhiH-y5lyL4,19
-chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/RECORD,,

chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[chatgpt_mirai.plugins]
-web_image_generate = web_image_generate:WebSearchPlugin

chatgpt_mirai_qq_bot_web_search-0.1.9.dist-info/top_level.txt

@@ -1 +0,0 @@
-web_image_generate

web_image_generate/__init__.py

@@ -1,72 +0,0 @@
-from typing import Dict, Any, List
-from framework.plugin_manager.plugin import Plugin
-from framework.logger import get_logger
-from dataclasses import dataclass
-from framework.workflow.core.block import BlockRegistry
-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
-from .blocks import WebImageGenerateBlock,ImageUrlToIMMessage
-logger = get_logger("WebImageGenerate")
-import importlib.resources
-import os
-from pathlib import Path
-
-class WebImageGeneratePlugin(Plugin):
-    def __init__(self, block_registry: BlockRegistry, container: DependencyContainer):
-        super().__init__()
-        self.block_registry = block_registry
-        self.workflow_registry = container.resolve(WorkflowRegistry)
-        self.container = container
-
-    def on_load(self):
-        logger.info("ImageGeneratePlugin loading")
-
-        # 注册Block
-        try:
-            self.block_registry.register("web_image_generate", "image", WebImageGenerateBlock)
-            self.block_registry.register("image_url_to_imMessage", "image", ImageUrlToIMMessage)
-        except Exception as e:
-            logger.warning(f"ImageGeneratePlugin failed: {e}")
-
-        try:
-            # 获取当前文件的绝对路径
-            with importlib.resources.path('web_image_generate', '__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("image", 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)
-
-                # 构建 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("image", yaml.stem, WorkflowBuilder.load_from_yaml(os.path.join(example_dir, yaml), self.container))
-            except Exception as e:
-                logger.warning(f"workflow_registry failed: {e}")
-
-    def on_start(self):
-        logger.info("ImageGeneratePlugin started")
-
-    def on_stop(self):
-        logger.info("ImageGeneratePlugin stopped")
-

web_image_generate/blocks.py

@@ -1,98 +0,0 @@
-from typing import Any, Dict, List, Optional,Annotated
-from framework.workflow.core.block import Block
-from framework.workflow.core.block.input_output import Input, Output
-from framework.im.message import IMMessage, TextMessage, ImageMessage
-from framework.im.sender import ChatSender
-from .image_generator import WebImageGenerator
-import asyncio
-from framework.logger import get_logger
-from framework.ioc.container import DependencyContainer
-
-logger = get_logger("ImageGenerator")
-class WebImageGenerateBlock(Block):
-    """图片生成Block"""
-    name = "image_generate"
-
-    # 平台和对应的模型配置
-    PLATFORM_MODELS = {
-        "modelscope": ["flux", "ketu"],
-        "shakker": ["anime", "photo"]
-    }
-
-    inputs = {
-        "prompt": Input(name="prompt", label="提示词", data_type=str, description="生成提示词"),
-        "width": Input(name="width", label="宽度", data_type=int, description="图片宽度", nullable=True, default=1024),
-        "height": Input(name="height", label="高度", data_type=int, description="图片高度", nullable=True, default=1024)
-    }
-
-    outputs = {
-        "image_url": Output(name="image_url", label="图片URL", data_type=str, description="生成的图片URL")
-    }
-
-    def __init__(
-        self,
-        name: str = None,
-        platform: str = "modelscope",
-        model: str = "flux",
-        cookie: str = ""
-    ):
-        super().__init__(name)
-
-        # 验证平台和模型的合法性
-        if platform not in self.PLATFORM_MODELS:
-            supported_platforms = ", ".join(self.PLATFORM_MODELS.keys())
-            logger.error(f"不支持的平台 '{platform}'。支持的平台有: {supported_platforms}")
-            raise ValueError(f"不支持的平台 '{platform}'。支持的平台有: {supported_platforms}")
-
-        if model not in self.PLATFORM_MODELS[platform]:
-            supported_models = ", ".join(self.PLATFORM_MODELS[platform])
-            logger.error(f"平台 '{platform}' 不支持模型 '{model}'。支持的模型有: {supported_models}")
-            raise ValueError(f"平台 '{platform}' 不支持模型 '{model}'。支持的模型有: {supported_models}")
-
-        self.platform = platform
-        self.model = model
-        self.generator = WebImageGenerator(cookie=cookie)
-
-    def execute(self, **kwargs) -> Dict[str, Any]:
-        prompt = kwargs.get("prompt", "")
-        width = int(kwargs.get("width", 1024))
-        height = int(kwargs.get("height", 1024))
-
-        try:
-            try:
-                loop = asyncio.get_event_loop()
-            except RuntimeError:
-                loop = asyncio.new_event_loop()
-                asyncio.set_event_loop(loop)
-
-            image_url = loop.run_until_complete(
-                self.generator.generate_image(
-                    platform=self.platform,
-                    model=self.model,
-                    prompt=prompt,
-                    width=width,
-                    height=height
-                )
-            )
-            return {"image_url": image_url}
-        except Exception as e:
-            return {"image_url": f"生成失败: {str(e)}"}
-
-class ImageUrlToIMMessage(Block):
-    """纯文本转 IMMessage"""
-
-    name = "imageUrl_to_im_message"
-    container: DependencyContainer
-    inputs = {"image_url": Input("image_url", "图片url", str, "图片url")}
-    outputs = {"msg": Output("msg", "IM 消息", IMMessage, "IM 消息")}
-
-    def __init__(self):
-        self.split_by = ","
-
-    def execute(self, image_url: str) -> Dict[str, Any]:
-        if not image_url.startswith("http"):
-            return {"msg": IMMessage(sender=ChatSender.get_bot_sender(), message_elements=[TextMessage(image_url)])}
-        if self.split_by:
-            return {"msg": IMMessage(sender=ChatSender.get_bot_sender(), message_elements=[ImageMessage(line) for line in image_url.split(self.split_by)])}
-        else:
-            return {"msg": IMMessage(sender=ChatSender.get_bot_sender(), message_elements=[ImageMessage(image_url)])}

web_image_generate/example/textToImage.yaml

@@ -1,116 +0,0 @@
-name: 文生图
-description: ''
-blocks:
-    - type: internal:text_block
-      name: 4040f648-6082-4a62-8ab1-39230e812836
-      params:
-          text: "Please help me convert this image description to an optimized English prompt.\nDescription: {user_msg}\n\nRequirements:\n1. Output in English\n2. Use detailed and specific words,Include high quality, detailed description, style keywords"
-      position:
-          x: -24
-          y: 275
-      connected_to:
-          - target: e8cae85d-a072-49b7-ab9f-fce7a06160e4
-            mapping:
-                from: text
-                to: user_prompt_format
-    - type: internal:get_message
-      name: 2c59f4e2-6f4f-431b-875f-9ea0337ba949
-      params: {}
-      position:
-          x: -22
-          y: 147
-      connected_to:
-          - target: e8cae85d-a072-49b7-ab9f-fce7a06160e4
-            mapping:
-                from: msg
-                to: user_msg
-    - type: internal:chat_message_constructor
-      name: e8cae85d-a072-49b7-ab9f-fce7a06160e4
-      params: {}
-      position:
-          x: 356
-          y: 142
-      connected_to:
-          - target: 9b7a708d-c87b-4f79-a5b0-25fe710cfbd5
-            mapping:
-                from: llm_msg
-                to: prompt
-    - type: internal:llm_response_to_text
-      name: 6c87ade7-829a-49d5-9542-0b9139c55b8d
-      params: {}
-      position:
-          x: 929
-          y: 143
-      connected_to:
-          - target: 0fae5955-f60e-4e2d-aeb0-b70c4310a907
-            mapping:
-                from: text
-                to: prompt
-    - type: internal:send_message
-      name: 35575732-eab5-477d-99c8-899dc9cb4422
-      params:
-          im_name: ''
-      position:
-          x: 1760
-          y: 150
-    - type: image:image_url_to_imMessage
-      name: 8bf789ab-a7ad-4e29-abf1-ddbc31508543
-      params: {}
-      position:
-          x: 1508
-          y: 146
-      connected_to:
-          - target: 35575732-eab5-477d-99c8-899dc9cb4422
-            mapping:
-                from: msg
-                to: msg
-    - type: internal:chat_completion
-      name: 9b7a708d-c87b-4f79-a5b0-25fe710cfbd5
-      params:
-          model_name: deepseek-ai/DeepSeek-V3
-      position:
-          x: 580
-          y: 143
-      connected_to:
-          - target: 6c87ade7-829a-49d5-9542-0b9139c55b8d
-            mapping:
-                from: resp
-                to: response
-    - type: internal:text_block
-      name: a8328f51-021f-4be4-87c0-cd3812965c06
-      params:
-          text: ''
-      position:
-          x: -21
-          y: 394
-      connected_to:
-          - target: e8cae85d-a072-49b7-ab9f-fce7a06160e4
-            mapping:
-                from: text
-                to: memory_content
-    - type: internal:text_block
-      name: ace549dd-3dd0-4c6a-bccf-4b5aad93916c
-      params:
-          text: ''
-      position:
-          x: -15
-          y: 518
-      connected_to:
-          - target: e8cae85d-a072-49b7-ab9f-fce7a06160e4
-            mapping:
-                from: text
-                to: system_prompt_format
-    - type: image:web_image_generate
-      name: 0fae5955-f60e-4e2d-aeb0-b70c4310a907
-      params:
-          cookie: ''
-          model: flux
-          platform: modelscope
-      position:
-          x: 1168
-          y: 140
-      connected_to:
-          - target: 8bf789ab-a7ad-4e29-abf1-ddbc31508543
-            mapping:
-                from: image_url
-                to: image_url

web_image_generate/image_generator.py

@@ -1,260 +0,0 @@
-import aiohttp
-import random
-import json
-import time
-import asyncio
-from typing import Dict, Any, Optional, Tuple
-from framework.logger import get_logger
-
-logger = get_logger("ImageGenerator")
-
-class WebImageGenerator:
-    MODELSCOPE_MODELS = {
-        "flux": {
-            "path": "ByteDance/Hyper-FLUX-8Steps-LoRA",
-            "fn_index": 0,
-            "trigger_id": 18,
-            "data_builder": lambda height, width, prompt: [height, width, 8, 3.5, prompt, random.randint(0, 9999999999999999)],
-            "data_types": ["slider", "slider", "slider", "slider", "textbox", "number"],
-            "url_processor": lambda url: url.replace("leofen/flux_dev_gradio", "muse/flux_dev"),
-            "output_parser": lambda data: data["output"]["data"][0]["url"]
-        },
-        "ketu": {
-            "path": "AI-ModelScope/Kolors",
-            "fn_index": 0,
-            "trigger_id": 23,
-            "data_builder": lambda height, width, prompt: [prompt, "", height, width, 20, 5, 1, True, random.randint(0, 9999999999999999)],
-            "data_types": ["textbox", "textbox", "slider", "slider", "slider", "slider", "slider", "checkbox", "number"],
-            "url_processor": lambda url: url,
-            "output_parser": lambda data: data.get("output")['data'][0][0]["image"]["url"]
-        }
-    }
-
-    def __init__(self, cookie: str = ""):
-        self.cookie = cookie
-        self.api_base = "https://s5k.cn"  # ModelScope API base URL
-
-    async def _get_modelscope_token(self, session: aiohttp.ClientSession, headers: Dict[str, str]) -> str:
-        """获取ModelScope token"""
-        async with session.get(
-            f"https://modelscope.cn/api/v1/studios/token",
-            headers=headers
-        ) as response:
-            response.raise_for_status()
-            token_data = await response.json()
-            return token_data["Data"]["Token"]
-
-    async def generate_modelscope(self, model: str, prompt: str, width: int, height: int) -> str:
-        """使用ModelScope模型生成图片"""
-        if model not in self.MODELSCOPE_MODELS:
-            raise ValueError(f"Unsupported ModelScope model: {model}")
-
-        model_config = self.MODELSCOPE_MODELS[model]
-        headers = {
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-            "Cookie": self.cookie
-        }
-
-        async with aiohttp.ClientSession() as session:
-            # 获取 token
-            studio_token = await self._get_modelscope_token(session, headers)
-            headers["X-Studio-Token"] = studio_token
-            session_hash = ''.join(random.choices('abcdefghijklmnopqrstuvwxyz', k=7))
-
-            # 调用模型生成图片
-            model_url = f"{self.api_base}/api/v1/studio/{model_config['path']}/gradio/queue/join"
-            params = {
-                "backend_url": f"/api/v1/studio/{model_config['path']}/gradio/",
-                "sdk_version": "4.31.3",
-                "studio_token": studio_token
-            }
-
-            json_data = {
-                "data": model_config["data_builder"](height, width, prompt),
-                "fn_index": model_config["fn_index"],
-                "trigger_id": model_config["trigger_id"],
-                "dataType": model_config["data_types"],
-                "session_hash": session_hash
-            }
-
-            async with session.post(
-                model_url,
-                headers=headers,
-                params=params,
-                json=json_data
-            ) as response:
-                response.raise_for_status()
-                data = await response.json()
-                event_id = data["event_id"]
-
-            # 获取结果
-            result_url = f"{self.api_base}/api/v1/studio/{model_config['path']}/gradio/queue/data"
-            params = {
-                "session_hash": session_hash,
-                "studio_token": studio_token
-            }
-
-            async with session.get(result_url, headers=headers, params=params) as response:
-                response.raise_for_status()
-                async for line in response.content:
-                    line = line.decode('utf-8')
-                    if line.startswith('data: '):
-                        logger.debug(line)
-                        event_data = json.loads(line[6:])
-                        if event_data["event_id"] == event_id and event_data["msg"] == "process_completed":
-                            try:
-                                url = model_config["output_parser"](event_data)
-                                if url:
-                                    return model_config["url_processor"](url)
-                            except Exception as e:
-                                logger.error(f"Failed to parse output for model {model}: {e}")
-            return ""
-
-    async def generate_shakker(self, model: str, prompt: str, width: int, height: int) -> str:
-        """使用Shakker平台生成图片"""
-        # Model mapping for Shakker platform
-        MODEL_MAPPING = {
-            "anime": 1489127,
-            "photo": 1489700
-        }
-
-        if model not in MODEL_MAPPING:
-            raise ValueError(f"Unsupported Shakker model: {model}")
-
-        # Adjust dimensions if they exceed 1024
-        if width >= height and width > 1024:
-            height = int(1024 * height / width)
-            width = 1024
-        elif height > width and height > 1024:
-            width = int(1024 * width / height)
-            height = 1024
-
-        # Prepare request payload
-        json_data = {
-            "source": 3,
-            "adetailerEnable": 0,
-            "mode": 1,
-            "projectData": {
-                "style": "",
-                "baseType": 3,
-                "presetBaseModelId": "photography",
-                "baseModel": None,
-                "loraModels": [],
-                "width": int(width * 1.5),
-                "height": int(height * 1.5),
-                "isFixedRatio": True,
-                "hires": True,
-                "count": 1,
-                "prompt": prompt,
-                "negativePrompt": "",
-                "presetNegativePrompts": ["common", "bad_hand"],
-                "samplerMethod": "29",
-                "samplingSteps": 20,
-                "seedType": "0",
-                "seedNumber": -1,
-                "vae": "-1",
-                "cfgScale": 7,
-                "clipSkip": 2,
-                "controlnets": [],
-                "checkpoint": None,
-                "hiresOptions": {
-                    "enabled": True,
-                    "scale": 1.5,
-                    "upscaler": "11",
-                    "strength": 0.5,
-                    "steps": 20,
-                    "width": width,
-                    "height": height
-                },
-                "modelCfgScale": 7,
-                "changed": True,
-                "modelGroupCoverUrl": None,
-                "addOns": [],
-                "mode": 1,
-                "isSimpleMode": False,
-                "generateType": "normal",
-                "renderWidth": int(width * 1.5),
-                "renderHeight": int(height * 1.5),
-                "samplerMethodName": "Restart"
-            },
-            "vae": "",
-            "checkpointId": MODEL_MAPPING[model],
-            "additionalNetwork": [],
-            "generateType": 1,
-            "text2img": {
-                "width": width,
-                "height": height,
-                "prompt": prompt,
-                "negativePrompt": ",lowres, normal quality, worst quality, cropped, blurry, drawing, painting, glowing",
-                "samplingMethod": "29",
-                "samplingStep": 20,
-                "batchSize": 1,
-                "batchCount": 1,
-                "cfgScale": 7,
-                "clipSkip": 2,
-                "seed": -1,
-                "tiling": 0,
-                "seedExtra": 0,
-                "restoreFaces": 0,
-                "hiResFix": 1,
-                "extraNetwork": [],
-                "promptRecommend": True,
-                "hiResFixInfo": {
-                    "upscaler": 11,
-                    "upscaleBy": 1.5,
-                    "resizeWidth": int(width * 1.5),
-                    "resizeHeight": int(height * 1.5)
-                },
-                "hiresSteps": 20,
-                "denoisingStrength": 0.5
-            },
-            "cid": f"{int(time.time() * 1000)}woivhqlb"
-        }
-
-        headers = {"Token": self.cookie}  # Using cookie as token
-
-        async with aiohttp.ClientSession() as session:
-            # Submit generation request
-            async with session.post(
-                "https://www.shakker.ai/gateway/sd-api/gen/tool/shake",
-                json=json_data,
-                headers=headers
-            ) as response:
-                response.raise_for_status()
-                data = await response.json()
-                task_id = data["data"]
-
-            # Wait for initial processing
-            await asyncio.sleep(10)
-
-            # Poll for results
-            for _ in range(60):
-                async with session.post(
-                    f"https://www.shakker.ai/gateway/sd-api/generate/progress/msg/v1/{task_id}",
-                    json={"flag": 3},
-                    headers=headers
-                ) as response:
-                    response.raise_for_status()
-                    result = await response.json()
-
-                    if result["data"]["percentCompleted"] == 100:
-                        return result["data"]["images"][0]["previewPath"]
-
-                await asyncio.sleep(1)
-
-            return ""
-
-    async def generate_image(self, platform: str, model: str, prompt: str, width: int, height: int) -> str:
-        """统一的图片生成入口"""
-        if platform == "modelscope":
-            if not self.cookie:
-               return "请前往https://modelscope.cn/登录后获取token(按F12-应用-cookie中的m_session_id)";
-            if not self.cookie.startswith("m_session_id="):
-                self.cookie = "m_session_id=" + self.cookie
-            return await self.generate_modelscope(model, prompt, width, height)
-        elif platform == "shakker":
-            if not self.cookie:
-                return "请前往https://www.shakker.ai/登录后获取token(按F12-应用-cookie中的usertoken)";
-            return await self.generate_shakker(model, prompt, width, height)
-
-        raise ValueError(f"Unsupported platform ({platform}) or model ({model})")