fix: drop unhashable Session from lru_cache key (ovos-bus-client 2.x compat) (#60)

* fix: drop unhashable Session from lru_cache key

ovos-bus-client 2.x makes Session unhashable (Session.__hash__ is None),
so passing it as an lru_cache argument to _calc_padacioso_intent raised
TypeError: unhashable type: 'Session' on every match attempt. Pass the two
blacklist sets the matcher actually reads as frozensets (hashable) instead
of the whole Session, restoring caching and matching under bus-client 2.x.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix: invalidate padacioso match cache on register/detach

_calc_padacioso_intent is @lru_cache-keyed on the intent_container object,
which is mutated in place by register/detach. After detaching an intent the
cache returned the stale pre-detach match (no complete_intent_failure emitted),
breaking the detach e2e tests. Clear the cache whenever a container is mutated.

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: JarbasAl

padacioso/opm.py

@@ -147,6 +147,8 @@ def __detach_intent(self, intent_name):
             self.registered_intents.remove(intent_name)
             for lang in self.containers:
                 self.containers[lang].remove_intent(intent_name)
+            # the container was mutated; drop stale cached matches
+            _calc_padacioso_intent.cache_clear()
 
     def handle_detach_intent(self, message):
         """Messagebus handler for detaching padacioso intent.
@@ -165,6 +167,8 @@ def __detach_entity(self, name, lang):
         """
         if lang in self.containers:
             self.containers[lang].remove_entity(name)
+            # the container was mutated; drop stale cached matches
+            _calc_padacioso_intent.cache_clear()
 
     def handle_detach_skill(self, message):
         """Messagebus handler for detaching all intents for skill.
@@ -204,6 +208,8 @@ def _register_object(self, message, object_name, register_func):
                 samples = [line.strip() for line in f.readlines()]
 
         register_func(name, samples)
+        # the container was mutated; drop stale cached matches
+        _calc_padacioso_intent.cache_clear()
 
     def register_intent(self, message):
         """Messagebus handler for registering intents.
@@ -261,9 +267,14 @@ def calc_intent(self, utterances: List[str], lang: str = None,
             return None
 
         sess = SessionManager.get(message)
+        # Session is not hashable, so it cannot be an lru_cache key. Pass the
+        # blacklists it carries as frozensets (hashable) instead.
+        blacklisted_intents = frozenset(sess.blacklisted_intents or [])
+        blacklisted_skills = frozenset(sess.blacklisted_skills or [])
 
         intent_container = self.containers.get(lang)
-        intents = [_calc_padacioso_intent(utt, intent_container, sess)
+        intents = [_calc_padacioso_intent(utt, intent_container,
+                                          blacklisted_intents, blacklisted_skills)
                    for utt in utterances]
         intents = [i for i in intents if i is not None]
         # select best
@@ -285,7 +296,8 @@ def shutdown(self):
 @lru_cache(maxsize=128)  # covers burst of multiple ASR hypotheses without thrashing
 def _calc_padacioso_intent(utt: str,
                            intent_container: FallbackIntentContainer,
-                           sess: Session) -> \
+                           blacklisted_intents: frozenset = frozenset(),
+                           blacklisted_skills: frozenset = frozenset()) -> \
         Optional[PadaciosoIntent]:
     """
     Try to match an utterance to an intent in an intent_container
@@ -295,8 +307,8 @@ def _calc_padacioso_intent(utt: str,
     try:
         intents = [i for i in intent_container.calc_intents(utt)
                    if i is not None
-                   and i["name"] not in sess.blacklisted_intents
-                   and i["name"].split(":")[0] not in sess.blacklisted_skills]
+                   and i["name"] not in blacklisted_intents
+                   and i["name"].split(":")[0] not in blacklisted_skills]
         if len(intents) == 0:
             return None
         best_conf = max(x.get("conf", 0) for x in intents if x.get("name"))