rasa-pro 3.10.7__py3-none-any.whl → 3.10.7.dev1__py3-none-any.whl

rasa/core/utils.py

@@ -1,3 +1,4 @@
+import structlog
 import logging
 import os
 from pathlib import Path
@@ -26,7 +27,7 @@ if TYPE_CHECKING:
     from rasa.core.nlg import NaturalLanguageGenerator
     from rasa.shared.core.domain import Domain
 
-logger = logging.getLogger(__name__)
+structlogger = structlog.get_logger()
 
 
 def configure_file_logging(
@@ -124,15 +125,17 @@ def list_routes(app: Sanic) -> Dict[Text, Text]:
         for arg in route._params:
             options[arg] = f"[{arg}]"
 
-        handlers = [(next(iter(route.methods)), route.name.replace("rasa_server.", ""))]
+        name = route.name.replace("rasa_server.", "")
+        methods = ",".join(route.methods)
 
-        for method, name in handlers:
-            full_endpoint = "/" + "/".join(endpoint)
-            line = unquote(f"{full_endpoint:50s} {method:30s} {name}")
-            output[name] = line
+        full_endpoint = "/" + "/".join(endpoint)
+        line = unquote(f"{full_endpoint:50s} {methods:30s} {name}")
+        output[name] = line
 
     url_table = "\n".join(output[url] for url in sorted(output))
-    logger.debug(f"Available web server routes: \n{url_table}")
+    structlogger.debug(
+        "server.routes", event_info=f"Available web server routes: \n{url_table}"
+    )
 
     return output
 
@@ -263,17 +266,22 @@ def number_of_sanic_workers(lock_store: Union[EndpointConfig, LockStore, None])
     """
 
     def _log_and_get_default_number_of_workers() -> int:
-        logger.debug(
-            f"Using the default number of Sanic workers ({DEFAULT_SANIC_WORKERS})."
+        structlogger.debug(
+            "server.worker.set_count",
+            number_of_workers=DEFAULT_SANIC_WORKERS,
+            event_info=f"Using the default number of Sanic workers "
+            f"({DEFAULT_SANIC_WORKERS}).",
         )
         return DEFAULT_SANIC_WORKERS
 
     try:
         env_value = int(os.environ.get(ENV_SANIC_WORKERS, DEFAULT_SANIC_WORKERS))
     except ValueError:
-        logger.error(
-            f"Cannot convert environment variable `{ENV_SANIC_WORKERS}` "
-            f"to int ('{os.environ[ENV_SANIC_WORKERS]}')."
+        structlogger.error(
+            "server.worker.set_count.error",
+            number_of_workers=os.environ[ENV_SANIC_WORKERS],
+            event_info=f"Cannot convert environment variable `{ENV_SANIC_WORKERS}` "
+            f"to int ('{os.environ[ENV_SANIC_WORKERS]}').",
         )
         return _log_and_get_default_number_of_workers()
 
@@ -281,20 +289,23 @@ def number_of_sanic_workers(lock_store: Union[EndpointConfig, LockStore, None])
         return _log_and_get_default_number_of_workers()
 
     if env_value < 1:
-        logger.debug(
-            f"Cannot set number of Sanic workers to the desired value "
-            f"({env_value}). The number of workers must be at least 1."
+        structlogger.debug(
+            "server.worker.set_count.error_less_than_one",
+            number_of_workers=env_value,
+            event_info=f"Cannot set number of Sanic workers to the desired value "
+            f"({env_value}). The number of workers must be at least 1.",
         )
         return _log_and_get_default_number_of_workers()
 
     if _lock_store_is_multi_worker_compatible(lock_store):
-        logger.debug(f"Using {env_value} Sanic workers.")
+        structlogger.debug(f"Using {env_value} Sanic workers.")
         return env_value
 
-    logger.debug(
-        f"Unable to assign desired number of Sanic workers ({env_value}) as "
+    structlogger.debug(
+        "server.worker.set_count.error_no_lock_store",
+        event_info=f"Unable to assign desired number of Sanic workers ({env_value}) as "
         f"no `RedisLockStore` or custom `LockStore` endpoint "
-        f"configuration has been found."
+        f"configuration has been found.",
     )
     return _log_and_get_default_number_of_workers()
 

rasa/dialogue_understanding/coexistence/llm_based_router.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import importlib
+import os
 from typing import Any, Dict, List, Optional
 
 import structlog
@@ -21,6 +22,7 @@ from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.constants import (
+    LLM_API_HEALTH_CHECK_ENV_VAR,
     ROUTE_TO_CALM_SLOT,
     PROMPT_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
@@ -36,6 +38,7 @@ from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_CHAT_MODEL_NAME,
     get_prompt_template,
+    llm_api_health_check,
     llm_factory,
     try_instantiate_llm_client,
 )
@@ -130,12 +133,16 @@ class LLMBasedRouter(GraphComponent):
     def train(self, training_data: TrainingData) -> Resource:
         """Train the intent classifier on a data set."""
         # Validate llm configuration
-        try_instantiate_llm_client(
+        llm_client = try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "llm_based_router.train",
-            "LLMBasedRouter",
+            LLMBasedRouter.__name__,
         )
+        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
+            llm_api_health_check(
+                llm_client, "llm_based_router.train", LLMBasedRouter.__name__
+            )
 
         self.persist()
         return self._resource

rasa/dialogue_understanding/commands/set_slot_command.py

@@ -127,11 +127,7 @@ class SetSlotCommand(Command):
         if (
             self.name not in slots_of_active_flow
             and self.name != ROUTE_TO_CALM_SLOT
-            and self.extractor
-            in {
-                SetSlotExtractor.LLM.value,
-                SetSlotExtractor.COMMAND_PAYLOAD_READER.value,
-            }
+            and self.extractor == SetSlotExtractor.LLM.value
         ):
             # Get the other predicted flows from the most recent message on the tracker.
             predicted_flows = get_flows_predicted_to_start_from_tracker(tracker)

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -2,6 +2,7 @@ from abc import ABC, abstractmethod
 from functools import lru_cache
 from typing import Dict, Any, List, Optional, Tuple, Union, Text
 
+import os
 import structlog
 from jinja2 import Template
 
@@ -22,6 +23,7 @@ from rasa.engine.graph import GraphComponent, ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
+from rasa.shared.constants import LLM_API_HEALTH_CHECK_ENV_VAR
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.flows import FlowStep, Flow, FlowsList
 from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
@@ -33,6 +35,7 @@ from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
+    llm_api_health_check,
     llm_factory,
     try_instantiate_llm_client,
 )
@@ -169,12 +172,18 @@ class LLMBasedCommandGenerator(GraphComponent, CommandGenerator, ABC):
         store.
         """
         # Validate llm configuration
-        try_instantiate_llm_client(
+        llm_client = try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "llm_based_command_generator.train",
-            "LLMBasedCommandGenerator",
+            LLMBasedCommandGenerator.__name__,
         )
+        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
+            llm_api_health_check(
+                llm_client,
+                "llm_based_command_generator.train",
+                LLMBasedCommandGenerator.__name__,
+            )
 
         # flow retrieval is populated with only user-defined flows
         try:

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -1,4 +1,4 @@
-from typing import Dict, Any, Optional, Text
+from typing import Any, Dict, Optional, Text
 
 import structlog
 from deprecated import deprecated  # type: ignore[import]

rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -55,7 +55,7 @@ responses:
         template: jinja
 
   utter_free_chitchat_response:
-    - text: "Sorry, I'm not able to answer that right now."
+    - text: placeholder_this_utterance_needs_the_rephraser
       metadata:
         rephrase: True
         rephrase_prompt: |
@@ -160,9 +160,9 @@ flows:
         action: action_run_slot_rejections
       - action: validate_{{context.collect}}
         next:
-          - if: "slots.{{context.collect}} is not null"
-            then: END
-          - else: ask_collect
+        - if: "slots.{{context.collect}} is not null"
+          then: END
+        - else: ask_collect
       - id: ask_collect
         action: "{{context.utter}}"
       - action: "{{context.collect_action}}"
@@ -205,17 +205,17 @@ flows:
     steps:
       - noop: true
         next:
-          - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_too_long'"
-            then:
-              - action: utter_user_input_too_long_error_rasa
-                next: END
-          - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_empty'"
-            then:
-              - action: utter_user_input_empty_error_rasa
-                next: END
-          - else:
-              - action: utter_internal_error_rasa
-                next: END
+        - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_too_long'"
+          then:
+          - action: utter_user_input_too_long_error_rasa
+            next: END
+        - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_empty'"
+          then:
+            - action: utter_user_input_empty_error_rasa
+              next: END
+        - else:
+            - action: utter_internal_error_rasa
+              next: END
 
 
   pattern_restart:

rasa/e2e_test/e2e_test_runner.py

@@ -16,6 +16,7 @@ import rasa.shared.utils.io
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.constants import ACTIVE_FLOW_METADATA_KEY, STEP_ID_METADATA_KEY
 from rasa.core.exceptions import AgentNotReady
+from rasa.core.persistor import StorageType
 from rasa.core.utils import AvailableEndpoints
 from rasa.e2e_test.constants import TEST_CASE_NAME, TEST_FILE_NAME
 from rasa.e2e_test.e2e_config import create_llm_judge_config
@@ -34,7 +35,6 @@ from rasa.e2e_test.e2e_test_result import (
     TestResult,
 )
 from rasa.llm_fine_tuning.conversations import Conversation
-from rasa.nlu.persistor import StorageType
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
 from rasa.shared.core.events import (
     ActionExecuted,

rasa/engine/graph.py

@@ -634,4 +634,3 @@ class GraphModelConfiguration:
     language: Optional[Text]
     core_target: Optional[Text]
     nlu_target: Optional[Text]
-    spaces: Optional[Dict[Text, Text]] = None

rasa/engine/recipes/config_files/default_config.yml

@@ -35,9 +35,6 @@ pipeline:
 policies:
   - name: MemoizationPolicy
   - name: RulePolicy
-  - name: UnexpecTEDIntentPolicy
-    max_history: 5
-    epochs: 100
   - name: TEDPolicy
     max_history: 5
     epochs: 100

rasa/engine/recipes/default_recipe.py

@@ -233,7 +233,6 @@ class DefaultV1Recipe(Recipe):
             training_type=training_type,
             assistant_id=config.get(ASSISTANT_ID_KEY),
             language=config.get("language"),
-            spaces=config.get("spaces"),
             core_target=core_target,
             nlu_target=f"run_{RegexMessageHandler.__name__}",
         )

rasa/engine/recipes/graph_recipe.py

@@ -73,7 +73,6 @@ class GraphV1Recipe(Recipe):
             training_type=training_type,
             assistant_id=config.get(ASSISTANT_ID_KEY),
             language=config.get("language"),
-            spaces=config.get("spaces"),
             core_target=core_target,
             nlu_target=nlu_target,
         )

rasa/engine/storage/local_model_storage.py

@@ -238,7 +238,6 @@ class LocalModelStorage(ModelStorage):
             predict_schema=model_configuration.predict_schema,
             training_type=model_configuration.training_type,
             project_fingerprint=rasa.model.project_fingerprint(),
-            spaces=model_configuration.spaces,
             language=model_configuration.language,
             core_target=model_configuration.core_target,
             nlu_target=model_configuration.nlu_target,

rasa/engine/storage/storage.py

@@ -6,7 +6,7 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import List, Tuple, Union, Text, Generator, Dict, Any, Optional
+from typing import Tuple, Union, Text, Generator, Dict, Any, Optional
 from packaging import version
 
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
@@ -140,7 +140,6 @@ class ModelMetadata:
     core_target: Optional[Text]
     nlu_target: Text
     language: Optional[Text]
-    spaces: Optional[List[Dict[Text, Any]]] = None
     training_type: TrainingType = TrainingType.BOTH
 
     def __post_init__(self) -> None:
@@ -170,7 +169,6 @@ class ModelMetadata:
             "core_target": self.core_target,
             "nlu_target": self.nlu_target,
             "language": self.language,
-            "spaces": self.spaces,
         }
 
     @classmethod
@@ -198,6 +196,4 @@ class ModelMetadata:
             core_target=serialized["core_target"],
             nlu_target=serialized["nlu_target"],
             language=serialized["language"],
-            # optional, since introduced later
-            spaces=serialized.get("spaces"),
         )

rasa/model_manager/config.py

@@ -0,0 +1,7 @@
+import sys
+
+SERVER_BASE_WORKING_DIRECTORY = "working-data"
+
+# The path to the python executable that is running this script
+# we will use the same python to run training / bots
+RASA_PYTHON_PATH = sys.executable