rasa-pro 3.13.0rc3__py3-none-any.whl → 3.13.0rc4__py3-none-any.whl

rasa/core/tracker_stores/auth_retry_tracker_store.py

@@ -92,6 +92,29 @@ class AuthRetryTrackerStore(TrackerStore):
             )
             return None
 
+    async def retrieve_full_tracker(
+        self, sender_id: Text
+    ) -> Optional["DialogueStateTracker"]:
+        """Retries retrieving the full tracker if it fails."""
+        # add + 1 to retries because the retries are additional to the first attempt
+        for _ in range(self.retries + 1):
+            try:
+                return await self._tracker_store.retrieve_full_tracker(sender_id)
+            except Exception as e:
+                logger.warning(
+                    f"Failed to retrieve full tracker for {sender_id}. Retrying...",
+                    exc_info=e,
+                )
+                self._tracker_store = self.recreate_tracker_store(
+                    self.domain, self.event_broker
+                )
+
+        logger.error(
+            f"Failed to retrieve full tracker for {sender_id} "
+            f"after {self.retries} retries."
+        )
+        return None
+
     async def save(self, tracker: "DialogueStateTracker") -> None:
         """Retries saving the tracker if it fails."""
         # add + 1 to retries because the retries are additional to the first attempt
@@ -120,6 +143,44 @@ class AuthRetryTrackerStore(TrackerStore):
         endpoint_config = EndpointResolver.update_config(self.endpoint_config)
         return create_tracker_store(endpoint_config, domain, event_broker)
 
-    async def delete(self, sender_id: Text) -> None:
-        """Delete tracker for the given sender_id."""
-        await self._tracker_store.delete(sender_id)
+    async def delete(self, sender_id: str) -> None:
+        """Retries deleting the tracker for the given sender_id."""
+        # add + 1 to retries because the retries are additional to the first attempt
+        for _ in range(self.retries + 1):
+            try:
+                await self._tracker_store.delete(sender_id)
+                break
+            except Exception as e:
+                logger.warning(
+                    f"Failed to delete tracker for {sender_id}. Retrying...",
+                    exc_info=e,
+                )
+                self._tracker_store = self.recreate_tracker_store(
+                    self.domain, self.event_broker
+                )
+        else:
+            logger.error(
+                f"Failed to delete tracker for {sender_id} "
+                f"after {self.retries} retries."
+            )
+
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Retries replacing the tracker if it fails."""
+        # add + 1 to retries because the retries are additional to the first attempt
+        for _ in range(self.retries + 1):
+            try:
+                await self._tracker_store.update(tracker)
+                break
+            except Exception as e:
+                logger.warning(
+                    f"Failed to replace tracker for {tracker.sender_id}. Retrying...",
+                    exc_info=e,
+                )
+                self._tracker_store = self.recreate_tracker_store(
+                    self.domain, self.event_broker
+                )
+        else:
+            logger.error(
+                f"Failed to replace tracker for {tracker.sender_id} "
+                f"after {self.retries} retries."
+            )

rasa/core/tracker_stores/dynamo_tracker_store.py

@@ -216,3 +216,13 @@ class DynamoTrackerStore(TrackerStore, SerializedTrackerAsDict):
             sender_ids.extend([i["sender_id"] for i in response["Items"]])
 
         return sender_ids
+
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Overwrites the tracker for the given sender_id."""
+        serialized = self.serialise_tracker(tracker)
+        self.db.put_item(Item=serialized)
+
+        structlogger.info(
+            "dynamo_tracker_store.replace.replaced_tracker",
+            sender_id=tracker.sender_id,
+        )

rasa/core/tracker_stores/mongo_tracker_store.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import itertools
+from datetime import datetime
 from typing import Any, Dict, Iterable, Iterator, List, Optional, Text
 
 import structlog
@@ -204,3 +205,19 @@ class MongoTrackerStore(TrackerStore, SerializedTrackerAsText):
     async def keys(self) -> Iterable[Text]:
         """Returns sender_ids of the Mongo Tracker Store."""
         return [c["sender_id"] for c in self.conversations.find()]
+
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Overwrites the tracker for the given sender_id."""
+        self.conversations.replace_one(
+            {"sender_id": tracker.sender_id},
+            tracker.current_state(EventVerbosity.ALL),
+            upsert=True,
+        )
+
+        first_event_timestamp = str(datetime.fromtimestamp(tracker.events[0].timestamp))
+
+        structlogger.info(
+            "redis_tracker_store.update.updated_tracker",
+            sender_id=tracker.sender_id,
+            first_event_timestamp=first_event_timestamp,
+        )

rasa/core/tracker_stores/redis_tracker_store.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import datetime
 from typing import Any, Dict, Iterable, Optional, Text
 
 import structlog
@@ -227,3 +228,25 @@ class RedisTrackerStore(TrackerStore, SerializedTrackerAsText):
                 merged.update(new_event)
 
         return merged
+
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Overwrites the tracker for the given sender_id."""
+        serialised_tracker = self.serialise_tracker(tracker)
+
+        # if the sender_id starts with the key prefix, we remove it
+        # this is used to avoid storing the prefix twice
+        sender_id = tracker.sender_id
+        if sender_id.startswith(self.key_prefix):
+            sender_id = sender_id[len(self.key_prefix) :]
+
+        self.red.set(
+            self.key_prefix + sender_id, serialised_tracker, ex=self.record_exp
+        )
+
+        first_event_timestamp = str(datetime.fromtimestamp(tracker.events[0].timestamp))
+
+        structlogger.info(
+            "redis_tracker_store.update.updated_tracker",
+            sender_id=tracker.sender_id,
+            first_event_timestamp=first_event_timestamp,
+        )

rasa/core/tracker_stores/sql_tracker_store.py

@@ -4,6 +4,7 @@ import contextlib
 import itertools
 import json
 import os
+from datetime import datetime
 from time import sleep
 from typing import (
     TYPE_CHECKING,
@@ -553,3 +554,29 @@ class SQLTrackerStore(TrackerStore, SerializedTrackerAsText):
         return itertools.islice(
             tracker.events, number_of_events_since_last_session, len(tracker.events)
         )
+
+    async def update(self, tracker_to_keep: DialogueStateTracker) -> None:
+        """Overwrite the tracker in the SQL tracker store."""
+        with self.session_scope() as session:
+            # Delete events whose timestamp are older
+            # than the first event of the tracker to keep.
+            statement = sa.delete(self.SQLEvent).where(
+                self.SQLEvent.sender_id == tracker_to_keep.sender_id,
+                self.SQLEvent.timestamp < tracker_to_keep.events[0].timestamp
+                if tracker_to_keep.events
+                else 0,
+            )
+
+            result = session.execute(statement)
+            session.commit()
+
+        first_event_timestamp = str(
+            datetime.fromtimestamp(tracker_to_keep.events[0].timestamp)
+        )
+
+        structlogger.info(
+            "sql_tracker_store.update.updated_tracker",
+            sender_id=tracker_to_keep.sender_id,
+            first_event_timestamp=first_event_timestamp,
+            event_info=f"{result.rowcount} rows removed from tracker.",
+        )

rasa/core/tracker_stores/tracker_store.py

@@ -251,6 +251,14 @@ class TrackerStore:
         """
         raise NotImplementedError()
 
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Replace an existing tracker with a new one.
+
+        Args:
+            tracker: The tracker to update.
+        """
+        raise NotImplementedError()
+
     async def retrieve_full_tracker(
         self, conversation_id: Text
     ) -> Optional[DialogueStateTracker]:
@@ -478,6 +486,14 @@ class InMemoryTrackerStore(TrackerStore, SerializedTrackerAsText):
 
         return multiple_tracker_sessions[-1]
 
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Replace an existing tracker with a new one.
+
+        Args:
+            tracker: The tracker to update.
+        """
+        await self.save(tracker)
+
 
 def validate_port(port: Any) -> Optional[int]:
     """Ensure that port can be converted to integer.
@@ -583,7 +599,19 @@ class FailSafeTrackerStore(TrackerStore):
 
     async def delete(self, sender_id: Text) -> None:
         """Delete tracker for the given sender_id."""
-        await self._tracker_store.delete(sender_id)
+        try:
+            await self._tracker_store.delete(sender_id)
+        except Exception as e:
+            self.on_tracker_store_error(e)
+            await self.fallback_tracker_store.delete(sender_id)
+
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Replace an existing tracker with a new one."""
+        try:
+            await self._tracker_store.update(tracker)
+        except Exception as e:
+            self.on_tracker_store_error(e)
+            await self.fallback_tracker_store.update(tracker)
 
     async def retrieve_full_tracker(
         self, sender_id: Text
@@ -793,7 +821,13 @@ class AwaitableTrackerStore(TrackerStore):
 
     async def delete(self, sender_id: Text) -> None:
         """Delete tracker for the given sender_id."""
-        await self._tracker_store.delete(sender_id)
+        result = self._tracker_store.delete(sender_id)
+        return await result if isawaitable(result) else result
+
+    async def update(self, tracker: DialogueStateTracker) -> None:
+        """Replace an existing tracker with a new one."""
+        result = self._tracker_store.update(tracker)
+        return await result if isawaitable(result) else result
 
     async def retrieve_full_tracker(
         self, conversation_id: Text

rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -249,7 +249,7 @@ flows:
                 next: END
 
   pattern_repeat_bot_messages:
-    description: Voice conversation repair pattern to repeat bot messages
+    description: Conversation repair flow for repeating previous messages
     name: pattern repeat bot messages
     steps:
       - action: action_repeat_bot_messages

rasa/privacy/privacy_manager.py

@@ -12,7 +12,7 @@ import structlog
 from apscheduler.schedulers.background import BackgroundScheduler
 
 import rasa.shared.core.trackers
-from rasa.core.tracker_stores.tracker_store import FailSafeTrackerStore, TrackerStore
+from rasa.core.tracker_stores.tracker_store import TrackerStore
 from rasa.privacy.constants import (
     TEXT_KEY,
     USER_CHAT_INACTIVITY_IN_MINUTES_ENV_VAR_NAME,
@@ -25,7 +25,7 @@ from rasa.privacy.privacy_config import (
 )
 from rasa.privacy.privacy_filter import PrivacyFilter
 from rasa.shared.core.events import Event, SlotSet, UserUttered, split_events
-from rasa.shared.core.trackers import DialogueStateTracker
+from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
 
 if TYPE_CHECKING:
     from asyncio import AbstractEventLoop
@@ -97,7 +97,7 @@ class BackgroundPrivacyManager:
                 else TrackerStore.create(None)
             )
 
-        self.tracker_store = FailSafeTrackerStore(tracker_store)
+        self.tracker_store = tracker_store
 
         self.event_brokers: List["EventBroker"] = []
         self.event_loop = event_loop
@@ -264,15 +264,16 @@ class BackgroundPrivacyManager:
             )
             return None
 
-        latest_message = tracker.latest_message
-
-        if latest_message is None or not latest_message.text:
+        latest_user_message = tracker.get_last_event_for(
+            UserUttered, event_verbosity=EventVerbosity.ALL
+        )
+        if latest_user_message is None or not latest_user_message.text:
             structlogger.debug(
                 "rasa.privacy_manager.no_user_message.skipping_processing",
             )
             return None
 
-        return latest_message
+        return latest_user_message
 
     @staticmethod
     def _has_session_been_anonymized(events: List[Event]) -> bool:
@@ -360,9 +361,13 @@ class BackgroundPrivacyManager:
                 full_tracker
             )
 
-            await self.tracker_store.delete(sender_id=key)
-
             if not events_to_be_retained:
+                await self.tracker_store.delete(sender_id=key)
+                structlogger.info(
+                    "rasa.privacy_manager.tracker_session_deleted",
+                    sender_id=full_tracker.sender_id,
+                    triggered_by="deletion_cron_job",
+                )
                 continue
 
             tracker = DialogueStateTracker.from_events(
@@ -370,12 +375,13 @@ class BackgroundPrivacyManager:
                 evts=events_to_be_retained,
                 slots=full_tracker.slots.values(),
             )
-            await self.tracker_store.save(tracker)
+            await self.tracker_store.update(tracker)
 
             structlogger.info(
-                "rasa.privacy_manager.save_tracker_after_deletion",
+                "rasa.privacy_manager.overwritten_tracker",
                 sender_id=key,
-                event_info="Saved tracker with events not scheduled "
+                event_info="Deleted eligible events and saved "
+                "tracker with events not scheduled "
                 "for deletion yet.",
             )
 
@@ -527,10 +533,7 @@ class BackgroundPrivacyManager:
                     last_event_timestamp=last_event_timestamp,
                     triggered_by="anonymization_cron_job",
                 )
-                tracker = DialogueStateTracker.from_events(
-                    session.sender_id, session.events
-                )
-                events = self.process_events(tracker, process_all=True)
+                events = self.process_events(session, process_all=True)
                 processed_events.extend(events)
             else:
                 # If the session is not valid for anonymization,

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.13.0rc3"
+__version__ = "3.13.0rc4"

{rasa_pro-3.13.0rc3.dist-info → rasa_pro-3.13.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0rc3
+Version: 3.13.0rc4
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH

{rasa_pro-3.13.0rc3.dist-info → rasa_pro-3.13.0rc4.dist-info}/RECORD

@@ -347,12 +347,12 @@ rasa/core/secrets_manager/secret_manager.py,sha256=oYihfIMIMUKA8U_ZRA3blcErFlCoz
 rasa/core/secrets_manager/vault.py,sha256=02wlsrN3QoHSZkqygHaM_CWDtkpkJ25iD-ksEu3ejBw,20481
 rasa/core/test.py,sha256=VGlGvmrXRqHaPMaetvvN1fa65oZMryN5ot9L3otNH5E,49282
 rasa/core/tracker_stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/core/tracker_stores/auth_retry_tracker_store.py,sha256=eFW-uCRImTxouhHux4HVppQhbWNOaPzusbvaJ-U0N4Y,4826
-rasa/core/tracker_stores/dynamo_tracker_store.py,sha256=opTSmFfNYKe3pKY5PL2JAKCc9uIur3pc5f_8SVW6g98,7906
-rasa/core/tracker_stores/mongo_tracker_store.py,sha256=nuj-XkIC02dGv0l7Ie8801fHGrSN9SWlepenz3DZs78,7024
-rasa/core/tracker_stores/redis_tracker_store.py,sha256=cODH4DlUNij-GnKz6ns3nU2E-z_pXtsNA7LojmARZWg,7974
-rasa/core/tracker_stores/sql_tracker_store.py,sha256=WZuo5c4TcBwOc6GwWlyNCv3LHNetgWTih0zEdMEvgYY,19879
-rasa/core/tracker_stores/tracker_store.py,sha256=BrQFZXQGMncl-Ig3DDUrqpJfxshuy-pOmoVTVa1IMbw,28223
+rasa/core/tracker_stores/auth_retry_tracker_store.py,sha256=eOwsLuQZhWu5Q4RZHJYffL3FhpKOglzJ0MNGffv2E60,7270
+rasa/core/tracker_stores/dynamo_tracker_store.py,sha256=-C0M03H4dlIyX7yOYtL6VJOtnDkNjnCMTdbRIYedN6g,8271
+rasa/core/tracker_stores/mongo_tracker_store.py,sha256=v2ktPXxp7PWfoHPqOJKLkMzML_5E_Of0Ihna2Vcqfbg,7644
+rasa/core/tracker_stores/redis_tracker_store.py,sha256=q38nCZoXW4G7xdZ6nOcOpanIB5XrzEM4rMdFnUHR3pE,8864
+rasa/core/tracker_stores/sql_tracker_store.py,sha256=oJgAqDysP3KXJkPRCZ1s8HhlxOn-y9Apmo6OVO3lQmc,20960
+rasa/core/tracker_stores/tracker_store.py,sha256=bJMsxzuhw90vGY2uGbbCogikoy4HucPy6SvYfcyFQJw,29472
 rasa/core/train.py,sha256=ESBhZ9vZySziZIG8fvshHO4AYApD0hywRFCmA9h1wFI,3521
 rasa/core/training/__init__.py,sha256=23DaZynwsxIaGYvZBSwQRxanaMWa-ihfON7f-NetK_g,3213
 rasa/core/training/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -431,7 +431,7 @@ rasa/dialogue_understanding/patterns/collect_information.py,sha256=8YWvhFTt8CJML
 rasa/dialogue_understanding/patterns/completed.py,sha256=7qkyUj2d__2R3mpwWVmQpfwCCbJruBrjRZbmbDr3Zbo,1278
 rasa/dialogue_understanding/patterns/continue_interrupted.py,sha256=OSTbe5l0B0ECNIYWpYB0pdzIeaqM3m3UZskNNjL5vrw,1682
 rasa/dialogue_understanding/patterns/correction.py,sha256=7fQ02-JU1CGZiTjTi9YqmD1F4o-9Tv5WCAXnFgZlvtY,11380
-rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml,sha256=8zQQ1o9KQsT_wmNBUx4_iHZzYbzPHVLjFDorT60yvCs,11030
+rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml,sha256=NwNXqrodwOTgDPYtu6L5n6epBLzXjnnRCzH_oBPLMnc,11030
 rasa/dialogue_understanding/patterns/domain_for_patterns.py,sha256=Zv_lCJn4nbkxeNYOPGsR0V8tmYAUsM_Ho_9to8hku-o,6493
 rasa/dialogue_understanding/patterns/human_handoff.py,sha256=1hkSdL6kui42rZc7zERZ9R7nLyvRHi_tHgNU7FyrhAQ,1132
 rasa/dialogue_understanding/patterns/internal_error.py,sha256=APCKVv16M6mSQ4upu4UwG0yIaaKTyr7uB2yV8ZtpMzo,1609
@@ -637,7 +637,7 @@ rasa/privacy/event_broker_utils.py,sha256=K0ej9vRED5sJiG8YJq3_pynMRJEenCyKSjt6xO
 rasa/privacy/privacy_config.py,sha256=mctRStSliSUbbjHAl5ISTczJ2TgU7T5yjSfZvLmUtlI,9339
 rasa/privacy/privacy_config_schema.json,sha256=kQVJCrlKljJMkOCL3WDzquVS8V1-KE6_XMEyVSuUkJw,1835
 rasa/privacy/privacy_filter.py,sha256=s1LxnOeIoGh16vzTzxoM5vSDelk1P55Ay3bm0XRuINs,14988
-rasa/privacy/privacy_manager.py,sha256=6tK1cLfJDfk_XbFZZNq1a9ImhtDh1_l8RC2GWHWRMfw,22386
+rasa/privacy/privacy_manager.py,sha256=IWbWIpJeX7EgHXPjYXPmq-5RaoJEnCFa5xKE7M2roTE,22593
 rasa/server.py,sha256=prH4FVO5kd7VKgSJnP_dt7PhXlW0vf8KWf62ccK8mlw,60505
 rasa/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/shared/constants.py,sha256=pYMlsFE9kao5BUOXd-8cHWLV9jMfUop7Mfm57mBPcxc,12856
@@ -846,9 +846,9 @@ rasa/utils/train_utils.py,sha256=ClJx-6x3-h3Vt6mskacgkcCUJTMXjFPe3zAcy_DfmaU,212
 rasa/utils/url_tools.py,sha256=dZ1HGkVdWTJB7zYEdwoDIrEuyX9HE5WsxKKFVsXBLE0,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=JXi8bz3SsTB2c1tbDRY3r3TkcfSbhxacoxs-rVx6a9s,82937
-rasa/version.py,sha256=-KPJ9E-IAgMogu8pKWMj7VxcA8dbmX0UKuG-U9k-adc,120
-rasa_pro-3.13.0rc3.dist-info/METADATA,sha256=5yPX5oyvTOwfwvysDX16kfh7toEmYoM6KUZSJqJjckY,10556
-rasa_pro-3.13.0rc3.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.13.0rc3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.13.0rc3.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.13.0rc3.dist-info/RECORD,,
+rasa/version.py,sha256=CR4TIGitcXn4TjFFR4dvuB7MwIBGoxfQBLSyXmoOigk,120
+rasa_pro-3.13.0rc4.dist-info/METADATA,sha256=kyiTLbOAtGtqCKm9hjUNlkTdUSTMCuZIUNB76NXTDu8,10556
+rasa_pro-3.13.0rc4.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.13.0rc4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.13.0rc4.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.13.0rc4.dist-info/RECORD,,