Merge pull request #113 from explosivo22/dev

Fix bad commit

Author: explosivo22

custom_components/rinnaicontrolr-ha/__init__.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD:custom_components/rinnaicontrolr-ha/__init__.py
 import logging
 import asyncio
 
@@ -84,93 +83,3 @@ async def async_remove_config_entry_device(
 ) -> bool:
     """Remove a config entry from a device."""
     return True
-=======
-import logging
-import asyncio
-from datetime import timedelta
-
-from aiorinnai import async_get_api
-from aiorinnai.errors import RequestError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_PASSWORD, 
-    CONF_EMAIL,
-    MAJOR_VERSION,
-    MINOR_VERSION,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.components.water_heater import DOMAIN as WATER_HEATER_DOMAIN
-
-from .const import (
-    CLIENT,
-    DOMAIN,
-    CONF_UNIT,
-    DEFAULT_UNIT,
-    CONF_MAINT_INTERVAL_ENABLED,
-    DEFAULT_MAINT_INTERVAL_ENABLED,
-)
-from .device import RinnaiDeviceDataUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-
-PLATFORMS = ["water_heater","binary_sensor", "sensor"]
-
-def is_min_ha_version(min_ha_major_ver: int, min_ha_minor_ver: int) -> bool:
-    """Check if HA version at least a specific version."""
-    return (
-        MAJOR_VERSION > min_ha_major_ver or
-        (MAJOR_VERSION == min_ha_major_ver and MINOR_VERSION >= min_ha_minor_ver)
-    )
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Rinnai from config entry"""
-    session = async_get_clientsession(hass)
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = {}
-
-    try:
-        hass.data[DOMAIN][entry.entry_id][CLIENT] = client = await async_get_api(
-            entry.data[CONF_EMAIL], entry.data[CONF_PASSWORD], session=session
-        )
-    except RequestError as err:
-        raise ConfigEntryNotReady from err
-
-    user_info = await client.user.get_info()
-
-    _LOGGER.debug("Rinnai user information: %s", user_info)
-
-    hass.data[DOMAIN][entry.entry_id]["devices"] = devices = [
-        RinnaiDeviceDataUpdateCoordinator(hass, client, device["id"], entry.options)
-        for device in user_info["devices"]["items"]
-    ]
-
-    if not entry.options:
-        await _async_options_updated(hass, entry)
-    
-    tasks = [device.async_refresh() for device in devices]
-    await asyncio.gather(*tasks)
-
-    if is_min_ha_version(2022,8):
-        await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    else:
-        hass.config_entries.async_setup_platforms(entry, PLATFORMS)
-
-    entry.async_on_unload(entry.add_update_listener(_async_options_updated))
-    
-    return True
-
-async def _async_options_updated(hass: HomeAssistant, entry: ConfigEntry):
-    """Update options."""
-    await hass.config_entries.async_reload(entry.entry_id)
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
-    """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    return unload_ok
->>>>>>> 6a60ac3ef2862a01b180479f5b5a2e441f6a6f88:custom_components/rinnai/__init__.py

custom_components/rinnaicontrolr-ha/config_flow.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD:custom_components/rinnaicontrolr-ha/config_flow.py
 """Config flow for Rinnai integration."""
 from typing import Any
 from collections.abc import Mapping
@@ -120,99 +119,4 @@ async def async_step_init(self, user_input=None):
         )
 
 class CannotConnect(exceptions.HomeAssistantError):
-=======
-"""Config flow for Rinnai integration."""
-from aiorinnai import async_get_api
-from aiorinnai.errors import RequestError
-import voluptuous as vol
-
-from homeassistant import config_entries, core, exceptions
-from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.core import callback
-
-from .const import (
-    DOMAIN,
-    LOGGER,
-    CONF_MAINT_INTERVAL_ENABLED,
-    DEFAULT_MAINT_INTERVAL_ENABLED,
-)
-
-DATA_SCHEMA = vol.Schema({vol.Required("email"): str, vol.Required("password"): str})
-
-async def validate_input(hass: core.HomeAssistant, data):
-    """Validate the user input allows us to connect.
-    Data has the keys from DATA_SCHEMA with values provided by the user.
-    """
-
-    session = async_get_clientsession(hass)
-    try:
-        api = await async_get_api(
-            data[CONF_EMAIL], data[CONF_PASSWORD], session=session
-        )
-    except RequestError as request_error:
-        LOGGER.error("Error connecting to the Rinnai API: %s", request_error)
-        raise CannotConnect from request_error
-
-    user_info = await api.user.get_info()
-    first_device_name = user_info["devices"]["items"][0]["id"]
-    device_info = await api.device.get_info(first_device_name)
-    return {"title": device_info["data"]["getDevice"]["device_name"]}
-
-class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Rinnai."""
-
-    VERSION = 1
-
-    async def async_step_user(self, user_input=None):
-        """Handle the initial step."""
-        errors = {}
-        if user_input is not None:
-            await self.async_set_unique_id(user_input[CONF_EMAIL])
-            self._abort_if_unique_id_configured()
-            try:
-                info = await validate_input(self.hass, user_input)
-                return self.async_create_entry(
-                    title=info["title"],
-                    data=user_input,
-                    options={
-                        CONF_MAINT_INTERVAL_ENABLED: DEFAULT_MAINT_INTERVAL_ENABLED,
-                    },
-                )
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-
-        return self.async_show_form(
-            step_id="user", data_schema=DATA_SCHEMA, errors=errors
-        )
-
-    @staticmethod
-    @callback
-    def async_get_options_flow(config_entry):
-        """Get the options flow for this handler."""
-        return OptionsFlow(config_entry)
-
-class OptionsFlow(config_entries.OptionsFlow):
-    def __init__(self, config_entry: config_entries.ConfigEntry):
-        """Initialize options flow."""
-        self.config_entry = config_entry
-
-    async def async_step_init(self, user_input=None):
-        if user_input is not None:
-            return self.async_create_entry(title="", data=user_input)
-
-        return self.async_show_form(
-            step_id="init", 
-            data_schema=vol.Schema(
-                {
-                    vol.Optional(
-                        CONF_MAINT_INTERVAL_ENABLED,
-                        default=self.config_entry.options.get(CONF_MAINT_INTERVAL_ENABLED, DEFAULT_MAINT_INTERVAL_ENABLED),
-                    ) : bool,
-                }
-            ),
-        )
-
-class CannotConnect(exceptions.HomeAssistantError):
->>>>>>> 6a60ac3ef2862a01b180479f5b5a2e441f6a6f88:custom_components/rinnai/config_flow.py
     """Error to indicate we cannot connect."""

custom_components/rinnaicontrolr-ha/const.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD:custom_components/rinnaicontrolr-ha/const.py
 """Constants for Rinnai Water Heater Monitoring"""
 import logging
 
@@ -31,34 +30,3 @@
 
 CONF_REFRESH_TOKEN = 'conf_refresh_token'
 CONF_ACCESS_TOKEN = 'conf_access_token'
-=======
-"""Constants for Rinnai Water Heater Monitoring"""
-import logging
-
-LOGGER = logging.getLogger(__package__)
-
-DOMAIN = 'rinnai'
-CLIENT = "client"
-
-ATTRIBUTION = "Data provided by Rinnai"
-
-DEFAULT_UNIT = "fahrenheit"
-CONF_UNIT = "units"
-
-CONF_MAINT_INTERVAL_ENABLED = "maint_interval_enabled"
-DEFAULT_MAINT_INTERVAL_ENABLED = True
-
-CONF_UNITS = ["celsius", "fahrenheit"]
-
-ATTR_CACHE = 'cache'
-ATTR_COORDINATOR = 'coordinator'
-
-SIGNAL_UPDATE_RINNAI = 'rinnai_temp_update'
-
-ICON_DOMESTIC_TEMP='mdi:thermometer'
-ICON_RECIRCULATION='mdi:sync'
-ICON_RECIRCULATION_DISABLED='mdi:octagon-outline'
-
-CONF_UNIT_SYSTEM_IMPERIAL = "imperial"
-CONF_UNIT_SYSTEM_METRIC = "metric"
->>>>>>> 6a60ac3ef2862a01b180479f5b5a2e441f6a6f88:custom_components/rinnai/const.py

custom_components/rinnaicontrolr-ha/manifest.json

@@ -5,6 +5,6 @@
     "documentation": "https://github.com/explosivo22/rinnaicontrolr-ha/",
     "codeowners": [ "@explosivo22" ],
     "requirements": [ "aiorinnai==0.4.0a2" ],
-    "version": "1.5.3",
+    "version": "1.5.4",
     "iot_class":  "cloud_polling"
 }