From d8da45bc972af391a5b61a8ff0957b4fbee45197 Mon Sep 17 00:00:00 2001 From: root <953994191@qq.com> Date: Wed, 22 Apr 2026 01:34:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20BACKEND=5FPORT=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.docker | 1 + docker/backend/Dockerfile | 1 + docker/docker-compose.yml | 1 + frontend/src/__init__.py | 2 +- frontend/src/api_client.py | 4 ++-- frontend/src/components/chat_area.py | 7 +++---- frontend/src/components/info_panel.py | 3 +-- frontend/src/components/sidebar.py | 5 ++--- frontend/src/logger.py | 2 +- frontend/src/state.py | 2 +- rag_indexer/config.py | 3 ++- scripts/start.sh | 16 ++++++++++------ 12 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.env.docker b/.env.docker index 7737272..ebece03 100644 --- a/.env.docker +++ b/.env.docker @@ -76,6 +76,7 @@ ENABLE_GRAPH_TRACE=false # ----------------------------------------------------------------------------- # 应用行为配置 # ----------------------------------------------------------------------------- +BACKEND_PORT=8079 MEMORY_SUMMARIZE_INTERVAL=10 # ----------------------------------------------------------------------------- diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 2bb8bfd..f98225a 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -46,6 +46,7 @@ ENV RAG_STORAGE_TYPE=postgres # ============================================================================= # 应用行为配置 # ============================================================================= +ENV BACKEND_PORT=8079 ENV MEMORY_SUMMARIZE_INTERVAL=10 ENV ENABLE_GRAPH_TRACE=false diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 252d174..c3ab2ea 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -61,6 +61,7 @@ services: # ========================================================================= # 应用行为配置 # ========================================================================= + - BACKEND_PORT=8079 - MEMORY_SUMMARIZE_INTERVAL=${MEMORY_SUMMARIZE_INTERVAL:-10} # ========================================================================= diff --git a/frontend/src/__init__.py b/frontend/src/__init__.py index 29e32df..f0ce013 100644 --- a/frontend/src/__init__.py +++ b/frontend/src/__init__.py @@ -3,7 +3,7 @@ AI Agent 前端模块 采用分层架构设计，包含配置、状态、API客户端和UI组件 """ -from .logger import debug, info, warning, error +from logger import debug, info, warning, error __version__ = "2.0.0" __all__ = ["debug", "info", "warning", "error"] \ No newline at end of file diff --git a/frontend/src/api_client.py b/frontend/src/api_client.py index ace6808..c5f8e01 100644 --- a/frontend/src/api_client.py +++ b/frontend/src/api_client.py @@ -8,8 +8,8 @@ from typing import List, Dict, Any, Generator import requests # 使用相对导入 -from .config import config -from .logger import error, warning +from config import config +from logger import error, warning class APIClient: diff --git a/frontend/src/components/chat_area.py b/frontend/src/components/chat_area.py index 7ffe449..2ab2cfe 100644 --- a/frontend/src/components/chat_area.py +++ b/frontend/src/components/chat_area.py @@ -6,10 +6,9 @@ import re import streamlit as st -# 使用相对导入 -from ..state import AppState -from ..api_client import api_client -from ..config import config +from state import AppState +from api_client import api_client +from config import config def render_chat_area(): diff --git a/frontend/src/components/info_panel.py b/frontend/src/components/info_panel.py index e163db8..f19c0e6 100644 --- a/frontend/src/components/info_panel.py +++ b/frontend/src/components/info_panel.py @@ -5,8 +5,7 @@ import streamlit as st -# 使用相对导入 -from ..state import AppState +from state import AppState def render_info_panel(): diff --git a/frontend/src/components/sidebar.py b/frontend/src/components/sidebar.py index 40eacbd..c04a03b 100644 --- a/frontend/src/components/sidebar.py +++ b/frontend/src/components/sidebar.py @@ -6,9 +6,8 @@ import streamlit as st from datetime import datetime -# 使用相对导入 -from ..state import AppState -from ..api_client import api_client +from state import AppState +from api_client import api_client def render_sidebar(): """渲染左侧栏""" diff --git a/frontend/src/logger.py b/frontend/src/logger.py index f5cacec..07ca2ae 100644 --- a/frontend/src/logger.py +++ b/frontend/src/logger.py @@ -4,7 +4,7 @@ """ import os -from .config import config +from config import config import logging from typing import Any from dotenv import load_dotenv diff --git a/frontend/src/state.py b/frontend/src/state.py index e1d32bb..0194633 100644 --- a/frontend/src/state.py +++ b/frontend/src/state.py @@ -7,7 +7,7 @@ import uuid from typing import List, Dict, Any import streamlit as st -from .config import config +from config import config class AppState: diff --git a/rag_indexer/config.py b/rag_indexer/config.py index ef89034..1ad0794 100644 --- a/rag_indexer/config.py +++ b/rag_indexer/config.py @@ -6,7 +6,8 @@ RAG Indexer 配置管理模块 """ import os - +from dotenv import load_dotenv +load_dotenv() # ========== 辅助函数：类型转换 ========== def _get_str(key: str) -> str | None: diff --git a/scripts/start.sh b/scripts/start.sh index 6edc2b2..e109d91 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -28,6 +28,11 @@ check_config() { echo -e "${BLUE}📋 开始环境配置检查...${NC}" echo "" + # 加载 .env 文件 + set -a + source "$PROJECT_DIR/.env" 2>/dev/null || true + set +a + PASS=0 FAIL=0 WARN=0 @@ -286,7 +291,7 @@ start_embedding() { # 启动 Python 服务 # ============================================================================= start_backend() { - echo -e "\n${BLUE}🚀 启动后端服务 (端口 8083)...${NC}" + echo -e "\n${BLUE}🚀 启动后端服务 (端口 8079)...${NC}" cd "$PROJECT_DIR" # 加载 .env 文件中的环境变量 @@ -294,9 +299,8 @@ start_backend() { source .env 2>/dev/null || true set +a - export PYTHONPATH="$PROJECT_DIR:$PROJECT_DIR/backend" - export BACKEND_PORT=8079 - python backend/app/backend.py & + export PYTHONPATH="$PROJECT_DIR/backend" + python -m app.backend & BACKEND_PID=$! echo -e "${GREEN}✓ 后端服务已启动 (PID: $BACKEND_PID)${NC}" sleep 2 @@ -311,8 +315,8 @@ start_frontend() { source .env 2>/dev/null || true set +a - export PYTHONPATH="$PROJECT_DIR:$PROJECT_DIR/backend" - streamlit run frontend/src/frontend_main.py & + export PYTHONPATH="$PROJECT_DIR/frontend/src" + streamlit run frontend/src/frontend_main.py --server.port 8501 --server.address 0.0.0.0 & FRONTEND_PID=$! echo -e "${GREEN}✓ 前端服务已启动 (PID: $FRONTEND_PID)${NC}" echo -e "${GREEN}✓ 访问地址:${NC}"