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

chatgpt-mirai-qq-bot-web-search-0.1.9/PKG-INFO

@@ -0,0 +1,42 @@
+Metadata-Version: 2.1
+Name: chatgpt-mirai-qq-bot-web-search
+Version: 0.1.9
+Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
+Home-page: https://github.com/chuanSir123/web_image_generate
+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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# web-image-generate for ChatGPT-Mirai-QQ-Bot
+
+本项目是 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的一个插件，用于生成图片。
+
+## 安装
+
+```bash
+pip install chatgpt-mirai-qq-bot-web-image-generate
+```
+
+## 使用
+
+在 chatgpt-mirai-qq-bot的web_ui中配置
+使用示例请参考 [web_image_generate/example/textToImage.yml](web_image_generate/example/textToImage.yaml)
+安装此插件会自动生成一个画图工作流，仅供参考
+
+## 开源协议
+
+本项目基于 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 开发，遵循其 [开源协议](https://github.com/lss233/chatgpt-mirai-qq-bot/blob/master/LICENSE)
+
+## 感谢
+
+感谢 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的作者 [lss233](https://github.com/lss233) 提供框架支持
+
+

{chatgpt_mirai_qq_bot_web_search-0.1.8 → chatgpt-mirai-qq-bot-web-search-0.1.9}/README.md

@@ -1,18 +1,18 @@
-# OneBot-adapter for ChatGPT-Mirai-QQ-Bot
+# web-image-generate for ChatGPT-Mirai-QQ-Bot
 
-本项目是 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的一个插件，用于将OneBot协议的消息转换为ChatGPT-Mirai-QQ-Bot的消息格式。
+本项目是 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的一个插件，用于生成图片。
 
 ## 安装
 
 ```bash
-pip install chatgpt-mirai-qq-bot-web-search
+pip install chatgpt-mirai-qq-bot-web-image-generate
 ```
 
 ## 使用
 
-在 chatgpt-mirai-qq-bot的web_ui中配置  
-使用示例请参考 [web_search/example/normal.yml](web_search/example/roleplayWithWebSearch.yaml)    
-工作流请参考 [示例图片](web_search/example/workflow.png)
+在 chatgpt-mirai-qq-bot的web_ui中配置
+使用示例请参考 [web_image_generate/example/textToImage.yml](web_image_generate/example/textToImage.yaml)
+安装此插件会自动生成一个画图工作流，仅供参考
 
 ## 开源协议
 

chatgpt-mirai-qq-bot-web-search-0.1.9/chatgpt_mirai_qq_bot_web_search.egg-info/PKG-INFO

@@ -0,0 +1,42 @@
+Metadata-Version: 2.1
+Name: chatgpt-mirai-qq-bot-web-search
+Version: 0.1.9
+Summary: WebSearch adapter for lss233/chatgpt-mirai-qq-bot
+Home-page: https://github.com/chuanSir123/web_image_generate
+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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# web-image-generate for ChatGPT-Mirai-QQ-Bot
+
+本项目是 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的一个插件，用于生成图片。
+
+## 安装
+
+```bash
+pip install chatgpt-mirai-qq-bot-web-image-generate
+```
+
+## 使用
+
+在 chatgpt-mirai-qq-bot的web_ui中配置
+使用示例请参考 [web_image_generate/example/textToImage.yml](web_image_generate/example/textToImage.yaml)
+安装此插件会自动生成一个画图工作流，仅供参考
+
+## 开源协议
+
+本项目基于 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 开发，遵循其 [开源协议](https://github.com/lss233/chatgpt-mirai-qq-bot/blob/master/LICENSE)
+
+## 感谢
+
+感谢 [ChatGPT-Mirai-QQ-Bot](https://github.com/lss233/chatgpt-mirai-qq-bot) 的作者 [lss233](https://github.com/lss233) 提供框架支持
+
+

{chatgpt_mirai_qq_bot_web_search-0.1.8 → chatgpt-mirai-qq-bot-web-search-0.1.9}/chatgpt_mirai_qq_bot_web_search.egg-info/SOURCES.txt

@@ -7,8 +7,7 @@ chatgpt_mirai_qq_bot_web_search.egg-info/dependency_links.txt
 chatgpt_mirai_qq_bot_web_search.egg-info/entry_points.txt
 chatgpt_mirai_qq_bot_web_search.egg-info/requires.txt
 chatgpt_mirai_qq_bot_web_search.egg-info/top_level.txt
-web_search/__init__.py
-web_search/blocks.py
-web_search/config.py
-web_search/web_searcher.py
-web_search/example/roleplayWithWebSearch.yaml
+web_image_generate/__init__.py
+web_image_generate/blocks.py
+web_image_generate/image_generator.py
+web_image_generate/example/textToImage.yaml

chatgpt-mirai-qq-bot-web-search-0.1.9/chatgpt_mirai_qq_bot_web_search.egg-info/entry_points.txt

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

chatgpt-mirai-qq-bot-web-search-0.1.9/chatgpt_mirai_qq_bot_web_search.egg-info/top_level.txt

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

{chatgpt_mirai_qq_bot_web_search-0.1.8 → chatgpt-mirai-qq-bot-web-search-0.1.9}/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.9'
 '').lstrip('v')
 
 setup(
@@ -11,14 +11,14 @@ setup(
     packages=find_packages(),
     include_package_data=True,  # 这行很重要
     package_data={
-        "web_search": ["example/*.yaml", "example/*.yml"],
+        "web_image_generate": ["example/*.yaml", "example/*.yml"],
     },
     install_requires=[
         "playwright","trafilatura","lxml_html_clean",
     ],
     entry_points={
         'chatgpt_mirai.plugins': [
-            'web_search = web_search:WebSearchPlugin'
+            'web_image_generate = web_image_generate:WebSearchPlugin'
         ]
     },
     author="chuanSir",
@@ -27,16 +27,16 @@ setup(
     description="WebSearch adapter for lss233/chatgpt-mirai-qq-bot",
     long_description=io.open("README.md", encoding='utf-8').read(),
     long_description_content_type="text/markdown",
-    url="https://github.com/chuanSir123/web_search",
+    url="https://github.com/chuanSir123/web_image_generate",
     classifiers=[
         "Programming Language :: Python :: 3",
         'License :: OSI Approved :: GNU Affero General Public License v3',
         "Operating System :: OS Independent",
     ],
     project_urls={
-        "Bug Tracker": "https://github.com/chuanSir123/web_search/issues",
-        "Documentation": "https://github.com/chuanSir123/web_search/wiki",
-        "Source Code": "https://github.com/chuanSir123/web_search",
+        "Bug Tracker": "https://github.com/chuanSir123/web_image_generate/issues",
+        "Documentation": "https://github.com/chuanSir123/web_image_generate/wiki",
+        "Source Code": "https://github.com/chuanSir123/web_image_generate",
     },
     python_requires=">=3.8",
 )

chatgpt-mirai-qq-bot-web-search-0.1.9/web_image_generate/__init__.py

@@ -0,0 +1,72 @@
+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")
+

chatgpt-mirai-qq-bot-web-search-0.1.9/web_image_generate/blocks.py

@@ -0,0 +1,98 @@
+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)])}

chatgpt-mirai-qq-bot-web-search-0.1.9/web_image_generate/example/textToImage.yaml

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