From 563b22e055c5f21420344b9be32fd5eeb3538100 Mon Sep 17 00:00:00 2001 From: urec56 Date: Sat, 1 Jun 2024 13:04:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=20=D1=87=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/views.py | 2 +- app/{users => }/chat/dao.py | 4 ++-- app/{users => }/chat/models.py | 0 app/{users => }/chat/router.py | 4 ++-- app/{users => }/chat/shemas.py | 0 app/{users => }/chat/websocket.py | 4 ++-- app/main.py | 19 ++----------------- app/migrations/env.py | 2 +- app/services/message_service.py | 4 ++-- app/tests/conftest.py | 2 +- app/users/dao.py | 2 +- 11 files changed, 14 insertions(+), 29 deletions(-) rename app/{users => }/chat/dao.py (98%) rename app/{users => }/chat/models.py (100%) rename app/{users => }/chat/router.py (98%) rename app/{users => }/chat/shemas.py (100%) rename app/{users => }/chat/websocket.py (96%) diff --git a/app/admin/views.py b/app/admin/views.py index 5b6703b..872c556 100644 --- a/app/admin/views.py +++ b/app/admin/views.py @@ -1,7 +1,7 @@ from sqladmin import ModelView from app.users.models import Users -from app.users.chat.models import Chats, UsersXChats, Messages +from app.chat.models import Chats, UsersXChats, Messages class UsersAdmin(ModelView, model=Users): diff --git a/app/users/chat/dao.py b/app/chat/dao.py similarity index 98% rename from app/users/chat/dao.py rename to app/chat/dao.py index d23d0f5..16a45ca 100644 --- a/app/users/chat/dao.py +++ b/app/chat/dao.py @@ -3,9 +3,9 @@ from sqlalchemy import insert, select, update, delete from app.dao.base import BaseDAO from app.database import async_session_maker, engine # noqa from app.exceptions import UserAlreadyInChatException, UserAlreadyPinnedChatException -from app.users.chat.shemas import SMessage +from app.chat.shemas import SMessage from app.users.models import Users -from app.users.chat.models import Chats, Messages, UsersXChats, PinnedChats, PinnedMessages, Answers +from app.chat.models import Chats, Messages, UsersXChats, PinnedChats, PinnedMessages, Answers class ChatDAO(BaseDAO): diff --git a/app/users/chat/models.py b/app/chat/models.py similarity index 100% rename from app/users/chat/models.py rename to app/chat/models.py diff --git a/app/users/chat/router.py b/app/chat/router.py similarity index 98% rename from app/users/chat/router.py rename to app/chat/router.py index f2647c7..5ea22d7 100644 --- a/app/users/chat/router.py +++ b/app/chat/router.py @@ -4,8 +4,8 @@ from fastapi import APIRouter, Depends, status from app.config import settings from app.exceptions import UserDontHavePermissionException, MessageNotFoundException, UserCanNotReadThisChatException -from app.users.chat.dao import ChatDAO -from app.users.chat.shemas import SMessage, SLastMessages, SPinnedMessage, SPinnedChat, SDeletedUser, SChat, \ +from app.chat.dao import ChatDAO +from app.chat.shemas import SMessage, SLastMessages, SPinnedMessage, SPinnedChat, SDeletedUser, SChat, \ SDeletedChat from app.users.dao import UserDAO diff --git a/app/users/chat/shemas.py b/app/chat/shemas.py similarity index 100% rename from app/users/chat/shemas.py rename to app/chat/shemas.py diff --git a/app/users/chat/websocket.py b/app/chat/websocket.py similarity index 96% rename from app/users/chat/websocket.py rename to app/chat/websocket.py index 82b245d..6a49dc4 100644 --- a/app/users/chat/websocket.py +++ b/app/chat/websocket.py @@ -3,8 +3,8 @@ from fastapi import WebSocket, WebSocketDisconnect from app.exceptions import IncorrectDataException, UserDontHavePermissionException from app.services.message_service import MessageService from app.users.auth import AuthService -from app.users.chat.router import router -from app.users.chat.shemas import SSendMessage, SMessage, SDeleteMessage, SEditMessage +from app.chat.router import router +from app.chat.shemas import SSendMessage, SMessage, SDeleteMessage, SEditMessage class ConnectionManager(WebSocket): diff --git a/app/main.py b/app/main.py index 422fe3b..59ac1e4 100644 --- a/app/main.py +++ b/app/main.py @@ -1,17 +1,14 @@ -from fastapi import FastAPI, Request +from fastapi import FastAPI from sqladmin import Admin -from starlette.middleware.base import BaseHTTPMiddleware from starlette.staticfiles import StaticFiles from fastapi.middleware.cors import CORSMiddleware -import sentry_sdk from app.admin.auth import authentication_backend from app.admin.views import UsersAdmin, ChatsAdmin, MessagesAdmin, UsersXChatsAdmin -from app.config import settings from app.database import engine from app.users.router import router as user_router from app.pages.router import router as pages_router -from app.users.chat.websocket import router as websocket_router +from app.chat.websocket import router as websocket_router from app.images.router import router as image_router @@ -21,17 +18,6 @@ from app.images.router import router as image_router # profiles_sample_rate=1.0, # ) -class CustomMiddleware(BaseHTTPMiddleware): - async def dispatch(self, request: Request, call_next): - print(f"Before request: {request.body()}") - - response = await call_next(request) - - return response - - -# Добавьте middleware в приложение FastAPI - app = FastAPI( title="Чат BP", root_path="/api" @@ -58,7 +44,6 @@ app.add_middleware( "Accept" ], ) -app.add_middleware(CustomMiddleware) admin = Admin(app, engine, authentication_backend=authentication_backend) diff --git a/app/migrations/env.py b/app/migrations/env.py index f11e252..1d33d33 100644 --- a/app/migrations/env.py +++ b/app/migrations/env.py @@ -9,7 +9,7 @@ sys.path.insert(0, dirname(dirname(abspath(__file__)))) from app.database import DATABASE_URL, Base from app.users.models import Users, UsersVerificationCodes # noqa -from app.users.chat.models import Chats, Messages, UsersXChats, PinnedMessages, PinnedChats # noqa +from app.chat.models import Chats, Messages, UsersXChats, PinnedMessages, PinnedChats # noqa # this is the Alembic Config object, which provides # access to the values within the .ini file in use. diff --git a/app/services/message_service.py b/app/services/message_service.py index 7b45167..3678281 100644 --- a/app/services/message_service.py +++ b/app/services/message_service.py @@ -1,5 +1,5 @@ -from app.users.chat.dao import ChatDAO -from app.users.chat.shemas import SMessage +from app.chat.dao import ChatDAO +from app.chat.shemas import SMessage class MessageService: diff --git a/app/tests/conftest.py b/app/tests/conftest.py index d93b842..547adc9 100644 --- a/app/tests/conftest.py +++ b/app/tests/conftest.py @@ -8,7 +8,7 @@ from httpx import AsyncClient from app.config import settings from app.database import Base, async_session_maker, engine from app.users.models import Users, UsersVerificationCodes -from app.users.chat.models import Chats, UsersXChats, Messages +from app.chat.models import Chats, UsersXChats, Messages from app.main import app as fastapi_app diff --git a/app/users/dao.py b/app/users/dao.py index b02b80b..0d2ecb6 100644 --- a/app/users/dao.py +++ b/app/users/dao.py @@ -4,7 +4,7 @@ from sqlalchemy import update, select, insert, and_, func, text, delete from app.dao.base import BaseDAO from app.database import async_session_maker, engine # noqa -from app.users.chat.models import UsersXChats, Chats +from app.chat.models import UsersXChats, Chats from app.users.models import Users, UsersVerificationCodes, UsersAvatars from app.users.schemas import SUser