From f3707c34bca168d51f75dcabd3701badc431adfe Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Fri, 4 Apr 2025 00:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/api.Dockerfile | 1 + docker/docker-compose.dev.yml | 1 + {src/utils => server}/db_manager.py | 2 +- {src => server}/main.py | 2 +- {src => server}/models/token_model.py | 0 server/routers/__init__.py | 13 +++++++++++++ {src => server}/routers/admin_router.py | 4 ++-- {src => server}/routers/base_router.py | 0 {src => server}/routers/chat_router.py | 0 {src => server}/routers/data_router.py | 0 {src => server}/routers/tool_router.py | 0 src/routers/__init__.py | 13 ------------- 12 files changed, 19 insertions(+), 17 deletions(-) rename {src/utils => server}/db_manager.py (94%) rename {src => server}/main.py (92%) rename {src => server}/models/token_model.py (100%) create mode 100644 server/routers/__init__.py rename {src => server}/routers/admin_router.py (96%) rename {src => server}/routers/base_router.py (100%) rename {src => server}/routers/chat_router.py (100%) rename {src => server}/routers/data_router.py (100%) rename {src => server}/routers/tool_router.py (100%) delete mode 100644 src/routers/__init__.py diff --git a/docker/api.Dockerfile b/docker/api.Dockerfile index 068bdc63..2bd86612 100644 --- a/docker/api.Dockerfile +++ b/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 diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 0232dc2d..4ac6df61 100644 --- a/docker/docker-compose.dev.yml +++ b/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，请添加此环境变量或者注释此行 diff --git a/src/utils/db_manager.py b/server/db_manager.py similarity index 94% rename from src/utils/db_manager.py rename to server/db_manager.py index d42e042a..0a05bcb9 100644 --- a/src/utils/db_manager.py +++ b/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: """数据库管理器""" diff --git a/src/main.py b/server/main.py similarity index 92% rename from src/main.py rename to server/main.py index 8280996d..1d144459 100644 --- a/src/main.py +++ b/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 diff --git a/src/models/token_model.py b/server/models/token_model.py similarity index 100% rename from src/models/token_model.py rename to server/models/token_model.py diff --git a/server/routers/__init__.py b/server/routers/__init__.py new file mode 100644 index 00000000..6878d934 --- /dev/null +++ b/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) diff --git a/src/routers/admin_router.py b/server/routers/admin_router.py similarity index 96% rename from src/routers/admin_router.py rename to server/routers/admin_router.py index 725ca49f..9471b6bc 100644 --- a/src/routers/admin_router.py +++ b/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"]) diff --git a/src/routers/base_router.py b/server/routers/base_router.py similarity index 100% rename from src/routers/base_router.py rename to server/routers/base_router.py diff --git a/src/routers/chat_router.py b/server/routers/chat_router.py similarity index 100% rename from src/routers/chat_router.py rename to server/routers/chat_router.py diff --git a/src/routers/data_router.py b/server/routers/data_router.py similarity index 100% rename from src/routers/data_router.py rename to server/routers/data_router.py diff --git a/src/routers/tool_router.py b/server/routers/tool_router.py similarity index 100% rename from src/routers/tool_router.py rename to server/routers/tool_router.py diff --git a/src/routers/__init__.py b/src/routers/__init__.py deleted file mode 100644 index 73f84125..00000000 --- a/src/routers/__init__.py +++ /dev/null @@ -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)