From c90a97a964ed952d2379ba2e2fea65e80c138e29 Mon Sep 17 00:00:00 2001 From: Roman Dyakov Date: Sat, 26 Aug 2023 21:44:17 +0300 Subject: [PATCH] Format --- Makefile | 19 ++++++++++--------- aciniformes_backend/__main__.py | 2 ++ aciniformes_backend/cli/__init__.py | 3 ++- aciniformes_backend/routes/base.py | 2 +- aciniformes_backend/worker/scheduler.py | 2 +- tests/ping_service/service/conftest.py | 1 - tests/ping_service/service/test_scheduler.py | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index f7ad658..a3ae72f 100644 --- a/Makefile +++ b/Makefile @@ -13,18 +13,19 @@ configure: venv venv: python3.11 -m venv venv -atomic-format: - autoflake -r --in-place --remove-all-unused-imports ./$(module) - isort ./$(module) - black ./$(module) - format: - make atomic-format module=pinger_backend - make atomic-format module=aciniformes_backend - make atomic-format module=settings.py + autoflake -r --in-place --remove-all-unused-imports aciniformes_backend + isort aciniformes_backend + black aciniformes_backend format-dev: - make atomic-format module=tests + autoflake -r --in-place --remove-all-unused-imports tests + isort tests + black tests + + autoflake -r --in-place --remove-all-unused-imports migrations + isort migrations + black migrations db: docker run -d -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name db-pinger_backend postgres:15 diff --git a/aciniformes_backend/__main__.py b/aciniformes_backend/__main__.py index ee6442a..c18f843 100644 --- a/aciniformes_backend/__main__.py +++ b/aciniformes_backend/__main__.py @@ -1,4 +1,6 @@ from logging.config import fileConfig + + fileConfig('./logging_prod.conf') from .cli import process diff --git a/aciniformes_backend/cli/__init__.py b/aciniformes_backend/cli/__init__.py index 7d37162..cadddfc 100644 --- a/aciniformes_backend/cli/__init__.py +++ b/aciniformes_backend/cli/__init__.py @@ -22,6 +22,7 @@ def process(): if args.command == "api": import uvicorn + from aciniformes_backend.routes import app logger.debug("API starting") @@ -33,8 +34,8 @@ def process(): import asyncio import signal - from aciniformes_backend.worker.scheduler import ApSchedulerService + from aciniformes_backend.worker.scheduler import ApSchedulerService def sigint_callback(scheduler: ApSchedulerService) -> None: try: diff --git a/aciniformes_backend/routes/base.py b/aciniformes_backend/routes/base.py index 458400d..b59852a 100644 --- a/aciniformes_backend/routes/base.py +++ b/aciniformes_backend/routes/base.py @@ -4,9 +4,9 @@ from aciniformes_backend.settings import get_settings from .alert import router as alert_router -from .reciever import router as receiver_router from .fetcher import router as fetcher_router from .mectric import router as metric_router +from .reciever import router as receiver_router app = FastAPI() diff --git a/aciniformes_backend/worker/scheduler.py b/aciniformes_backend/worker/scheduler.py index 2a9bfa2..c78ad05 100644 --- a/aciniformes_backend/worker/scheduler.py +++ b/aciniformes_backend/worker/scheduler.py @@ -7,10 +7,10 @@ import aiohttp from apscheduler.schedulers.asyncio import AsyncIOScheduler +from aciniformes_backend.exceptions import AlreadyRunning, AlreadyStopped from aciniformes_backend.models import Alert, Fetcher, FetcherType, Metric, Receiver from aciniformes_backend.routes.alert import CreateSchema as AlertCreateSchema from aciniformes_backend.routes.mectric import CreateSchema as MetricCreateSchema -from aciniformes_backend.exceptions import AlreadyRunning, AlreadyStopped from aciniformes_backend.settings import get_settings from .ping import ping diff --git a/tests/ping_service/service/conftest.py b/tests/ping_service/service/conftest.py index 27364f8..7d42d7c 100644 --- a/tests/ping_service/service/conftest.py +++ b/tests/ping_service/service/conftest.py @@ -1,5 +1,4 @@ import pytest - from pinger_backend.service.scheduler import ApSchedulerService diff --git a/tests/ping_service/service/test_scheduler.py b/tests/ping_service/service/test_scheduler.py index 5f9b7ce..92c8e99 100644 --- a/tests/ping_service/service/test_scheduler.py +++ b/tests/ping_service/service/test_scheduler.py @@ -1,7 +1,7 @@ import pytest +from pinger_backend.exceptions import AlreadyRunning from aciniformes_backend.models import Fetcher, Metric -from pinger_backend.exceptions import AlreadyRunning @pytest.fixture()