diff --git a/db/connection.py b/db/connection.py index 3950913..f5d1825 100644 --- a/db/connection.py +++ b/db/connection.py @@ -1,6 +1,6 @@ import psycopg2 import os -import logging +from loguru import logger from contextlib import contextmanager from typing import Generator @@ -8,8 +8,6 @@ from utils.loadDotEnv import initializeENV initializeENV() -logger = logging.getLogger(__name__) - def PSQLConnect(): conn = psycopg2.connect(os.getenv('POSTDRESS_CONNECTION')) return conn @@ -24,16 +22,16 @@ def get_connection() -> Generator[psycopg2.extensions.connection, None, None]: conn = None try: conn = PSQLConnect() - logger.debug("Подключение к БД установлено") + logger.info("Подключение к БД установлено") yield conn except psycopg2.OperationalError as e: - logger.error(f"Ошибка подключения к БД: {e}") + logger.error(f"Ошибка подключения к БД:\n{e}") raise except psycopg2.Error as e: - logger.error(f"Ошибка PostgreSQL: {e}") + logger.error(f"Ошибка PostgreSQL:\n{e}") raise except Exception as e: - logger.error(f"Неожиданная ошибка при работе с БД: {e}") + logger.error(f"Неожиданная ошибка при работе с БД:\n{e}") raise finally: if conn: @@ -41,7 +39,7 @@ def get_connection() -> Generator[psycopg2.extensions.connection, None, None]: conn.close() logger.debug("Соединение с БД закрыто") except Exception as e: - logger.warning(f"Ошибка при закрытии соединения: {e}") + logger.warning(f"Ошибка при закрытии соединения:\n{e}") def test_connection() -> bool: try: @@ -56,6 +54,7 @@ def test_connection() -> bool: cur.close() logger.debug("Курсор закрыт") except Exception as e: - logger.error(f"Тест подключения к БД провален: {e}") + logger.error(f"Тест подключения к БД провален:\n{e}") return False -print(test_connection()) \ No newline at end of file + +logger.debug(test_connection()) \ No newline at end of file diff --git a/db/repositories/ai_prediction_repository.py b/db/repositories/ai_prediction_repository.py index acc3e7f..176fd9c 100644 --- a/db/repositories/ai_prediction_repository.py +++ b/db/repositories/ai_prediction_repository.py @@ -1,11 +1,9 @@ from typing import List, Optional from datetime import datetime, date -import logging +from loguru import logger from db.connection import get_connection from model.ai_prediction import AIPrediction -logger = logging.getLogger(__name__) - class AIPredictionsRepository: def get_all(self) -> List[AIPrediction]: try: diff --git a/db/repositories/inventory_repository.py b/db/repositories/inventory_repository.py index 0d5611d..c6873a1 100644 --- a/db/repositories/inventory_repository.py +++ b/db/repositories/inventory_repository.py @@ -1,12 +1,10 @@ # db/repositories/inventory_repository.py from typing import List, Optional, Tuple from datetime import datetime -import logging +from loguru import logger from db.connection import get_connection from model.inventory import InventoryRecord -logger = logging.getLogger(__name__) - class InventoryRepository: def get_all(self) -> List[InventoryRecord]: try: diff --git a/db/repositories/product_repository.py b/db/repositories/product_repository.py index 6de73b8..7fc3cbb 100644 --- a/db/repositories/product_repository.py +++ b/db/repositories/product_repository.py @@ -1,10 +1,8 @@ from typing import List, Optional -import logging +from loguru import logger from db.connection import get_connection from model.product import Product -logger = logging.getLogger(__name__) - class ProductRepository: def get_all(self) -> List[Product]: try: diff --git a/db/repositories/robot_repository.py b/db/repositories/robot_repository.py index 7ebd872..3ae1aff 100644 --- a/db/repositories/robot_repository.py +++ b/db/repositories/robot_repository.py @@ -1,10 +1,8 @@ from typing import List, Optional -import logging +from loguru import logger from db.connection import get_connection from model.robot import Robot -logger = logging.getLogger(__name__) - class RobotRepository: def get_all(self) -> List[Robot]: try: diff --git a/db/repositories/user_repository.py b/db/repositories/user_repository.py index 4c7413b..0563d1e 100644 --- a/db/repositories/user_repository.py +++ b/db/repositories/user_repository.py @@ -1,10 +1,8 @@ from typing import List, Optional -import logging +from loguru import logger from model.user import User from db.connection import get_connection -logger = logging.getLogger(__name__) - class UserRepository: def get_all(self) -> List[User]: try: