From caa6c4885bd55ffa2778f682daa6190e4140f0f3 Mon Sep 17 00:00:00 2001 From: ghmark675 Date: Thu, 6 Nov 2025 17:21:19 +0800 Subject: [PATCH 1/4] fix(database): init_database in app.py --- app.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app.py b/app.py index 120338e..8749dcc 100644 --- a/app.py +++ b/app.py @@ -16,6 +16,7 @@ import requests from loguru import logger import importlib from pathlib import Path +from MindSpider.main import MindSpider # 导入ReportEngine try: @@ -220,6 +221,12 @@ def initialize_system_components(): """启动所有依赖组件(Streamlit 子应用、ForumEngine、ReportEngine)。""" logs = [] errors = [] + + spider = MindSpider() + if spider.initialize_database(): + logger.info("数据库初始化成功") + else: + logger.error("数据库初始化失败") try: stop_forum_engine() From c6deecd56834337d48b51c3aab3dc556ee7837e1 Mon Sep 17 00:00:00 2001 From: ghmark675 Date: Thu, 6 Nov 2025 17:21:47 +0800 Subject: [PATCH 2/4] fix(env): fix report agent api key error --- InsightEngine/agent.py | 2 +- ReportEngine/agent.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/InsightEngine/agent.py b/InsightEngine/agent.py index 328effb..deb4ff3 100644 --- a/InsightEngine/agent.py +++ b/InsightEngine/agent.py @@ -779,5 +779,5 @@ def create_agent(config_file: Optional[str] = None) -> DeepSearchAgent: Returns: DeepSearchAgent实例 """ - config = settings + config = Settings() return DeepSearchAgent(config) diff --git a/ReportEngine/agent.py b/ReportEngine/agent.py index 1584e92..b32e979 100644 --- a/ReportEngine/agent.py +++ b/ReportEngine/agent.py @@ -138,7 +138,7 @@ class ReportAgent: self.state = ReportState() # 确保输出目录存在 - os.makedirs(settings.OUTPUT_DIR, exist_ok=True) + os.makedirs(self.config.OUTPUT_DIR, exist_ok=True) logger.info("Report Agent已初始化") logger.info(f"使用LLM: {self.llm_client.get_model_info()}") @@ -146,11 +146,11 @@ class ReportAgent: def _setup_logging(self): """设置日志""" # 确保日志目录存在 - log_dir = os.path.dirname(settings.LOG_FILE) + log_dir = os.path.dirname(self.config.LOG_FILE) os.makedirs(log_dir, exist_ok=True) # 创建专用的logger,避免与其他模块冲突 - logger.add(settings.LOG_FILE, level="INFO") + logger.add(self.config.LOG_FILE, level="INFO") def _initialize_file_baseline(self): """初始化文件数量基准""" @@ -164,9 +164,9 @@ class ReportAgent: def _initialize_llm(self) -> LLMClient: """初始化LLM客户端""" return LLMClient( - api_key=settings.REPORT_ENGINE_API_KEY, - model_name=settings.REPORT_ENGINE_MODEL_NAME, - base_url=settings.REPORT_ENGINE_BASE_URL, + api_key=self.config.REPORT_ENGINE_API_KEY, + model_name=self.config.REPORT_ENGINE_MODEL_NAME, + base_url=self.config.REPORT_ENGINE_BASE_URL, ) def _initialize_nodes(self): From 7ab182e6f60c8fdfa7095d891fbf12985879647f Mon Sep 17 00:00:00 2001 From: ghmark675 Date: Thu, 6 Nov 2025 17:22:31 +0800 Subject: [PATCH 3/4] chore(docker): docker compose cancel load .env --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 228a51e..2c4afe3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,6 @@ services: image: bettafish:latest container_name: bettafish restart: unless-stopped - env_file: - - .env environment: - PYTHONUNBUFFERED=1 ports: From 97a71b9c7cd91e1b03661aeb877807d6fbc17626 Mon Sep 17 00:00:00 2001 From: ghmark675 Date: Thu, 6 Nov 2025 17:23:11 +0800 Subject: [PATCH 4/4] chore(workflow): build docker when push tag --- .github/workflows/docker_ci.yml | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/docker_ci.yml diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml new file mode 100644 index 0000000..4622100 --- /dev/null +++ b/.github/workflows/docker_ci.yml @@ -0,0 +1,49 @@ +name: Docker Image CI + +on: + push: + tags: + - 'v*' + +jobs: + build_and_publish: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ghcr.io/${{ github.repository }} + tags: | + type=ref,event=tag + type=semver,pattern={{version}} + type=raw,value=latest + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + driver: docker-container + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max