mirror of
https://github.com/flibusta-apps/users_settings_server.git
synced 2025-12-06 14:45:38 +01:00
Migrate to ruff
This commit is contained in:
@@ -2,10 +2,8 @@ import os
|
||||
import sys
|
||||
|
||||
from alembic import context
|
||||
from sqlalchemy.engine import create_engine
|
||||
|
||||
from core.db import DATABASE_URL
|
||||
|
||||
from sqlalchemy.engine import create_engine
|
||||
|
||||
myPath = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, myPath + "/../../")
|
||||
@@ -15,7 +13,6 @@ config = context.config
|
||||
|
||||
from app.models import BaseMeta
|
||||
|
||||
|
||||
target_metadata = BaseMeta.metadata
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from fastapi import Security, HTTPException, status
|
||||
from fastapi import HTTPException, Security, status
|
||||
|
||||
from core.auth import default_security
|
||||
from core.config import env_config
|
||||
|
||||
@@ -2,7 +2,7 @@ from datetime import datetime
|
||||
|
||||
import ormar
|
||||
|
||||
from core.db import metadata, database
|
||||
from core.db import database, metadata
|
||||
|
||||
|
||||
class BaseMeta(ormar.ModelMeta):
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
from typing import cast
|
||||
|
||||
from app.models import User, Language
|
||||
from app.models import Language, User
|
||||
|
||||
|
||||
async def update_user_allowed_langs(user: User, new_allowed_langs: list[str]) -> bool:
|
||||
user_allowed_langs = cast(list[Language], user.allowed_langs)
|
||||
|
||||
exists_langs = set(lang.code for lang in user_allowed_langs)
|
||||
exists_langs = {lang.code for lang in user_allowed_langs}
|
||||
new_langs = set(new_allowed_langs)
|
||||
|
||||
to_delete = exists_langs - new_langs
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
from typing import Optional, Union
|
||||
|
||||
from fastapi import HTTPException, status
|
||||
|
||||
import orjson
|
||||
from fastapi import HTTPException, status
|
||||
from redis import asyncio as aioredis
|
||||
|
||||
from app.models import User
|
||||
@@ -134,9 +133,9 @@ class UsersDataManager:
|
||||
if new_data[key] != old_data[key]:
|
||||
return True
|
||||
|
||||
if allowed_langs and set(allowed_langs) != set(
|
||||
[lang.code for lang in old_user.allowed_langs]
|
||||
):
|
||||
if allowed_langs and set(allowed_langs) != {
|
||||
lang.code for lang in old_user.allowed_langs
|
||||
}:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter, HTTPException, status, Depends, Request
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
||||
from fastapi_pagination import Page, Params
|
||||
from fastapi_pagination.ext.ormar import paginate
|
||||
from redis import asyncio as aioredis
|
||||
|
||||
from app.depends import check_token
|
||||
from app.models import User, Language, UserActivity
|
||||
from app.models import Language, User, UserActivity
|
||||
from app.serializers import (
|
||||
UserCreateOrUpdate,
|
||||
UserUpdate,
|
||||
UserDetail,
|
||||
CreateLanguage,
|
||||
LanguageDetail,
|
||||
UserCreateOrUpdate,
|
||||
UserDetail,
|
||||
UserUpdate,
|
||||
)
|
||||
from app.services.users_data_manager import UsersDataManager
|
||||
|
||||
|
||||
users_router = APIRouter(
|
||||
prefix="/users", tags=["users"], dependencies=[Depends(check_token)]
|
||||
)
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
from fastapi import FastAPI
|
||||
from fastapi.responses import ORJSONResponse
|
||||
|
||||
from fastapi_pagination import add_pagination
|
||||
from prometheus_fastapi_instrumentator import Instrumentator
|
||||
from redis import asyncio as aioredis
|
||||
|
||||
from app.views import users_router, languages_router, healthcheck_router
|
||||
from app.views import healthcheck_router, languages_router, users_router
|
||||
from core.config import env_config
|
||||
from core.db import database
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from fastapi.security import APIKeyHeader
|
||||
|
||||
|
||||
default_security = APIKeyHeader(name="Authorization")
|
||||
|
||||
@@ -5,7 +5,6 @@ from sqlalchemy import MetaData
|
||||
|
||||
from core.config import env_config
|
||||
|
||||
|
||||
DATABASE_URL = (
|
||||
f"postgresql://{env_config.POSTGRES_USER}:{quote(env_config.POSTGRES_PASSWORD)}@"
|
||||
f"{env_config.POSTGRES_HOST}:{env_config.POSTGRES_PORT}/{env_config.POSTGRES_DB}"
|
||||
|
||||
@@ -4,7 +4,6 @@ from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
|
||||
from core.app import start_app
|
||||
from core.config import env_config
|
||||
|
||||
|
||||
sentry_sdk.init(dsn=env_config.SENTRY_SDN)
|
||||
|
||||
app = SentryAsgiMiddleware(start_app())
|
||||
|
||||
Reference in New Issue
Block a user