重命名项目结构

docker/api.Dockerfile

@@ -16,4 +16,5 @@ RUN apt-get update && apt-get install ffmpeg libsm6 libxext6  -y
 
 # 复制代码到容器中
 COPY ../src /app/src
+COPY ../server /app/server
 

docker/docker-compose.dev.yml

@@ -6,6 +6,7 @@ services:
     container_name: api-dev
     working_dir: /app
     volumes:
+      - ../server:/app/server
       - ../src:/app/src
       - ../saves_dev:/app/saves
       # - ${MODEL_DIR}:/models # 如果出现 undefined volume MODEL_DIR: invalid compose project，请添加此环境变量或者注释此行

server/db_manager.py

@@ -5,7 +5,7 @@ from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 
-from src.models.token_model import Base, AgentToken
+from server.models.token_model import Base, AgentToken
 
 class DBManager:
     """数据库管理器"""

server/main.py

@@ -2,7 +2,7 @@ import uvicorn
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from src.routers import router
+from server.routers import router
 from src.utils.logging_config import logger
 
 

server/routers/__init__.py

@@ -0,0 +1,13 @@
+from fastapi import APIRouter
+from server.routers.chat_router import chat
+from server.routers.data_router import data
+from server.routers.base_router import base
+from server.routers.tool_router import tool
+from server.routers.admin_router import admin
+
+router = APIRouter()
+router.include_router(base)
+router.include_router(chat)
+router.include_router(data)
+router.include_router(tool)
+router.include_router(admin)

server/routers/admin_router.py

@@ -5,8 +5,8 @@ from pydantic import BaseModel
 from typing import List, Optional
 from sqlalchemy.orm import Session
 
-from src.utils.db_manager import db_manager
-from src.models.token_model import AgentToken
+from server.db_manager import db_manager
+from server.models.token_model import AgentToken
 
 admin = APIRouter(prefix="/admin", tags=["admin"])
 

src/routers/__init__.py

@@ -1,13 +0,0 @@
-from fastapi import APIRouter
-from src.routers.chat_router import chat
-from src.routers.data_router import data
-from src.routers.base_router import base
-from src.routers.tool_router import tool
-from src.routers.admin_router import admin
-
-router = APIRouter()
-router.include_router(base)
-router.include_router(chat)
-router.include_router(data)
-router.include_router(tool)
-router.include_router(admin)