rasa-pro 3.13.0rc3__tar.gz → 3.13.1__tar.gz

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0rc3
+Version: 3.13.1
 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
@@ -81,7 +81,7 @@ Requires-Dist: pep440-version-utils (>=1.1.0,<1.2.0)
 Requires-Dist: pluggy (>=1.2.0,<2.0.0)
 Requires-Dist: portalocker (>=2.7.0,<3.0.0)
 Requires-Dist: prompt-toolkit (>=3.0.28,<3.0.29)
-Requires-Dist: protobuf (>=4.23.3,<4.25.4)
+Requires-Dist: protobuf (>=4.25.8,<4.26.0)
 Requires-Dist: psutil (>=5.9.5,<6.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<2.10.0)
 Requires-Dist: pydot (>=1.4,<1.5)
@@ -99,7 +99,7 @@ Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: qdrant-client (>=1.9.1,<1.10.0)
 Requires-Dist: questionary (>=1.10.0,<2.1.0)
 Requires-Dist: randomname (>=0.2.1,<0.3.0)
-Requires-Dist: rasa-sdk (==3.13.0rc1)
+Requires-Dist: rasa-sdk (==3.13.0)
 Requires-Dist: redis (>=4.6.0,<6.0)
 Requires-Dist: regex (>=2024.7.24,<2024.8.0)
 Requires-Dist: requests (>=2.32.3,<2.33.0)
@@ -115,7 +115,7 @@ Requires-Dist: scikit-learn (>=1.5.1,<1.6.0)
 Requires-Dist: scipy (>=1.13.1,<1.14.0)
 Requires-Dist: sentencepiece[sentencepiece] (>=0.1.99,<0.2.0) ; extra == "transformers" or extra == "full"
 Requires-Dist: sentry-sdk (>=2.8.0,<3)
-Requires-Dist: setuptools (>=70.0.0,<70.1.0)
+Requires-Dist: setuptools (>=78.1.1,<78.2.0)
 Requires-Dist: sklearn-crfsuite (>=0.3.6,<0.4.0)
 Requires-Dist: skops (>=0.10.0,<0.11.0)
 Requires-Dist: slack-sdk (>=3.27.1,<3.28.0)

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.13.0rc3"
+version = "3.13.1"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -166,9 +166,9 @@ SQLAlchemy = ">=2.0.41,<2.1.0"
 sklearn-crfsuite = "~0.3.6"
 psycopg2-binary = ">=2.9.10,<2.10.0"
 python-dateutil = "~2.8.2"
-protobuf = ">=4.23.3,< 4.25.4"
+protobuf = "~4.25.8"
 tensorflow_hub = "^0.13.0"
-setuptools = "~70.0.0"
+setuptools = "~78.1.1"
 ujson = ">=5.8,<6.0"
 regex = "~2024.7.24"
 sentry-sdk = ">=2.8.0,<3"
@@ -301,7 +301,7 @@ timeout_func_only = true
 asyncio_mode = "auto"
 
 [tool.poetry.dependencies.rasa-sdk]
-version = "3.13.0rc1"
+version = "3.13.0"
 allow-prereleases = true
 
 [tool.poetry.dependencies.keras]
@@ -375,6 +375,9 @@ convention = "google"
 
 
 
+
+
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/cli/inspect.py

@@ -9,6 +9,7 @@ from rasa import telemetry
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import shell as arguments
 from rasa.core import constants
+from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.engine.storage.local_model_storage import LocalModelStorage
 from rasa.exceptions import ModelNotFound
 from rasa.model import get_local_model
@@ -83,6 +84,12 @@ def inspect(args: argparse.Namespace) -> None:
 
     model = get_validated_path(args.model, "model", DEFAULT_MODELS_PATH)
 
+    # Load endpoints with proper endpoint file location
+    # This will initialise the endpoints singleton properly so that
+    # it can be used safely throughout the codebase with
+    # `AvailableEndpoints.get_instance()`
+    AvailableEndpoints.get_instance(args.endpoints)
+
     try:
         model = get_local_model(model)
     except ModelNotFound:

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/cli/shell.py

@@ -6,6 +6,7 @@ from typing import List
 from rasa import telemetry
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import shell as arguments
+from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.engine.storage.local_model_storage import LocalModelStorage
 from rasa.exceptions import ModelNotFound
 from rasa.model import get_local_model
@@ -105,7 +106,11 @@ def shell(args: argparse.Namespace) -> None:
     from rasa.shared.constants import DEFAULT_MODELS_PATH
 
     args.connector = "cmdline"
-
+    # Load endpoints with proper endpoint file location
+    # This will initialise the endpoints singleton properly so that
+    # it can be used safely throughout the codebase with
+    # `AvailableEndpoints.get_instance()`
+    AvailableEndpoints.get_instance(args.endpoints)
     model = get_validated_path(args.model, "model", DEFAULT_MODELS_PATH)
 
     try:

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/cli/train.py

@@ -112,6 +112,10 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
     )
     config = rasa.cli.utils.get_validated_config(args.config, CONFIG_MANDATORY_KEYS)
 
+    # Validates and loads endpoints with proper endpoint file location
+    # This will initialise the endpoints singleton properly so that
+    # it can be used safely throughout the codebase with
+    # `AvailableEndpoints.get_instance()`
     _check_nlg_endpoint_validity(args.endpoints)
 
     training_files = [

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/core/channels/voice_stream/asr/asr_engine.py

@@ -26,7 +26,7 @@ logger = structlog.get_logger(__name__)
 
 @dataclass
 class ASREngineConfig(MergeableConfig):
-    pass
+    keep_alive_interval: int = 5  # seconds
 
 
 class ASREngine(Generic[T]):
@@ -93,3 +93,7 @@ class ASREngine(Generic[T]):
     def get_default_config() -> T:
         """Get the default config for this component."""
         raise NotImplementedError
+
+    async def send_keep_alive(self) -> None:
+        """Send a keep-alive message to the ASR system if supported."""
+        pass

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/core/channels/voice_stream/asr/deepgram.py

@@ -145,3 +145,8 @@ class DeepgramASR(ASREngine[DeepgramASRConfig]):
     def concatenate_transcripts(t1: str, t2: str) -> str:
         """Concatenate two transcripts making sure there is a space between them."""
         return (t1.strip() + " " + t2.strip()).strip()
+
+    async def send_keep_alive(self) -> None:
+        """Send a keep-alive message to the Deepgram websocket connection."""
+        if self.asr_socket is not None:
+            await self.asr_socket.send(json.dumps({"type": "KeepAlive"}))

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/core/channels/voice_stream/audiocodes.py

@@ -81,6 +81,12 @@ class AudiocodesVoiceOutputChannel(VoiceOutputChannel):
         logger.debug("Sending start marker", stream_id=self._get_stream_id())
         await self.voice_websocket.send(media_message)
 
+        # This should be set when the bot actually starts speaking
+        # however, Audiocodes does not have an event to indicate that.
+        # This is an approximation, as the bot will be sent the audio chunks next
+        # which are played to the user immediately.
+        call_state.is_bot_speaking = True  # type: ignore[attr-defined]
+
     async def send_intermediate_marker(self, recipient_id: str) -> None:
         """Audiocodes doesn't need intermediate markers, so do nothing."""
         pass
@@ -170,21 +176,20 @@ class AudiocodesVoiceInputChannel(VoiceInputChannel):
         if data["type"] == "activities":
             activities = data["activities"]
             for activity in activities:
-                logger.debug("audiocodes_stream.activity", data=activity)
                 if activity["name"] == "start":
-                    # already handled in collect_call_parameters
+                    # handled in collect_call_parameters
                     pass
                 elif activity["name"] == "dtmf":
-                    # TODO: handle DTMF input
+                    logger.info("audiocodes_stream.dtmf_ignored", data=activity)
                     pass
                 elif activity["name"] == "playFinished":
                     logger.debug("audiocodes_stream.playFinished", data=activity)
+                    call_state.is_bot_speaking = False  # type: ignore[attr-defined]
                     if call_state.should_hangup:
                         logger.info("audiocodes_stream.hangup")
                         self._send_hangup(ws, data)
                         # the conversation should continue until
                         # we receive a end message from audiocodes
-                    pass
                 else:
                     logger.warning("audiocodes_stream.unknown_activity", data=activity)
         elif data["type"] == "userStream.start":

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/core/channels/voice_stream/voice_channel.py

@@ -468,10 +468,17 @@ class VoiceInputChannel(InputChannel):
                     call_parameters,
                 )
 
+        async def asr_keep_alive_task() -> None:
+            interval = getattr(asr_engine.config, "keep_alive_interval", 5)
+            while True:
+                await asyncio.sleep(interval)
+                await asr_engine.send_keep_alive()
+
         tasks = [
             asyncio.create_task(consume_audio_bytes()),
             asyncio.create_task(receive_asr_events()),
             asyncio.create_task(handle_asr_events()),
+            asyncio.create_task(asr_keep_alive_task()),
         ]
         await asyncio.wait(
             tasks,

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/core/policies/enterprise_search_policy.py

@@ -679,7 +679,7 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
         answer_relevant = not _ENTERPRISE_SEARCH_ANSWER_NOT_RELEVANT_PATTERN.search(
             llm_answer
         )
-        structlogger.debug("")
+
         return _RelevancyCheckResponse(
             answer=llm_answer if answer_relevant else None,
             relevant=answer_relevant,

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/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_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/core/tracker_stores/dynamo_tracker_store.py

@@ -109,7 +109,35 @@ class DynamoTrackerStore(TrackerStore, SerializedTrackerAsDict):
         await self.stream_events(tracker)
         serialized = self.serialise_tracker(tracker)
 
-        self.db.put_item(Item=serialized)
+        full_tracker = await self.retrieve_full_tracker(tracker.sender_id)
+        if full_tracker is None:
+            self.db.put_item(Item=serialized)
+            return None
+
+        # return the latest events since the last user message
+        new_tracker = DialogueStateTracker.from_dict(
+            serialized["sender_id"], events_as_dict=serialized["events"]
+        )
+        new_events = new_tracker.get_last_turn_events()
+        new_serialized_events = [event.as_dict() for event in new_events]
+
+        # we need to save the full tracker if it is a new tracker
+        # without events following a user message
+        if not new_serialized_events:
+            self.db.put_item(Item=serialized)
+            return None
+
+        # append new events to the existing tracker
+        self.db.update_item(
+            Key={"sender_id": tracker.sender_id},
+            UpdateExpression="SET events = list_append(if_not_exists(events, :empty_list), :events)",  # noqa: E501
+            ExpressionAttributeValues={
+                ":events": new_serialized_events,
+                ":empty_list": [],
+            },
+            ReturnValues="UPDATED_NEW",
+        )
+        return None
 
     async def delete(self, sender_id: Text) -> None:
         """Delete tracker for the given sender_id."""
@@ -181,7 +209,7 @@ class DynamoTrackerStore(TrackerStore, SerializedTrackerAsDict):
                 events = rasa.utils.json_utils.replace_decimals_with_floats(
                     dialogue["events"]
                 )
-                events_with_floats += events
+                events_with_floats.extend(events)
 
         if self.domain is None:
             slots = []
@@ -216,3 +244,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_pro-3.13.0rc3 → rasa_pro-3.13.1}/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_pro-3.13.0rc3 → rasa_pro-3.13.1}/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_pro-3.13.0rc3 → rasa_pro-3.13.1}/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_pro-3.13.0rc3 → rasa_pro-3.13.1}/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_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -232,16 +232,6 @@ class CorrectSlotsCommand(Command):
             proposed_slots, all_flows, tracker
         )
 
-        if not earliest_collect and not is_reset_only:
-            # if we could not find any step in the flow, where the slots were
-            # previously set, and we also don't want to reset the slots, do
-            # not correct the slots.
-            structlogger.debug(
-                "correct_slots_command.skip_correction",
-                is_reset_only=is_reset_only,
-            )
-            return None
-
         return CorrectionPatternFlowStackFrame(
             is_reset_only=is_reset_only,
             corrected_slots=proposed_slots,

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/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_pro-3.13.0rc3 → rasa_pro-3.13.1}/rasa/dialogue_understanding/processor/command_processor.py

@@ -398,7 +398,12 @@ def clean_up_commands(
     """
     domain = domain if domain else Domain.empty()
 
-    slots_so_far, active_flow = filled_slots_for_active_flow(tracker, all_flows)
+    slots_so_far, _ = filled_slots_for_active_flow(tracker, all_flows)
+
+    # update the slots so far with the slots that were set in the tracker
+    slots_so_far.update(
+        {event.key for event in tracker.events if isinstance(event, SlotSet)}
+    )
 
     clean_commands: List[Command] = []
 

{rasa_pro-3.13.0rc3 → rasa_pro-3.13.1}/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,