diff --git a/homeassistant/components/ai_task/__init__.py b/homeassistant/components/ai_task/__init__.py index a650dfdd0be..5d8082e06b3 100644 --- a/homeassistant/components/ai_task/__init__.py +++ b/homeassistant/components/ai_task/__init__.py @@ -11,14 +11,13 @@ from homeassistant.helpers.typing import ConfigType from .const import DATA_COMPONENT, DOMAIN from .entity import AITaskEntity from .http import async_setup as async_setup_conversation_http -from .task import GenTextTask, GenTextTaskResult, GenTextTaskType, async_generate_text +from .task import GenTextTask, GenTextTaskResult, async_generate_text __all__ = [ "DOMAIN", "AITaskEntity", "GenTextTask", "GenTextTaskResult", - "GenTextTaskType", "async_generate_text", "async_setup", "async_setup_entry", diff --git a/homeassistant/components/ai_task/const.py b/homeassistant/components/ai_task/const.py index 9d580ab39f5..7c5b4e281d2 100644 --- a/homeassistant/components/ai_task/const.py +++ b/homeassistant/components/ai_task/const.py @@ -2,7 +2,6 @@ from __future__ import annotations -from enum import StrEnum from typing import TYPE_CHECKING from homeassistant.util.hass_dict import HassKey @@ -18,17 +17,3 @@ DATA_COMPONENT: HassKey[EntityComponent[AITaskEntity]] = HassKey(DOMAIN) DEFAULT_SYSTEM_PROMPT = ( "You are a Home Assistant expert and help users with their tasks." ) - - -class GenTextTaskType(StrEnum): - """Generate text task types. - - A task type describes the intent of the request in order to - match the right model for balance of cost and quality. - """ - - GENERATE = "generate" - """Generate content, which may target a higher quality result.""" - - SUMMARY = "summary" - """Summarize existing content, which be able to use a more cost effective model.""" diff --git a/homeassistant/components/ai_task/http.py b/homeassistant/components/ai_task/http.py index c79694194aa..22a603662ee 100644 --- a/homeassistant/components/ai_task/http.py +++ b/homeassistant/components/ai_task/http.py @@ -7,7 +7,7 @@ import voluptuous as vol from homeassistant.components import websocket_api from homeassistant.core import HomeAssistant, callback -from .task import GenTextTaskType, async_generate_text +from .task import async_generate_text @callback @@ -21,7 +21,6 @@ def async_setup(hass: HomeAssistant) -> None: vol.Required("type"): "ai_task/generate_text", vol.Required("task_name"): str, vol.Required("entity_id"): str, - vol.Required("task_type"): (lambda v: GenTextTaskType(v)), # pylint: disable=unnecessary-lambda vol.Required("instructions"): str, } ) diff --git a/homeassistant/components/ai_task/task.py b/homeassistant/components/ai_task/task.py index 2f6c901dce8..0a286cb7fcf 100644 --- a/homeassistant/components/ai_task/task.py +++ b/homeassistant/components/ai_task/task.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from homeassistant.core import HomeAssistant -from .const import DATA_COMPONENT, GenTextTaskType +from .const import DATA_COMPONENT async def async_generate_text( @@ -14,7 +14,6 @@ async def async_generate_text( *, task_name: str, entity_id: str, - task_type: GenTextTaskType, instructions: str, ) -> GenTextTaskResult: """Run a task in the AI Task integration.""" @@ -25,7 +24,6 @@ async def async_generate_text( return await entity.internal_async_generate_text( GenTextTask( name=task_name, - type=task_type, instructions=instructions, ) ) @@ -38,15 +36,12 @@ class GenTextTask: name: str """Name of the task.""" - type: GenTextTaskType - """Type of the task.""" - instructions: str """Instructions on what needs to be done.""" def __str__(self) -> str: """Return task as a string.""" - return f"" + return f"" @dataclass(slots=True) diff --git a/tests/components/ai_task/test_entity.py b/tests/components/ai_task/test_entity.py index 1689306bd21..fba2972e76e 100644 --- a/tests/components/ai_task/test_entity.py +++ b/tests/components/ai_task/test_entity.py @@ -2,7 +2,7 @@ from freezegun import freeze_time -from homeassistant.components.ai_task import GenTextTaskType, async_generate_text +from homeassistant.components.ai_task import async_generate_text from homeassistant.const import STATE_UNKNOWN from homeassistant.core import HomeAssistant @@ -27,7 +27,6 @@ async def test_state_generate_text( hass, task_name="Test task", entity_id=TEST_ENTITY_ID, - task_type=GenTextTaskType.SUMMARY, instructions="Test prompt", ) assert result.result == "Mock result" @@ -37,5 +36,4 @@ async def test_state_generate_text( assert mock_ai_task_entity.mock_generate_text_tasks task = mock_ai_task_entity.mock_generate_text_tasks[0] - assert task.type == GenTextTaskType.SUMMARY assert task.instructions == "Test prompt" diff --git a/tests/components/ai_task/test_http.py b/tests/components/ai_task/test_http.py index 5421025bf3a..ac3395e84b0 100644 --- a/tests/components/ai_task/test_http.py +++ b/tests/components/ai_task/test_http.py @@ -25,7 +25,6 @@ async def test_ws_generate_text( "type": "ai_task/generate_text", "task_name": "Test Task", "entity_id": TEST_ENTITY_ID, - "task_type": "summary", "instructions": "Test prompt", } ) diff --git a/tests/components/ai_task/test_task.py b/tests/components/ai_task/test_task.py index 4e355bcf1bd..56a1ff20a6a 100644 --- a/tests/components/ai_task/test_task.py +++ b/tests/components/ai_task/test_task.py @@ -4,7 +4,7 @@ from freezegun import freeze_time import pytest from syrupy.assertion import SnapshotAssertion -from homeassistant.components.ai_task import GenTextTaskType, async_generate_text +from homeassistant.components.ai_task import async_generate_text from homeassistant.components.conversation import async_get_chat_log from homeassistant.core import HomeAssistant from homeassistant.helpers import chat_session @@ -25,7 +25,6 @@ async def test_run_text_task_unknown_entity( hass, task_name="Test Task", entity_id="ai_task.unknown_entity", - task_type="summary", instructions="Test prompt", ) @@ -41,7 +40,6 @@ async def test_run_text_task_updates_chat_log( hass, task_name="Test Task", entity_id=TEST_ENTITY_ID, - task_type=GenTextTaskType.SUMMARY, instructions="Test prompt", ) assert result.result == "Mock result"