jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 17:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add service entity context (#71558)" (#72610)

Browse Source
This commit is contained in:
Paulus Schoutsen 2022-05-27 10:30:40 -07:00 committed by GitHub
parent 2a1405c4bd
commit d59258bd25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/helpers/service.py
View File

@ -3,7 +3,6 @@ from __future__ import annotations
import asyncio import asyncio
from collections.abc import Awaitable, Callable, Iterable from collections.abc import Awaitable, Callable, Iterable
from contextvars import ContextVar
import dataclasses import dataclasses
from functools import partial, wraps from functools import partial, wraps
import logging import logging
@ -64,15 +63,6 @@ _LOGGER = logging.getLogger(__name__)
SERVICE_DESCRIPTION_CACHE = "service_description_cache" SERVICE_DESCRIPTION_CACHE = "service_description_cache"
_current_entity: ContextVar[str | None] = ContextVar("current_entity", default=None)
@callback
def async_get_current_entity() -> str | None:
"""Get the current entity on which the service is called."""
return _current_entity.get()
class ServiceParams(TypedDict): class ServiceParams(TypedDict):
"""Type for service call parameters.""" """Type for service call parameters."""
@ -716,7 +706,6 @@ async def _handle_entity_call(
) -> None: ) -> None:
"""Handle calling service method.""" """Handle calling service method."""
entity.async_set_context(context) entity.async_set_context(context)
_current_entity.set(entity.entity_id)
if isinstance(func, str): if isinstance(func, str):
result = hass.async_run_job(partial(getattr(entity, func), **data)) # type: ignore[arg-type] result = hass.async_run_job(partial(getattr(entity, func), **data)) # type: ignore[arg-type]

16
tests/helpers/test_service.py
View File

@ -19,12 +19,12 @@ from homeassistant.const import (
STATE_ON, STATE_ON,
) )
from homeassistant.helpers import ( from homeassistant.helpers import (
config_validation as cv,
device_registry as dev_reg, device_registry as dev_reg,
entity_registry as ent_reg, entity_registry as ent_reg,
service, service,
template, template,
) )
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity import EntityCategory
from homeassistant.setup import async_setup_component from homeassistant.setup import async_setup_component
@ -1206,17 +1206,3 @@ async def test_async_extract_config_entry_ids(hass):
) )
assert await service.async_extract_config_entry_ids(hass, call) == {"abc"} assert await service.async_extract_config_entry_ids(hass, call) == {"abc"}
async def test_current_entity_context(hass, mock_entities):
"""Test we set the current entity context var."""
async def mock_service(entity, call):
assert entity.entity_id == service.async_get_current_entity()
await service.entity_service_call(
hass,
[Mock(entities=mock_entities)],
mock_service,
ha.ServiceCall("test_domain", "test_service", {"entity_id": "light.kitchen"}),
)