From 662d2d9b19e9cba771c575cb8d0de3472e93d4bb Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 5 Jul 2020 12:55:47 +0000 Subject: [PATCH] cache entity_filter in the lambda --- homeassistant/components/history/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/history/__init__.py b/homeassistant/components/history/__init__.py index 549c7659c56..62565245c6c 100644 --- a/homeassistant/components/history/__init__.py +++ b/homeassistant/components/history/__init__.py @@ -648,9 +648,13 @@ class Filters: baked_query += lambda q: q.filter(~States.domain.in_(IGNORE_DOMAINS)) - entity_filter = self.entity_filter() - if entity_filter is not None: - baked_query += lambda q: q.filter(entity_filter) + if ( + self.excluded_entities + or self.excluded_domains + or self.included_entities + or self.included_domains + ): + baked_query += lambda q: q.filter(self.entity_filter()) def entity_filter(self): """Generate the entity filter query."""