From ce27e96c50e02847b5db1583c5197d46340828d9 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Thu, 21 Nov 2024 17:05:22 +0100 Subject: [PATCH] refactor: formatter --- backend/bec_atlas/authentication.py | 3 ++- backend/bec_atlas/datasources/scylladb/scylladb.py | 5 +++-- backend/bec_atlas/main.py | 3 ++- backend/bec_atlas/router/redis_router.py | 3 ++- backend/bec_atlas/router/scan_router.py | 3 ++- backend/bec_atlas/router/user.py | 7 ++++--- backend/bec_atlas/utils/launch.py | 1 + 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/backend/bec_atlas/authentication.py b/backend/bec_atlas/authentication.py index 50bdb50..82cb9d6 100644 --- a/backend/bec_atlas/authentication.py +++ b/backend/bec_atlas/authentication.py @@ -3,12 +3,13 @@ from datetime import datetime, timedelta from typing import Annotated import jwt -from bec_atlas.datasources.scylladb import scylladb_schema as schema from fastapi import Depends, HTTPException, status from fastapi.security import OAuth2PasswordBearer from jwt.exceptions import InvalidTokenError from pwdlib import PasswordHash +from bec_atlas.datasources.scylladb import scylladb_schema as schema + ALGORITHM = "HS256" ACCESS_TOKEN_EXPIRE_MINUTES = 30 diff --git a/backend/bec_atlas/datasources/scylladb/scylladb.py b/backend/bec_atlas/datasources/scylladb/scylladb.py index 75fe4db..00f0edf 100644 --- a/backend/bec_atlas/datasources/scylladb/scylladb.py +++ b/backend/bec_atlas/datasources/scylladb/scylladb.py @@ -1,13 +1,14 @@ import json import os -from bec_atlas.authentication import get_password_hash -from bec_atlas.datasources.scylladb import scylladb_schema as schema from cassandra.cluster import Cluster from cassandra.cqlengine import connection from cassandra.cqlengine.management import create_keyspace_simple, sync_table from pydantic import BaseModel +from bec_atlas.authentication import get_password_hash +from bec_atlas.datasources.scylladb import scylladb_schema as schema + class ScylladbDatasource: KEYSPACE = "bec_atlas" diff --git a/backend/bec_atlas/main.py b/backend/bec_atlas/main.py index 3ad35b3..60c1b44 100644 --- a/backend/bec_atlas/main.py +++ b/backend/bec_atlas/main.py @@ -1,10 +1,11 @@ import socketio import uvicorn +from fastapi import FastAPI + from bec_atlas.datasources.datasource_manager import DatasourceManager from bec_atlas.router.redis_router import RedisRouter, RedisWebsocket from bec_atlas.router.scan_router import ScanRouter from bec_atlas.router.user import UserRouter -from fastapi import FastAPI CONFIG = {"redis": {"host": "localhost", "port": 6380}, "scylla": {"hosts": ["localhost"]}} diff --git a/backend/bec_atlas/router/redis_router.py b/backend/bec_atlas/router/redis_router.py index 644fb1a..46d0215 100644 --- a/backend/bec_atlas/router/redis_router.py +++ b/backend/bec_atlas/router/redis_router.py @@ -4,10 +4,11 @@ import json from typing import TYPE_CHECKING import socketio -from bec_atlas.router.base_router import BaseRouter from bec_lib.endpoints import MessageEndpoints from fastapi import APIRouter, WebSocket, WebSocketDisconnect +from bec_atlas.router.base_router import BaseRouter + if TYPE_CHECKING: from bec_lib.redis_connector import RedisConnector diff --git a/backend/bec_atlas/router/scan_router.py b/backend/bec_atlas/router/scan_router.py index 60638bf..6bad351 100644 --- a/backend/bec_atlas/router/scan_router.py +++ b/backend/bec_atlas/router/scan_router.py @@ -1,7 +1,8 @@ +from fastapi import APIRouter, Depends + from bec_atlas.authentication import get_current_user from bec_atlas.datasources.scylladb import scylladb_schema as schema from bec_atlas.router.base_router import BaseRouter -from fastapi import APIRouter, Depends class ScanRouter(BaseRouter): diff --git a/backend/bec_atlas/router/user.py b/backend/bec_atlas/router/user.py index 881959d..5248536 100644 --- a/backend/bec_atlas/router/user.py +++ b/backend/bec_atlas/router/user.py @@ -1,13 +1,14 @@ from typing import Annotated -from bec_atlas.authentication import create_access_token, get_current_user, verify_password -from bec_atlas.datasources.scylladb import scylladb_schema as schema -from bec_atlas.router.base_router import BaseRouter from fastapi import APIRouter, Depends from fastapi.exceptions import HTTPException from fastapi.security import OAuth2PasswordRequestForm from pydantic import BaseModel +from bec_atlas.authentication import create_access_token, get_current_user, verify_password +from bec_atlas.datasources.scylladb import scylladb_schema as schema +from bec_atlas.router.base_router import BaseRouter + class UserLoginRequest(BaseModel): username: str diff --git a/backend/bec_atlas/utils/launch.py b/backend/bec_atlas/utils/launch.py index 6e2a3b9..5b3b67a 100644 --- a/backend/bec_atlas/utils/launch.py +++ b/backend/bec_atlas/utils/launch.py @@ -2,6 +2,7 @@ import argparse import os import libtmux + from bec_atlas.utils.service_handler import ServiceHandler