From 0260df4d09a0c53cd7d1fafb1ee08de4e5a7d78a Mon Sep 17 00:00:00 2001 From: grillazz Date: Sat, 8 Mar 2025 17:27:53 +0100 Subject: [PATCH] format code --- app/api/shakespeare.py | 3 +-- app/api/stuff.py | 2 +- app/api/user.py | 4 ++-- app/models/shakespeare.py | 1 + app/models/stuff.py | 4 ++-- app/models/user.py | 4 ++-- app/schemas/stuff.py | 2 +- app/schemas/user.py | 2 +- app/services/scheduler.py | 7 +++---- app/services/smtp.py | 7 ++----- app/utils/logging.py | 2 +- tests/api/test_auth.py | 8 ++++---- tests/api/test_import_xlsx.py | 3 +-- tests/api/test_stuff.py | 3 +-- tests/conftest.py | 1 - 15 files changed, 23 insertions(+), 30 deletions(-) diff --git a/app/api/shakespeare.py b/app/api/shakespeare.py index efd1f0a..b6da057 100644 --- a/app/api/shakespeare.py +++ b/app/api/shakespeare.py @@ -1,9 +1,8 @@ from typing import Annotated from fastapi import APIRouter, Depends, Query -from sqlalchemy.ext.asyncio import AsyncSession - from fastapi_cache.decorator import cache +from sqlalchemy.ext.asyncio import AsyncSession from app.database import get_db from app.models.shakespeare import Paragraph diff --git a/app/api/stuff.py b/app/api/stuff.py index 6b7c6f6..552bd20 100644 --- a/app/api/stuff.py +++ b/app/api/stuff.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter, Depends, HTTPException, status, Request +from fastapi import APIRouter, Depends, HTTPException, Request, status from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.ext.asyncio import AsyncSession diff --git a/app/api/user.py b/app/api/user.py index 5698eb4..4b2d468 100644 --- a/app/api/user.py +++ b/app/api/user.py @@ -1,11 +1,11 @@ from typing import Annotated -from fastapi import APIRouter, Depends, status, Request, HTTPException, Form +from fastapi import APIRouter, Depends, Form, HTTPException, Request, status from sqlalchemy.ext.asyncio import AsyncSession from app.database import get_db from app.models.user import User -from app.schemas.user import UserSchema, UserResponse, UserLogin, TokenResponse +from app.schemas.user import TokenResponse, UserLogin, UserResponse, UserSchema from app.services.auth import create_access_token from app.utils.logging import AppLogger diff --git a/app/models/shakespeare.py b/app/models/shakespeare.py index 6aa752c..fc542bd 100644 --- a/app/models/shakespeare.py +++ b/app/models/shakespeare.py @@ -11,6 +11,7 @@ from sqlalchemy import ( ) from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import Mapped, mapped_column, relationship + from app.models.base import Base diff --git a/app/models/stuff.py b/app/models/stuff.py index d9e63a7..248d7e3 100644 --- a/app/models/stuff.py +++ b/app/models/stuff.py @@ -1,9 +1,9 @@ import uuid -from sqlalchemy import String, select, ForeignKey +from sqlalchemy import ForeignKey, String, select from sqlalchemy.dialects.postgresql import UUID from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import mapped_column, Mapped, relationship, joinedload +from sqlalchemy.orm import Mapped, joinedload, mapped_column, relationship from app.models.base import Base from app.models.nonsense import Nonsense diff --git a/app/models/user.py b/app/models/user.py index 6ea0b32..005c71d 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -3,10 +3,10 @@ from typing import Any import bcrypt from pydantic import SecretStr -from sqlalchemy import String, LargeBinary, select, Column +from sqlalchemy import Column, LargeBinary, String, select from sqlalchemy.dialects.postgresql import UUID from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import mapped_column, Mapped +from sqlalchemy.orm import Mapped, mapped_column from app.models.base import Base diff --git a/app/schemas/stuff.py b/app/schemas/stuff.py index 90ddc29..d5703b2 100644 --- a/app/schemas/stuff.py +++ b/app/schemas/stuff.py @@ -1,6 +1,6 @@ from uuid import UUID -from pydantic import BaseModel, Field, ConfigDict +from pydantic import BaseModel, ConfigDict, Field config = ConfigDict(from_attributes=True) diff --git a/app/schemas/user.py b/app/schemas/user.py index dce7785..69626c8 100644 --- a/app/schemas/user.py +++ b/app/schemas/user.py @@ -1,6 +1,6 @@ from uuid import UUID -from pydantic import BaseModel, Field, EmailStr, ConfigDict, SecretStr +from pydantic import BaseModel, ConfigDict, EmailStr, Field, SecretStr config = ConfigDict(from_attributes=True) diff --git a/app/services/scheduler.py b/app/services/scheduler.py index 739e369..31a5673 100644 --- a/app/services/scheduler.py +++ b/app/services/scheduler.py @@ -1,11 +1,10 @@ from datetime import datetime -from attrs import define - -from sqlalchemy import text -from starlette.types import ASGIApp, Receive, Scope, Send from apscheduler import AsyncScheduler from apscheduler.triggers.interval import IntervalTrigger +from attrs import define +from sqlalchemy import text +from starlette.types import ASGIApp, Receive, Scope, Send from app.database import AsyncSessionFactory from app.utils.logging import AppLogger diff --git a/app/services/smtp.py b/app/services/smtp.py index dcb5b0f..098a261 100644 --- a/app/services/smtp.py +++ b/app/services/smtp.py @@ -1,18 +1,15 @@ -from attrs import define, field import smtplib from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from app.config import settings as global_settings - +from attrs import define, field from fastapi.templating import Jinja2Templates - from pydantic import EmailStr +from app.config import settings as global_settings from app.utils.logging import AppLogger from app.utils.singleton import SingletonMetaNoArgs - logger = AppLogger().get_logger() diff --git a/app/utils/logging.py b/app/utils/logging.py index 0527800..f74f509 100644 --- a/app/utils/logging.py +++ b/app/utils/logging.py @@ -20,5 +20,5 @@ class RichConsoleHandler(RichHandler): def __init__(self, width=200, style=None, **kwargs): super().__init__( console=Console(color_system="256", width=width, style=style, stderr=True), - **kwargs + **kwargs, ) diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py index eee49d9..9000ef3 100644 --- a/tests/api/test_auth.py +++ b/tests/api/test_auth.py @@ -1,9 +1,9 @@ -import pytest -from httpx import AsyncClient -from starlette import status import jwt +import pytest +from dirty_equals import IsPositiveFloat, IsStr, IsUUID +from httpx import AsyncClient from inline_snapshot import snapshot -from dirty_equals import IsStr, IsUUID, IsPositiveFloat +from starlette import status pytestmark = pytest.mark.anyio diff --git a/tests/api/test_import_xlsx.py b/tests/api/test_import_xlsx.py index f0dd9b4..80cb84a 100644 --- a/tests/api/test_import_xlsx.py +++ b/tests/api/test_import_xlsx.py @@ -1,6 +1,5 @@ -from anyio import Path - import pytest +from anyio import Path from fastapi import status from httpx import AsyncClient diff --git a/tests/api/test_stuff.py b/tests/api/test_stuff.py index 577eb26..e1352c2 100644 --- a/tests/api/test_stuff.py +++ b/tests/api/test_stuff.py @@ -1,9 +1,8 @@ import pytest +from dirty_equals import IsUUID from fastapi import status from httpx import AsyncClient from inline_snapshot import snapshot -from dirty_equals import IsUUID - from polyfactory.factories.pydantic_factory import ModelFactory from app.schemas.stuff import StuffSchema diff --git a/tests/conftest.py b/tests/conftest.py index 1651df4..2c83229 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -29,7 +29,6 @@ async def start_db(): @pytest.fixture(scope="session") async def client(start_db) -> AsyncClient: - transport = ASGITransport( app=app, )