Fix service actions being identified as entities

Author: frenck

custom_components/spook/ectoplasms/automation/repairs/unknown_entity_references.py

@@ -12,18 +12,20 @@
 from ....const import LOGGER
 from ....repairs import AbstractSpookRepair
 from ....util import (
-    async_extract_entities_from_config,  # Added
+    async_extract_entities_from_config,
     async_extract_entities_from_template_string,
     async_filter_known_entity_ids_with_templates,
     async_get_all_entity_ids,
-    is_template_string,  # Keep for extract_entities_from_value
+    is_template_string,
 )
 
 if TYPE_CHECKING:
     from homeassistant.core import HomeAssistant
 
 
-async def extract_template_entities_from_automation_entity(entity: Any) -> set[str]:
+async def extract_template_entities_from_automation_entity(
+    hass: HomeAssistant, entity: Any
+) -> set[str]:
     """Extract entities from automation configuration using Template analysis.
 
     This function finds template strings in automation configuration and creates
@@ -37,8 +39,7 @@ async def extract_template_entities_from_automation_entity(entity: Any) -> set[s
     else:
         return set()
 
-    # Use the new utility function
-    return await async_extract_entities_from_config(config)
+    return await async_extract_entities_from_config(hass, config)
 
 
 async def extract_entities_from_automation_config(
@@ -229,7 +230,7 @@ async def extract_entities_from_value(hass: HomeAssistant, value: Any) -> set[st
             # Process as template to extract entity references
             try:
                 template_entities = await async_extract_entities_from_template_string(
-                    value
+                    hass, value
                 )
                 entities.update(template_entities)
             # pylint: disable-next=broad-exception-caught
@@ -302,7 +303,7 @@ async def async_inspect(self) -> None:
 
             # Extract entities from Template objects within the automation entity
             template_entities = await extract_template_entities_from_automation_entity(
-                entity
+                self.hass, entity
             )
             all_entities.update(template_entities)
 

custom_components/spook/ectoplasms/script/repairs/unknown_entity_references.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components import script
 from homeassistant.const import EVENT_COMPONENT_LOADED
@@ -11,12 +11,14 @@
 
 from ....repairs import AbstractSpookRepair
 from ....util import (
-    async_extract_entities_from_config,  # Added
+    async_extract_entities_from_config,
     async_filter_known_entity_ids_with_templates,
     async_get_all_entity_ids,
-    # is_template_string, # No longer needed directly here
 )
 
+if TYPE_CHECKING:
+    from homeassistant.core import HomeAssistant
+
 
 def extract_entities_from_trigger_config(config: dict[str, Any] | list) -> set[str]:
     """Extract entity IDs from a trigger config."""
@@ -49,7 +51,9 @@ def extract_entities_from_trigger_config(config: dict[str, Any] | list) -> set[s
     return entities
 
 
-async def extract_template_entities_from_script_entity(entity: Any) -> set[str]:
+async def extract_template_entities_from_script_entity(
+    hass: HomeAssistant, entity: Any
+) -> set[str]:
     """Extract entities from script configuration using Template analysis.
 
     This function finds template strings in script configuration and creates
@@ -69,8 +73,7 @@ async def extract_template_entities_from_script_entity(entity: Any) -> set[str]:
     if not config:
         return set()
 
-    # Use the new utility function
-    return await async_extract_entities_from_config(config)
+    return await async_extract_entities_from_config(hass, config)
 
 
 class SpookRepair(AbstractSpookRepair):
@@ -140,7 +143,7 @@ async def async_inspect(self) -> None:
 
             # Extract entities from Template objects within the script entity
             template_entities = await extract_template_entities_from_script_entity(
-                entity
+                self.hass, entity
             )
             all_entities.update(template_entities)
 

custom_components/spook/util.py

@@ -469,7 +469,7 @@ def is_template_string(value: str) -> bool:
 
 
 async def async_extract_entities_from_template_string(
-    template_str: str,
+    hass: HomeAssistant, template_str: str
 ) -> set[str]:
     """Extract entity IDs from a template string using regex analysis.
 
@@ -483,7 +483,7 @@ async def async_extract_entities_from_template_string(
 
     # Use regex patterns to find entities
     try:
-        regex_entities = extract_entities_from_template_regex(template_str)
+        regex_entities = extract_entities_from_template_regex(hass, template_str)
         entities.update(regex_entities)
     # pylint: disable-next=broad-exception-caught
     except Exception as exc:  # noqa: BLE001 - Keep broad for unexpected regex issues
@@ -496,7 +496,9 @@ async def async_extract_entities_from_template_string(
     return entities
 
 
-def extract_entities_from_template_regex(template_str: str) -> set[str]:
+def extract_entities_from_template_regex(
+    hass: HomeAssistant, template_str: str
+) -> set[str]:
     """Extract entity IDs from template string using regex patterns.
 
     This function uses regex patterns based on Home Assistant's core validation
@@ -525,19 +527,26 @@ def extract_entities_from_template_regex(template_str: str) -> set[str]:
                 if valid_entity_id(individual_id):
                     entities.add(individual_id)
 
-    return entities
+    # Filter out known services to avoid false positives
+    known_services = async_get_all_services(hass)
+    return entities - known_services
 
 
 async def _process_template_object(
-    template: Template, known_entity_ids: set[str], unknown_entities: set[str]
+    hass: HomeAssistant,
+    template: Template,
+    known_entity_ids: set[str],
+    unknown_entities: set[str],
 ) -> None:
     """Process a Template object and add unknown entities to the set."""
     template_entities = set()
 
     # Use regex patterns on the template string
     try:
         if hasattr(template, "template") and template.template:
-            regex_entities = extract_entities_from_template_regex(template.template)
+            regex_entities = extract_entities_from_template_regex(
+                hass, template.template
+            )
             template_entities.update(regex_entities)
     # pylint: disable-next=broad-exception-caught
     except Exception:  # noqa: BLE001
@@ -550,12 +559,15 @@ async def _process_template_object(
 
 
 async def _process_template_string(
+    hass: HomeAssistant,
     template_str: str,
     known_entity_ids: set[str],
     unknown_entities: set[str],
 ) -> None:
     """Process a template string and add unknown entities to the set."""
-    template_entities = await async_extract_entities_from_template_string(template_str)
+    template_entities = await async_extract_entities_from_template_string(
+        hass, template_str
+    )
     # Check if any of the template entities are unknown
     for template_entity in template_entities:
         # Handle comma-separated entity lists
@@ -587,7 +599,7 @@ async def async_filter_known_entity_ids_with_templates(
         # Handle Template objects
         if isinstance(entity_id_raw, Template):
             await _process_template_object(
-                entity_id_raw, known_entity_ids, unknown_entities
+                hass, entity_id_raw, known_entity_ids, unknown_entities
             )
             continue
 
@@ -597,7 +609,7 @@ async def async_filter_known_entity_ids_with_templates(
         # Check if this looks like a template string
         if is_template_string(entity_id_raw):
             await _process_template_string(
-                entity_id_raw, known_entity_ids, unknown_entities
+                hass, entity_id_raw, known_entity_ids, unknown_entities
             )
         else:
             # Process as regular entity ID(s), handling comma-separated lists
@@ -655,8 +667,10 @@ def extract_template_strings_from_config(
     return strings
 
 
-async def async_extract_entities_from_config(config: Any) -> set[str]:
-    """Extract all entity IDs referenced in templates within a configuration structure."""
+async def async_extract_entities_from_config(
+    hass: HomeAssistant, config: Any
+) -> set[str]:
+    """Extract entity IDs referenced in templates within a configuration structure."""
     entities = set()
     if not config:
         return entities
@@ -667,7 +681,7 @@ async def async_extract_entities_from_config(config: Any) -> set[str]:
             # async_extract_entities_from_template_string already handles
             # TemplateError and other exceptions internally, logging them.
             referenced_entities = await async_extract_entities_from_template_string(
-                template_str
+                hass, template_str
             )
             entities.update(referenced_entities)
         # pylint: disable-next=broad-exception-caught