rasa-pro 3.12.21__py3-none-any.whl → 3.13.0__py3-none-any.whl

rasa/cli/studio/push.py

@@ -0,0 +1,78 @@
+import argparse
+from typing import List, Text
+
+from rasa.cli import SubParsersAction
+from rasa.cli.arguments.default_arguments import (
+    add_config_param,
+    add_data_param,
+    add_domain_param,
+    add_endpoint_param,
+)
+from rasa.shared.constants import (
+    DEFAULT_DOMAIN_PATH,
+    DEFAULT_ENDPOINTS_PATH,
+)
+from rasa.studio.push import (
+    handle_push,
+    handle_push_config,
+    handle_push_endpoints,
+)
+
+
+def add_subparser(
+    subparsers: SubParsersAction,
+    parents: List[argparse.ArgumentParser],
+    domain: Text = DEFAULT_DOMAIN_PATH,
+) -> None:
+    """Register the `rasa studio push` command and its sub-commands.
+
+    Args:
+        subparsers: The subparsers to add the command to.
+        parents: Parent parsers, needed to ensure tree structure in argparse
+        domain: Path to the assistant's domain file.
+    """
+    push_parser = subparsers.add_parser(
+        "push",
+        parents=parents,
+        conflict_handler="resolve",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        help="Push assistant data to Rasa Studio.",
+    )
+    push_subparsers = push_parser.add_subparsers()
+
+    # Arguments for pushing configuration only
+    config_parser = push_subparsers.add_parser(
+        "config",
+        parents=parents,
+        conflict_handler="resolve",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        help="Push only the assistant configuration file.",
+    )
+    add_config_param(config_parser)
+    config_parser.set_defaults(func=handle_push_config)
+
+    # Arguments for pushing endpoints only
+    endpoints_parser = push_subparsers.add_parser(
+        "endpoints",
+        parents=parents,
+        conflict_handler="resolve",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        help="Push ONLY the endpoints configuration file.",
+    )
+    add_endpoint_param(
+        endpoints_parser,
+        "Configuration file for the model endpoints.",
+        default=DEFAULT_ENDPOINTS_PATH,
+    )
+    endpoints_parser.set_defaults(func=handle_push_endpoints)
+
+    # Arguments for pushing the whole assistant data
+    add_domain_param(push_parser, domain)
+    add_data_param(push_parser)
+    add_config_param(push_parser)
+    add_endpoint_param(
+        push_parser,
+        "Configuration file for the model endpoints.",
+        default=DEFAULT_ENDPOINTS_PATH,
+    )
+    push_parser.set_defaults(func=handle_push)

rasa/cli/studio/studio.py

@@ -5,10 +5,15 @@ from urllib.parse import ParseResult, urlparse
 import questionary
 
 import rasa.cli.studio.download
+import rasa.cli.studio.link
+import rasa.cli.studio.pull
+import rasa.cli.studio.push
 import rasa.cli.studio.train
 import rasa.cli.studio.upload
 import rasa.shared.utils.cli
 from rasa.cli import SubParsersAction
+from rasa.cli.utils import get_validated_path
+from rasa.shared.constants import DEFAULT_DOMAIN_PATH, DEFAULT_DOMAIN_PATHS
 from rasa.studio.auth import StudioAuth
 from rasa.studio.config import StudioConfig
 
@@ -33,6 +38,13 @@ def add_subparser(
     rasa.cli.studio.upload.add_subparser(studio_subparsers, parents)
     rasa.cli.studio.download.add_subparser(studio_subparsers, parents)
 
+    domain = get_validated_path(
+        DEFAULT_DOMAIN_PATH, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True
+    )
+    rasa.cli.studio.link.add_subparser(studio_subparsers, parents, domain)
+    rasa.cli.studio.push.add_subparser(studio_subparsers, parents, domain)
+    rasa.cli.studio.pull.add_subparser(studio_subparsers, parents, domain)
+
     _add_config_subparser(studio_subparsers, parents)
     _add_login_subparser(studio_subparsers, parents)
 

rasa/cli/studio/train.py

@@ -20,10 +20,7 @@ def add_subparser(
         parents=parents,
         conflict_handler="resolve",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        help=(
-            "Trains a Rasa model using Rasa Studio "
-            "data and your NLU data and stories."
-        ),
+        help="Trains a Rasa model using Rasa Studio data.",
     )
 
     train_parser.set_defaults(func=handle_train)
@@ -36,7 +33,6 @@ def set_studio_train_arguments(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "assistant_name",
         default=None,
-        nargs=1,
         type=str,
         help="Name of the assistant on Rasa Studio",
     )

rasa/cli/studio/upload.py

@@ -25,7 +25,7 @@ def add_subparser(
         parents=parents,
         conflict_handler="resolve",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        help="Upload primitives to Rasa Studio. Only works with NLU assistants.",
+        help="Upload primitives to Rasa Studio.",
     )
 
     upload_parser.set_defaults(func=handle_upload)
@@ -56,7 +56,9 @@ def set_upload_arguments(parser: argparse.ArgumentParser) -> None:
     )
 
     parser.add_argument(
-        "--calm",
-        action="store_true",
-        help="If set, creates a new CALM assistant in Rasa Studio.",
+        "assistant_name",
+        default=None,
+        nargs="?",
+        type=str,
+        help="Name of the assistant on Rasa Studio",
     )

rasa/cli/train.py

@@ -11,7 +11,7 @@ import rasa.cli.utils
 import rasa.core.utils
 import rasa.utils.common
 from rasa.cli import SubParsersAction
-from rasa.core import ContextualResponseRephraser
+from rasa.core.nlg.contextual_response_rephraser import ContextualResponseRephraser
 from rasa.core.nlg.generator import NaturalLanguageGenerator
 from rasa.core.train import do_compare_training
 from rasa.engine.validation import validate_api_type_config_key_usage
@@ -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/cli/utils.py

@@ -104,7 +104,7 @@ def get_validated_path(
                 parameter=parameter,
                 event_info=(f"Parameter '{parameter}' was not set. {shared_info}"),
             )
-        else:
+        elif current not in default_options:
             structlogger.warn(
                 "cli.get_validated_path.path_does_not_exists",
                 path=current,

rasa/cli/x.py

@@ -15,7 +15,7 @@ import rasa.utils.common
 import rasa.utils.io
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import x as arguments
-from rasa.core.utils import AvailableEndpoints
+from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.shared.constants import (
     DEFAULT_CREDENTIALS_PATH,
     DEFAULT_ENDPOINTS_PATH,

rasa/constants.py

@@ -44,3 +44,5 @@ HTTP_STATUS_FORBIDDEN = 403
 HTTP_STATUS_NOT_FOUND = 404
 
 RASA_REMOTE_STORAGE_ENV_VAR_NAME = "RASA_REMOTE_STORAGE"
+
+RASA_DIR_NAME = ".rasa"

rasa/core/__init__.py

@@ -1,16 +0,0 @@
-import logging
-
-import rasa
-from rasa.core.nlg.contextual_response_rephraser import ContextualResponseRephraser
-from rasa.core.policies.enterprise_search_policy import EnterpriseSearchPolicy
-from rasa.core.policies.intentless_policy import IntentlessPolicy
-
-logging.getLogger(__name__).addHandler(logging.NullHandler())
-
-__version__ = rasa.__version__
-
-__all__ = [
-    "EnterpriseSearchPolicy",
-    "IntentlessPolicy",
-    "ContextualResponseRephraser",
-]

rasa/core/actions/action.py

@@ -23,9 +23,11 @@ from rasa.core.constants import (
     KEY_IS_COEXISTENCE_ASSISTANT,
     UTTER_SOURCE_METADATA_KEY,
 )
+from rasa.core.nlg.translate import get_translated_buttons, get_translated_text
 from rasa.core.policies.policy import PolicyPrediction
 from rasa.core.utils import add_bot_utterance_metadata
 from rasa.e2e_test.constants import KEY_STUB_CUSTOM_ACTIONS
+from rasa.engine.language import Language
 from rasa.nlu.constants import (
     RESPONSE_SELECTOR_DEFAULT_INTENT,
     RESPONSE_SELECTOR_PREDICTION_KEY,
@@ -82,6 +84,7 @@ from rasa.shared.core.events import (
     UserUttered,
 )
 from rasa.shared.core.flows import FlowsList
+from rasa.shared.core.flows.constants import KEY_TRANSLATION
 from rasa.shared.core.slot_mappings import (
     SlotFillingManager,
     extract_slot_value,
@@ -248,25 +251,36 @@ def action_for_name_or_text(
     return RemoteAction(action_name_or_text, action_endpoint)
 
 
-def create_bot_utterance(message: Dict[Text, Any]) -> BotUttered:
-    """Create BotUttered event from message."""
-    bot_message = BotUttered(
-        text=message.pop(TEXT, None),
-        data={
-            ELEMENTS: message.pop(ELEMENTS, None),
-            QUICK_REPLIES: message.pop(QUICK_REPLIES, None),
-            BUTTONS: message.pop(BUTTONS, None),
-            # for legacy / compatibility reasons we need to set the image
-            # to be the attachment if there is no other attachment (the
-            # `.get` is intentional - no `pop` as we still need the image`
-            # property to set it in the following line)
-            ATTACHMENT: message.pop(ATTACHMENT, None) or message.get(IMAGE, None),
-            IMAGE: message.pop(IMAGE, None),
-            CUSTOM: message.pop(CUSTOM, None),
-        },
-        metadata=message,
+def create_bot_utterance(
+    message: Dict[Text, Any], language: Optional[Language] = None
+) -> BotUttered:
+    """Create BotUttered event from message with translation support."""
+    message_copy = copy.deepcopy(message)
+
+    text = get_translated_text(
+        text=message_copy.pop(TEXT, None),
+        translation=message_copy.pop(KEY_TRANSLATION, {}),
+        language=language,
+    )
+
+    buttons = get_translated_buttons(
+        buttons=message_copy.pop(BUTTONS, None), language=language
     )
-    return bot_message
+
+    data = {
+        ELEMENTS: message_copy.pop(ELEMENTS, None),
+        QUICK_REPLIES: message_copy.pop(QUICK_REPLIES, None),
+        BUTTONS: buttons,
+        # for legacy / compatibility reasons we need to set the image
+        # to be the attachment if there is no other attachment (the
+        # `.get` is intentional - no `pop` as we still need the image`
+        # property to set it in the following line)
+        ATTACHMENT: message_copy.pop(ATTACHMENT, None) or message_copy.get(IMAGE, None),
+        IMAGE: message_copy.pop(IMAGE, None),
+        CUSTOM: message_copy.pop(CUSTOM, None),
+    }
+
+    return BotUttered(text=text, data=data, metadata=message_copy)
 
 
 class Action:
@@ -379,7 +393,7 @@ class ActionBotResponse(Action):
         message = add_bot_utterance_metadata(
             message, self.utter_action, nlg, domain, tracker
         )
-        return [create_bot_utterance(message)]
+        return [create_bot_utterance(message, tracker.current_language)]
 
     def name(self) -> Text:
         """Returns action name."""
@@ -413,7 +427,7 @@ class ActionEndToEndResponse(Action):
     ) -> List[Event]:
         """Runs action (see parent class for full docstring)."""
         message = {"text": self.action_text}
-        return [create_bot_utterance(message)]
+        return [create_bot_utterance(message, tracker.current_language)]
 
     def event_for_successful_execution(
         self,
@@ -879,10 +893,7 @@ class RemoteAction(Action):
             generated_response = response.pop("response", None)
             if generated_response is not None:
                 draft = await nlg.generate(
-                    generated_response,
-                    tracker,
-                    output_channel.name(),
-                    **response,
+                    generated_response, tracker, output_channel.name(), **response
                 )
                 if not draft:
                     continue
@@ -898,9 +909,9 @@ class RemoteAction(Action):
                 draft["buttons"].extend(buttons)
 
             # Avoid overwriting `draft` values with empty values
-            response = {k: v for k, v in response.items() if v is not None}
+            response = {k: v for k, v in response.items() if v}
             draft.update(response)
-            bot_messages.append(create_bot_utterance(draft))
+            bot_messages.append(create_bot_utterance(draft, tracker.current_language))
 
         return bot_messages
 
@@ -1057,7 +1068,6 @@ def _revert_rephrasing_events() -> List[Event]:
     ]
 
 
-# TODO: this should be removed, e.g. it uses a hardcoded message and no translation
 class ActionDefaultAskAffirmation(Action):
     """Default implementation which asks the user to affirm his intent.
 
@@ -1109,7 +1119,7 @@ class ActionDefaultAskAffirmation(Action):
             "utter_action": self.name(),
         }
 
-        return [create_bot_utterance(message)]
+        return [create_bot_utterance(message, tracker.current_language)]
 
 
 class ActionDefaultAskRephrase(ActionBotResponse):
@@ -1142,7 +1152,11 @@ class ActionSendText(Action):
         fallback = {"text": ""}
         metadata_copy = copy.deepcopy(metadata) if metadata else {}
         message = metadata_copy.get("message", fallback)
-        return [create_bot_utterance(message)]
+
+        should_send_text = metadata_copy.get("should_send_text", True)
+        if should_send_text:
+            return [create_bot_utterance(message, tracker.current_language)]
+        return []
 
 
 class ActionExtractSlots(Action):

rasa/core/actions/action_repeat_bot_messages.py

@@ -25,7 +25,7 @@ class ActionRepeatBotMessages(Action):
         """Return the name of the action."""
         return ACTION_REPEAT_BOT_MESSAGES
 
-    def _get_last_bot_events(self, tracker: DialogueStateTracker) -> List[Event]:
+    def _get_last_bot_events(self, tracker: DialogueStateTracker) -> List[BotUttered]:
         """Get the last consecutive bot events before the most recent user message.
 
         This function scans the dialogue history in reverse to find the last sequence of
@@ -48,33 +48,21 @@ class ActionRepeatBotMessages(Action):
             The elif condition doesn't break when it sees User3 event.
             But it does at User2 event.
         """
-        # Skip action if we are in a collect information step whose
-        # default behavior is to repeat anyways
-        top_frame = tracker.stack.top(
-            lambda frame: isinstance(frame, RepeatBotMessagesPatternFlowStackFrame)
-            or isinstance(frame, UserSilencePatternFlowStackFrame)
-        )
-        if isinstance(top_frame, CollectInformationPatternFlowStackFrame):
-            return []
         # filter user and bot events
-        filtered = [
+        user_and_bot_events = [
             e for e in tracker.events if isinstance(e, (BotUttered, UserUttered))
         ]
-        bot_events: List[Event] = []
+        last_bot_events: List[BotUttered] = []
 
         # find the last BotUttered events
-        for e in reversed(filtered):
-            if isinstance(e, BotUttered):
-                # insert instead of append because the list is reversed
-                bot_events.insert(0, e)
-
-            # stop if a UserUttered event is found
-            # only if we have collected some bot events already
-            # this condition skips the first N UserUttered events
-            elif bot_events:
+        for e in reversed(user_and_bot_events):
+            # stop when seeing a user event after having seen bot events already
+            if isinstance(e, UserUttered) and len(last_bot_events) > 0:
                 break
+            elif isinstance(e, BotUttered):
+                last_bot_events.append(e)
 
-        return bot_events
+        return list(reversed(last_bot_events))
 
     async def run(
         self,
@@ -85,5 +73,13 @@ class ActionRepeatBotMessages(Action):
         metadata: Optional[Dict[str, Any]] = None,
     ) -> List[Event]:
         """Send the last bot messages to the channel again"""
-        bot_events = self._get_last_bot_events(tracker)
+        top_frame = tracker.stack.top(
+            lambda frame: isinstance(frame, RepeatBotMessagesPatternFlowStackFrame)
+            or isinstance(frame, UserSilencePatternFlowStackFrame)
+        )
+
+        bot_events: List[Event] = list(self._get_last_bot_events(tracker))
+        # drop the last bot event in a collect step as that part will be repeated anyway
+        if isinstance(top_frame, CollectInformationPatternFlowStackFrame):
+            bot_events = bot_events[:-1]
         return bot_events

rasa/core/actions/action_run_slot_rejections.py

@@ -105,7 +105,6 @@ def run_rejections(
             structlogger.error(
                 "run.predicate.error",
                 predicate=condition,
-                document=document,
                 error=str(e),
             )
             violation = True
@@ -217,6 +216,6 @@ class ActionRunSlotRejections(Action):
             message = add_bot_utterance_metadata(
                 message, utterance, nlg, domain, tracker
             )
-            events.append(create_bot_utterance(message))
+            events.append(create_bot_utterance(message, tracker.current_language))
 
         return events

rasa/core/agent.py

@@ -13,6 +13,7 @@ from aiohttp import ClientError
 
 import rasa.shared.utils.io
 from rasa.core import jobs
+from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.channels.channel import OutputChannel, UserMessage
 from rasa.core.constants import DEFAULT_REQUEST_TIMEOUT
 from rasa.core.exceptions import AgentNotReady
@@ -22,18 +23,19 @@ from rasa.core.nlg import NaturalLanguageGenerator, TemplatedNaturalLanguageGene
 from rasa.core.persistor import StorageType
 from rasa.core.policies.policy import PolicyPrediction
 from rasa.core.processor import MessageProcessor
-from rasa.core.tracker_store import (
+from rasa.core.tracker_stores.tracker_store import (
     FailSafeTrackerStore,
     InMemoryTrackerStore,
     TrackerStore,
 )
-from rasa.core.utils import AvailableEndpoints
 from rasa.exceptions import ModelNotFound
 from rasa.nlu.utils import is_url
+from rasa.privacy.privacy_manager import BackgroundPrivacyManager
 from rasa.shared.constants import DEFAULT_SENDER_ID
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
 from rasa.shared.exceptions import RasaException
+from rasa.telemetry import track_privacy_enabled
 from rasa.utils.common import TempDirectoryPath, get_temp_dir_name
 from rasa.utils.endpoints import EndpointConfig
 
@@ -215,13 +217,14 @@ async def load_agent(
         The instantiated `Agent` or `None`.
     """
     from rasa.core.brokers.broker import EventBroker
-    from rasa.core.tracker_store import TrackerStore
+    from rasa.core.tracker_stores.tracker_store import TrackerStore
 
     tracker_store = None
     lock_store = None
     generator = None
     action_endpoint = None
     http_interpreter = None
+    privacy_manager = None
 
     if endpoints:
         broker = await EventBroker.create(endpoints.event_broker, loop=loop)
@@ -234,6 +237,18 @@ async def load_agent(
         model_server = endpoints.model if endpoints.model else model_server
         if endpoints.nlu:
             http_interpreter = RasaNLUHttpInterpreter(endpoints.nlu)
+        if endpoints.privacy:
+            in_memory_tracker_store = (
+                tracker_store
+                if isinstance(tracker_store, InMemoryTrackerStore)
+                else None
+            )
+            privacy_manager = await BackgroundPrivacyManager.create_instance(
+                endpoints=endpoints,
+                event_loop=loop,
+                in_memory_tracker_store=in_memory_tracker_store,
+            )
+            track_privacy_enabled(privacy_manager.config, broker)
 
     agent = Agent(
         generator=generator,
@@ -244,6 +259,7 @@ async def load_agent(
         remote_storage=remote_storage,
         http_interpreter=http_interpreter,
         endpoints=endpoints,
+        privacy_manager=privacy_manager,
     )
 
     try:
@@ -306,6 +322,7 @@ class Agent:
         remote_storage: Optional[StorageType] = None,
         http_interpreter: Optional[RasaNLUHttpInterpreter] = None,
         endpoints: Optional[AvailableEndpoints] = None,
+        privacy_manager: Optional[BackgroundPrivacyManager] = None,
     ):
         """Initializes an `Agent`."""
         self.domain = domain
@@ -321,6 +338,7 @@ class Agent:
         self._set_fingerprint(fingerprint)
         self.model_server = model_server
         self.remote_storage = remote_storage
+        self.privacy_manager = privacy_manager
 
     @classmethod
     def load(
@@ -336,6 +354,7 @@ class Agent:
         remote_storage: Optional[StorageType] = None,
         http_interpreter: Optional[RasaNLUHttpInterpreter] = None,
         endpoints: Optional[AvailableEndpoints] = None,
+        privacy_manager: Optional[BackgroundPrivacyManager] = None,
     ) -> Agent:
         """Constructs a new agent and loads the processor and model."""
         agent = Agent(
@@ -349,6 +368,7 @@ class Agent:
             remote_storage=remote_storage,
             http_interpreter=http_interpreter,
             endpoints=endpoints,
+            privacy_manager=privacy_manager,
         )
         agent.load_model(model_path=model_path, fingerprint=fingerprint)
         return agent
@@ -365,6 +385,7 @@ class Agent:
             generator=self.nlg,
             http_interpreter=self.http_interpreter,
             endpoints=self.endpoints,
+            privacy_manager=self.privacy_manager,
         )
         self.domain = self.processor.domain