diff --git a/rasa/core/actions/forms.py b/rasa/core/actions/forms.py index dba1398a11c5..a9682ba37b76 100644 --- a/rasa/core/actions/forms.py +++ b/rasa/core/actions/forms.py @@ -658,25 +658,22 @@ async def is_done( # We explicitly check only the last occurrences for each possible termination # event instead of doing `return event in events_so_far` to make it possible # to override termination events which were returned earlier. - return ( - next( - ( - event - for event in reversed(events_so_far) - if isinstance(event, SlotSet) and event.key == REQUESTED_SLOT - ), - None, - ) - == SlotSet(REQUESTED_SLOT, None) - or next( - ( - event - for event in reversed(events_so_far) - if isinstance(event, ActiveLoop) - ), - None, - ) - == ActiveLoop(None) + return next( + ( + event + for event in reversed(events_so_far) + if isinstance(event, SlotSet) and event.key == REQUESTED_SLOT + ), + None, + ) == SlotSet(REQUESTED_SLOT, None) or next( + ( + event + for event in reversed(events_so_far) + if isinstance(event, ActiveLoop) + ), + None, + ) == ActiveLoop( + None ) async def deactivate(self, *args: Any, **kwargs: Any) -> List[Event]: diff --git a/rasa/nlu/extractors/extractor.py b/rasa/nlu/extractors/extractor.py index bba228f5c103..bdd054b8602f 100644 --- a/rasa/nlu/extractors/extractor.py +++ b/rasa/nlu/extractors/extractor.py @@ -477,6 +477,7 @@ class EntityExtractorMixin(EntityExtractor): EntityExtractorMixin was renamed to EntityExtractor in 3.3. This class will be removed in 4.0 """ + def __init_subclass__(cls, **kwargs): super().__init_subclass__(**kwargs) rasa.shared.utils.io.raise_deprecation_warning( diff --git a/tests/nlu/extractors/test_extractor.py b/tests/nlu/extractors/test_extractor.py index f12dfce1624f..e4cf61fb4f2d 100644 --- a/tests/nlu/extractors/test_extractor.py +++ b/tests/nlu/extractors/test_extractor.py @@ -487,6 +487,7 @@ def test_check_correct_entity_annotations( def test_entity_extractor_mixin_raises_deprecation_warning(): with pytest.warns(FutureWarning) as record: + class DeprecatedEntityExtractorMixin(GraphComponent, EntityExtractorMixin): @classmethod def create(