Sync with core code

Shulyaka · Shulyaka · commit 21755c5f1946 · 2025-07-21T20:35:20.000+03:00
diff --git a/custom_components/powerllm/api.py b/custom_components/powerllm/api.py
@@ -11,6 +11,7 @@
 from homeassistant.components.intent import async_device_supports_timers
 from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN
 from homeassistant.components.script import DOMAIN as SCRIPT_DOMAIN
+from homeassistant.components.todo import DOMAIN as TODO_DOMAIN
 from homeassistant.components.weather import INTENT_GET_WEATHER
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEFAULT, CONF_NAME
@@ -34,9 +35,11 @@
 )
 from .llm_tools import (
     PowerCalendarGetEventsTool,
+    PowerGetLiveContextTool,
     PowerIntentTool,
     PowerLLMTool,
     PowerScriptTool,
+    PowerTodoGetItemsTool,
 )
 from .tools.duckduckgo import DDGNewsTool, DDGTextSearchTool
 from .tools.memory import MemoryTool
@@ -78,7 +81,7 @@ async def async_get_api_instance(
         """Return the instance of the API."""
         if llm_context.assistant:
             exposed_entities: dict | None = llm._get_exposed_entities(
-                self.hass, llm_context.assistant
+                self.hass, llm_context.assistant, include_state=False
             )
         else:
             exposed_entities = None
@@ -103,10 +106,7 @@ def _async_get_api_prompt(
     ) -> str:
         """Return the prompt for the API."""
         if not exposed_entities or not exposed_entities["entities"]:
-            return (
-                "Only if the user wants to control a device, tell them to expose "
-                "entities to their voice assistant in Home Assistant."
-            )
+            return llm.NO_ENTITIES_PROMPT
         return "\n".join(
             [
                 *self._async_get_preable(llm_context),
@@ -160,6 +160,9 @@ def _async_get_preable(self, llm_context: llm.LLMContext) -> list[str]:
         ):
             prompt.append("This device is not able to start timers.")
 
+        if self.config_entry.options[CONF_PROMPT_ENTITIES]:
+            prompt.append(llm.DYNAMIC_CONTEXT_PROMPT)
+
         return prompt
 
     @callback
@@ -183,7 +186,8 @@ def _async_get_exposed_entities_prompt(
                 )
 
             prompt.append(
-                "An overview of the areas and the devices in this smart home:"
+                "Static Context: An overview of the areas and the devices in this "
+                "smart home:"
             )
             prompt.append(yaml.dump(exposed_entities["entities"]))
 
@@ -259,11 +263,22 @@ def _async_get_tools(
                     names.extend(info["names"].split(", "))
                 tools.append(PowerCalendarGetEventsTool(names))
 
+            if exposed_domains is not None and TODO_DOMAIN in exposed_domains:
+                names = []
+                for info in exposed_entities["entities"].values():
+                    if info["domain"] != TODO_DOMAIN:
+                        continue
+                    names.extend(info["names"].split(", "))
+                tools.append(PowerTodoGetItemsTool(names))
+
             tools.extend(
                 PowerScriptTool(self.hass, script_entity_id)
                 for script_entity_id in exposed_entities[SCRIPT_DOMAIN]
             )
 
+        if exposed_domains:
+            tools.append(PowerGetLiveContextTool())
+
         tools.append(
             DynamicScriptTool(self.config_entry.options[CONF_SCRIPT_EXPOSED_ONLY])
         )
diff --git a/custom_components/powerllm/config_flow.py b/custom_components/powerllm/config_flow.py
@@ -146,7 +146,6 @@ async def get_options_schema(self) -> vol.Schema:
         tmp_context = llm.LLMContext(
             platform=DOMAIN,
             context=Context(user_id="Temp"),
-            user_prompt=None,
             language=None,
             assistant=None,
             device_id=None,
diff --git a/custom_components/powerllm/http.py b/custom_components/powerllm/http.py
@@ -47,7 +47,6 @@ async def get(self, request: web.Request, api: str) -> web.Response:
         llm_context = llm.LLMContext(
             platform=DOMAIN,
             context=self.context(request),
-            user_prompt=None,
             language=hass.config.language,
             assistant=CONVERSATION_DOMAIN,
             device_id=None,
@@ -69,7 +68,6 @@ async def get(self, request: web.Request, api: str) -> web.Response:
     @RequestDataValidator(
         vol.Schema(
             {
-                vol.Optional("user_input"): cv.string,
                 vol.Optional("language"): cv.string,
                 vol.Optional("device_id"): cv.string,
             }
@@ -85,7 +83,6 @@ async def post(
         llm_context = llm.LLMContext(
             platform=DOMAIN,
             context=self.context(request),
-            user_prompt=data.get("user_input"),
             language=data.get("language", hass.config.language),
             assistant=CONVERSATION_DOMAIN,
             device_id=data.get("device_id"),
@@ -115,7 +112,6 @@ class LLMToolView(HomeAssistantView):
         vol.Schema(
             {
                 vol.Optional("tool_args", default={}): {cv.string: object},
-                vol.Optional("user_input"): cv.string,
                 vol.Optional("language"): cv.string,
                 vol.Optional("device_id"): cv.string,
             }
@@ -135,7 +131,6 @@ async def post(
         llm_context = llm.LLMContext(
             platform=DOMAIN,
             context=self.context(request),
-            user_prompt=data.get("user_input"),
             language=data.get("language", hass.config.language),
             assistant=CONVERSATION_DOMAIN,
             device_id=data.get("device_id"),
diff --git a/custom_components/powerllm/llm_tools.py b/custom_components/powerllm/llm_tools.py
@@ -246,22 +246,39 @@ async def async_call(
             platform=llm_context.platform,
             intent_type=self.intent_handler.intent_type,
             slots=slots,
-            text_input=llm_context.user_prompt,
+            text_input=None,
             context=llm_context.context,
             language=llm_context.language,
             assistant=llm_context.assistant,
             device_id=llm_context.device_id,
         )
-        response = intent_response.as_dict()
-        if self._response_entities and intent_response.matched_states:
-            response["data"]["matched_states"] = [
+        return PowerIntentResponseDict(intent_response, self._response_entities, hass)
+
+
+class PowerIntentResponseDict(dict):
+    """Dictionary to represent an intent response resulting from a tool call."""
+
+    def __init__(
+        self,
+        intent_response: Any,
+        response_entities: bool = False,
+        hass: HomeAssistant | None = None,
+    ) -> None:
+        """Initialize the dictionary."""
+        if not isinstance(intent_response, intent.IntentResponse):
+            super().__init__(intent_response)
+            return
+
+        result = intent_response.as_dict()
+        if response_entities and intent_response.matched_states and hass is not None:
+            result["data"]["matched_states"] = [
                 _format_state(hass, state) for state in intent_response.matched_states
             ]
-        if self._response_entities and intent_response.unmatched_states:
-            response["data"]["unmatched_states"] = [
+        if response_entities and intent_response.unmatched_states and hass is not None:
+            result["data"]["unmatched_states"] = [
                 _format_state(hass, state) for state in intent_response.unmatched_states
             ]
-        del response["language"]
+        del result["language"]
 
         def remove_empty(value: JsonValueType):
             if isinstance(value, list):
@@ -274,16 +291,26 @@ def remove_empty(value: JsonValueType):
                 if not value[key] and value[key] is not False:
                     del value[key]
 
-        remove_empty(response)
-        return response
+        remove_empty(result)
+
+        super().__init__(result)
+        self.original = intent_response
 
 
 class PowerScriptTool(PowerLLMTool, llm.ScriptTool):
     """Power LLM Tool representing a Script."""
 
 
 class PowerCalendarGetEventsTool(PowerLLMTool, llm.CalendarGetEventsTool):
-    """LLM Tool allowing querying a calendar."""
+    """Power LLM Tool allowing querying a calendar."""
+
+
+class PowerTodoGetItemsTool(PowerLLMTool, llm.TodoGetItemsTool):
+    """Power LLM Tool allowing querying a to-do list."""
+
+
+class PowerGetLiveContextTool(PowerLLMTool, llm.GetLiveContextTool):
+    """Power LLM Tool for getting the current state of exposed entities."""
 
 
 class PowerFunctionTool(PowerLLMTool):
diff --git a/hacs.json b/hacs.json
@@ -1,4 +1,4 @@
 {
     "name": "Power LLM",
-    "homeassistant": "2025.3.0"
+    "homeassistant": "2025.7.0"
 }
diff --git a/tests/__snapshots__/test_http.ambr b/tests/__snapshots__/test_http.ambr
@@ -4,7 +4,7 @@
     'prompt': 'Only if the user wants to control a device, tell them to expose entities to their voice assistant in Home Assistant.',
     'tools': list([
       dict({
-        'description': 'Turns on/opens a device or entity',
+        'description': "Turns on/opens/presses a device or entity. For locks, this performs a 'lock' action. Use for requests like 'turn on', 'activate', 'enable', or 'lock'.",
         'name': 'HassTurnOn',
         'parameters': dict({
           'properties': dict({
@@ -22,13 +22,16 @@
                   'garage',
                   'gas',
                   'gate',
+                  'identify',
                   'outlet',
                   'receiver',
+                  'restart',
                   'shade',
                   'shutter',
                   'speaker',
                   'switch',
                   'tv',
+                  'update',
                   'water',
                   'window',
                 ]),
@@ -55,7 +58,7 @@
         }),
       }),
       dict({
-        'description': 'Turns off/closes a device or entity',
+        'description': "Turns off/closes a device or entity. For locks, this performs an 'unlock' action. Use for requests like 'turn off', 'deactivate', 'disable', or 'unlock'.",
         'name': 'HassTurnOff',
         'parameters': dict({
           'properties': dict({
@@ -73,13 +76,16 @@
                   'garage',
                   'gas',
                   'gate',
+                  'identify',
                   'outlet',
                   'receiver',
+                  'restart',
                   'shade',
                   'shutter',
                   'speaker',
                   'switch',
                   'tv',
+                  'update',
                   'water',
                   'window',
                 ]),
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -69,7 +69,6 @@ def llm_context() -> llm.LLMContext:
     return llm.LLMContext(
         platform="test_platform",
         context=Context(user_id="12345"),
-        user_prompt=None,
         language=None,
         assistant=None,
         device_id=None,
diff --git a/tests/test_api.py b/tests/test_api.py
diff --git a/tests/test_http.py b/tests/test_http.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Power LLM",`
`3`		`- "homeassistant": "2025.3.0"`
	`3`	`+ "homeassistant": "2025.7.0"`
`4`	`4`	`}`