From 8eb6b40f2503601a0a227c55d0d7fc4c9fd0d0a1 Mon Sep 17 00:00:00 2001 From: killua4396 <1223086337@qq.com> Date: Mon, 6 May 2024 11:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86schema=E3=80=81route?= =?UTF-8?q?=E3=80=81controller=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 8 ++++---- app/controllers/{character.py => character_controller.py} | 2 +- app/controllers/{chat.py => chat_controller.py} | 2 +- app/controllers/{session.py => session_controller.py} | 2 +- app/controllers/{user.py => user_controller.py} | 2 +- app/routes/{character.py => character_route.py} | 2 +- app/routes/{chat.py => chat_route.py} | 2 +- app/routes/{session.py => session_route.py} | 2 +- app/routes/{user.py => user_route.py} | 2 +- app/schemas/{base.py => base_schema.py} | 0 app/schemas/{character.py => character_schema.py} | 2 +- app/schemas/{chat.py => chat_schema.py} | 2 +- app/schemas/{session.py => session_schema.py} | 2 +- app/schemas/{user.py => user_schema.py} | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) rename app/controllers/{character.py => character_controller.py} (98%) rename app/controllers/{chat.py => chat_controller.py} (99%) rename app/controllers/{session.py => session_controller.py} (98%) rename app/controllers/{user.py => user_controller.py} (98%) rename app/routes/{character.py => character_route.py} (96%) rename app/routes/{chat.py => chat_route.py} (95%) rename app/routes/{session.py => session_route.py} (94%) rename app/routes/{user.py => user_route.py} (97%) rename app/schemas/{base.py => base_schema.py} (100%) rename app/schemas/{character.py => character_schema.py} (98%) rename app/schemas/{chat.py => chat_schema.py} (96%) rename app/schemas/{session.py => session_schema.py} (96%) rename app/schemas/{user.py => user_schema.py} (98%) diff --git a/app/__init__.py b/app/__init__.py index c08db0a..66d25fb 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,10 +2,10 @@ from fastapi import FastAPI, Depends from fastapi.middleware.cors import CORSMiddleware from sqlalchemy import create_engine from .models import Base -from .routes.character import router as character_router -from .routes.user import router as user_router -from .routes.session import router as session_router -from .routes.chat import router as chat_router +from .routes.character_route import router as character_router +from .routes.user_route import router as user_router +from .routes.session_route import router as session_router +from .routes.chat_route import router as chat_router from .dependencies.logger import get_logger from config import get_config diff --git a/app/controllers/character.py b/app/controllers/character_controller.py similarity index 98% rename from app/controllers/character.py rename to app/controllers/character_controller.py index 17de36c..cba4666 100644 --- a/app/controllers/character.py +++ b/app/controllers/character_controller.py @@ -1,4 +1,4 @@ -from ..schemas.character import * +from ..schemas.character_schema import * from ..dependencies.logger import get_logger from sqlalchemy.orm import Session from ..models import Character diff --git a/app/controllers/chat.py b/app/controllers/chat_controller.py similarity index 99% rename from app/controllers/chat.py rename to app/controllers/chat_controller.py index 6b09398..4e9d272 100644 --- a/app/controllers/chat.py +++ b/app/controllers/chat_controller.py @@ -1,4 +1,4 @@ -from ..schemas.chat import * +from ..schemas.chat_schema import * from ..dependencies.logger import get_logger from .controller_enum import * from ..models import UserCharacter, Session, Character, User diff --git a/app/controllers/session.py b/app/controllers/session_controller.py similarity index 98% rename from app/controllers/session.py rename to app/controllers/session_controller.py index fd402eb..bac9e4a 100644 --- a/app/controllers/session.py +++ b/app/controllers/session_controller.py @@ -1,4 +1,4 @@ -from ..schemas.session import * +from ..schemas.session_schema import * from ..dependencies.logger import get_logger from fastapi import HTTPException, status from ..models import Session diff --git a/app/controllers/user.py b/app/controllers/user_controller.py similarity index 98% rename from app/controllers/user.py rename to app/controllers/user_controller.py index 155cd27..43da3ce 100644 --- a/app/controllers/user.py +++ b/app/controllers/user_controller.py @@ -1,4 +1,4 @@ -from ..schemas.user import * +from ..schemas.user_schema import * from ..dependencies.logger import get_logger from ..models import User, Hardware from datetime import datetime diff --git a/app/routes/character.py b/app/routes/character_route.py similarity index 96% rename from app/routes/character.py rename to app/routes/character_route.py index 3578e2c..f474d57 100644 --- a/app/routes/character.py +++ b/app/routes/character_route.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, HTTPException, status -from ..controllers.character import * +from ..controllers.character_controller import * from fastapi import Depends from sqlalchemy.orm import Session from ..dependencies.database import get_db diff --git a/app/routes/chat.py b/app/routes/chat_route.py similarity index 95% rename from app/routes/chat.py rename to app/routes/chat_route.py index b367b9d..1f217ab 100644 --- a/app/routes/chat.py +++ b/app/routes/chat_route.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, HTTPException, status, WebSocket -from ..controllers.chat import * +from ..controllers.chat_controller import * from fastapi import Depends from ..dependencies.database import get_db from ..dependencies.redis import get_redis diff --git a/app/routes/session.py b/app/routes/session_route.py similarity index 94% rename from app/routes/session.py rename to app/routes/session_route.py index 30e0ca6..6dd26c1 100644 --- a/app/routes/session.py +++ b/app/routes/session_route.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, Query, HTTPException, status -from ..controllers.session import * +from ..controllers.session_controller import * from fastapi import Depends from ..dependencies.database import get_db from ..dependencies.redis import get_redis diff --git a/app/routes/user.py b/app/routes/user_route.py similarity index 97% rename from app/routes/user.py rename to app/routes/user_route.py index 75ce47e..995f615 100644 --- a/app/routes/user.py +++ b/app/routes/user_route.py @@ -1,5 +1,5 @@ from fastapi import APIRouter, HTTPException, status -from ..controllers.user import * +from ..controllers.user_controller import * from fastapi import Depends from sqlalchemy.orm import Session from ..dependencies.database import get_db diff --git a/app/schemas/base.py b/app/schemas/base_schema.py similarity index 100% rename from app/schemas/base.py rename to app/schemas/base_schema.py diff --git a/app/schemas/character.py b/app/schemas/character_schema.py similarity index 98% rename from app/schemas/character.py rename to app/schemas/character_schema.py index d67fc12..d084062 100644 --- a/app/schemas/character.py +++ b/app/schemas/character_schema.py @@ -1,6 +1,6 @@ from pydantic import BaseModel from typing import Optional -from .base import BaseResponse +from .base_schema import BaseResponse #---------------------------角色创建----------------------------- #角色创建请求类 diff --git a/app/schemas/chat.py b/app/schemas/chat_schema.py similarity index 96% rename from app/schemas/chat.py rename to app/schemas/chat_schema.py index d1fe253..45c3916 100644 --- a/app/schemas/chat.py +++ b/app/schemas/chat_schema.py @@ -1,6 +1,6 @@ from pydantic import BaseModel from typing import Optional -from .base import BaseResponse +from .base_schema import BaseResponse #--------------------------------新聊天创建-------------------------------- #创建新聊天请求类 diff --git a/app/schemas/session.py b/app/schemas/session_schema.py similarity index 96% rename from app/schemas/session.py rename to app/schemas/session_schema.py index e725a97..3cfa60d 100644 --- a/app/schemas/session.py +++ b/app/schemas/session_schema.py @@ -1,7 +1,7 @@ from pydantic import BaseModel from typing import List from typing import Optional -from .base import BaseResponse +from .base_schema import BaseResponse #----------------------------Session_id查询------------------------------ #session_id查询请求类 diff --git a/app/schemas/user.py b/app/schemas/user_schema.py similarity index 98% rename from app/schemas/user.py rename to app/schemas/user_schema.py index 8caa3db..4157397 100644 --- a/app/schemas/user.py +++ b/app/schemas/user_schema.py @@ -1,6 +1,6 @@ from pydantic import BaseModel from typing import Optional -from .base import BaseResponse +from .base_schema import BaseResponse