mirror of
https://github.com/grillazz/fastapi-sqlalchemy-asyncpg.git
synced 2025-11-30 13:20:40 +03:00
Merge remote-tracking branch 'origin/switch-logger-to-rotoger' into switch-logger-to-rotoger
# Conflicts: # pyproject.toml # uv.lock
This commit is contained in:
@@ -2,12 +2,12 @@ from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, Request, status
|
||||
from pydantic import EmailStr
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
from starlette.concurrency import run_in_threadpool
|
||||
|
||||
from app.services.smtp import SMTPEmailService
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@ from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Form
|
||||
from fastapi.responses import StreamingResponse
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
|
||||
from app.services.llm import get_llm_service
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
@@ -8,7 +8,7 @@ from app.models.stuff import RandomStuff, Stuff
|
||||
from app.schemas.stuff import RandomStuff as RandomStuffSchema
|
||||
from app.schemas.stuff import StuffResponse, StuffSchema
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
router = APIRouter(prefix="/v1/stuff")
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Form, HTTPException, Request, status
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.database import get_db
|
||||
@@ -9,7 +9,7 @@ from app.models.user import User
|
||||
from app.schemas.user import TokenResponse, UserLogin, UserResponse, UserSchema
|
||||
from app.services.auth import create_access_token
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
router = APIRouter(prefix="/v1/user")
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
from collections.abc import AsyncGenerator
|
||||
|
||||
from fastapi.exceptions import ResponseValidationError
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
||||
|
||||
from app.config import settings as global_settings
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
engine = create_async_engine(
|
||||
global_settings.asyncpg_url.unicode_string(),
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import orjson
|
||||
from attrs import define, field
|
||||
from fastapi import Request
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
|
||||
@define(slots=True)
|
||||
|
||||
@@ -5,7 +5,7 @@ import asyncpg
|
||||
from fastapi import Depends, FastAPI, Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from fastapi.templating import Jinja2Templates
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
|
||||
from app.api.health import router as health_router
|
||||
from app.api.ml import router as ml_router
|
||||
@@ -18,7 +18,7 @@ from app.exception_handlers import register_exception_handlers
|
||||
from app.redis import get_redis
|
||||
from app.services.auth import AuthBearer
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
templates = Jinja2Templates(directory=Path(__file__).parent.parent / "templates")
|
||||
|
||||
|
||||
|
||||
@@ -2,12 +2,12 @@ from typing import Any
|
||||
|
||||
from asyncpg import UniqueViolationError
|
||||
from fastapi import HTTPException, status
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
from sqlalchemy.exc import IntegrityError, SQLAlchemyError
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import DeclarativeBase, declared_attr
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
|
||||
class Base(DeclarativeBase):
|
||||
|
||||
@@ -3,12 +3,12 @@ import time
|
||||
import jwt
|
||||
from fastapi import HTTPException, Request
|
||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
|
||||
from app.config import settings as global_settings
|
||||
from app.models.user import User
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
|
||||
async def get_from_redis(request: Request, key: str):
|
||||
|
||||
@@ -3,13 +3,13 @@ from datetime import datetime
|
||||
from apscheduler import AsyncScheduler
|
||||
from apscheduler.triggers.interval import IntervalTrigger
|
||||
from attrs import define
|
||||
from rotoger import get_logger
|
||||
from sqlalchemy import text
|
||||
from starlette.types import ASGIApp, Receive, Scope, Send
|
||||
|
||||
from app.database import AsyncSessionFactory
|
||||
from app.utils.logging import AppLogger
|
||||
|
||||
logger = AppLogger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
|
||||
async def tick():
|
||||
|
||||
@@ -5,12 +5,12 @@ from email.mime.text import MIMEText
|
||||
from attrs import define, field
|
||||
from fastapi.templating import Jinja2Templates
|
||||
from pydantic import EmailStr
|
||||
from rotoger import Rotoger
|
||||
from rotoger import get_logger
|
||||
|
||||
from app.config import settings as global_settings
|
||||
from app.utils.singleton import SingletonMetaNoArgs
|
||||
|
||||
logger = Rotoger().get_logger()
|
||||
logger = get_logger()
|
||||
|
||||
|
||||
@define
|
||||
|
||||
Reference in New Issue
Block a user