weather code float to int fix (#17)

* weather code float to int fix

* add unittests and add better error handling

Author: cybcon

Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.23.2
 
 LABEL maintainer="Michael Oberdorf <info@oberdorf-itc.de>"
-LABEL site.local.program.version="1.3.3"
+LABEL site.local.program.version="1.3.4"
 
 ENV TZ="UTC" \
     REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt \

README.md

@@ -26,7 +26,8 @@ Container image: [DockerHub](https://hub.docker.com/r/oitc/weather2mqtt)
 
 # Supported tags and respective `Dockerfile` links
 
-* [`latest`, `1.3.3`](https://github.com/cybcon/docker.weather2mqtt/blob/v1.3.3/Dockerfile)
+* [`latest`, `1.3.4`](https://github.com/cybcon/docker.weather2mqtt/blob/v1.3.4/Dockerfile)
+* [`1.3.3`](https://github.com/cybcon/docker.weather2mqtt/blob/v1.3.3/Dockerfile)
 * [`1.3.1`](https://github.com/cybcon/docker.weather2mqtt/blob/v1.3.1/Dockerfile)
 * [`1.3.0`](https://github.com/cybcon/docker.weather2mqtt/blob/v1.3.0/Dockerfile)
 * [`1.2.0`](https://github.com/cybcon/docker.weather2mqtt/blob/v1.2.0/Dockerfile)

src/app/bin/lib/weather_codes/__init__.py

@@ -13,7 +13,7 @@
 __author__ = "Michael Oberdorf <info@oberdorf-itc.de>"
 __status__ = "production"
 __date__ = "2026-01-11"
-__version_info__ = ("1", "0", "1")
+__version_info__ = ("1", "0", "2")
 __version__ = ".".join(__version_info__)
 
 __all__ = ["WeatherCodes"]
@@ -53,8 +53,14 @@ def translate(self, code: int) -> str:
         :param code: Weather code
         :return: Human readable description
         """
-        # transform the code to int and str to fit to the json keys
-
+        if code is None:
+            self.logger.debug("Weather code is None, returning 'Unknown weather code'")
+            return "Unknown weather code"
+        if isinstance(code, str):
+            self.logger.debug(
+                f"Weather code {code} is a string but must be an integer, returning 'Unknown weather code'"
+            )
+            return "Unknown weather code"
         # Avoid "cannot convert float NaN to integer"
         if math.isnan(code):
             self.logger.debug(f"Weather code {code} is NaN, returning 'Unknown weather code'")

src/app/bin/weather2mqtt.py

@@ -18,6 +18,7 @@
 import datetime
 import json
 import logging
+import math
 import os
 import ssl
 import sys
@@ -29,7 +30,7 @@
 from lib.weather_codes import WeatherCodes
 from retry_requests import retry  # seeAlso: https://pypi.org/project/retry-requests/
 
-__version__ = "1.3.3"
+__version__ = "1.3.4"
 __script_path__ = os.path.dirname(__file__)
 __config_path__ = os.path.join(os.path.dirname(__script_path__), "etc")
 __local_tz__ = pytz.timezone("UTC")
@@ -266,13 +267,15 @@ def parse_current_weather(data: any, fields: list = []) -> dict:
     parsed_data = dict()
 
     parsed_data["time"] = datetime.datetime.fromtimestamp(data.Time(), tz=__local_tz__).isoformat()
+    log.debug(f"Current weather time: {parsed_data['time']}")
 
     for i in range(0, len(fields)):
         parsed_data[fields[i]] = data.Variables(i).Value()
         log.debug(f"{fields[i]}: {parsed_data[fields[i]]}")
 
     # Translate weather code
-    if "weather_code" in parsed_data.keys():
+    if "weather_code" in parsed_data.keys() and not math.isnan(parsed_data["weather_code"]):
+        parsed_data["weather_code"] = int(parsed_data["weather_code"])  # be sure it's an int
         weather_code_language = os.environ.get("WEATHER_CODE_LANGUAGE", "en")[0:2].lower()
         parsed_data["weather_code_text"] = WeatherCodes(language=weather_code_language).translate(
             code=parsed_data["weather_code"]
@@ -302,28 +305,34 @@ def parse_daily_weather(data: any, fields: list = []) -> dict:
     forecast_ends_at = datetime.datetime.fromtimestamp(data.TimeEnd(), tz=__local_tz__)
     delta = forecast_ends_at - forecast_starts_at
     interval = datetime.timedelta(seconds=data.Interval())
+    log.debug(
+        f"Range from {forecast_starts_at.strftime('%Y-%m-%d')} to {forecast_ends_at.strftime('%Y-%m-%d')} with interval {interval.days} days"
+    )
 
-    # print("Range from", daily_forecast_starts_at.strftime('%Y-%m-%d'), "to", daily_forecast_ends_at.strftime('%Y-%m-%d'), "with interval", interval.days, "days")
     interval_range = list()
     for i in range(delta.days):
         forecast_interval = (forecast_starts_at + i * interval).strftime("%Y-%m-%d")
         interval_range.append(forecast_interval)
+    log.debug(f"Interval range: {interval_range}")
 
     variables_with_time = [data.Variables(i) for i in range(0, data.VariablesLength())]
 
     for i in range(0, len(fields)):
-        # Not sure do we require to varify the field. Does field order matches?
-        # And what about sunshine?
         field = parsed_data[fields[i]] = dict()
         for j in range(len(interval_range)):
             field[interval_range[j]] = variables_with_time[i].Values(j)
+            log.debug(f"{fields[i]}[{interval_range[j]}]: {field[interval_range[j]]}")
 
     # Translate weather code
     if "weather_code" in parsed_data.keys():
         weather_code_language = os.environ.get("WEATHER_CODE_LANGUAGE", "en")[0:2].lower()
         parsed_data["weather_code_text"] = dict()
         for k, v in parsed_data["weather_code"].items():
-            parsed_data["weather_code_text"][k] = WeatherCodes(language=weather_code_language).translate(code=v)
+            if math.isnan(v):
+                parsed_data["weather_code_text"][k] = "Unknown weather code"
+                continue
+            parsed_data["weather_code"][k] = int(v)  # be sure it's an int
+            parsed_data["weather_code_text"][k] = WeatherCodes(language=weather_code_language).translate(code=int(v))
 
     log.debug(f"Parsed current weather: {parsed_data}")
     return parsed_data

test/test_weather2mqtt.py

@@ -1,18 +1,18 @@
 """
-***************************************************************************\n
-test_weather2mqtt.py is a python unit test for the python script\n
-   weather2mqtt.py\n
-Author: Michael Oberdorf\n
-Date:   2025-04-13\n
-Last modified by: Michael Oberdorf\n
-Last modified at: 2025-12-31\n
-***************************************************************************\n
+***************************************************************************
+test_weather2mqtt.py is a python unit test for the python script
+   weather2mqtt.py
+Author: Michael Oberdorf
+Date:   2025-04-13
+Last modified by: Michael Oberdorf
+Last modified at: 2026-01-11
+***************************************************************************
 """
 
 __author__ = "Michael Oberdorf <info@oberdorf-itc.de>"
 __status__ = "production"
-__date__ = "2025-12-31"
-__version_info__ = ("1", "0", "0")
+__date__ = "2026-01-11"
+__version_info__ = ("1", "0", "1")
 __version__ = ".".join(__version_info__)
 
 __all__ = ["TestWeather2Mqtt"]

test/test_weather_codes.py

@@ -1,18 +1,18 @@
 """
-***************************************************************************\n
+***************************************************************************
 test_weather_codes.py is a python unit test for the python module
-   weather_codes\n
-Author: Michael Oberdorf\n
-Date:   2025-04-11\n
-Last modified by: Michael Oberdorf\n
-Last modified at: 2025-04-12\n
-***************************************************************************\n
+   weather_codes
+Author: Michael Oberdorf
+Date:   2025-04-11
+Last modified by: Michael Oberdorf
+Last modified at: 2026-01-11
+***************************************************************************
 """
 
 __author__ = "Michael Oberdorf <info@oberdorf-itc.de>"
 __status__ = "production"
-__date__ = "2025-04-12"
-__version_info__ = ("1", "0", "0")
+__date__ = "2026-01-11"
+__version_info__ = ("1", "1", "0")
 __version__ = ".".join(__version_info__)
 
 __all__ = ["TestWeatherCodes"]
@@ -30,15 +30,48 @@ def test_translate(self):
 
         # Test cases for specific languages (English and German)
         self.assertEqual(WeatherCodes(language="en").translate(code=3), "Cloudy")
-        self.assertEqual(WeatherCodes(language="en").translate(code=199), "Unknown weather code")
         self.assertEqual(WeatherCodes(language="de").translate(code=45), "Nebel")
         self.assertEqual(WeatherCodes(language="de").translate(code=66), "Leichter Eisregen")
         self.assertEqual(WeatherCodes(language="de").translate(code=81), "Regenschauer")
-        self.assertEqual(WeatherCodes(language="de").translate(code=199), "Unknown weather code")
 
         # Test case for unsupported language (fallback to English)
         self.assertEqual(WeatherCodes(language="foo").translate(code=77), "Snow Grains")
 
+    def test_invalid_code(self):
+        # Check if invalid code returns "Unknown weather code"
+        self.assertEqual(WeatherCodes().translate(code=199), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="en").translate(code=199), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="de").translate(code=199), "Unknown weather code")
+
+    def test_negative_code(self):
+        # Check if negative code returns "Unknown weather code"
+        self.assertEqual(WeatherCodes().translate(code=-1), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="en").translate(code=-5), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="de").translate(code=-10), "Unknown weather code")
+
+    def test_large_code(self):
+        # Check if excessively large code returns "Unknown weather code"
+        self.assertEqual(WeatherCodes().translate(code=1000), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="en").translate(code=5000), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="de").translate(code=9999), "Unknown weather code")
+
+    def float_code(self):
+        # Check if float that is an integer returns correct translation
+        self.assertEqual(WeatherCodes().translate(code=2.0), "Partly cloudy")
+        self.assertEqual(WeatherCodes(language="en").translate(code=4.0), "Overcast")
+        self.assertEqual(WeatherCodes(language="de").translate(code=10.0), "Schneefall schwach")
+        # Check if float code returns "Unknown weather code"
+        self.assertEqual(WeatherCodes().translate(code=3.5), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="en").translate(code=7.2), "Unknown weather code")
+        self.assertEqual(WeatherCodes(language="de").translate(code=12.9), "Unknown weather code")
+
+    def test_non_integer_code(self):
+        # Check if non-integer code returns "Unknown weather code"
+        self.assertEqual(WeatherCodes().translate(code="abc"), "Unknown weather code")
+        self.assertEqual(WeatherCodes().translate(code=None), "Unknown weather code")
+        # Check if NaN is handled correctly
+        self.assertEqual(WeatherCodes().translate(code=float("nan")), "Unknown weather code")
+
 
 if __name__ == "__main__":
     unittest.main()