gazpar2haws 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

gazpar2haws/bridge.py

@@ -16,12 +16,30 @@ class Bridge:
     def __init__(self, config: config_utils.ConfigLoader):
 
         # GrDF scan interval (in seconds)
+        if config.get("grdf.scan_interval") is None:
+            raise ValueError("Configuration parameter 'grdf.scan_interval' is missing")
         self._grdf_scan_interval = int(config.get("grdf.scan_interval"))
 
-        # Home Assistant configuration
+        # Home Assistant configuration: host
+        if config.get("homeassistant.host") is None:
+            raise ValueError("Configuration parameter 'homeassistant.host' is missing")
         ha_host = config.get("homeassistant.host")
+
+        # Home Assistant configuration: port
+        if config.get("homeassistant.port") is None:
+            raise ValueError("Configuration parameter 'homeassistant.port' is missing")
         ha_port = config.get("homeassistant.port")
-        ha_endpoint = config.get("homeassistant.endpoint")
+
+        # Home Assistant configuration: endpoint
+        ha_endpoint = (
+            config.get("homeassistant.endpoint")
+            if config.get("homeassistant.endpoint")
+            else "/api/websocket"
+        )
+
+        # Home Assistant configuration: token
+        if config.get("homeassistant.token") is None:
+            raise ValueError("Configuration parameter 'homeassistant.token' is missing")
         ha_token = config.get("homeassistant.token")
 
         # Initialize Home Assistant
@@ -29,6 +47,9 @@ class Bridge:
 
         # Initialize Gazpar
         self._gazpar = []
+
+        if config.get("grdf.devices") is None:
+            raise ValueError("Configuration parameter 'grdf.devices' is missing")
         for grdf_device_config in config.get("grdf.devices"):
             self._gazpar.append(Gazpar(grdf_device_config, self._homeassistant))
 

gazpar2haws/gazpar.py

@@ -19,15 +19,59 @@ class Gazpar:
 
         self._homeassistant = homeassistant
 
-        # GrDF configuration
+        # GrDF configuration: name
+        if config.get("name") is None:
+            raise ValueError("Configuration parameter 'grdf.devices[].name' is missing")
         self._name = config.get("name")
-        self._data_source = config.get("data_source")
+
+        # GrDF configuration: data source
+        self._data_source = (
+            config.get("data_source") if config.get("data_source") else "json"
+        )
+
+        # GrDF configuration: username
+        if self._data_source != "test" and config.get("username") is None:
+            raise ValueError(
+                "Configuration parameter 'grdf.devices[].username' is missing"
+            )
         self._username = config.get("username")
+
+        # GrDF configuration: password
+        if self._data_source != "test" and config.get("password") is None:
+            raise ValueError(
+                "Configuration parameter 'grdf.devices[].password' is missing"
+            )
         self._password = config.get("password")
+
+        # GrDF configuration: pce_identifier
+        if self._data_source != "test" and config.get("pce_identifier") is None:
+            raise ValueError(
+                "Configuration parameter 'grdf.devices[].pce_identifier' is missing"
+            )
         self._pce_identifier = str(config.get("pce_identifier"))
-        self._tmp_dir = config.get("tmp_dir")
+
+        # GrDF configuration: tmp_dir
+        self._tmp_dir = config.get("tmp_dir") if config.get("tmp_dir") else "/tmp"
+
+        # GrDF configuration: last_days
+        if config.get("last_days") is None:
+            raise ValueError(
+                "Configuration parameter 'grdf.devices[].last_days' is missing"
+            )
         self._last_days = int(str(config.get("last_days")))
+
+        # GrDF configuration: timezone
+        if config.get("timezone") is None:
+            raise ValueError(
+                "Configuration parameter 'grdf.devices[].timezone' is missing"
+            )
         self._timezone = str(config.get("timezone"))
+
+        # GrDF configuration: reset
+        if config.get("reset") is None:
+            raise ValueError(
+                "Configuration parameter 'grdf.devices[].reset' is missing"
+            )
         self._reset = bool(config.get("reset"))
 
         # As of date: YYYY-MM-DD
@@ -43,7 +87,8 @@ class Gazpar:
 
         # Set the timezone
         timezone = pytz.timezone(self._timezone)
-        self._as_of_date = timezone.localize(self._as_of_date)
+        if self._as_of_date.tzinfo is None:
+            self._as_of_date = timezone.localize(self._as_of_date)
 
     # ----------------------------------
     def name(self):
@@ -128,7 +173,13 @@ class Gazpar:
                 continue
 
             # Compute the total volume and energy
-            total += reading[property_name]
+            if reading[property_name] is not None:
+                total += reading[property_name]
+            else:
+                Logger.warning(
+                    f"Missing property {property_name} for date {date}. Skipping..."
+                )
+                continue
 
             statistics.append({"start": date.isoformat(), "state": total, "sum": total})
 

{gazpar2haws-0.1.10.dist-info → gazpar2haws-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gazpar2haws
-Version: 0.1.10
+Version: 0.1.12
 Summary: Gazpar2HAWS is a gateway that reads data history from the GrDF (French gas provider) meter and send it to Home Assistant using WebSocket interface
 License: MIT License
          

{gazpar2haws-0.1.10.dist-info → gazpar2haws-0.1.12.dist-info}/RECORD

@@ -1,11 +1,11 @@
 gazpar2haws/__init__.py,sha256=3MCDQdGGmT3FQMKaAB3mBJq7L75T_bJSdpDRjE-pado,58
 gazpar2haws/__main__.py,sha256=KdhkowqJP6L8WTF9FNpTy4ZzDf1OPARm6mVtMclxGFk,3265
-gazpar2haws/bridge.py,sha256=s8ENqugNhxTJMAOJzRwVt1YidwxzbPfwdWKx7TLQN7w,3625
+gazpar2haws/bridge.py,sha256=IDunENo7bQ9NDov76IEefAkMOen-6Wc_2NZcHGyk_XI,4601
 gazpar2haws/config_utils.py,sha256=89ClKudFGxiT_EnzqRhfEvYVm9SeWq6U2xhNjvm3hhs,2161
-gazpar2haws/gazpar.py,sha256=6FyKUKtvn9zlpHbyaUvEYs6uUK7Bnx8LDGB9Nbs_E58,8327
+gazpar2haws/gazpar.py,sha256=29RfLxBaBCpoopOBpCX3xh681Ksm5pjZlLu9l3PqTAI,10321
 gazpar2haws/haws.py,sha256=H--UWGECYq9JYlbU6IHLO2btaRXInwoVRZnHIXSA1ts,8169
 gazpar2haws/version.py,sha256=9Iq5Jm63Ev7QquCjhDqa9_KAgHdKl9FJHynq8M6JNrY,83
-gazpar2haws-0.1.10.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
-gazpar2haws-0.1.10.dist-info/METADATA,sha256=1XWk-lyLPStqcb-3ln9dWTB-Z3u82UpV_b83G_PClJw,9451
-gazpar2haws-0.1.10.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-gazpar2haws-0.1.10.dist-info/RECORD,,
+gazpar2haws-0.1.12.dist-info/LICENSE,sha256=ajApZPyhVx8AU9wN7DXeRGhoWFqY2ylBZUa5GRhTmok,1073
+gazpar2haws-0.1.12.dist-info/METADATA,sha256=NmIJJEnASLPY2zzI3Zc39PGjwI73KUEEHIKANjmgGBc,9451
+gazpar2haws-0.1.12.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+gazpar2haws-0.1.12.dist-info/RECORD,,