rasa-pro 3.10.8__py3-none-any.whl → 3.10.9__py3-none-any.whl

rasa/core/processor.py

@@ -101,6 +101,9 @@ logger = logging.getLogger(__name__)
 structlogger = structlog.get_logger()
 
 MAX_NUMBER_OF_PREDICTIONS = int(os.environ.get("MAX_NUMBER_OF_PREDICTIONS", "10"))
+MAX_NUMBER_OF_PREDICTIONS_CALM = int(
+    os.environ.get("MAX_NUMBER_OF_PREDICTIONS_CALM", "1000")
+)
 
 
 class MessageProcessor:
@@ -114,6 +117,7 @@ class MessageProcessor:
         generator: NaturalLanguageGenerator,
         action_endpoint: Optional[EndpointConfig] = None,
         max_number_of_predictions: int = MAX_NUMBER_OF_PREDICTIONS,
+        max_number_of_predictions_calm: int = MAX_NUMBER_OF_PREDICTIONS_CALM,
         on_circuit_break: Optional[LambdaType] = None,
         http_interpreter: Optional[RasaNLUHttpInterpreter] = None,
         endpoints: Optional["AvailableEndpoints"] = None,
@@ -122,7 +126,6 @@ class MessageProcessor:
         self.nlg = generator
         self.tracker_store = tracker_store
         self.lock_store = lock_store
-        self.max_number_of_predictions = max_number_of_predictions
         self.on_circuit_break = on_circuit_break
         self.action_endpoint = action_endpoint
         self.model_filename, self.model_metadata, self.graph_runner = self._load_model(
@@ -130,6 +133,10 @@ class MessageProcessor:
         )
         self.endpoints = endpoints
 
+        self.max_number_of_predictions = max_number_of_predictions
+        self.max_number_of_predictions_calm = max_number_of_predictions_calm
+        self.is_calm_assistant = self._is_calm_assistant()
+
         if self.model_metadata.assistant_id is None:
             rasa.shared.utils.io.raise_warning(
                 f"The model metadata does not contain a value for the "
@@ -972,11 +979,15 @@ class MessageProcessor:
     ) -> int:
         """Select the action limit based on the tracker state.
 
-        Usually, we want to limit the number of predictions to the number of actions
-        that have been executed in the conversation so far. However, if the
-        conversation is currently in a state where the user is correcting the flow
-        we want to allow for more predictions to be made as we might be traversing
-        through a long flow.
+        This function determines the maximum number of predictions that should be
+        made during a dialogue conversation. Typically, the number of predictions
+        is limited to the number of actions executed so far in the conversation.
+        However, in certain states (e.g., when the user is correcting the
+        conversation flow), more predictions may be allowed as the system traverses
+        through a long dialogue flow.
+
+        Additionally, if the `ROUTE_TO_CALM_SLOT` is present in the tracker slots,
+        the action limit is adjusted to a separate limit for CALM-based flows.
 
         Args:
             tracker: instance of DialogueStateTracker.
@@ -984,6 +995,18 @@ class MessageProcessor:
         Returns:
         The maximum number of predictions to make.
         """
+        # Check if it is a CALM assistant and if so, that the `ROUTE_TO_CALM_SLOT`
+        # is either not present or set to `True`.
+        # If it does, use the specific prediction limit for CALM assistants.
+        # Otherwise, use the default prediction limit.
+        if self.is_calm_assistant and (
+            not tracker.has_coexistence_routing_slot
+            or tracker.get_slot(ROUTE_TO_CALM_SLOT)
+        ):
+            max_number_of_predictions = self.max_number_of_predictions_calm
+        else:
+            max_number_of_predictions = self.max_number_of_predictions
+
         reversed_events = list(tracker.events)[::-1]
         is_conversation_in_flow_correction = False
         for e in reversed_events:
@@ -998,8 +1021,10 @@ class MessageProcessor:
             # allow for more predictions to be made as we might be traversing through
             # a long flow. We multiply the number of predictions by 10 to allow for
             # more predictions to be made - the factor is a best guess.
-            return self.max_number_of_predictions * 5
-        return self.max_number_of_predictions
+            return max_number_of_predictions * 5
+
+        # Return the default
+        return max_number_of_predictions
 
     def is_action_limit_reached(
         self, tracker: DialogueStateTracker, should_predict_another_action: bool
@@ -1387,3 +1412,27 @@ class MessageProcessor:
         ]
 
         return len(filtered_commands) > 0
+
+    def _is_calm_assistant(self) -> bool:
+        """Inspects the nodes of the graph schema to determine whether
+        any node is associated with the `FlowPolicy`, which is indicative of a
+        CALM assistant setup.
+
+        Returns:
+            bool: True if any node in the graph schema uses `FlowPolicy`.
+        """
+        # Get the graph schema's nodes from the graph runner.
+        nodes: dict[str, Any] = self.graph_runner._graph_schema.nodes  # type: ignore[attr-defined]
+
+        flow_policy_class_path = "rasa.core.policies.flow_policy.FlowPolicy"
+        # Iterate over the nodes and check if any node uses `FlowPolicy`.
+        for node_name, schema_node in nodes.items():
+            if (
+                schema_node.uses is not None
+                and f"{schema_node.uses.__module__}.{schema_node.uses.__name__}"
+                == flow_policy_class_path
+            ):
+                return True
+
+        # Return False if no node is found using `FlowPolicy`.
+        return False

rasa/e2e_test/utils/io.py

@@ -346,7 +346,7 @@ def read_test_cases(path: str) -> TestSuite:
     beta_flag_verified = False
 
     for test_file in test_files:
-        test_file_content = parse_raw_yaml(Path(test_file).read_text())
+        test_file_content = parse_raw_yaml(Path(test_file).read_text(encoding="utf-8"))
 
         validate_yaml_data_using_schema_with_assertions(
             yaml_data=test_file_content, schema_content=e2e_test_schema
@@ -506,6 +506,8 @@ def transform_results_output_to_yaml(yaml_string: str) -> str:
             result.append(s)
         elif s.startswith("\n"):
             result.append(s.strip())
+        elif s.strip().startswith("#"):
+            continue
         else:
             result.append(s)
     return "".join(result)

rasa/version.py

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

{rasa_pro-3.10.8.dist-info → rasa_pro-3.10.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.10.8
+Version: 3.10.9
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
@@ -64,13 +64,13 @@ Requires-Dist: jsonschema (>=4.22)
 Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.2.0,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.0,<0.3.0)
-Requires-Dist: litellm (>=1.50.0,<1.51.0)
+Requires-Dist: litellm (>=1.52.6,<1.53.0)
 Requires-Dist: matplotlib (>=3.7,<3.8)
 Requires-Dist: mattermostwrapper (>=2.2,<2.3)
 Requires-Dist: mlflow (>=2.15.1,<3.0.0) ; extra == "mlflow"
 Requires-Dist: networkx (>=3.1,<3.2)
 Requires-Dist: numpy (>=1.23.5,<1.25.0) ; python_version >= "3.9" and python_version < "3.11"
-Requires-Dist: openai (>=1.52.0,<1.53.0)
+Requires-Dist: openai (>=1.54.0,<1.55.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: opentelemetry-api (>=1.16.0,<1.17.0)
 Requires-Dist: opentelemetry-exporter-jaeger (>=1.16.0,<1.17.0)

{rasa_pro-3.10.8.dist-info → rasa_pro-3.10.9.dist-info}/RECORD

@@ -309,7 +309,7 @@ rasa/core/policies/policy.py,sha256=HeVtIaV0dA1QcAG3vjdn-4g7-oUEJPL4u01ETJt78YA,
 rasa/core/policies/rule_policy.py,sha256=YNDPZUZkpKFCvZwKe1kSfP6LQnDL9CQ6JU69JRwdmWw,50729
 rasa/core/policies/ted_policy.py,sha256=TFTM-Ujp1Mu7dQKnX5euKY81cvzDkzokGqAT813PKkY,86658
 rasa/core/policies/unexpected_intent_policy.py,sha256=zeV4atIW9K2QHr4io_8RWOtreABSHoAQHjiznwcmUSo,39441
-rasa/core/processor.py,sha256=pBkQK4bNUvw4rdTuFrUUh-RXuVgKDOjHFXsOPiUUqPw,52260
+rasa/core/processor.py,sha256=-Jf2WliPA7lUZ8DCNt4r7fdU7qLNQf4g-IhoGZIswN0,54434
 rasa/core/run.py,sha256=s32pZE3B1uKIs20xIbSty0HxeQ9One63_8NeCODwpQE,11050
 rasa/core/secrets_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/core/secrets_manager/constants.py,sha256=jVhtn_2PN2LQVq-FkeBEipztCQPYSVQq4_n2xq0wfoY,1051
@@ -416,7 +416,7 @@ rasa/e2e_test/pykwalify_extensions.py,sha256=OGYKIKYJXd2S0NrWknoQuijyBQaE-oMLkfV
 rasa/e2e_test/stub_custom_action.py,sha256=teq8c5I6IuUsFX4lPdeBLY3j0SLSMCC95KmKx7GrE8I,2369
 rasa/e2e_test/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/e2e_test/utils/e2e_yaml_utils.py,sha256=_3yxv18fUkmO8tvOcXzBzVVBhRdV-d9o2YAlrmCAZcE,1603
-rasa/e2e_test/utils/io.py,sha256=vZVrMlboovZ1W8c5-2pyM9OrhJH8JzLclEvLqdWtKzQ,18939
+rasa/e2e_test/utils/io.py,sha256=HVsFb8uVPTlu7PcQdFmMNUFf0rRrD5Wiys0oMZqu2nA,19016
 rasa/e2e_test/utils/validation.py,sha256=BRjTg3KOAlvGtfZJApOKW29V__cX6hJIG8A5RjzoW54,2348
 rasa/engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/engine/caching.py,sha256=Uu-0yn_eQGysmW7nsub-tb3gD8QNz6TNssNd-GIthuI,16451
@@ -463,7 +463,6 @@ rasa/graph_components/validators/default_recipe_validator.py,sha256=BHrF6NTfJz42
 rasa/graph_components/validators/finetuning_validator.py,sha256=38AcwmV8cF5TIlWhUIzh98wtZf934ix04HcczCJiWkU,12863
 rasa/hooks.py,sha256=3nsfCA142V56mBQ7ktBXhD_RyaSrfj7fY3t7HnsD4Pc,3709
 rasa/jupyter.py,sha256=x_GF9PK2zMhltb48GEIV9YZ4pRhCto8nV5SioYSCljI,1782
-rasa/keys,sha256=2Stg1fstgJ203cOoW1B2gGMY29fhEnjIfTVxKv_fqPo,101
 rasa/llm_fine_tuning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/llm_fine_tuning/annotation_module.py,sha256=wFmW3d6lI5o49OWmdbYQlgr24rqHDgA0T0hLM1pSb9U,8578
 rasa/llm_fine_tuning/conversations.py,sha256=QvsgoL8wes5Pad22J1LFOKqtl90SCnjZ1HvawbxZ5tw,5197
@@ -721,9 +720,9 @@ rasa/utils/train_utils.py,sha256=f1NWpp5y6al0dzoQyyio4hc4Nf73DRoRSHDzEK6-C4E,212
 rasa/utils/url_tools.py,sha256=JQcHL2aLqLHu82k7_d9imUoETCm2bmlHaDpOJ-dKqBc,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=ToRaa4dS859CJO3H2VGqS943O5qWOg45ypbDfFMKECU,62699
-rasa/version.py,sha256=k7n32G26Uetoww4_U8R5CAjKHoKt3aeOe3PvkC12DoI,117
-rasa_pro-3.10.8.dist-info/METADATA,sha256=90WkKiBCMB-2dqhOo-7X0BThrPU18uYeKiDcdpO62Oo,30892
-rasa_pro-3.10.8.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.10.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rasa_pro-3.10.8.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.10.8.dist-info/RECORD,,
+rasa/version.py,sha256=DK8n4XcyRXMG-ezphYn9efLxc4P02gVlclLzdO4NdwI,117
+rasa_pro-3.10.9.dist-info/METADATA,sha256=VZG80CP9Yg2VvP5pCXTC8cuqd76qeVkSR6okEihMW_U,30892
+rasa_pro-3.10.9.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.10.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rasa_pro-3.10.9.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.10.9.dist-info/RECORD,,

rasa/keys

@@ -1 +0,0 @@
-{"segment": "CcvVD1I68Nkkxrv93cIqv1twIwrwG8nz", "sentry": "a283f1fde04347b099c8d729109dd450@o251570"}