fixes #1373

ready for 9.0.11

.github/workflows/builder.yaml

@@ -92,7 +92,7 @@ jobs:
 
       - name: Login to GitHub Container Registry
         if: env.BUILD_ARGS != '--test'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -100,7 +100,7 @@ jobs:
 
       - name: Build ${{ matrix.addon }} add-on
         if: steps.check.outputs.build_arch == 'true'
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2025.03.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \

apps/nspanel-lovelace-ui/luibackend/controller.py

@@ -334,6 +334,11 @@ class LuiController(object):
                     apis.ha_api.get_entity(entity_id).call_service("return_to_base")
             elif entity_id.startswith('service'):
                 apis.ha_api.call_service(entity_id.replace('service.', '', 1).replace('.','/', 1), **entity_config.data)
+            elif entity_id.startswith('valve'):
+                if apis.ha_api.get_entity(entity_id).state == "open":
+                    apis.ha_api.get_entity(entity_id).call_service("close_valve")
+                else:
+                    apis.ha_api.get_entity(entity_id).call_service("open_valve")
 
         # for media page
         if button_type == "media-next":

apps/nspanel-lovelace-ui/luibackend/icons.py

@@ -159,8 +159,8 @@ alarm_control_panel_mapping = {
 }
 
 climate_mapping = {
-    'auto':       'calendar-sync',
-    'heat_cool':  'calendar-sync',
+    'auto':       'fan-auto',
+    'heat_cool':  'sun-snowflake-variant',
     'heat':  'fire',
     'off':  'power',
     'cool':  'snowflake',

apps/nspanel-lovelace-ui/luibackend/pages.py

@@ -25,7 +25,7 @@ class LuiPagesGen(object):
         self._config = config
         self._locale  = config.get("locale")
         self._send_mqtt_msg = send_mqtt_msg
-    
+
     def get_entity_color(self, entity, ha_type=None, stateOverwrite=None, overwrite=None):
         if overwrite is not None:
             if type(overwrite) in [str, list]:
@@ -82,7 +82,7 @@ class LuiPagesGen(object):
                     icon_color = 63878 #red
                 if state == "fog":
                     icon_color = 38066 #75% grey
-                if state in ["hail", "snowy"]: 
+                if state in ["hail", "snowy"]:
                     icon_color = 65535 #white
                 if state == "lightning":
                     icon_color = 65120 #golden-yellow
@@ -128,7 +128,7 @@ class LuiPagesGen(object):
         else:
             dateformat = self._config.get("dateFormat")
             date = datetime.datetime.now().strftime(dateformat)
-            
+
         addTemplate = self._config.get("dateAdditionalTemplate")
         addDateText = apis.ha_api.render_template(addTemplate)
         self._send_mqtt_msg(f"date~{date}{addDateText}")
@@ -137,7 +137,7 @@ class LuiPagesGen(object):
         if target_page == "cardUnlock":
             target_page = "cardAlarm"
         self._send_mqtt_msg(f"pageType~{target_page}")
-    
+
     def update_screensaver_weather(self, theme):
         entities = self._config._config_screensaver.entities
 
@@ -150,7 +150,7 @@ class LuiPagesGen(object):
         item_str = ""
         for item in entities:
             item_str += self.generate_entities_item(item, "cardEntities", mask=["type", "entityId"])
-    
+
         self._send_mqtt_msg(f"weatherUpdate{item_str}")
         # send color if configured in screensaver
         if theme is not None:
@@ -180,11 +180,11 @@ class LuiPagesGen(object):
         colorOverride = item.colorOverride
         name = item.nameOverride
         uuid = item.uuid
-        
+
         # check ha template for name
         if item.nameOverride is not None and ("{" in item.nameOverride and "}" in item.nameOverride):
             name = apis.ha_api.render_template(item.nameOverride)
-        
+
         # type of the item is the string before the "." in the entityId
         if entityId is not None:
             entityType = entityId.split(".")[0]
@@ -256,7 +256,7 @@ class LuiPagesGen(object):
         if entity is None:
             return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~Not found check~ apps.yaml"
 
-        
+
         # HA Entities
         # common res vars
         entityTypePanel = "text"
@@ -308,13 +308,18 @@ class LuiPagesGen(object):
             device_class = entity.attributes.get("device_class", "")
             unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
             value = entity.state
-            
+
+            try:
+                value = str(round(float(value), 1))
+            except:
+                print("An exception occurred") 
+                
             # limit value to 4 chars on us-p
             if self._config.get("model") == "us-p" and cardType == "cardEntities":
                 value = entity.state[:4]
                 if value[-1] == ".":
                     value = value[:-1]
-                    
+
             if device_class != "temperature":
                 value = value + " "
             value = value + unit_of_measurement
@@ -382,20 +387,50 @@ class LuiPagesGen(object):
         elif entityType == "weather":
             entityTypePanel = "text"
             unit = get_attr_safe(entity, "temperature_unit", "")
-            if type(item.stype) == int and len(entity.attributes['forecast']) >= item.stype:
-                fdate = dp.parse(entity.attributes['forecast'][item.stype]['datetime'])
-                global babel_spec
-                if babel_spec is not None:
-                    dateformat = "E" if item.nameOverride is None else item.nameOverride
-                    name = babel.dates.format_datetime(fdate.astimezone(), dateformat, locale=self._locale)
+            rt = None
+            if type(item.stype) == str and ":" in item.stype and len(item.stype.split(":")) == 2:
+                spintstr = item.stype.split(":")
+                rt = spintstr[0]
+                item.stype = int(spintstr[1])
+            if type(item.stype) == int:
+                bits = get_attr_safe(entity, "supported_features", 0b0)
+                if not rt:
+                    rt = "daily"
+                    if bits & 0b001: #FORECAST_DAILY
+                        rt = "daily"
+                    elif bits & 0b010: #FORECAST_HOURLY
+                        rt = "hourly"
+                    elif bits & 0b100: #FORECAST_TWICE_DAILY
+                        rt = "twice_daily"
+
+                results = apis.ha_api.call_service(
+                    "weather/get_forecasts", target={"entity_id": entityId}, service_data={"type": rt}
+                )
+                forecast = results.get("result", {}).get("response", {}).get(entityId, {}).get('forecast') or entity.attributes.get('forecast', [])
+                if len(forecast) >= item.stype:
+                    day_forecast = forecast[item.stype]
+                    fdate = dp.parse(day_forecast['datetime'])
+                    global babel_spec
+                    if babel_spec is not None:
+                        dateformat = "E" if item.nameOverride is None else item.nameOverride
+                        name = babel.dates.format_datetime(fdate.astimezone(), dateformat, locale=self._locale)
+                    else:
+                        dateformat = "%a" if item.nameOverride is None else item.nameOverride
+                        name = fdate.astimezone().strftime(dateformat)
+                    icon_id = get_icon_ha(entityId, stateOverwrite=day_forecast['condition'])
+                    value = f'{day_forecast.get("temperature", "")}{unit}'
+                    color = self.get_entity_color(entity, ha_type=entityType, stateOverwrite=day_forecast['condition'], overwrite=colorOverride)
                 else:
-                    dateformat = "%a" if item.nameOverride is None else item.nameOverride
-                    name = fdate.astimezone().strftime(dateformat)
-                icon_id = get_icon_ha(entityId, stateOverwrite=entity.attributes['forecast'][item.stype]['condition'])
-                value = f'{entity.attributes['forecast'][item.stype].get("temperature", "")}{unit}'
-                color = self.get_entity_color(entity, ha_type=entityType, stateOverwrite=entity.attributes['forecast'][item.stype]['condition'], overwrite=colorOverride)
+                    value = f'{get_attr_safe(entity, "temperature", "")}{unit}'
             else:
                 value = f'{get_attr_safe(entity, "temperature", "")}{unit}'
+        elif entityType == "valve":
+            entityTypePanel = "valve"
+            value = get_translation(self._locale, f"backend.component.binary_sensor.state.door.{entity.state}")
+            if entity.state == "open":
+                icon_id = get_icon_id("valve-open")
+            else:
+                icon_id = get_icon_id("valve-closed")
         else:
             name = "unsupported"
         # Overwrite for value
@@ -475,10 +510,10 @@ class LuiPagesGen(object):
             state_value += get_translation(self._locale, f"backend.component.climate.state._.{entity.state}")
             if hvac_action != "":
                 state_value += ")"
-            
+
             min_temp     = int(get_attr_safe(entity, "min_temp", 0)*10)
             max_temp     = int(get_attr_safe(entity, "max_temp", 0)*10)
-            step_temp    = int(get_attr_safe(entity, "target_temp_step", 0.5)*10) 
+            step_temp    = int(get_attr_safe(entity, "target_temp_step", 0.5)*10)
             icon_res_list = []
             icon_res = ""
 
@@ -503,7 +538,7 @@ class LuiPagesGen(object):
                 state = 0
                 if(mode == entity.state):
                     state = 1
-                
+
                 icon_res_list.append(f"~{icon_id}~{color_on}~{state}~{mode}")
 
             icon_res = "".join(icon_res_list)
@@ -518,11 +553,11 @@ class LuiPagesGen(object):
                 icon_res = "~"*4 + icon_res_list[0] + "~"*4 + icon_res_list[1] + "~"*4 + icon_res_list[2] + "~"*4 + icon_res_list[3]
             elif len(icon_res_list) >= 5 or self._config.get("model") == "us-p":
                 icon_res = "".join(icon_res_list) + "~"*4*(8-len(icon_res_list))
-            
+
             currently_translation = get_translation(self._locale, "frontend.ui.card.climate.currently")
             state_translation = get_translation(self._locale, "frontend.ui.panel.config.devices.entities.state")
             action_translation = get_translation(self._locale, "frontend.ui.card.climate.operation").replace(' ','\r\n')
-            
+
             detailPage = "1"
             if any(x in ["preset_modes", "swing_modes", "fan_modes"] for x in entity.attributes):
                 detailPage = "0"
@@ -606,7 +641,7 @@ class LuiPagesGen(object):
             item_str = ""
             for item in entities:
                 item_str += self.generate_entities_item(item, "cardGrid")
-            
+
             bck_override = entity.iconOverride
             if entity.status is not None:
                 bck_entity = entity.entityId
@@ -614,14 +649,14 @@ class LuiPagesGen(object):
 
             entity.iconOverride = "mdi:speaker"
             item_str += self.generate_entities_item(entity, "cardGrid")
-            
+
             entity.iconOverride = bck_override
             if entity.status is not None:
                 entity.entityId = bck_entity
 
             command = f"entityUpd~{heading}~{navigation}~{entityId}~{title}~~{author}~~{volume}~{iconplaypause}~{onoffbutton}~{shuffleBtn}{media_icon}{item_str}"
         self._send_mqtt_msg(command)
-        
+
     def generate_alarm_page(self, navigation, title, entity, overwrite_supported_modes, alarmBtn):
         item = entity.entityId
         if not apis.ha_api.entity_exists(item):
@@ -688,8 +723,8 @@ class LuiPagesGen(object):
                 else:
                     icon_color = rgb_dec565([243,179,0])
                 add_btn=f"{iconnav}~{icon_color}~{entity}"
-                
-                
+
+
             # add padding to arm buttons
             arm_buttons = ""
             for b in supported_modes:
@@ -699,12 +734,12 @@ class LuiPagesGen(object):
                 arm_buttons += "~"*((4-len(supported_modes))*2)
             command = f"entityUpd~{title}~{navigation}~{item}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}~{add_btn}"
         self._send_mqtt_msg(command)
-        
+
     def generate_unlock_page(self, navigation, item, title, destination, pin):
         color = rgb_dec565([255,0,0])
         icon = get_icon_id("lock")
         supported_modes = ["cardUnlock-unlock"]
-        
+
         # add padding to arm buttons
         arm_buttons = ""
         for b in supported_modes:
@@ -743,8 +778,8 @@ class LuiPagesGen(object):
             if (time.time()-card.last_update) < card.cooldown:
                 return
         card.last_update = time.time()
-        
-        
+
+
         leftBtn = "delete~~~~~"
         if card.uuid_prev is not None:
             leftBtn = self.generate_entities_item(Entity(
@@ -790,7 +825,7 @@ class LuiPagesGen(object):
             self._send_mqtt_msg(f"timeout~{card.sleepTimeout}")
         else:
             self._send_mqtt_msg(f'timeout~{self._config.get("sleepTimeout")}')
-        
+
         temp_unit = card.raw_config.get("temperatureUnit", "celsius")
         if card.cardType in ["cardEntities", "cardGrid", "cardGrid1","cardGrid2"]:
             self.generate_entities_page(navigation, card.title, card.entities, card.cardType, temp_unit)
@@ -845,7 +880,7 @@ class LuiPagesGen(object):
         color = "disable"
         effect_supported = "disable"
         supported_color_modes = entity.attributes['supported_color_modes']
-        
+
         if "onoff" not in supported_color_modes:
             brightness = 0
         if entity.state == "on":
@@ -873,20 +908,20 @@ class LuiPagesGen(object):
         brightness_translation = get_translation(self._locale, "frontend.ui.card.light.brightness")
         color_temp_translation = get_translation(self._locale, "frontend.ui.card.light.color_temperature")
         self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}~{effect_supported}", force=is_open_detail)
-    
+
     def generate_shutter_detail_page(self, entity_id, is_open_detail=False):
         entity       = apis.ha_api.get_entity(entity_id)
         entityType   = "cover"
         device_class = entity.attributes.get("device_class", "window")
         icon_id      = get_icon_ha(entity_id)
-        
+
         pos = entity.attributes.get("current_position")
         if pos is None:
             pos_status = entity.state
             pos = "disable"
         else:
             pos_status = pos
-        
+
         pos_translation = ""
         icon_up   = ""
         icon_stop = ""
@@ -990,7 +1025,7 @@ class LuiPagesGen(object):
                 if modes:
                     modes_out += f"{heading}~{mode}~{cur_mode}~{modes_res}~"
 
-        self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~{icon_id}~{icon_color}~{modes_out}", force=is_open_detail)  
+        self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~{icon_id}~{icon_color}~{modes_out}", force=is_open_detail)
 
     def generate_input_select_detail_page(self, entity_id, is_open_detail=False):
         options_list = None
@@ -1054,8 +1089,9 @@ class LuiPagesGen(object):
             label2  = get_translation(self._locale, "frontend.ui.card.timer.actions.cancel")
             label3  = get_translation(self._locale, "frontend.ui.card.timer.actions.finish")
         self._send_mqtt_msg(f"entityUpdateDetail~{entity_id}~~{icon_color}~{entity_id}~{min_remaining}~{sec_remaining}~{editable}~{action1}~{action2}~{action3}~{label1}~{label2}~{label3}", force=is_open_detail)
-        
+
     def send_message_page(self, ident, heading, msg, b1, b2):
         self._send_mqtt_msg(f"pageType~popupNotify")
         self._send_mqtt_msg(f"entityUpdateDetail~{ident}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")
-    
+
+

apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py

@@ -34,7 +34,7 @@ class NsPanelLovelaceUIManager(ad.ADBase):
         
         desired_tasmota_driver_version   = 8
         desired_display_firmware_version = 53
-        version     = "v4.3.3"
+        version     = "v4.7.3"
         
         model       = cfg.get("model")
         if model == "us-l":

docs/prepare_ha.md

@@ -94,37 +94,3 @@ Now, to install NSPanel Lovelace UI Backend with HACS, follow these steps:
    proceed with the download
 7. The Backend Application is now installed, and HACS will inform you when updates are available
 
-# Workaround for HomeAssistant 2024.04
-AppDaemon is using the old REST API that until AppDaemon moved on the the websocket API this woraround is needed to get weather forecast data from homeassistant. (https://github.com/AppDaemon/appdaemon/issues/1837)
-
-To get the forecast data in appdaemon, there is a script needed in homeassistant's configuration.yaml:
-
-```yaml
-template:
-  - trigger:
-      - platform: time_pattern
-        hours: /1
-      - platform: homeassistant
-        event: start
-    action:
-      - service: weather.get_forecasts
-        data:
-          type: daily
-        target:
-          entity_id: weather.home # change to your weather entity
-        response_variable: daily
-    sensor:
-      - name: Weather Forecast Daily
-        unique_id: weather_forecast_daily
-        state: "{{ states('weather.home') }}" # # change to your weather entity in this line
-        attributes:
-          temperature: "{{ state_attr('weather.home', 'temperature') }}" # change to your weather entity
-          temperature_unit: "{{ state_attr('weather.home', 'temperature_unit') }}" # change to your weather entity
-          forecast: "{{ daily['weather.home'].forecast }}" # change to your weather entity
-```
-![image](https://github.com/joBr99/nspanel-lovelace-ui/assets/29555657/41f21db3-a6e2-4e4f-8dab-b9351ecd23e5)
-
-Adjust the entities in your apps.yaml that are accessing the forecast to the newly created trigger template:
-
-![image](https://github.com/joBr99/nspanel-lovelace-ui/assets/29555657/1cfd913d-88be-4cb0-9a68-0e864ee1ad4f)
-