From af9e44e3731a45581121cb7c73072f076768eec7 Mon Sep 17 00:00:00 2001 From: Mose Mueller Date: Wed, 18 Oct 2023 15:41:46 +0200 Subject: [PATCH] using std logging instead of loguru --- icon_service_base/database/config.py | 1 - icon_service_base/database/create_config.py | 3 +++ icon_service_base/database/influxdb_session.py | 4 +++- icon_service_base/database/postgres_session.py | 4 +++- pyproject.toml | 1 - 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/icon_service_base/database/config.py b/icon_service_base/database/config.py index 3bcde75..99d655b 100644 --- a/icon_service_base/database/config.py +++ b/icon_service_base/database/config.py @@ -2,7 +2,6 @@ from pathlib import Path from typing import Literal, Optional from confz import BaseConfig, EnvSource, FileSource -from loguru import logger from pydantic import AnyUrl, SecretStr # Retrieve the name of the current package diff --git a/icon_service_base/database/create_config.py b/icon_service_base/database/create_config.py index 600aaee..cf09dfb 100644 --- a/icon_service_base/database/create_config.py +++ b/icon_service_base/database/create_config.py @@ -1,9 +1,12 @@ +import logging from pathlib import Path from typing import Optional, TypeVar from confz import BaseConfig, FileSource from loguru import logger +logger = logging.getLogger(__name__) + T = TypeVar("T", bound=BaseConfig) diff --git a/icon_service_base/database/influxdb_session.py b/icon_service_base/database/influxdb_session.py index 2564ab0..133d512 100644 --- a/icon_service_base/database/influxdb_session.py +++ b/icon_service_base/database/influxdb_session.py @@ -1,5 +1,6 @@ from __future__ import annotations +import logging from collections.abc import Iterable from dataclasses import dataclass from pathlib import Path @@ -18,12 +19,13 @@ from influxdb_client import ( from influxdb_client.client.write.point import DEFAULT_WRITE_PRECISION from influxdb_client.client.write_api import SYNCHRONOUS from influxdb_client.rest import ApiException -from loguru import logger from reactivex import Observable from icon_service_base.database.config import InfluxDBConfig from icon_service_base.database.create_config import create_config +logger = logging.getLogger(__name__) + class InfluxDBSession: """ diff --git a/icon_service_base/database/postgres_session.py b/icon_service_base/database/postgres_session.py index 784b4a9..d71f9ee 100644 --- a/icon_service_base/database/postgres_session.py +++ b/icon_service_base/database/postgres_session.py @@ -2,6 +2,7 @@ from __future__ import annotations import datetime import json +import logging import re from pathlib import Path from types import TracebackType @@ -9,12 +10,13 @@ from typing import Any, Optional from confz import FileSource from dateutil.parser import ParserError, parse # type: ignore -from loguru import logger from sqlmodel import Session, SQLModel, create_engine from icon_service_base.database.config import OperationMode, PostgreSQLConfig from icon_service_base.database.create_config import create_config +logger = logging.getLogger(__name__) + def json_loads_or_return_input(input_string: str) -> dict[str, Any] | Any: """ diff --git a/pyproject.toml b/pyproject.toml index f7496ad..2b9dc41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,6 @@ packages = [{ include = "icon_service_base" }] [tool.poetry.dependencies] python = "^3.10" -loguru = "^0.7.0" influxdb-client = "^1.36.1" sqlmodel = "^0.0.8" confz = "^2.0.0"