Merge pull request #50 from zestysoft/use_CCF_or_gal_for_units

Use different unit names

Author: zestysoft

custom_components/sensus_analytics/config_flow.py

@@ -50,7 +50,7 @@ async def async_step_user(self, user_input=None) -> FlowResult:
                 vol.Required(CONF_PASSWORD): str,
                 vol.Required(CONF_ACCOUNT_NUMBER): str,
                 vol.Required(CONF_METER_NUMBER): str,
-                vol.Required("unit_type", default="CF"): vol.In(["CF", "G"]),
+                vol.Required("unit_type", default="CCF"): vol.In(["CCF", "gal"]),
                 vol.Optional("tier1_gallons"): cv.positive_float,
                 vol.Required("tier1_price", default=0.0128): cv.positive_float,
                 vol.Optional("tier2_gallons"): cv.positive_float,
@@ -129,8 +129,8 @@ async def async_step_init(self, user_input=None) -> FlowResult:
                 ): str,
                 vol.Required(
                     "unit_type",
-                    default=current_data.get("unit_type", "CF"),
-                ): vol.In(["CF", "G"]),
+                    default=current_data.get("unit_type", "CCF"),
+                ): vol.In(["CCF", "gal"]),
                 vol.Optional(
                     "tier1_gallons",
                     default=current_data.get("tier1_gallons"),

custom_components/sensus_analytics/coordinator.py

@@ -2,12 +2,12 @@
 
 import logging
 from datetime import datetime, timedelta
-from urllib.parse import urljoin  # Import urljoin
+from urllib.parse import urljoin
 
 import requests
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt as dt_util  # Import HA's datetime utilities
+from homeassistant.util import dt as dt_util
 
 from .const import CONF_ACCOUNT_NUMBER, CONF_BASE_URL, CONF_METER_NUMBER, CONF_PASSWORD, CONF_USERNAME, DOMAIN
 
@@ -119,7 +119,7 @@ def _retrieve_hourly_data(self, session: requests.Session, target_date: datetime
 
         try:
             response = session.get(usage_url, params=params, timeout=10)
-            response.raise_for_status()  # Ensure the request was successful
+            response.raise_for_status()
             hourly_data = response.json()
             _LOGGER.debug("Hourly data response: %s", hourly_data)
 
@@ -177,7 +177,7 @@ def _process_hourly_data_response(self, hourly_data):
             return None
 
         # The first element contains units
-        units = usage_list[0]  # ["CF", "INCHES", "FAHRENHEIT", "CF"]
+        units = usage_list[0]  # ["CCF", "INCHES", "FAHRENHEIT", "gal"]
         usage_unit = units[0]
         rain_unit = units[1]
         temp_unit = units[2]

custom_components/sensus_analytics/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "sensus_analytics",
   "name": "Sensus Analytics Integration",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "documentation": "https://github.com/zestysoft/sensus_analytics_integration",
   "dependencies": [],
   "codeowners": ["@zestysoft"],

custom_components/sensus_analytics/sensor.py

@@ -115,7 +115,7 @@ def __init__(self, coordinator, entry):
         self._attr_name = f"{DEFAULT_NAME} Daily Usage"
         self._attr_unique_id = f"{self._unique_id}_daily_usage"
         self._attr_icon = "mdi:water"
-        self._attr_device_class = SensorDeviceClass.WATER  # Set device class to water
+        self._attr_device_class = SensorDeviceClass.WATER
 
     @property
     def native_value(self):
@@ -240,7 +240,7 @@ def __init__(self, coordinator, entry):
         self._attr_name = f"{DEFAULT_NAME} Meter Odometer"
         self._attr_unique_id = f"{self._unique_id}_meter_odometer"
         self._attr_icon = "mdi:water"
-        self._attr_device_class = SensorDeviceClass.WATER  # Set device class to water
+        self._attr_device_class = SensorDeviceClass.WATER
 
     @property
     def native_value(self):
@@ -258,7 +258,7 @@ def __init__(self, coordinator, entry):
         self._attr_name = f"{DEFAULT_NAME} Billing Usage"
         self._attr_unique_id = f"{self._unique_id}_billing_usage"
         self._attr_icon = "mdi:water"
-        self._attr_device_class = SensorDeviceClass.WATER  # Set device class to water
+        self._attr_device_class = SensorDeviceClass.WATER
 
     @property
     def native_value(self):
@@ -385,7 +385,7 @@ def __init__(self, coordinator, entry):
         self._attr_name = f"{DEFAULT_NAME} Last Hour Usage"
         self._attr_unique_id = f"{self._unique_id}_last_hour_usage"
         self._attr_icon = "mdi:water"
-        self._attr_device_class = SensorDeviceClass.WATER  # Set device class to water
+        self._attr_device_class = SensorDeviceClass.WATER
 
     @property
     def native_value(self):

custom_components/sensus_analytics/strings.json

@@ -10,7 +10,7 @@
           "password": "Password",
           "account_number": "Account Number",
           "meter_number": "Meter Number",
-          "unit_type": "Unit Type (CF or G)",
+          "unit_type": "Unit Type (CCF or gal)",
           "tier1_gallons": "Tier 1 Gallons",
           "tier1_price": "Tier 1 Price",
           "tier2_gallons": "Tier 2 Gallons",
@@ -37,7 +37,7 @@
           "password": "Password",
           "account_number": "Account Number",
           "meter_number": "Meter Number",
-          "unit_type": "Unit Type (CF or G)",
+          "unit_type": "Unit Type (CCF or gal)",
           "tier1_gallons": "Tier 1 Gallons",
           "tier1_price": "Tier 1 Price",
           "tier2_gallons": "Tier 2 Gallons",