rasa-pro 3.12.6.dev2__py3-none-any.whl → 3.13.0.dev2__py3-none-any.whl

rasa/shared/utils/health_check/health_check.py

@@ -3,7 +3,6 @@ import sys
 from typing import Any, Dict, Optional
 
 from rasa.shared.constants import (
-    LANGFUSE_CUSTOM_METADATA_DICT,
     LLM_API_HEALTH_CHECK_DEFAULT_VALUE,
     LLM_API_HEALTH_CHECK_ENV_VAR,
     MODELS_CONFIG_KEY,
@@ -199,12 +198,7 @@ def send_test_llm_api_request(
         config=llm_client.config,
     )
     try:
-        llm_client.completion(
-            "hello",
-            metadata={
-                LANGFUSE_CUSTOM_METADATA_DICT: {"component": log_source_component}
-            },
-        )
+        llm_client.completion("hello")
     except Exception as e:
         structlogger.error(
             f"{log_source_function}.send_test_llm_api_request_failed",

rasa/shared/utils/llm.py

@@ -762,7 +762,7 @@ def allowed_values_for_slot(slot: Slot) -> Union[str, None]:
     if isinstance(slot, BooleanSlot):
         return str([True, False])
     if isinstance(slot, CategoricalSlot):
-        return str([v for v in slot.values if v != "__other__"])
+        return str([v for v in slot.values if v != "__other__"] + ["other"])
     else:
         return None
 

rasa/tracing/instrumentation/attribute_extractors.py

@@ -22,8 +22,14 @@ from rasa.dialogue_understanding.generator import LLMBasedCommandGenerator
 from rasa.dialogue_understanding.generator.constants import FLOW_RETRIEVAL_KEY
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding_test.du_test_result import (
+    KEY_COMMANDS_F1_MACRO,
+    KEY_COMMANDS_F1_MICRO,
+    KEY_COMMANDS_F1_WEIGHTED,
     KEY_TEST_CASES_ACCURACY,
     KEY_USER_UTTERANCES_ACCURACY,
+    OUTPUT_COMMANDS_F1_MACRO_INSTRUMENTATION_ATTR,
+    OUTPUT_COMMANDS_F1_MICRO_INSTRUMENTATION_ATTR,
+    OUTPUT_COMMANDS_F1_WEIGHTED_INSTRUMENTATION_ATTR,
     OUTPUT_COMPLETION_TOKEN_METRICS,
     OUTPUT_LATENCY_METRICS,
     OUTPUT_NAMES_OF_FAILED_TESTS,
@@ -320,7 +326,7 @@ def extract_attrs_for_command(
 def extract_llm_config(
     self: Any,
     default_llm_config: Dict[str, Any],
-    default_embeddings_config: Dict[str, Any],
+    default_embeddings_config: Optional[Dict[str, Any]],
 ) -> Dict[str, Any]:
     if isinstance(self, ContextualResponseRephraser):
         # ContextualResponseRephraser is not a graph component, so it's
@@ -340,8 +346,12 @@ def extract_llm_config(
             default_embeddings_config,
         )
     else:
-        embeddings_property = combine_custom_and_default_config(
-            config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
+        embeddings_property = (
+            combine_custom_and_default_config(
+                config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
+            )
+            if default_embeddings_config is not None
+            else {}
         )
 
     attributes = {
@@ -372,7 +382,6 @@ def extract_llm_config(
 def extract_attrs_for_llm_based_command_generator(
     self: "LLMBasedCommandGenerator",
     prompt: str,
-    metadata: Optional[Dict[str, Any]] = None,
 ) -> Dict[str, Any]:
     from rasa.dialogue_understanding.generator.flow_retrieval import (
         DEFAULT_EMBEDDINGS_CONFIG,
@@ -388,7 +397,8 @@ def extract_attrs_for_llm_based_command_generator(
 
 
 def extract_attrs_for_contextual_response_rephraser(
-    self: Any, prompt: str, sender_id: str
+    self: Any,
+    prompt: str,
 ) -> Dict[str, Any]:
     from rasa.core.nlg.contextual_response_rephraser import DEFAULT_LLM_CONFIG
 
@@ -396,7 +406,7 @@ def extract_attrs_for_contextual_response_rephraser(
         self,
         default_llm_config=DEFAULT_LLM_CONFIG,
         # rephraser is not using embeddings
-        default_embeddings_config={},
+        default_embeddings_config=None,
     )
 
     return extend_attributes_with_prompt_tokens_length(self, attributes, prompt)
@@ -412,7 +422,7 @@ def extract_attrs_for_create_history(
         self,
         default_llm_config=DEFAULT_LLM_CONFIG,
         # rephraser is not using embeddings
-        default_embeddings_config={},
+        default_embeddings_config=None,
     )
 
 
@@ -614,6 +624,15 @@ def extract_attrs_for_du_print_test_results(
         OUTPUT_NAMES_OF_FAILED_TESTS: json.dumps(
             test_suite_result.names_of_failed_tests
         ),
+        OUTPUT_COMMANDS_F1_MACRO_INSTRUMENTATION_ATTR: (
+            test_suite_result.f1_score[KEY_COMMANDS_F1_MACRO]
+        ),
+        OUTPUT_COMMANDS_F1_MICRO_INSTRUMENTATION_ATTR: (
+            test_suite_result.f1_score[KEY_COMMANDS_F1_MICRO]
+        ),
+        OUTPUT_COMMANDS_F1_WEIGHTED_INSTRUMENTATION_ATTR: (
+            test_suite_result.f1_score[KEY_COMMANDS_F1_WEIGHTED]
+        ),
     }
     if test_suite_result.command_metrics:
         for (
@@ -638,12 +657,27 @@ def extract_attrs_for_du_print_test_results(
             for key, value in test_suite_result.llm_config.items():
                 attributes_dict[f"llm_config_0_{key}"] = value
 
-    for key, value in test_suite_result.latency_metrics.items():
-        attributes_dict[f"{OUTPUT_LATENCY_METRICS}_{key}"] = value
-    for key, value in test_suite_result.prompt_token_metrics.items():
-        attributes_dict[f"{OUTPUT_PROMPT_TOKEN_METRICS}_{key}"] = value
-    for key, value in test_suite_result.completion_token_metrics.items():
-        attributes_dict[f"{OUTPUT_COMPLETION_TOKEN_METRICS}_{key}"] = value
+    for component_name, latency_metric in test_suite_result.latency_metrics.items():
+        for metric_name, metric_value in latency_metric.items():
+            attributes_dict[
+                f"{OUTPUT_LATENCY_METRICS}_{component_name}_{metric_name}"
+            ] = metric_value
+    for (
+        component_name,
+        prompt_token_metric,
+    ) in test_suite_result.prompt_token_metrics.items():
+        for metric_name, metric_value in prompt_token_metric.items():
+            attributes_dict[
+                f"{OUTPUT_PROMPT_TOKEN_METRICS}_{component_name}_{metric_name}"
+            ] = metric_value
+    for (
+        component_name,
+        completion_token_metric,
+    ) in test_suite_result.completion_token_metrics.items():
+        for metric_name, metric_value in completion_token_metric.items():
+            attributes_dict[
+                f"{OUTPUT_COMPLETION_TOKEN_METRICS}_{component_name}_{metric_name}"
+            ] = metric_value
 
     return attributes_dict
 
@@ -721,7 +755,7 @@ def extract_attrs_for_intentless_policy_find_closest_response(
 
 
 def extract_attrs_for_intentless_policy_generate_llm_answer(
-    self: "IntentlessPolicy", llm: "BaseLLM", prompt: str, sender_id: str
+    self: "IntentlessPolicy", llm: "BaseLLM", prompt: str
 ) -> Dict[str, Any]:
     from rasa.core.policies.intentless_policy import (
         DEFAULT_EMBEDDINGS_CONFIG,
@@ -738,17 +772,16 @@ def extract_attrs_for_intentless_policy_generate_llm_answer(
 
 
 def extract_attrs_for_enterprise_search_generate_llm_answer(
-    self: "EnterpriseSearchPolicy", llm: "BaseLLM", prompt: str, sender_id: str
+    self: "EnterpriseSearchPolicy", llm: "BaseLLM", prompt: str
 ) -> Dict[str, Any]:
     from rasa.core.policies.enterprise_search_policy import (
-        DEFAULT_EMBEDDINGS_CONFIG,
         DEFAULT_LLM_CONFIG,
     )
 
     attributes = extract_llm_config(
         self,
         default_llm_config=DEFAULT_LLM_CONFIG,
-        default_embeddings_config=DEFAULT_EMBEDDINGS_CONFIG,
+        default_embeddings_config=None,
     )
 
     return extend_attributes_with_prompt_tokens_length(self, attributes, prompt)

rasa/tracing/instrumentation/instrumentation.py

@@ -982,18 +982,18 @@ def _instrument_command_processor_module(tracer_provider: TracerProvider) -> Non
         "validate_state_of_commands",
         attribute_extractors.extract_attrs_for_validate_state_of_commands,
     )
-    _instrument_function(
-        tracer_provider.get_tracer(COMMAND_PROCESSOR_MODULE_NAME),
-        COMMAND_PROCESSOR_MODULE_NAME,
-        "clean_up_commands",
-        attribute_extractors.extract_attrs_for_clean_up_commands,
-    )
-    _instrument_function(
-        tracer_provider.get_tracer(COMMAND_PROCESSOR_MODULE_NAME),
-        COMMAND_PROCESSOR_MODULE_NAME,
-        "remove_duplicated_set_slots",
-        attribute_extractors.extract_attrs_for_remove_duplicated_set_slots,
-    )
+    # _instrument_function(
+    #     tracer_provider.get_tracer(COMMAND_PROCESSOR_MODULE_NAME),
+    #     COMMAND_PROCESSOR_MODULE_NAME,
+    #     "clean_up_commands",
+    #     attribute_extractors.extract_attrs_for_clean_up_commands,
+    # )
+    # _instrument_function(
+    #     tracer_provider.get_tracer(COMMAND_PROCESSOR_MODULE_NAME),
+    #     COMMAND_PROCESSOR_MODULE_NAME,
+    #     "remove_duplicated_set_slots",
+    #     attribute_extractors.extract_attrs_for_remove_duplicated_set_slots,
+    # )
     mark_module_as_instrumented(COMMAND_PROCESSOR_MODULE_NAME)
 
 

rasa/tracing/instrumentation/intentless_policy_instrumentation.py

@@ -121,13 +121,12 @@ def _instrument_generate_answer(
             response_examples: List[str],
             conversation_samples: List[str],
             history: str,
-            sender_id: str,
         ) -> Optional[str]:
             with tracer.start_as_current_span(
                 f"{self.__class__.__name__}.{fn.__name__}"
             ) as span:
                 llm_response = await fn(
-                    self, response_examples, conversation_samples, history, sender_id
+                    self, response_examples, conversation_samples, history
                 )
                 span.set_attributes(
                     {

rasa/utils/licensing.py

@@ -539,18 +539,3 @@ async def _count_conversations_after(
         return 0
 
     return await tracker_store.count_conversations(after_timestamp=after_timestamp)
-
-
-def get_human_readable_licence_owner() -> str:
-    user_id = "unknown"
-
-    try:
-        retrieved_license = retrieve_license_from_env()
-        if retrieved_license:
-            decoded = License.decode(retrieved_license)
-            if decoded:
-                user_id = (
-                    f"{decoded.company or ''}_{decoded.email or ''}_{decoded.jti or ''}"
-                )
-    finally:
-        return user_id

rasa/validator.py

@@ -48,7 +48,7 @@ from rasa.shared.core.domain import (
     Domain,
 )
 from rasa.shared.core.events import ActionExecuted, ActiveLoop, UserUttered
-from rasa.shared.core.flows import Flow, FlowsList
+from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.flows.constants import KEY_NAME, KEY_TRANSLATION
 from rasa.shared.core.flows.flow_step_links import IfFlowStepLink
 from rasa.shared.core.flows.steps.action import ActionFlowStep
@@ -56,7 +56,6 @@ from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
 from rasa.shared.core.flows.steps.link import LinkFlowStep
 from rasa.shared.core.flows.steps.set_slots import SetSlotsFlowStep
 from rasa.shared.core.flows.utils import (
-    ALL_LABEL,
     get_duplicate_slot_persistence_config_error_message,
     get_invalid_slot_persistence_config_error_message,
     warn_deprecated_collect_step_config,
@@ -1281,7 +1280,6 @@ class Validator:
             self.verify_unique_flows(),
             self.verify_predicates(),
             self.verify_slot_persistence_configuration(),
-            self.verify_digression_configuration(),
         ]
 
         all_good = all(flow_validation_conditions)
@@ -1830,126 +1828,6 @@ class Validator:
 
         return all_good
 
-    def verify_digression_configuration(self) -> bool:
-        """Validates the digression configuration in flows."""
-        all_good = True
-
-        for flow in self.flows.underlying_flows:
-            all_good = self._validate_ask_confirm_digressions(flow, all_good)
-            all_good = self._validate_block_digressions(flow, all_good)
-
-        return all_good
-
-    def _validate_ask_confirm_digressions(self, flow: Flow, all_good: bool) -> bool:
-        """Validates the ask_confirm_digressions configuration in a flow."""
-        for flow_id in flow.ask_confirm_digressions:
-            if flow_id == ALL_LABEL:
-                continue
-            if flow_id not in self.flows.flow_ids:
-                structlogger.error(
-                    "validator.verify_digression_configuration.ask_confirm_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in the "
-                        f"`ask_confirm_digressions` configuration of flow "
-                        f"'{flow.id}', but it is not found in the "
-                        f"flows file. Please make sure that the flow id is correct."
-                    ),
-                )
-                all_good = False
-
-            if flow_id in flow.block_digressions:
-                structlogger.error(
-                    "validator.verify_digression_configuration.overlap_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in both the "
-                        f"`ask_confirm_digressions` and `block_digressions` "
-                        f"configuration of flow '{flow.id}'. "
-                        f"Please make sure that the flow id is not listed in both "
-                        f"configurations."
-                    ),
-                )
-                all_good = False
-
-        for step in flow.get_collect_steps():
-            for flow_id in step.ask_confirm_digressions:
-                if flow_id == ALL_LABEL:
-                    continue
-
-                if flow_id not in self.flows.flow_ids:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.ask_confirm_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in the "
-                            f"`ask_confirm_digressions` configuration of step "
-                            f"'{step.id}' in flow '{flow.id}', but it is "
-                            f"not found in the flows file. "
-                            f"Please make sure that the flow id is correct."
-                        ),
-                    )
-                    all_good = False
-
-                if flow_id in step.block_digressions:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.overlap_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in both the "
-                            f"`ask_confirm_digressions` and `block_digressions` "
-                            f"configuration of step '{step.id}' in flow '{flow.id}'. "
-                            f"Please make sure that the flow id is not listed in both "
-                            f"configurations."
-                        ),
-                    )
-                    all_good = False
-
-        return all_good
-
-    def _validate_block_digressions(self, flow: Flow, all_good: bool) -> bool:
-        """Validates the block_digressions configuration in a flow."""
-        for flow_id in flow.block_digressions:
-            if flow_id == ALL_LABEL:
-                continue
-
-            if flow_id not in self.flows.flow_ids:
-                structlogger.error(
-                    "validator.verify_digression_configuration.block_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in the `block_digressions` "
-                        f"configuration of flow '{flow.id}', but it is not found "
-                        f"in the flows file. Please make sure that the flow id "
-                        f"is correct."
-                    ),
-                )
-                all_good = False
-
-        for step in flow.get_collect_steps():
-            for flow_id in step.block_digressions:
-                if flow_id == ALL_LABEL:
-                    continue
-
-                if flow_id not in self.flows.flow_ids:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.block_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in the "
-                            f"`block_digressions` configuration of step "
-                            f"'{step.id}' in flow '{flow.id}', but it is "
-                            f"not found in the flows file. "
-                            f"Please make sure that the flow id is correct."
-                        ),
-                    )
-                    all_good = False
-
-        return all_good
-
     def verify_slot_validation(self) -> bool:
         """Validates the slot validation configuration in the domain file."""
         all_good = True

rasa/version.py

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

{rasa_pro-3.12.6.dev2.dist-info → rasa_pro-3.13.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.12.6.dev2
+Version: 3.13.0.dev2
 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
@@ -63,7 +63,6 @@ Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.2.17,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.19,<0.3.0)
 Requires-Dist: langcodes (>=3.5.0,<4.0.0)
-Requires-Dist: langfuse (>=2.60.2,<2.61.0)
 Requires-Dist: litellm (>=1.52.6,<1.53.0)
 Requires-Dist: matplotlib (>=3.7,<3.8)
 Requires-Dist: mattermostwrapper (>=2.2,<2.3)
@@ -101,7 +100,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.12.0)
+Requires-Dist: rasa-sdk (==3.13.0.dev1)
 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)