🎨 Format files with pre-commit and Ruff (#611)
This commit is contained in:

committed by
GitHub

parent
2802a4df9e
commit
0cc802eec8
@@ -1,5 +1,5 @@
|
||||
import secrets
|
||||
from typing import Any, Dict, List, Optional, Union
|
||||
from typing import Any
|
||||
|
||||
from pydantic import AnyHttpUrl, BaseSettings, EmailStr, HttpUrl, PostgresDsn, validator
|
||||
|
||||
@@ -14,21 +14,21 @@ class Settings(BaseSettings):
|
||||
# BACKEND_CORS_ORIGINS is a JSON-formatted list of origins
|
||||
# e.g: '["http://localhost", "http://localhost:4200", "http://localhost:3000", \
|
||||
# "http://localhost:8080", "http://local.dockertoolbox.tiangolo.com"]'
|
||||
BACKEND_CORS_ORIGINS: List[AnyHttpUrl] = []
|
||||
BACKEND_CORS_ORIGINS: list[AnyHttpUrl] = []
|
||||
|
||||
@validator("BACKEND_CORS_ORIGINS", pre=True)
|
||||
def assemble_cors_origins(cls, v: Union[str, List[str]]) -> Union[List[str], str]:
|
||||
def assemble_cors_origins(cls, v: str | list[str]) -> list[str] | str:
|
||||
if isinstance(v, str) and not v.startswith("["):
|
||||
return [i.strip() for i in v.split(",")]
|
||||
elif isinstance(v, (list, str)):
|
||||
elif isinstance(v, list | str):
|
||||
return v
|
||||
raise ValueError(v)
|
||||
|
||||
PROJECT_NAME: str
|
||||
SENTRY_DSN: Optional[HttpUrl] = None
|
||||
SENTRY_DSN: HttpUrl | None = None
|
||||
|
||||
@validator("SENTRY_DSN", pre=True)
|
||||
def sentry_dsn_can_be_blank(cls, v: str) -> Optional[str]:
|
||||
def sentry_dsn_can_be_blank(cls, v: str) -> str | None:
|
||||
if len(v) == 0:
|
||||
return None
|
||||
return v
|
||||
@@ -37,10 +37,10 @@ class Settings(BaseSettings):
|
||||
POSTGRES_USER: str
|
||||
POSTGRES_PASSWORD: str
|
||||
POSTGRES_DB: str
|
||||
SQLALCHEMY_DATABASE_URI: Optional[PostgresDsn] = None
|
||||
SQLALCHEMY_DATABASE_URI: PostgresDsn | None = None
|
||||
|
||||
@validator("SQLALCHEMY_DATABASE_URI", pre=True)
|
||||
def assemble_db_connection(cls, v: Optional[str], values: Dict[str, Any]) -> Any:
|
||||
def assemble_db_connection(cls, v: str | None, values: dict[str, Any]) -> Any:
|
||||
if isinstance(v, str):
|
||||
return v
|
||||
return PostgresDsn.build(
|
||||
@@ -52,15 +52,15 @@ class Settings(BaseSettings):
|
||||
)
|
||||
|
||||
SMTP_TLS: bool = True
|
||||
SMTP_PORT: Optional[int] = None
|
||||
SMTP_HOST: Optional[str] = None
|
||||
SMTP_USER: Optional[str] = None
|
||||
SMTP_PASSWORD: Optional[str] = None
|
||||
EMAILS_FROM_EMAIL: Optional[EmailStr] = None
|
||||
EMAILS_FROM_NAME: Optional[str] = None
|
||||
SMTP_PORT: int | None = None
|
||||
SMTP_HOST: str | None = None
|
||||
SMTP_USER: str | None = None
|
||||
SMTP_PASSWORD: str | None = None
|
||||
EMAILS_FROM_EMAIL: EmailStr | None = None
|
||||
EMAILS_FROM_NAME: str | None = None
|
||||
|
||||
@validator("EMAILS_FROM_NAME")
|
||||
def get_project_name(cls, v: Optional[str], values: Dict[str, Any]) -> str:
|
||||
def get_project_name(cls, v: str | None, values: dict[str, Any]) -> str:
|
||||
if not v:
|
||||
return values["PROJECT_NAME"]
|
||||
return v
|
||||
@@ -70,7 +70,7 @@ class Settings(BaseSettings):
|
||||
EMAILS_ENABLED: bool = False
|
||||
|
||||
@validator("EMAILS_ENABLED", pre=True)
|
||||
def get_emails_enabled(cls, v: bool, values: Dict[str, Any]) -> bool:
|
||||
def get_emails_enabled(cls, v: bool, values: dict[str, Any]) -> bool:
|
||||
return bool(
|
||||
values.get("SMTP_HOST")
|
||||
and values.get("SMTP_PORT")
|
||||
|
@@ -1,5 +1,5 @@
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Any, Union
|
||||
from typing import Any
|
||||
|
||||
from jose import jwt
|
||||
from passlib.context import CryptContext
|
||||
@@ -12,9 +12,7 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
ALGORITHM = "HS256"
|
||||
|
||||
|
||||
def create_access_token(
|
||||
subject: Union[str, Any], expires_delta: timedelta = None
|
||||
) -> str:
|
||||
def create_access_token(subject: str | Any, expires_delta: timedelta = None) -> str:
|
||||
if expires_delta:
|
||||
expire = datetime.utcnow() + expires_delta
|
||||
else:
|
||||
|
Reference in New Issue
Block a user