Sync changes from hacore2/dwd_global_rad_api_server

Author: aschmere

custom_components/dwd_global_rad/api_client.py

@@ -1,4 +1,5 @@
 import logging
+import traceback
 
 import aiohttp
 
@@ -15,14 +16,18 @@ def __init__(self, hass: HomeAssistant, hostname: str, port_number: int):
         self.session = aiohttp.ClientSession()
         self._locations = None
         self.base_url = f"http://{self.hostname}:{self.port_number}"
+        self.debug_mode = _LOGGER.isEnabledFor(logging.DEBUG)
+        self.tracing_enabled = False  # Separate flag for tracing
 
     @property
     async def locations(self):
+        self._log_debug_info("Fetching locations property")
         if self._locations is None:
             await self.fetch_locations()
         return self._locations
 
     async def fetch_locations(self):
+        self._log_debug_info("Fetching locations")
         url = f"{self.base_url}/locations"
         async with self.session.get(url) as response:
             if response.status == 200:
@@ -32,6 +37,7 @@ async def fetch_locations(self):
         return self._locations
 
     async def get_location_by_name(self, name: str):
+        self._log_debug_info(f"Fetching location by name: {name}")
         url = f"{self.base_url}/locations/{name}"
         async with self.session.get(url) as response:
             data = await response.json()
@@ -40,27 +46,32 @@ async def get_location_by_name(self, name: str):
             return data
 
     async def add_location(self, name: str, latitude: float, longitude: float):
+        self._log_debug_info(f"Adding location: {name}")
         url = f"{self.base_url}/locations"
         data = {"name": name, "latitude": latitude, "longitude": longitude}
         async with self.session.post(url, json=data) as response:
             return await response.json()
 
     async def fetch_forecasts(self):
+        self._log_debug_info("Fetching forecasts")
         url = f"{self.base_url}/forecasts"
         async with self.session.get(url) as response:
             return await response.json()
 
     async def fetch_measurements(self, hours: int = 3):
+        self._log_debug_info(f"Fetching measurements for {hours} hours")
         url = f"{self.base_url}/measurements?hours={hours}"
         async with self.session.get(url) as response:
             return await response.json()
 
     async def remove_location(self, name: str):
+        self._log_debug_info(f"Removing location: {name}")
         url = f"{self.base_url}/locations/{name}"
         async with self.session.delete(url) as response:
             return await response.json()
 
     async def get_status(self):
+        self._log_debug_info("Checking API server status")
         url = f"{self.base_url}/status"
         async with self.session.get(url) as response:
             if response.status == 204:
@@ -69,4 +80,13 @@ async def get_status(self):
                 return False
 
     async def close(self):
+        self._log_debug_info("Closing session")
         await self.session.close()
+
+    def _log_debug_info(self, message: str):
+        _LOGGER.debug(message)
+        if self.debug_mode and self.tracing_enabled:
+            _LOGGER.debug("Call stack:")
+            stack = traceback.format_stack()
+            for line in stack:
+                _LOGGER.debug(line.strip())

custom_components/dwd_global_rad/coordinator.py

@@ -216,10 +216,16 @@ async def get_location_data(self):
             )
             return None
 
-        if "measurements" not in measurement_data or "forecasts" not in forecast_data:
-            _LOGGER.debug(
-                "Measurement or forecast data lists are empty for %s", self.name
-            )
+        # Check if measurements and forecasts exist and are not empty
+        if (
+            "measurements" not in measurement_data
+            or not measurement_data["measurements"]
+        ):
+            _LOGGER.debug("Measurement data list is empty for %s", self.name)
+            return None
+
+        if "forecasts" not in forecast_data or not forecast_data["forecasts"]:
+            _LOGGER.debug("Forecast data list is empty for %s", self.name)
             return None
 
         self._location_data = {

custom_components/dwd_global_rad/manifest.json

@@ -9,6 +9,6 @@
   "iot_class": "cloud_polling",
   "requirements": [],
   "ssdp": [],
-  "version": "0.2.8-beta",
+  "version": "0.2.9-beta",
   "zeroconf": []
 }

custom_components/dwd_global_rad/utils.py

@@ -9,6 +9,8 @@
     - homeassistant.util.dt: Provides date and time utility functions for Home Assistant.
 """
 
+import logging
+
 from homeassistant.util.dt import as_local, utc_from_timestamp
 
 
@@ -18,3 +20,33 @@ def convert_to_local(timestamp):
     utc_dt = utc_from_timestamp(timestamp)
     # Return local datetime object
     return as_local(utc_dt)
+
+
+def setup_logger(name, level=logging.DEBUG, log_file=None):
+    """Set up logger with the specified name and level."""
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+
+    # Create console handler and set level to debug
+    ch = logging.StreamHandler()
+    ch.setLevel(level)
+
+    # Create formatter
+    formatter = logging.Formatter(
+        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    )
+
+    # Add formatter to ch
+    ch.setFormatter(formatter)
+
+    # Add ch to logger
+    logger.addHandler(ch)
+
+    # Optional: Add file handler
+    if log_file:
+        fh = logging.FileHandler(log_file)
+        fh.setLevel(level)
+        fh.setFormatter(formatter)
+        logger.addHandler(fh)
+
+    return logger