Enhancement: Revert to default logging (#336)

* revert and delete central log config * revert and delete central log config * fix imports * use lazy logging
DurgNomis-drol · Mar 26, 2024 · 709a8b7 · 709a8b7
1 parent 2c8b576
commit 709a8b7
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 87 deletions.
diff --git a/mytoyota/api.py b/mytoyota/api.py
@@ -4,7 +4,6 @@
 from datetime import date, datetime, timezone
 from uuid import uuid4
 
-import mytoyota.utils.logging.logging_config  # noqa # pylint: disable=unused-import
 from mytoyota.const import (
     VEHICLE_ASSOCIATION_ENDPOINT,
     VEHICLE_GLOBAL_REMOTE_ELECTRIC_STATUS_ENDPOINT,

diff --git a/mytoyota/client.py b/mytoyota/client.py
@@ -11,7 +11,6 @@
 import logging
 from typing import List, Optional
 
-import mytoyota.utils.logging.logging_config  # noqa # pylint: disable=unused-import
 from mytoyota.api import Api
 from mytoyota.models.vehicle import Vehicle
 

diff --git a/mytoyota/controller.py b/mytoyota/controller.py
@@ -11,7 +11,6 @@
 import httpx
 import jwt
 
-import mytoyota.utils.logging.logging_config  # noqa # pylint: disable=unused-import
 from mytoyota.const import (
     ACCESS_TOKEN_URL,
     API_BASE_URL,
@@ -24,7 +23,7 @@
     ToyotaInvalidUsernameError,
     ToyotaLoginError,
 )
-from mytoyota.utils.logging.log_utils import format_httpx_response
+from mytoyota.utils.log_utils import format_httpx_response
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 

diff --git a/mytoyota/models/vehicle.py b/mytoyota/models/vehicle.py
@@ -2,7 +2,6 @@
 import asyncio
 import copy
 import json
-import logging
 from datetime import date
 from functools import partial
 from itertools import groupby
@@ -11,7 +10,6 @@
 
 from arrow import Arrow
 
-import mytoyota.utils.logging.logging_config  # noqa # pylint: disable=unused-import
 from mytoyota.api import Api
 from mytoyota.models.dashboard import Dashboard
 from mytoyota.models.endpoints.vehicle_guid import VehicleGuidModel
@@ -22,9 +20,7 @@
 from mytoyota.models.summary import Summary, SummaryType
 from mytoyota.models.trips import Trip
 from mytoyota.utils.helpers import add_with_none
-from mytoyota.utils.logging.log_utils import censor_all
-
-_LOGGER: logging.Logger = logging.getLogger(__name__)
+from mytoyota.utils.log_utils import censor_all
 
 
 class Vehicle:

diff --git a/mytoyota/utils/conversions.py b/mytoyota/utils/conversions.py
@@ -1,20 +1,18 @@
 """Conversion utilities used."""
 import logging
 
-import mytoyota.utils.logging.logging_config  # noqa # pylint: disable=unused-import
-
 _LOGGER: logging.Logger = logging.getLogger(__name__)
 
 
 def convert_to_miles(kilometers: float) -> float:
     """Convert kilometers to miles."""
-    _LOGGER.debug(f"Converting {kilometers} to miles...")
+    _LOGGER.debug("Converting %s kilometers to miles...", kilometers)
     return kilometers * 0.621371192
 
 
 def convert_to_km(miles: float) -> float:
     """Convert kilometers to miles."""
-    _LOGGER.debug(f"Converting {miles} to kilometers...")
+    _LOGGER.debug("Converting %s miles to kilometers...", miles)
     return miles * 1.60934
 
 
@@ -29,11 +27,11 @@ def convert_distance(convert_to: str, convert_from: str, value: float, decimal_p
 
 def convert_to_liter_per_100_miles(liters: float) -> float:
     """Convert liters per 100 km to liters per 100 miles."""
-    _LOGGER.debug("Converting to L/100miles...")
+    _LOGGER.debug("Converting %s liters to L/100miles...", liters)
     return round(liters * 1.609344, 4)
 
 
 def convert_to_mpg(liters_per_100_km: float) -> float:
     """Convert to miles per UK gallon (MPG)."""
-    _LOGGER.debug("Converting to MPG...")
+    _LOGGER.debug("Converting %s L/100km to MPG...", liters_per_100_km)
     return round(282.5 / liters_per_100_km, 4) if liters_per_100_km > 0.0 else 0.0
diff --git a/mytoyota/utils/logging/log_utils.py → mytoyota/utils/log_utils.py b/mytoyota/utils/logging/log_utils.py → mytoyota/utils/log_utils.py
diff --git a/mytoyota/utils/logging/log_config.yaml b/mytoyota/utils/logging/log_config.yaml
diff --git a/mytoyota/utils/logging/log_filters.py b/mytoyota/utils/logging/log_filters.py
diff --git a/mytoyota/utils/logging/logging_config.py b/mytoyota/utils/logging/logging_config.py
diff --git a/simple_client_example.py b/simple_client_example.py
@@ -1,16 +1,13 @@
 """Simple test of new API Changes."""
 import asyncio
 import json
-import logging
 import pprint
 from datetime import date, timedelta
 
-import mytoyota.utils.logging.logging_config  # noqa # pylint: disable=unused-import
 from mytoyota.client import MyT
 from mytoyota.models.summary import SummaryType
 
 pp = pprint.PrettyPrinter(indent=4)
-_LOGGER = logging.getLogger(__name__)
 
 
 # Set your username and password in a file on top level called "credentials.json" in the format:

diff --git a/tests/unit_tests/test_utils/test_logs.py b/tests/unit_tests/test_utils/test_logs.py
@@ -2,7 +2,7 @@
 import pytest
 from httpx import Request, Response
 
-from mytoyota.utils.logging.log_utils import (
+from mytoyota.utils.log_utils import (
     censor_all,
     censor_string,
     censor_value,