diff --git a/custom_components/fpl/ProjectedBillSensor.py b/custom_components/fpl/ProjectedBillSensor.py new file mode 100644 index 0000000..8945dd0 --- /dev/null +++ b/custom_components/fpl/ProjectedBillSensor.py @@ -0,0 +1,36 @@ +from .FplSensor import FplSensor + + +class FplProjectedBillSensor(FplSensor): + def __init__(self, hass, config, account): + FplSensor.__init__(self, hass, config, account, "Projected Bill") + + @property + def state(self): + data = self.data + try: + if "budget_bill" in data.keys(): + if data["budget_bill"]: + if "budget_billing_projected_bill" in data.keys(): + self._state = data["budget_billing_projected_bill"] + else: + if "projected_bill" in data.keys(): + self._state = data["projected_bill"] + except: + pass + + return self._state + + @property + def device_state_attributes(self): + """Return the state attributes.""" + + if "budget_bill" in self.data.keys(): + self.attr["budget_bill"] = self.data["budget_bill"] + + + return self._state + + @property + def icon(self): + return "mdi:currency-usd" \ No newline at end of file diff --git a/custom_components/fpl/fplapi.py b/custom_components/fpl/fplapi.py new file mode 100644 index 0000000..857b35a --- /dev/null +++ b/custom_components/fpl/fplapi.py @@ -0,0 +1,346 @@ +import logging +from datetime import datetime + +import aiohttp +import async_timeout +import json +import sys + + +# from bs4 import BeautifulSoup + +STATUS_CATEGORY_OPEN = "OPEN" +# Api login result +LOGIN_RESULT_OK = "OK" +LOGIN_RESULT_INVALIDUSER = "NOTVALIDUSER" +LOGIN_RESULT_INVALIDPASSWORD = "FAILEDPASSWORD" +LOGIN_RESULT_UNAUTHORIZED = "UNAUTHORIZED" +LOGIN_RESULT_FAILURE = "FAILURE" + +_LOGGER = logging.getLogger(__package__) +TIMEOUT = 30 + +URL_LOGIN = "https://www.fpl.com/api/resources/login" +URL_RESOURCES_HEADER = "https://www.fpl.com/api/resources/header" +URL_RESOURCES_ACCOUNT = "https://www.fpl.com/api/resources/account/{account}" +URL_RESOURCES_PROJECTED_BILL = "https://www.fpl.com/api/resources/account/{account}/projectedBill?premiseNumber={premise}&lastBilledDate={lastBillDate}" + +ENROLLED = "ENROLLED" +NOTENROLLED = "NOTENROLLED" + + +class FplApi(object): + """A class for getting energy usage information from Florida Power & Light.""" + + def __init__(self, username, password, session): + """Initialize the data retrieval. Session should have BasicAuth flag set.""" + self._username = username + self._password = password + self._session = session + + async def async_get_data(self) -> dict: + # self._session = aiohttp.ClientSession() + data = {} + data["accounts"] = [] + if await self.login() == LOGIN_RESULT_OK: + accounts = await self.async_get_open_accounts() + + data["accounts"] = accounts + for account in accounts: + accountData = await self.__async_get_data(account) + data[account] = accountData + + await self.logout() + return data + + async def login(self): + _LOGGER.info("Logging in") + # login and get account information + result = LOGIN_RESULT_OK + try: + async with async_timeout.timeout(TIMEOUT): + response = await self._session.get( + URL_LOGIN, auth=aiohttp.BasicAuth(self._username, self._password) + ) + + js = json.loads(await response.text()) + + if response.reason == "Unauthorized": + result = LOGIN_RESULT_UNAUTHORIZED + + if js["messages"][0]["messageCode"] != "login.success": + _LOGGER.error(f"Logging Failure") + result = LOGIN_RESULT_FAILURE + + _LOGGER.info(f"Logging Successful") + + except Exception as e: + _LOGGER.error(f"Error {e} : {sys.exc_info()[0]}") + result = LOGIN_RESULT_FAILURE + + return result + + async def logout(self): + _LOGGER.info("Logging out") + URL = "https://www.fpl.com/api/resources/logout" + async with async_timeout.timeout(TIMEOUT): + await self._session.get(URL) + + async def async_get_open_accounts(self): + _LOGGER.info(f"Getting accounts") + result = [] + + try: + async with async_timeout.timeout(TIMEOUT): + response = await self._session.get(URL_RESOURCES_HEADER) + + js = await response.json() + accounts = js["data"]["accounts"]["data"]["data"] + + for account in accounts: + if account["statusCategory"] == STATUS_CATEGORY_OPEN: + result.append(account["accountNumber"]) + except Exception as e: + _LOGGER.error(f"Getting accounts {e}") + + # self._account_number = js["data"]["selectedAccount"]["data"]["accountNumber"] + # self._premise_number = js["data"]["selectedAccount"]["data"]["acctSecSettings"]["premiseNumber"] + return result + + async def __async_get_data(self, account) -> dict: + _LOGGER.info(f"Getting Data") + data = {} + + async with async_timeout.timeout(TIMEOUT): + response = await self._session.get( + URL_RESOURCES_ACCOUNT.format(account=account) + ) + accountData = (await response.json())["data"] + + premise = accountData["premiseNumber"].zfill(9) + + # currentBillDate + currentBillDate = datetime.strptime( + accountData["currentBillDate"].replace("-", "").split("T")[0], "%Y%m%d" + ).date() + + # nextBillDate + nextBillDate = datetime.strptime( + accountData["nextBillDate"].replace("-", "").split("T")[0], "%Y%m%d" + ).date() + + data["current_bill_date"] = str(currentBillDate) + data["next_bill_date"] = str(nextBillDate) + + today = datetime.now().date() + remaining = (nextBillDate - today).days + days = (today - currentBillDate).days + + data["service_days"] = (nextBillDate - currentBillDate).days + data["as_of_days"] = days + data["remaining_days"] = remaining + + # zip code + zip_code = accountData["serviceAddress"]["zip"] + + # projected bill + pbData = await self.__getFromProjectedBill(account, premise, currentBillDate) + data.update(pbData) + + # programs + programsData = accountData["programs"]["data"] + + programs = dict() + _LOGGER.info(f"Getting Programs") + for program in programsData: + if "enrollmentStatus" in program.keys(): + key = program["name"] + programs[key] = program["enrollmentStatus"] == ENROLLED + + if programs["BBL"]: + # budget billing + data["budget_bill"] = True + bblData = await self.__getBBL_async(account, data) + data.update(bblData) + + data.update( + await self.__getDataFromEnergyService(account, premise, currentBillDate) + ) + + data.update(await self.__getDataFromApplianceUsage(account, currentBillDate)) + return data + + async def __getFromProjectedBill(self, account, premise, currentBillDate) -> dict: + data = {} + + try: + async with async_timeout.timeout(TIMEOUT): + response = await self._session.get( + URL_RESOURCES_PROJECTED_BILL.format( + account=account, + premise=premise, + lastBillDate=currentBillDate.strftime("%m%d%Y"), + ) + ) + + if response.status == 200: + + projectedBillData = (await response.json())["data"] + + billToDate = float(projectedBillData["billToDate"]) + projectedBill = float(projectedBillData["projectedBill"]) + dailyAvg = float(projectedBillData["dailyAvg"]) + avgHighTemp = int(projectedBillData["avgHighTemp"]) + + data["bill_to_date"] = billToDate + data["projected_bill"] = projectedBill + data["daily_avg"] = dailyAvg + data["avg_high_temp"] = avgHighTemp + except: + pass + + return data + + async def __getBBL_async(self, account, projectedBillData) -> dict: + _LOGGER.info(f"Getting budget billing data") + data = {} + + URL = "https://www.fpl.com/api/resources/account/{account}/budgetBillingGraph/premiseDetails" + try: + async with async_timeout.timeout(TIMEOUT): + response = await self._session.get(URL.format(account=account)) + if response.status == 200: + r = (await response.json())["data"] + dataList = r["graphData"] + + startIndex = len(dataList) - 1 + + billingCharge = 0 + budgetBillDeferBalance = r["defAmt"] + + projectedBill = projectedBillData["projected_bill"] + asOfDays = projectedBillData["as_of_days"] + + for det in dataList: + billingCharge += det["actuallBillAmt"] + + calc1 = (projectedBill + billingCharge) / 12 + calc2 = (1 / 12) * (budgetBillDeferBalance) + + projectedBudgetBill = round(calc1 + calc2, 2) + bbDailyAvg = round(projectedBudgetBill / 30, 2) + bbAsOfDateAmt = round(projectedBudgetBill / 30 * asOfDays, 2) + + data["budget_billing_daily_avg"] = bbDailyAvg + data["budget_billing_bill_to_date"] = bbAsOfDateAmt + + data["budget_billing_projected_bill"] = float(projectedBudgetBill) + except: + pass + + URL = "https://www.fpl.com/api/resources/account/{account}/budgetBillingGraph" + + try: + async with async_timeout.timeout(TIMEOUT): + response = await self._session.get(URL.format(account=account)) + if response.status == 200: + r = (await response.json())["data"] + data["bill_to_date"] = float(r["eleAmt"]) + data["defered_amount"] = float(r["defAmt"]) + except: + pass + + return data + + async def __getDataFromEnergyService( + self, account, premise, lastBilledDate + ) -> dict: + _LOGGER.info(f"Getting data from energy service") + URL = "https://www.fpl.com/dashboard-api/resources/account/{account}/energyService/{account}" + + date = str(lastBilledDate.strftime("%m%d%Y")) + JSON = { + "recordCount": 24, + "status": 2, + "channel": "WEB", + "amrFlag": "Y", + "accountType": "RESIDENTIAL", + "revCode": "1", + "premiseNumber": premise, + "projectedBillFlag": True, + "billComparisionFlag": True, + "monthlyFlag": True, + "frequencyType": "Daily", + "lastBilledDate": date, + "applicationPage": "resDashBoard", + } + + data = {} + + async with async_timeout.timeout(TIMEOUT): + response = await self._session.post(URL.format(account=account), json=JSON) + if response.status == 200: + r = (await response.json())["data"] + dailyUsage = [] + + # totalPowerUsage = 0 + if "data" in r["DailyUsage"]: + for daily in r["DailyUsage"]["data"]: + if ( + "kwhUsed" in daily.keys() + and "billingCharge" in daily.keys() + and "date" in daily.keys() + and "averageHighTemperature" in daily.keys() + ): + dailyUsage.append( + { + "usage": daily.get("kwhUsed"), + "cost": daily.get("billingCharge"), + "date": daily.get("date"), + "max_temperature": daily.get( + "averageHighTemperature" + ), + "netDeliveredKwh": daily.get("netDeliveredKwh"), + "netReceivedKwh": daily.get("netReceivedKwh"), + "readTime": daily.get("readTime"), + } + ) + # totalPowerUsage += int(daily["kwhUsed"]) + + # data["total_power_usage"] = totalPowerUsage + data["daily_usage"] = dailyUsage + + data["projectedKWH"] = r["CurrentUsage"].get("projectedKWH") + data["dailyAverageKWH"] = r["CurrentUsage"].get("dailyAverageKWH") + data["billToDateKWH"] = r["CurrentUsage"].get("billToDateKWH") + data["recMtrReading"] = r["CurrentUsage"].get("recMtrReading") + data["delMtrReading"] = r["CurrentUsage"].get("delMtrReading") + data["billStartDate"] = r["CurrentUsage"].get("billStartDate") + return data + + async def __getDataFromApplianceUsage(self, account, lastBilledDate) -> dict: + _LOGGER.info(f"Getting data from applicance usage") + URL = "https://www.fpl.com/dashboard-api/resources/account/{account}/applianceUsage/{account}" + JSON = {"startDate": str(lastBilledDate.strftime("%m%d%Y"))} + data = {} + try: + async with async_timeout.timeout(TIMEOUT): + response = await self._session.post( + URL.format(account=account), json=JSON + ) + if response.status == 200: + electric = (await response.json())["data"]["electric"] + + full = 100 + for e in electric: + rr = round(float(e["percentageDollar"])) + if rr < full: + full = full - rr + else: + rr = full + data[e["category"].replace(" ", "_")] = rr + + except: + pass + + return {"energy_percent_by_applicance": data} diff --git a/custom_components/fpl/sensor_AllData.py b/custom_components/fpl/sensor_AllData.py new file mode 100644 index 0000000..d8395fd --- /dev/null +++ b/custom_components/fpl/sensor_AllData.py @@ -0,0 +1,33 @@ +from .fplEntity import FplEntity + + +class AllDataSensor(FplEntity): + def __init__(self, coordinator, config, account): + super().__init__(coordinator, config, account, "") + + @property + def state(self): + budget = self.getData("budget_bill") + budget_billing_projected_bill = self.getData("budget_billing_projected_bill") + + if budget == True and budget_billing_projected_bill is not None: + return self.getData("budget_billing_projected_bill") + + try: + self._state=self.getData("projected_bill") + except: + pass + return self._state + + @property + def icon(self): + return "mdi:currency-usd" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Budget Projected Bill" + attributes["device_class"] = "monetary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" + return attributes \ No newline at end of file diff --git a/custom_components/fpl/sensor_DailyUsageSensor.py b/custom_components/fpl/sensor_DailyUsageSensor.py new file mode 100644 index 0000000..23ab8ed --- /dev/null +++ b/custom_components/fpl/sensor_DailyUsageSensor.py @@ -0,0 +1,172 @@ +from .fplEntity import FplEnergyEntity, FplMoneyEntity + + +class FplDailyUsageSensor(FplMoneyEntity): + def __init__(self, coordinator, config, account): + super().__init__(coordinator, config, account, "Daily Usage") + + @property + def state(self): + data = self.getData("daily_usage") + + try: + self._state = data[-1]["cost"] + except: + pass + return self._state + + def defineAttributes(self): + """Return the state attributes.""" + data = self.getData("daily_usage") + attributes = {} + attributes["friendly_name"] = "Daily Usage" + attributes["device_class"] = "monetary" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "$" + if data is not None: + if ( + (len(data) > 0) + and (data[-1] is not None) + and (data[-1]["readTime"] is not None) + ): + attributes["date"] = data[-1]["readTime"] + if ( + (len(data) > 1) + and (data[-2] is not None) + and (data[-2]["readTime"] is not None) + ): + attributes["last_reset"] = data[-2]["readTime"] + return attributes + + +class FplDailyUsageKWHSensor(FplEnergyEntity): + def __init__(self, coordinator, config, account): + super().__init__(coordinator, config, account, "Daily Usage KWH") + + @property + def state(self): + data = self.getData("daily_usage") + + try: + self._state = data[-1]["usage"] + except: + pass + return self._state + + def defineAttributes(self): + """Return the state attributes.""" + data = self.getData("daily_usage") + + attributes = {} + attributes["friendly_name"] = "Daily Usage" + attributes["device_class"] = "energy" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "kWh" + + if data is not None: + if ( + (len(data) > 0) + and (data[-1] is not None) + and (data[-1]["readTime"] is not None) + ): + attributes["date"] = data[-1]["readTime"] + if ( + (len(data) > 1) + and (data[-2] is not None) + and (data[-2]["readTime"] is not None) + ): + attributes["last_reset"] = data[-2]["readTime"] + + return attributes + + @property + def icon(self): + return "mdi:flash" + + +class FplDailyReceivedKWHSensor(FplEntity): + def __init__(self, coordinator, config, account): + super().__init__(coordinator, config, account, "Daily Received KWH") + + @property + def state(self): + data = self.getData("daily_usage") + try: + self._state = data[-1]["netReceivedKwh"] + except: + pass + return self._state + + def defineAttributes(self): + """Return the state attributes.""" + data = self.getData("daily_usage") + + attributes = {} + attributes["friendly_name"] = "Daily Return to Grid" + attributes["device_class"] = "energy" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "kWh" + if data is not None: + if ( + (len(data) > 0) + and (data[-1] is not None) + and (data[-1]["readTime"] is not None) + ): + attributes["date"] = data[-1]["readTime"] + if ( + (len(data) > 1) + and (data[-2] is not None) + and (data[-2]["readTime"] is not None) + ): + attributes["last_reset"] = data[-2]["readTime"] + return attributes + + @property + def icon(self): + return "mdi:flash" + + +class FplDailyDeliveredKWHSensor(FplEntity): + def __init__(self, coordinator, config, account): + super().__init__(coordinator, config, account, "Daily Delivered KWH") + + @property + def state(self): + data = self.getData("daily_usage") + try: + self._state = data[-1]["netDeliveredKwh"] + except: + pass + return self._state + + def defineAttributes(self): + """Return the state attributes.""" + data = self.getData("daily_usage") + +<<<<<<< HEAD + return {} +======= + attributes = {} + attributes["friendly_name"] = "Daily Consumption" + attributes["device_class"] = "energy" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "kWh" + if data is not None: + if ( + (len(data) > 0) + and (data[-1] is not None) + and (data[-1]["readTime"] is not None) + ): + attributes["date"] = data[-1]["readTime"] + if ( + (len(data) > 1) + and (data[-2] is not None) + and (data[-2]["readTime"] is not None) + ): + attributes["last_reset"] = data[-2]["readTime"] + return attributes + + @property + def icon(self): + return "mdi:flash" +>>>>>>> master diff --git a/custom_components/fpl1/const.py b/custom_components/fpl1/const.py index cb9ee79..908e2bb 100644 --- a/custom_components/fpl1/const.py +++ b/custom_components/fpl1/const.py @@ -3,7 +3,7 @@ NAME = "FPL Integration" DOMAIN = "fpl" DOMAIN_DATA = f"{DOMAIN}_data" -VERSION = "0.0.1" +VERSION = "0.1.0" PLATFORMS = ["sensor"] REQUIRED_FILES = [ ".translations/en.json", diff --git a/custom_components/fpl1/fplEntity.py b/custom_components/fpl1/fplEntity.py index 91b0553..295923e 100644 --- a/custom_components/fpl1/fplEntity.py +++ b/custom_components/fpl1/fplEntity.py @@ -30,16 +30,17 @@ class FplEntity(CoordinatorEntity, SensorEntity): DOMAIN, self.account, self.sensorName.lower().replace(" ", "") ) - @property - def name(self): - return f"{DOMAIN.upper()} {self.account} {self.sensorName}" - @property def device_info(self): return { "identifiers": {(DOMAIN, self.account)}, "name": f"FPL Account {self.account}", +<<<<<<< HEAD:custom_components/fpl1/fplEntity.py "model": VERSION, +======= + "model": "FPL Monitoring API", + "sw_version": VERSION, +>>>>>>> master:custom_components/fpl/fplEntity.py "manufacturer": "Florida Power & Light", } diff --git a/custom_components/fpl1/manifest.json b/custom_components/fpl1/manifest.json index 0397962..ec5fb6d 100644 --- a/custom_components/fpl1/manifest.json +++ b/custom_components/fpl1/manifest.json @@ -12,5 +12,6 @@ "integrationhelper" ], "version": "1.0.0", - "issue_tracker": "https://github.com/dotKrad/hass-fpl/issues" + "issue_tracker": "https://github.com/dotKrad/hass-fpl/issues", + "homeassistant": "2021.12.7" } \ No newline at end of file diff --git a/custom_components/fpl1/sensor.py b/custom_components/fpl1/sensor.py index 45bb018..d390b82 100644 --- a/custom_components/fpl1/sensor.py +++ b/custom_components/fpl1/sensor.py @@ -23,7 +23,6 @@ from .sensor_ProjectedBillSensor import ( from .sensor_AverageDailySensor import ( DailyAverageSensor, BudgetDailyAverageSensor, - ActualDailyAverageSensor, ) from .sensor_DailyUsageSensor import ( FplDailyUsageKWHSensor, @@ -31,6 +30,10 @@ from .sensor_DailyUsageSensor import ( FplDailyDeliveredKWHSensor, FplDailyReceivedKWHSensor, ) +<<<<<<< HEAD:custom_components/fpl1/sensor.py +======= + +>>>>>>> master:custom_components/fpl/sensor.py from .const import DOMAIN # from .TestSensor import TestSensor @@ -56,10 +59,10 @@ async def async_setup_entry(hass, entry, async_add_devices): # usage sensors fpl_accounts.append(DailyAverageSensor(coordinator, entry, account)) fpl_accounts.append(BudgetDailyAverageSensor(coordinator, entry, account)) - fpl_accounts.append(ActualDailyAverageSensor(coordinator, entry, account)) - fpl_accounts.append(FplDailyUsageSensor(coordinator, entry, account)) fpl_accounts.append(FplDailyUsageKWHSensor(coordinator, entry, account)) + fpl_accounts.append(FplDailyReceivedKWHSensor(coordinator, entry, account)) + fpl_accounts.append(FplDailyDeliveredKWHSensor(coordinator, entry, account)) # date sensors fpl_accounts.append(CurrentBillDateSensor(coordinator, entry, account)) @@ -72,6 +75,9 @@ async def async_setup_entry(hass, entry, async_add_devices): fpl_accounts.append(ProjectedKWHSensor(coordinator, entry, account)) fpl_accounts.append(DailyAverageKWHSensor(coordinator, entry, account)) fpl_accounts.append(BillToDateKWHSensor(coordinator, entry, account)) + fpl_accounts.append(NetReceivedKWHSensor(coordinator, entry, account)) + fpl_accounts.append(NetDeliveredKWHSensor(coordinator, entry, account)) + fpl_accounts.append(NetReceivedKWHSensor(coordinator, entry, account)) fpl_accounts.append(NetDeliveredKWHSensor(coordinator, entry, account)) diff --git a/custom_components/fpl1/sensor_AverageDailySensor.py b/custom_components/fpl1/sensor_AverageDailySensor.py index f997c0c..51edb16 100644 --- a/custom_components/fpl1/sensor_AverageDailySensor.py +++ b/custom_components/fpl1/sensor_AverageDailySensor.py @@ -17,14 +17,36 @@ class DailyAverageSensor(FplMoneyEntity): if budget and budget_billing_projected_bill is not None: return self.getData("budget_billing_daily_avg") - return self.getData("daily_avg") + try: + self._state=self.getData("daily_avg") + except: + pass + return self._state +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:currency-usd" + +<<<<<<< HEAD:custom_components/fpl1/sensor_AverageDailySensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Daily Average" + attributes["device_class"] = "monetary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" + return attributes +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_AverageDailySensor.py class BudgetDailyAverageSensor(FplMoneyEntity): """budget daily average sensor""" @@ -34,14 +56,22 @@ class BudgetDailyAverageSensor(FplMoneyEntity): @property def state(self): - return self.getData("budget_billing_daily_avg") + try: + self._state= self.getData("budget_billing_daily_avg") + except: + pass + return self._state +<<<<<<< HEAD:custom_components/fpl1/sensor_AverageDailySensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= +<<<<<<< HEAD +>>>>>>> master:custom_components/fpl/sensor_AverageDailySensor.py class ActualDailyAverageSensor(FplMoneyEntity): """Actual daily average sensor""" @@ -52,9 +82,27 @@ class ActualDailyAverageSensor(FplMoneyEntity): @property def state(self): return self.getData("daily_avg") +<<<<<<< HEAD:custom_components/fpl1/sensor_AverageDailySensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= +======= + @property + def icon(self): + return "mdi:currency-usd" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Budget Daily Average" + attributes["device_class"] = "monitary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" + return attributes + +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_AverageDailySensor.py diff --git a/custom_components/fpl1/sensor_DatesSensor.py b/custom_components/fpl1/sensor_DatesSensor.py index 0a54844..e437ab2 100644 --- a/custom_components/fpl1/sensor_DatesSensor.py +++ b/custom_components/fpl1/sensor_DatesSensor.py @@ -1,48 +1,153 @@ +<<<<<<< HEAD:custom_components/fpl1/sensor_DatesSensor.py """dates sensors""" import datetime from .fplEntity import FplDateEntity, FplDayEntity +======= +<<<<<<< HEAD +from .fplEntity import FplDateEntity +>>>>>>> master:custom_components/fpl/sensor_DatesSensor.py +======= +from .fplEntity import FplEntity +import datetime +>>>>>>> master class CurrentBillDateSensor(FplDateEntity): def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Current Bill Date") + super().__init__(coordinator, config, account, "Billing Current Date") @property def state(self): +<<<<<<< HEAD:custom_components/fpl1/sensor_DatesSensor.py return datetime.date.fromisoformat(self.getData("current_bill_date")) +======= + try: + self._state= datetime.date.fromisoformat(self.getData("current_bill_date")) + except: + pass + return self._state +>>>>>>> master:custom_components/fpl/sensor_DatesSensor.py +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:calendar" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["device_class"] = "date" + attributes["friendly_name"] = "Billing Current" + return attributes +>>>>>>> master class NextBillDateSensor(FplDateEntity): def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Next Bill Date") + super().__init__(coordinator, config, account, "Billing Next") @property def state(self): +<<<<<<< HEAD:custom_components/fpl1/sensor_DatesSensor.py return datetime.date.fromisoformat(self.getData("next_bill_date")) class ServiceDaysSensor(FplDayEntity): +======= + try: + self._state= datetime.date.fromisoformat(self.getData("next_bill_date")) + except: + pass + return self._state + + +<<<<<<< HEAD +class ServiceDaysSensor(FplDateEntity): +======= + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["device_class"] = "date" + attributes["friendly_name"] = "Billing Next" + return attributes + +class ServiceDaysSensor(FplEntity): +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_DatesSensor.py def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Service Days") + super().__init__(coordinator, config, account, "Billing Total Days") @property def state(self): - return self.getData("service_days") + try: + self._state= self.getData("service_days") + except: + pass + return self._state +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:calendar" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["unit_of_measurement"] = "days" + attributes["friendly_name"] = "Billing Total" + return attributes +>>>>>>> master class AsOfDaysSensor(FplDayEntity): def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "As Of Days") + super().__init__(coordinator, config, account, "Billing As Of") @property def state(self): - return self.getData("as_of_days") + try: + self._state= self.getData("as_of_days") + except: + pass + return self._state +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:calendar" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["unit_of_measurement"] = "days" + attributes["friendly_name"] = "Billing As Of" + return attributes +>>>>>>> master class RemainingDaysSensor(FplDayEntity): def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Remaining Days") + super().__init__(coordinator, config, account, "Billing Remaining") @property def state(self): +<<<<<<< HEAD return self.getData("remaining_days") +======= + try: + self._state= self.getData("remaining_days") + except: + pass + return self._state + + @property + def icon(self): + return "mdi:calendar" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["unit_of_measurement"] = "days" + attributes["friendly_name"] = "Billing Remaining" + return attributes +>>>>>>> master diff --git a/custom_components/fpl1/sensor_KWHSensor.py b/custom_components/fpl1/sensor_KWHSensor.py index 767f186..c019156 100644 --- a/custom_components/fpl1/sensor_KWHSensor.py +++ b/custom_components/fpl1/sensor_KWHSensor.py @@ -10,11 +10,15 @@ from .fplEntity import FplEnergyEntity class ProjectedKWHSensor(FplEnergyEntity): def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Projected KWH") + super().__init__(coordinator, config, account, "Projected") @property def state(self): - return self.getData("projectedKWH") + try: + self._state = self.getData("projectedKWH") + except: + pass + return self._state def customAttributes(self): """Return the state attributes.""" @@ -23,28 +27,69 @@ class ProjectedKWHSensor(FplEnergyEntity): return attributes +<<<<<<< HEAD class DailyAverageKWHSensor(FplEnergyEntity): +======= + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Projected KWH" + attributes["device_class"] = "energy" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "kWh" + return attributes + + +class DailyAverageKWHSensor(FplEntity): +>>>>>>> master def __init__(self, coordinator, config, account): super().__init__(coordinator, config, account, "Daily Average KWH") @property def state(self): - return self.getData("dailyAverageKWH") + try: + self._state = self.getData("dailyAverageKWH") + except: + pass + return self._state +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:flash" + +<<<<<<< HEAD:custom_components/fpl1/sensor_KWHSensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Daily Average" + attributes["device_class"] = "energy" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "kWh" + return attributes + +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_KWHSensor.py class BillToDateKWHSensor(FplEnergyEntity): def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Bill To Date KWH") + super().__init__(coordinator, config, account, "Bill To Date") @property def state(self): - return self.getData("billToDateKWH") + try: + self._state = self.getData("billToDateKWH") + except: + pass + return self._state def customAttributes(self): """Return the state attributes.""" @@ -60,13 +105,33 @@ class BillToDateKWHSensor(FplEnergyEntity): return attributes +<<<<<<< HEAD class NetReceivedKWHSensor(FplEnergyEntity): +======= + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Billing Usage" + attributes["device_class"] = "energy" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "kWh" + if self.getData("billStartDate") is not None: + attributes["last_reset"] = self.getData("billStartDate") + return attributes + + +class NetReceivedKWHSensor(FplEntity): +>>>>>>> master def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Received Meter Reading KWH") + super().__init__(coordinator, config, account, "Received Reading") @property def state(self): - return self.getData("recMtrReading") + try: + self._state = self.getData("recMtrReading") + except: + pass + return self._state def customAttributes(self): """Return the state attributes.""" @@ -74,17 +139,58 @@ class NetReceivedKWHSensor(FplEnergyEntity): attributes["state_class"] = STATE_CLASS_TOTAL_INCREASING return attributes +<<<<<<< HEAD class NetDeliveredKWHSensor(FplEnergyEntity): +======= + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Meter Return to Grid" + attributes["device_class"] = "energy" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "kWh" + if self.getData("billStartDate") is not None: + attributes["last_reset"] = self.getData("billStartDate") + + return attributes + + +class NetDeliveredKWHSensor(FplEntity): +>>>>>>> master def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Delivered Meter Reading KWH") + super().__init__(coordinator, config, account, "Delivered Reading") @property def state(self): - return self.getData("delMtrReading") + try: + self._state = self.getData("delMtrReading") + except: + try: + self._state = self.getData("billToDateKWH") + except: + pass + return self._state +<<<<<<< HEAD:custom_components/fpl1/sensor_KWHSensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL_INCREASING +======= + @property + def icon(self): + return "mdi:flash" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Meter Consumption" + attributes["device_class"] = "energy" + attributes["state_class"] = "total_increasing" + attributes["unit_of_measurement"] = "kWh" + if self.getData("billStartDate") is not None: + attributes["last_reset"] = self.getData("billStartDate") + +>>>>>>> master:custom_components/fpl/sensor_KWHSensor.py return attributes diff --git a/custom_components/fpl1/sensor_ProjectedBillSensor.py b/custom_components/fpl1/sensor_ProjectedBillSensor.py index 264217a..c1ac206 100644 --- a/custom_components/fpl1/sensor_ProjectedBillSensor.py +++ b/custom_components/fpl1/sensor_ProjectedBillSensor.py @@ -28,17 +28,35 @@ class FplProjectedBillSensor(FplMoneyEntity): budget = self.getData("budget_bill") budget_billing_projected_bill = self.getData("budget_billing_projected_bill") +<<<<<<< HEAD:custom_components/fpl1/sensor_ProjectedBillSensor.py if budget and budget_billing_projected_bill is not None: return self.getData("budget_billing_projected_bill") return self.getData("projected_bill") """ +======= + try: + if budget == True and budget_billing_projected_bill is not None: + self._state = self.getData("budget_billing_projected_bill") + else: + self._state = self.getData("projected_bill") + except: + self._state = None + return self._state +>>>>>>> master:custom_components/fpl/sensor_ProjectedBillSensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} +<<<<<<< HEAD:custom_components/fpl1/sensor_ProjectedBillSensor.py attributes["state_class"] = STATE_CLASS_TOTAL attributes["budget_bill"] = self.getData("budget_bill") +======= + attributes["friendly_name"] = "Projected Bill Payment Due" + attributes["device_class"] = "monetary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" +>>>>>>> master:custom_components/fpl/sensor_ProjectedBillSensor.py return attributes @@ -47,10 +65,11 @@ class DeferedAmountSensor(FplMoneyEntity): """Defered amount sensor""" def __init__(self, coordinator, config, account): - super().__init__(coordinator, config, account, "Defered Amount") + super().__init__(coordinator, config, account, "Deferred Amount") @property def state(self): +<<<<<<< HEAD:custom_components/fpl1/sensor_ProjectedBillSensor.py if self.getData("budget_bill"): return self.getData("defered_amount") return 0 @@ -61,6 +80,31 @@ class DeferedAmountSensor(FplMoneyEntity): attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= + try: + self._state = self.getData("deferred_amount") + except: + self._state = 0 + pass + return self._state + +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:currency-usd" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Deferred Amount" + attributes["device_class"] = "monetary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" + return attributes + +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_ProjectedBillSensor.py class ProjectedBudgetBillSensor(FplMoneyEntity): """projected budget bill sensor""" @@ -70,14 +114,37 @@ class ProjectedBudgetBillSensor(FplMoneyEntity): @property def state(self): - return self.getData("budget_billing_projected_bill") + try: + self._state = self.getData("budget_billing_projected_bill") + except: + pass + return self._state +<<<<<<< HEAD +======= + @property + def icon(self): + return "mdi:currency-usd" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Projected Budget Bill" + attributes["device_class"] = "monitary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" + return attributes + +<<<<<<< HEAD:custom_components/fpl1/sensor_ProjectedBillSensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_ProjectedBillSensor.py class ProjectedActualBillSensor(FplMoneyEntity): """projeted actual bill sensor""" @@ -87,10 +154,35 @@ class ProjectedActualBillSensor(FplMoneyEntity): @property def state(self): +<<<<<<< HEAD return self.getData("projected_bill") +<<<<<<< HEAD:custom_components/fpl1/sensor_ProjectedBillSensor.py def customAttributes(self): """Return the state attributes.""" attributes = {} attributes["state_class"] = STATE_CLASS_TOTAL return attributes +======= +======= + try: + self._state = self.getData("projected_bill") + except: + pass + return self._state + + @property + def icon(self): + return "mdi:currency-usd" + + def defineAttributes(self): + """Return the state attributes.""" + attributes = {} + attributes["friendly_name"] = "Projected Actual Bill" + attributes["device_class"] = "monitary" + attributes["state_class"] = "total" + attributes["unit_of_measurement"] = "$" + + return attributes +>>>>>>> master +>>>>>>> master:custom_components/fpl/sensor_ProjectedBillSensor.py