rasa-pro 3.13.11__py3-none-any.whl → 3.13.13__py3-none-any.whl

rasa/core/actions/direct_custom_actions_executor.py

@@ -35,8 +35,6 @@ class DirectCustomActionExecutor(CustomActionExecutor):
         self.action_name = action_name
         self.action_endpoint = action_endpoint
         self.action_executor = self._create_action_executor()
-        self.register_actions_from_a_module()
-        self.action_executor.reload()
 
     @staticmethod
     @lru_cache(maxsize=1)
@@ -88,12 +86,21 @@ class DirectCustomActionExecutor(CustomActionExecutor):
 
         Returns:
             The response from the execution of the custom action.
+
+        Raises:
+            RasaException: If the actions module specified does not exist.
         """
         structlogger.debug(
             "action.direct_custom_action_executor.run",
             action_name=self.action_name,
         )
 
+        # Register actions module if not already registered.
+        # This is done here instead of __init__ to allow proper
+        # exception handling and avoid hanging conversations.
+        self.register_actions_from_a_module()
+        self.action_executor.reload()
+
         tracker_state = tracker.current_state(EventVerbosity.ALL)
         action_call = {
             "next_action": self.action_name,

rasa/shared/providers/llm/litellm_router_llm_client.py

@@ -148,7 +148,7 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
         if not self._use_chat_completions_endpoint:
             return self._text_completion(messages)
         try:
-            formatted_messages = self._format_messages(messages)
+            formatted_messages = self._get_formatted_messages(messages)
             response = self.router_client.completion(
                 messages=formatted_messages, **self._completion_fn_args
             )
@@ -185,7 +185,7 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
         if not self._use_chat_completions_endpoint:
             return await self._atext_completion(messages)
         try:
-            formatted_messages = self._format_messages(messages)
+            formatted_messages = self._get_formatted_messages(messages)
             response = await self.router_client.acompletion(
                 messages=formatted_messages, **self._completion_fn_args
             )

rasa/utils/licensing.py

@@ -20,7 +20,8 @@ from rasa.shared.utils.cli import print_error_and_exit
 if typing.TYPE_CHECKING:
     from rasa.core.tracker_stores.tracker_store import TrackerStore
 
-LICENSE_ENV_VAR = "RASA_PRO_LICENSE"
+LICENSE_ENV_VAR = "RASA_LICENSE"
+LICENSE_ENV_VAR_LEGACY = "RASA_PRO_LICENSE"
 ALGORITHM = "RS256"
 # deepcode ignore HardcodedKey: This is a public key - not a security issue.
 PUBLIC_KEY = """-----BEGIN PUBLIC KEY-----
@@ -265,12 +266,22 @@ class License:
 
 def retrieve_license_from_env() -> Text:
     """Return the license found in the env var."""
+    # Check environment variables first
+    license_value = os.environ.get(LICENSE_ENV_VAR) or os.environ.get(
+        LICENSE_ENV_VAR_LEGACY
+    )
+    if license_value:
+        return license_value
+
+    # Fall back to .env file
     stored_env_values = dotenv_values(".env")
-    license_from_env = os.environ.get(LICENSE_ENV_VAR)
-    license = license_from_env or stored_env_values.get(LICENSE_ENV_VAR)
-    if not license:
-        raise LicenseNotFoundException()
-    return license
+    license_value = stored_env_values.get(LICENSE_ENV_VAR) or stored_env_values.get(
+        LICENSE_ENV_VAR_LEGACY
+    )
+    if license_value:
+        return license_value
+
+    raise LicenseNotFoundException()
 
 
 def is_license_expiring_soon(license: License) -> bool:
@@ -297,15 +308,15 @@ def validate_license_from_env(product_area: Text = PRODUCT_AREA) -> None:
     except LicenseNotFoundException:
         structlogger.error("license.not_found.error")
         raise SystemExit(
-            f"A Rasa Pro license is required. "
-            f"Please set the environmental variable "
+            f"A Rasa license is required. "
+            f"Please set the environment variable "
             f"`{LICENSE_ENV_VAR}` to a valid license string. "
         )
     except LicenseValidationException as e:
         structlogger.error("license.validation.error", error=e)
         raise SystemExit(
-            f"Failed to validate Rasa Pro license "
-            f"which was read from environmental variable `{LICENSE_ENV_VAR}`. "
+            f"Failed to validate Rasa license "
+            f"which was read from environment variable `{LICENSE_ENV_VAR}`. "
             f"Please ensure `{LICENSE_ENV_VAR}` is set to a valid license string. "
         )
 

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.11"
+__version__ = "3.13.13"

{rasa_pro-3.13.11.dist-info → rasa_pro-3.13.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.11
+Version: 3.13.13
 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.11.dist-info → rasa_pro-3.13.13.dist-info}/RECORD

@@ -90,7 +90,7 @@ rasa/core/actions/action_trigger_flow.py,sha256=IydYAGafTtoY6XSgCX124xJQhzudUg8J
 rasa/core/actions/action_trigger_search.py,sha256=QfYqnaGRCqRYJ4msYsLAbnVYW5ija_tqhCcKIN8aEfw,1064
 rasa/core/actions/constants.py,sha256=gfgdWmj-OJ5xTcTAS1OcXQ3dgcTiHO98NC-SGyKlTjs,161
 rasa/core/actions/custom_action_executor.py,sha256=qafASBdM3-hByDqbkNxgXfx5yMSsJh_nB3B7x9ye0TY,6176
-rasa/core/actions/direct_custom_actions_executor.py,sha256=IzxRnPF92zs3WX-p9DoFq51Vf0QwfE6prB_AlyEEllc,3746
+rasa/core/actions/direct_custom_actions_executor.py,sha256=zGHI3cXVRfyzaaGSH7VePXHQxsDAvF0iAZSEcOuM-_M,4026
 rasa/core/actions/e2e_stub_custom_action_executor.py,sha256=D-kECC1QjVLv4owNxstW2xJPPsXTGfGepvquMeWB_ec,2282
 rasa/core/actions/forms.py,sha256=MPGxp3vg-EgFcU5UQYqWM2tycSFIuoF6vWvNSSWPhSA,26967
 rasa/core/actions/grpc_custom_action_executor.py,sha256=EDxdSIDA4H4Mu-QZk-pPGV2N41ZsbY8W9laV6l1WlDQ,9103
@@ -754,7 +754,7 @@ rasa/shared/providers/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 rasa/shared/providers/llm/_base_litellm_client.py,sha256=Ua5Kt6VGe5vRzSzWWWx2Q3LH2PCDd8V7V4zfYD464yU,11634
 rasa/shared/providers/llm/azure_openai_llm_client.py,sha256=ui85vothxR2P_-eLc4nLgbpjnpEKY2BXnIjLxBZoYz8,12504
 rasa/shared/providers/llm/default_litellm_llm_client.py,sha256=q6QoyPPq0K7V9aeD0zr08ZK69xlH4GseGFdhUxpWcG8,4210
-rasa/shared/providers/llm/litellm_router_llm_client.py,sha256=_6vAdPLAVSI_sBJLaXLnE87M-0ip_klfQ78fQ_pyoyI,7947
+rasa/shared/providers/llm/litellm_router_llm_client.py,sha256=68kQGl5OAhbp39xFlo4YVAx7gn-hJzDBHjNENZeilBQ,7961
 rasa/shared/providers/llm/llm_client.py,sha256=-hTCRsL-A3GCMRHtcyCgcCyra-9OJ8GUC-mURoRXH0k,3242
 rasa/shared/providers/llm/llm_response.py,sha256=8mOpZdmh4-3yM7aOmNO0yEYUmRDErfoP7ZDMUuHr2Cc,3504
 rasa/shared/providers/llm/openai_llm_client.py,sha256=rSdLj29Hl1Wm5G6Uwo77j4WqogK_3QIbTA7fyt63YAg,5013
@@ -818,7 +818,7 @@ rasa/utils/converter.py,sha256=H4LHpoAK7MXMmvNZG_uSn0gbccCJvHtsA2-6Zya4u6M,1656
 rasa/utils/endpoints.py,sha256=jX9xSI_3KJ-NpzymyfaO-Zj-ISaWbA4ql2Kx3NulBvE,10905
 rasa/utils/io.py,sha256=LIAdQQqUPA-V_mdpgeQzPDzA4rmsdZLyVKc8j_0Z70Y,7161
 rasa/utils/json_utils.py,sha256=SKtJzzsIRCAgNEQiBvWDDm9euMRBgJ-TyvCi2tXHH1w,1689
-rasa/utils/licensing.py,sha256=_YGELCUjBF9rzVwlKoP1YfnqskszHUqyd-_qVpXr5Kw,20508
+rasa/utils/licensing.py,sha256=SP_jm0S1hpwPGh9bQaJviBL0Eu4xuwToObWTZRLaouQ,20768
 rasa/utils/log_utils.py,sha256=QR0R5Ezs9xOaESluelqdikViIypXSWVxCPJmJM4Ir3E,5440
 rasa/utils/mapper.py,sha256=CZiD3fu7-W-OJgoB1R8JaOg-Hq13TK20D-zGVNgbF18,7726
 rasa/utils/ml_utils.py,sha256=y4Czr9GdRBj-a2npXU8ED2qC9bzw5olRyqQEmu5BB8k,4185
@@ -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=fhRlHQvuBkiup0FnNYmwRmqQwC3QpdCJt0TuvW4jMaI,83125
-rasa/version.py,sha256=Jzj7EnZb3wsuxW8HdqrnCnuZtLvC2rhZaQzbe_WVA-Y,118
-rasa_pro-3.13.11.dist-info/METADATA,sha256=Fott0Gi1RETKy7isFGu91-sV_THQlBxv3un2fd3Bxyg,10551
-rasa_pro-3.13.11.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.13.11.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.13.11.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.13.11.dist-info/RECORD,,
+rasa/version.py,sha256=3Kf4XoIzuaCcf-vrZlNxJGSEw7BE0qBlX306vDMeKt8,118
+rasa_pro-3.13.13.dist-info/METADATA,sha256=N1D9y7ZFUTrN1f_yXeACwxRwA4nnBe6dUHPpjQbymx8,10551
+rasa_pro-3.13.13.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.13.13.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.13.13.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.13.13.dist-info/RECORD,,