Merge branch 'refactoring-v3-mvp' of github.com:lss233/chatgpt-mirai-qq-bot into refactoring-v3-mvp

Author: lss233

.github/workflows/run-tests.yml

@@ -14,18 +14,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-        
-    - name: Install dependencies
+    - name: Set up Docker
+      uses: docker/setup-docker-action@v4
+    - name: Build Docker image
       run: |
-        python -m pip install --upgrade pip
-        pip install pytest
-        pip install -r requirements.txt
-        
-    - name: Run tests
+        docker build -t test-image .
+    - name: Run tests in Docker
       run: |
-        python -m pytest -v
+        docker run test-image sh -c "python -m pip install pytest && python -m pytest -v"

Dockerfile

@@ -2,27 +2,35 @@ FROM python:3.10.13-slim-bullseye
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-COPY ./fonts/sarasa-mono-sc-regular.ttf /usr/share/fonts/
+COPY ./data/fonts/sarasa-mono-sc-regular.ttf /usr/share/fonts/
 
-RUN apt-get update && \
-    apt install --no-install-recommends xvfb binutils build-essential qtbase5-dev wkhtmltopdf ffmpeg dbus -yq && \
+RUN apt-get -yqq update && \
+    apt-get -yqq install --no-install-recommends xvfb binutils build-essential qtbase5-dev wkhtmltopdf ffmpeg dbus curl jq unzip && \
     (strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 || true) && \
-    apt-get clean && \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
+    apt-get -yq clean && \
+    apt-get -yq purge --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
     rm -rf /var/lib/apt/lists/*
 
 RUN export DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --config-file=/usr/share/dbus-1/session.conf --print-address`
 
 RUN mkdir -p /app
+
 WORKDIR /app
 
 COPY requirements.txt /app
-RUN pip install --no-cache-dir -r requirements.txt && \
+
+RUN LATEST_RELEASE_URL=$(curl -s https://api.github.com/repos/DarkSkyTeam/chatgpt-for-bot-webui/releases | jq -r '.[0].assets[] | select(.name == "dist.zip") | .browser_download_url') \
+    && curl -L -o dist.zip "$LATEST_RELEASE_URL" \
+    && unzip dist.zip -d web \
+    && rm dist.zip && \
+    pip install --no-cache-dir -r requirements.txt && \
     pip cache purge && \
     python -c "from pycloudflared import try_cloudflare; try_cloudflare(-1)" || true
 
-RUN apt-get remove --purge -yq binutils
+RUN apt-get -yqq remove --purge binutils unzip curl jq
 
 COPY . /app
 
+EXPOSE 8080
+
 CMD ["/bin/bash", "/app/docker/start.sh"]

framework/im/manager.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Dict
+from typing import Dict, Type
 
 from framework.config.config_loader import pydantic_validation_wrapper
 from framework.config.global_config import GlobalConfig, IMConfig
@@ -60,7 +60,7 @@ def update_adapter_config(self, name: str, config: IMConfig):
         :param name: adapter 的名称
         :param config: adapter 的配置
         """
-        self.get_adapter_config(name).config = config
+        self.get_adapter_config(name).config = config.model_dump()
 
     def delete_adapter(self, name: str):
         """
@@ -88,10 +88,7 @@ def start_adapters(self, loop=None):
             adapter_config = config_class(**im.config)
 
             # 创建 adapter 实例
-            with self.container.scoped() as scoped_container:
-                scoped_container.register(config_class, adapter_config)
-                adapter = Inject(scoped_container).create(adapter_class)()
-            self.adapters[im.name] = adapter
+            adapter = self.create_adapter(im.name, adapter_class, adapter_config)
             if im.enable:
                 tasks.append(asyncio.ensure_future(self._start_adapter(im.name, adapter), loop=loop))
         if len(tasks) > 0:  
@@ -127,14 +124,14 @@ def get_adapter(self, key: str) -> IMAdapter:
 
     async def _start_adapter(self, key: str, adapter: IMAdapter):
         logger.info(f"Starting adapter: {key}")
-        adapter.is_running = True
         await adapter.start()
+        adapter.is_running = True
         logger.info(f"Started adapter: {key}")
 
     async def _stop_adapter(self, key: str, adapter: IMAdapter):
         logger.info(f"Stopping adapter: {key}")
-        adapter.is_running = False
         await adapter.stop()
+        adapter.is_running = False
         logger.info(f"Stopped adapter: {key}")
 
     def stop_adapter(self, adapter_id: str, loop: asyncio.AbstractEventLoop):
@@ -158,3 +155,12 @@ def is_adapter_running(self, key: str) -> bool:
 
         return key in self.adapters and getattr(self.adapters[key], "is_running", False)
 
+    def create_adapter(self, name: str, adapter_class: Type[IMAdapter], adapter_config: IMConfig) -> IMAdapter:
+        with self.container.scoped() as scoped_container:
+            scoped_container.register(adapter_config.__class__, adapter_config)
+            adapter = Inject(scoped_container).create(adapter_class)()
+            adapter.is_running = False
+        self.adapters[name] = adapter
+        return adapter
+
+

framework/web/api/dispatch/routes.py

@@ -75,7 +75,7 @@ async def create_rule():
         return jsonify({"error": "Rule ID already exists"}), 400
 
     # 检查工作流是否存在
-    if not workflow_registry.get_workflow(rule_config.workflow_id):
+    if not workflow_registry.get(rule_config.workflow_id):
         return jsonify({"error": "Workflow not found"}), 400
 
     # 检查规则类型是否存在
@@ -139,7 +139,7 @@ async def update_rule(rule_id: str):
         return jsonify({"error": "Rule not found"}), 404
 
     # 检查工作流是否存在
-    if not workflow_registry.get_workflow(rule_config.workflow_id):
+    if not workflow_registry.get(rule_config.workflow_id):
         return jsonify({"error": "Workflow not found"}), 400
 
     # 检查规则类型是否存在

framework/web/api/im/routes.py

@@ -64,41 +64,47 @@ async def get_adapter(adapter_id: str):
 async def create_adapter():
     """创建新的适配器"""
     data = await request.get_json()
-    adapter_config = IMAdapterConfig(**data)
+    adapter_info = IMAdapterConfig(**data)
 
     config: GlobalConfig = g.container.resolve(GlobalConfig)
     registry: IMRegistry = g.container.resolve(IMRegistry)
     manager: IMManager = g.container.resolve(IMManager)
 
     # 检查适配器类型是否存在
-    if adapter_config.adapter not in registry.get_all_adapters():
+    if adapter_info.adapter not in registry.get_all_adapters():
         return jsonify({"error": "Invalid adapter type"}), 400
 
     # 检查ID是否已存在
-    if manager.has_adapter(adapter_config.name):
+    if manager.has_adapter(adapter_info.name):
         return jsonify({"error": "Adapter ID already exists"}), 400
 
     # 更新配置
-    config.ims.append(adapter_config)
+    config.ims.append(adapter_info)
+    adapter_class = registry.get_all_adapters()[adapter_info.adapter]
+    adapter_config_class = registry.get_config_class(adapter_info.adapter)
+    adapter_config = adapter_config_class(**adapter_info.config)
+    manager.create_adapter(adapter_info.name, adapter_class, adapter_config)
+    manager.start_adapter(adapter_info.name, asyncio.get_event_loop())
 
     # 保存配置到文件
     ConfigLoader.save_config_with_backup("config.yaml", config)
 
     return IMAdapterResponse(adapter=IMAdapterStatus(
-        name=adapter_config.name,
-        adapter=adapter_config.adapter,
+        name=adapter_info.name,
+        adapter=adapter_info.adapter,
         is_running=False,
-        config=adapter_config.config
+        config=adapter_info.config
     )).model_dump()
 
 @im_bp.route('/adapters/<adapter_id>', methods=['PUT'])
 @require_auth
 async def update_adapter(adapter_id: str):
     """更新适配器配置"""
     data = await request.get_json()
-    adapter_config = IMAdapterConfig(**data)
+    adapter_info = IMAdapterConfig(**data)
+    registry: IMRegistry = g.container.resolve(IMRegistry)
 
-    if adapter_id != adapter_config.name:
+    if adapter_id != adapter_info.name:
         return jsonify({"error": "Adapter ID mismatch"}), 400
 
     config: GlobalConfig = g.container.resolve(GlobalConfig)
@@ -110,8 +116,11 @@ async def update_adapter(adapter_id: str):
         return jsonify({"error": "Adapter not found"}), 404
 
     # 更新配置
-    manager.update_adapter_config(adapter_id, adapter_config.config)
+    adapter_config_class = registry.get_config_class(adapter_info.adapter)
+    adapter_config = adapter_config_class(**adapter_info.config)
+    manager.update_adapter_config(adapter_id, adapter_config)
 
+
     # 保存配置到文件
     ConfigLoader.save_config_with_backup("config.yaml", config)
 
@@ -123,9 +132,10 @@ async def update_adapter(adapter_id: str):
 
     return IMAdapterResponse(adapter=IMAdapterStatus(
         name=adapter_id,
-        adapter=adapter_config.adapter,
+        adapter=adapter_info.adapter,
         is_running=is_running,
-        config=adapter_config.config
+        config=adapter_info.config
+
     )).model_dump()
 
 @im_bp.route('/adapters/<adapter_id>', methods=['DELETE'])

framework/web/app.py

@@ -4,8 +4,9 @@
 from quart_cors import cors
 from hypercorn.config import Config
 from hypercorn.asyncio import serve
+from werkzeug.exceptions import NotFound
 from pathlib import Path
-
+import os
 from framework.logger import get_logger, HypercornLoggerWrapper
 from framework.ioc.container import DependencyContainer
 from .auth.routes import auth_bp
@@ -21,7 +22,24 @@
 from framework.web.auth.services import AuthService, FileBasedAuthService
 
 def create_app(container: DependencyContainer) -> Quart:
-    app = Quart(__name__, static_folder='web', static_url_path='')
+    app = Quart(__name__)
+    app.static_folder = '../../web'
+    
+    @app.route('/')
+    async def index():
+        print("Serving index.html")
+        return await app.send_static_file('index.html')
+    @app.route('/<path:path>')
+    async def serve_static(path):
+        if path.startswith('backend-api'):
+            raise NotFound()
+        try:
+            return await app.send_static_file(path)
+        except Exception as e:
+            return await app.send_static_file('index.html')
+
+
+        
     app = cors(app)  # 启用CORS支持
 
     # 注册蓝图
@@ -40,6 +58,7 @@ async def inject_container():
         g.container = container
 
     app.container = container
+
     return app
 
 class WebServer: