rasa-pro 3.13.12__py3-none-any.whl → 3.14.0__py3-none-any.whl

rasa/engine/recipes/default_components.py

@@ -3,8 +3,6 @@ from rasa.core.policies.flow_policy import FlowPolicy
 from rasa.core.policies.intentless_policy import IntentlessPolicy
 from rasa.core.policies.memoization import AugmentedMemoizationPolicy, MemoizationPolicy
 from rasa.core.policies.rule_policy import RulePolicy
-from rasa.core.policies.ted_policy import TEDPolicy
-from rasa.core.policies.unexpected_intent_policy import UnexpecTEDIntentPolicy
 from rasa.dialogue_understanding.coexistence.intent_based_router import (
     IntentBasedRouter,
 )
@@ -13,79 +11,116 @@ from rasa.dialogue_understanding.generator import (
     LLMCommandGenerator,
 )
 from rasa.dialogue_understanding.generator.nlu_command_adapter import NLUCommandAdapter
-from rasa.nlu.classifiers.diet_classifier import DIETClassifier
 from rasa.nlu.classifiers.fallback_classifier import FallbackClassifier
 from rasa.nlu.classifiers.keyword_intent_classifier import KeywordIntentClassifier
-from rasa.nlu.classifiers.logistic_regression_classifier import (
-    LogisticRegressionClassifier,
-)
-from rasa.nlu.classifiers.mitie_intent_classifier import MitieIntentClassifier
-from rasa.nlu.classifiers.sklearn_intent_classifier import SklearnIntentClassifier
-from rasa.nlu.extractors.crf_entity_extractor import CRFEntityExtractor
 from rasa.nlu.extractors.duckling_entity_extractor import DucklingEntityExtractor
 from rasa.nlu.extractors.entity_synonyms import EntitySynonymMapper
-from rasa.nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
 from rasa.nlu.extractors.regex_entity_extractor import RegexEntityExtractor
-from rasa.nlu.extractors.spacy_entity_extractor import SpacyEntityExtractor
-from rasa.nlu.featurizers.dense_featurizer.convert_featurizer import ConveRTFeaturizer
-from rasa.nlu.featurizers.dense_featurizer.lm_featurizer import LanguageModelFeaturizer
-from rasa.nlu.featurizers.dense_featurizer.mitie_featurizer import MitieFeaturizer
-from rasa.nlu.featurizers.dense_featurizer.spacy_featurizer import SpacyFeaturizer
 from rasa.nlu.featurizers.sparse_featurizer.count_vectors_featurizer import (
     CountVectorsFeaturizer,
 )
-from rasa.nlu.featurizers.sparse_featurizer.lexical_syntactic_featurizer import (
-    LexicalSyntacticFeaturizer,
-)
 from rasa.nlu.featurizers.sparse_featurizer.regex_featurizer import RegexFeaturizer
-from rasa.nlu.selectors.response_selector import ResponseSelector
-from rasa.nlu.tokenizers.jieba_tokenizer import JiebaTokenizer
-from rasa.nlu.tokenizers.mitie_tokenizer import MitieTokenizer
-from rasa.nlu.tokenizers.spacy_tokenizer import SpacyTokenizer
 from rasa.nlu.tokenizers.whitespace_tokenizer import WhitespaceTokenizer
-from rasa.nlu.utils.mitie_utils import MitieNLP
-from rasa.nlu.utils.spacy_utils import SpacyNLP
+from rasa.shared.utils.common import conditional_import
+
+# Conditional imports for components with external dependencies
+
+# components dependent on tensorflow
+TEDPolicy, TED_POLICY_AVAILABLE = conditional_import(
+    "rasa.core.policies.ted_policy", "TEDPolicy"
+)
+UnexpecTEDIntentPolicy, UNEXPECTED_INTENT_POLICY_AVAILABLE = conditional_import(
+    "rasa.core.policies.unexpected_intent_policy", "UnexpecTEDIntentPolicy"
+)
+DIETClassifier, DIET_CLASSIFIER_AVAILABLE = conditional_import(
+    "rasa.nlu.classifiers.diet_classifier", "DIETClassifier"
+)
+ConveRTFeaturizer, CONVERT_FEATURIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.featurizers.dense_featurizer.convert_featurizer", "ConveRTFeaturizer"
+)
+LanguageModelFeaturizer, LANGUAGE_MODEL_FEATURIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.featurizers.dense_featurizer.lm_featurizer", "LanguageModelFeaturizer"
+)
+ResponseSelector, RESPONSE_SELECTOR_AVAILABLE = conditional_import(
+    "rasa.nlu.selectors.response_selector", "ResponseSelector"
+)
+
+# components dependent on skops
+LogisticRegressionClassifier, LOGISTIC_REGRESSION_CLASSIFIER_AVAILABLE = (
+    conditional_import(
+        "rasa.nlu.classifiers.logistic_regression_classifier",
+        "LogisticRegressionClassifier",
+    )
+)
+SklearnIntentClassifier, SKLEARN_INTENT_CLASSIFIER_AVAILABLE = conditional_import(
+    "rasa.nlu.classifiers.sklearn_intent_classifier", "SklearnIntentClassifier"
+)
+
+# components dependent on spacy
+LexicalSyntacticFeaturizer, LEXICAL_SYNTACTIC_FEATURIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.featurizers.sparse_featurizer.lexical_syntactic_featurizer",
+    "LexicalSyntacticFeaturizer",
+)
+SpacyFeaturizer, SPACY_FEATURIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.featurizers.dense_featurizer.spacy_featurizer", "SpacyFeaturizer"
+)
+SpacyTokenizer, SPACY_TOKENIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.tokenizers.spacy_tokenizer", "SpacyTokenizer"
+)
+SpacyEntityExtractor, SPACY_ENTITY_EXTRACTOR_AVAILABLE = conditional_import(
+    "rasa.nlu.extractors.spacy_entity_extractor", "SpacyEntityExtractor"
+)
+SpacyNLP, SPACY_NLP_AVAILABLE = conditional_import(
+    "rasa.nlu.utils.spacy_utils", "SpacyNLP"
+)
+
+# components dependent on sklearn_crfsuite
+CRFEntityExtractor, CRF_ENTITY_EXTRACTOR_AVAILABLE = conditional_import(
+    "rasa.nlu.extractors.crf_entity_extractor", "CRFEntityExtractor"
+)
+
+# components dependent on mitie
+MitieFeaturizer, MITIE_FEATURIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.featurizers.dense_featurizer.mitie_featurizer", "MitieFeaturizer"
+)
+MitieTokenizer, MITIE_TOKENIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.tokenizers.mitie_tokenizer", "MitieTokenizer"
+)
+MitieIntentClassifier, MITIE_INTENT_CLASSIFIER_AVAILABLE = conditional_import(
+    "rasa.nlu.classifiers.mitie_intent_classifier", "MitieIntentClassifier"
+)
+MitieEntityExtractor, MITIE_ENTITY_EXTRACTOR_AVAILABLE = conditional_import(
+    "rasa.nlu.extractors.mitie_entity_extractor", "MitieEntityExtractor"
+)
+MitieNLP, MITIE_NLP_AVAILABLE = conditional_import(
+    "rasa.nlu.utils.mitie_utils", "MitieNLP"
+)
 
+# components dependent on jieba
+JiebaTokenizer, JIEBA_TOKENIZER_AVAILABLE = conditional_import(
+    "rasa.nlu.tokenizers.jieba_tokenizer", "JiebaTokenizer"
+)
+
+# Base components that are always available (no external dependencies)
 DEFAULT_COMPONENTS = [
-    # Message Classifiers
-    DIETClassifier,
+    # Classifiers
     FallbackClassifier,
     KeywordIntentClassifier,
-    MitieIntentClassifier,
-    SklearnIntentClassifier,
-    LogisticRegressionClassifier,
     NLUCommandAdapter,
     LLMCommandGenerator,
     LLMBasedRouter,
     IntentBasedRouter,
-    # Response Selectors
-    ResponseSelector,
-    # Message Entity Extractors
-    CRFEntityExtractor,
+    # Entity Extractors
     DucklingEntityExtractor,
     EntitySynonymMapper,
-    MitieEntityExtractor,
-    SpacyEntityExtractor,
     RegexEntityExtractor,
-    # Message Feauturizers
-    LexicalSyntacticFeaturizer,
-    ConveRTFeaturizer,
-    MitieFeaturizer,
-    SpacyFeaturizer,
+    # Featurizers
     CountVectorsFeaturizer,
-    LanguageModelFeaturizer,
     RegexFeaturizer,
     # Tokenizers
-    JiebaTokenizer,
-    MitieTokenizer,
-    SpacyTokenizer,
     WhitespaceTokenizer,
     # Language Model Providers
-    MitieNLP,
-    SpacyNLP,
-    # Dialogue Management Policies
-    TEDPolicy,
-    UnexpecTEDIntentPolicy,
+    # Policies
     RulePolicy,
     MemoizationPolicy,
     AugmentedMemoizationPolicy,
@@ -93,3 +128,57 @@ DEFAULT_COMPONENTS = [
     EnterpriseSearchPolicy,
     IntentlessPolicy,
 ]
+
+# Conditionally add components based on dependencies
+
+# components dependent on tensorflow
+if DIET_CLASSIFIER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(DIETClassifier)
+if CONVERT_FEATURIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(ConveRTFeaturizer)
+if LANGUAGE_MODEL_FEATURIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(LanguageModelFeaturizer)
+if RESPONSE_SELECTOR_AVAILABLE:
+    DEFAULT_COMPONENTS.append(ResponseSelector)
+if TED_POLICY_AVAILABLE:
+    DEFAULT_COMPONENTS.append(TEDPolicy)
+if UNEXPECTED_INTENT_POLICY_AVAILABLE:
+    DEFAULT_COMPONENTS.append(UnexpecTEDIntentPolicy)
+
+# components dependent on skops
+if LOGISTIC_REGRESSION_CLASSIFIER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(LogisticRegressionClassifier)
+if SKLEARN_INTENT_CLASSIFIER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(SklearnIntentClassifier)
+
+# components dependent on spacy
+if LEXICAL_SYNTACTIC_FEATURIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(LexicalSyntacticFeaturizer)
+if SPACY_FEATURIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(SpacyFeaturizer)
+if SPACY_TOKENIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(SpacyTokenizer)
+if SPACY_ENTITY_EXTRACTOR_AVAILABLE:
+    DEFAULT_COMPONENTS.append(SpacyEntityExtractor)
+if SPACY_NLP_AVAILABLE:
+    DEFAULT_COMPONENTS.append(SpacyNLP)
+
+# components dependent on mitie
+if MITIE_FEATURIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(MitieFeaturizer)
+if MITIE_TOKENIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(MitieTokenizer)
+if MITIE_INTENT_CLASSIFIER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(MitieIntentClassifier)
+if MITIE_ENTITY_EXTRACTOR_AVAILABLE:
+    DEFAULT_COMPONENTS.append(MitieEntityExtractor)
+if MITIE_NLP_AVAILABLE:
+    DEFAULT_COMPONENTS.append(MitieNLP)
+
+# components dependent on jieba
+if JIEBA_TOKENIZER_AVAILABLE:
+    DEFAULT_COMPONENTS.append(JiebaTokenizer)
+
+# components dependent on sklearn_crfsuite
+if CRF_ENTITY_EXTRACTOR_AVAILABLE:
+    DEFAULT_COMPONENTS.append(CRFEntityExtractor)

rasa/engine/recipes/default_recipe.py

@@ -5,6 +5,7 @@ import dataclasses
 import enum
 import logging
 import math
+import sys
 from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, Set, Text, Tuple, Type, Union
 
@@ -180,7 +181,28 @@ class DefaultV1Recipe(Recipe):
     @classmethod
     def _from_registry(cls, name: Text) -> RegisteredComponent:
         # Importing all the default Rasa components will automatically register them
-        from rasa.engine.recipes.default_components import DEFAULT_COMPONENTS  # noqa
+        from rasa.engine.recipes.default_components import (
+            CONVERT_FEATURIZER_AVAILABLE,
+            CRF_ENTITY_EXTRACTOR_AVAILABLE,
+            DIET_CLASSIFIER_AVAILABLE,
+            JIEBA_TOKENIZER_AVAILABLE,
+            LANGUAGE_MODEL_FEATURIZER_AVAILABLE,
+            LEXICAL_SYNTACTIC_FEATURIZER_AVAILABLE,
+            LOGISTIC_REGRESSION_CLASSIFIER_AVAILABLE,
+            MITIE_ENTITY_EXTRACTOR_AVAILABLE,
+            MITIE_FEATURIZER_AVAILABLE,
+            MITIE_INTENT_CLASSIFIER_AVAILABLE,
+            MITIE_NLP_AVAILABLE,
+            MITIE_TOKENIZER_AVAILABLE,
+            RESPONSE_SELECTOR_AVAILABLE,
+            SKLEARN_INTENT_CLASSIFIER_AVAILABLE,
+            SPACY_ENTITY_EXTRACTOR_AVAILABLE,
+            SPACY_FEATURIZER_AVAILABLE,
+            SPACY_NLP_AVAILABLE,
+            SPACY_TOKENIZER_AVAILABLE,
+            TED_POLICY_AVAILABLE,
+            UNEXPECTED_INTENT_POLICY_AVAILABLE,
+        )
 
         if name in cls._registered_components:
             return cls._registered_components[name]
@@ -190,6 +212,56 @@ class DefaultV1Recipe(Recipe):
             if clazz.__name__ in cls._registered_components:
                 return cls._registered_components[clazz.__name__]
 
+        # Check Python version compatibility for TensorFlow components
+        # TensorFlow support was removed for Python 3.12+ due to compatibility issues
+        if sys.version_info >= (3, 12):
+            raise InvalidConfigException(
+                f"{name} is not available on Python 3.12+. "
+                "TensorFlow support has been removed for Python 3.12+ versions. "
+                "Please use Python 3.11 or earlier for TensorFlow-based components. "
+            )
+
+        # Check for nlu components that failed to load
+        # because conditional module import of those components did not succeed
+        nlu_components = {
+            # tensorflow-dependent components
+            "DIETClassifier": DIET_CLASSIFIER_AVAILABLE,
+            "TEDPolicy": TED_POLICY_AVAILABLE,
+            "UnexpecTEDIntentPolicy": UNEXPECTED_INTENT_POLICY_AVAILABLE,
+            "ResponseSelector": RESPONSE_SELECTOR_AVAILABLE,
+            "ConveRTFeaturizer": CONVERT_FEATURIZER_AVAILABLE,
+            "LanguageModelFeaturizer": LANGUAGE_MODEL_FEATURIZER_AVAILABLE,
+            # nlu components dependent on other dependencies than tensorflow
+            "LogisticRegressionClassifier": LOGISTIC_REGRESSION_CLASSIFIER_AVAILABLE,
+            "SklearnIntentClassifier": SKLEARN_INTENT_CLASSIFIER_AVAILABLE,
+            "LexicalSyntacticFeaturizer": LEXICAL_SYNTACTIC_FEATURIZER_AVAILABLE,
+            "MitieFeaturizer": MITIE_FEATURIZER_AVAILABLE,
+            "SpacyFeaturizer": SPACY_FEATURIZER_AVAILABLE,
+            "JiebaTokenizer": JIEBA_TOKENIZER_AVAILABLE,
+            "MitieTokenizer": MITIE_TOKENIZER_AVAILABLE,
+            "SpacyTokenizer": SPACY_TOKENIZER_AVAILABLE,
+            "MitieIntentClassifier": MITIE_INTENT_CLASSIFIER_AVAILABLE,
+            "MitieEntityExtractor": MITIE_ENTITY_EXTRACTOR_AVAILABLE,
+            "SpacyEntityExtractor": SPACY_ENTITY_EXTRACTOR_AVAILABLE,
+            "MitieNLP": MITIE_NLP_AVAILABLE,
+            "SpacyNLP": SPACY_NLP_AVAILABLE,
+            "CRFEntityExtractor": CRF_ENTITY_EXTRACTOR_AVAILABLE,
+        }
+
+        if name in nlu_components:
+            # nlu-dependent component failed to load
+            # because nlu dependency group not installed
+            if not nlu_components[name]:
+                from rasa.exceptions import MissingDependencyException
+
+                raise MissingDependencyException(
+                    f"The {name} component requires additional dependencies "
+                    f"which are not installed. "
+                    f"Please install the required extra by running: "
+                    f"pip install 'rasa-pro[nlu]' OR "
+                    f"poetry add 'rasa-pro[nlu]'"
+                )
+
         raise InvalidConfigException(
             f"Can't load class for name '{name}'. Please make sure to provide "
             f"a valid name or module path and to register it using the "
@@ -485,17 +557,42 @@ class DefaultV1Recipe(Recipe):
         component: Type[GraphComponent],
         component_config: Dict[Text, Any],
     ) -> Dict[Text, Any]:
-        from rasa.nlu.classifiers.mitie_intent_classifier import MitieIntentClassifier
-        from rasa.nlu.classifiers.sklearn_intent_classifier import (
-            SklearnIntentClassifier,
-        )
-        from rasa.nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
+        # Try to import MitieIntentClassifier, but handle ImportError gracefully
+        # since the dependencies for it may not be installed
+        try:
+            from rasa.nlu.classifiers.mitie_intent_classifier import (
+                MitieIntentClassifier,
+            )
+        except ImportError:
+            MitieIntentClassifier = None  # type: ignore
 
-        cli_args_mapping: Dict[Type[GraphComponent], List[Text]] = {
-            MitieIntentClassifier: ["num_threads"],
-            MitieEntityExtractor: ["num_threads"],
-            SklearnIntentClassifier: ["num_threads"],
-        }
+        # Try to import MitieEntityExtractor, but handle ImportError gracefully
+        # since the dependencies for it may not be installed
+        try:
+            from rasa.nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
+        except ImportError:
+            MitieEntityExtractor = None  # type: ignore
+
+        # Try to import SklearnIntentClassifier, but handle ImportError gracefully
+        # since the dependencies for it may not be installed
+        try:
+            from rasa.nlu.classifiers.sklearn_intent_classifier import (
+                SklearnIntentClassifier,
+            )
+        except ImportError:
+            SklearnIntentClassifier = None  # type: ignore
+
+        cli_args_mapping: Dict[Type[GraphComponent], List[Text]] = {}
+
+        # Only add components if they were successfully imported
+        if MitieIntentClassifier is not None:
+            cli_args_mapping[MitieIntentClassifier] = ["num_threads"]
+
+        if MitieEntityExtractor is not None:
+            cli_args_mapping[MitieEntityExtractor] = ["num_threads"]
+
+        if SklearnIntentClassifier is not None:
+            cli_args_mapping[SklearnIntentClassifier] = ["num_threads"]
 
         config_from_cli = {
             param: cli_parameters[param]

rasa/engine/runner/dask.py

@@ -1,18 +1,18 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 from typing import Any, Dict, List, Optional, Text
 
 import dask.core
 import dask.local
+import structlog
 
 from rasa.engine.exceptions import GraphRunError
 from rasa.engine.graph import ExecutionContext, GraphNode, GraphNodeHook, GraphSchema
 from rasa.engine.runner.interface import GraphRunner
 from rasa.engine.storage.storage import ModelStorage
 
-logger = logging.getLogger(__name__)
+structlogger = structlog.get_logger()
 
 
 class DaskGraphRunner(GraphRunner):
@@ -94,9 +94,12 @@ class DaskGraphRunner(GraphRunner):
         if inputs:
             self._add_inputs_to_graph(inputs, run_graph)
 
-        logger.debug(
-            f"Running graph with inputs: {inputs}, targets: {targets} "
-            f"and {self._execution_context}."
+        structlogger.debug(
+            "rasa.engine.runner.dask.run",
+            event_info="Running graph with inputs, targets and execution context.",
+            inputs=inputs,
+            targets=targets,
+            execution_context=self._execution_context,
         )
 
         try:

rasa/engine/validation.py

@@ -23,7 +23,8 @@ import structlog
 import typing_utils
 
 import rasa.utils.common
-from rasa.core.available_endpoints import AvailableEndpoints
+from rasa.core.config.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 from rasa.core.nlg.contextual_response_rephraser import ContextualResponseRephraser
 from rasa.core.policies.intentless_policy import IntentlessPolicy
 from rasa.core.policies.policy import PolicyPrediction
@@ -80,6 +81,7 @@ from rasa.shared.constants import (
     ROUTING_STRATEGIES_NOT_REQUIRING_CACHE,
     ROUTING_STRATEGIES_REQUIRING_REDIS_CACHE,
     ROUTING_STRATEGY_CONFIG_KEY,
+    SECRET_DATA_FORMAT_PATTERN,
     SENSITIVE_DATA,
     USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY,
     VALID_PROVIDERS_FOR_API_TYPE_CONFIG_KEY,
@@ -1039,7 +1041,7 @@ def validate_model_client_configuration_setup_during_training_time(
                     )
 
     # also include the ContextualResponseRephraser component
-    endpoints = AvailableEndpoints.get_instance()
+    endpoints = Configuration.get_instance().endpoints
     if endpoints.nlg is not None:
         _validate_component_model_client_config(
             endpoints.nlg.kwargs,
@@ -1075,7 +1077,7 @@ def validate_model_client_configuration_setup_during_training_time(
             ),
         )
 
-    endpoints = AvailableEndpoints.get_instance()
+    endpoints = Configuration.get_instance().endpoints
     if len(model_group_ids) > 0 and endpoints.model_groups is None:
         raise ValidationError(
             code="engine.validation.validate_model_client_configuration_setup"
@@ -1138,7 +1140,7 @@ def _validate_component_model_client_config_has_references_to_endpoints(
         # no llm/embeddings configuration present
         return
 
-    endpoints = AvailableEndpoints.get_instance()
+    endpoints = Configuration.get_instance().endpoints
 
     if MODEL_GROUP_CONFIG_KEY in component_config[key]:
         referencing_model_group_id = component_config[key][MODEL_GROUP_CONFIG_KEY]
@@ -1213,7 +1215,7 @@ def validate_model_client_configuration_setup_during_inference_time(
                     )
 
     # also include the ContextualResponseRephraser component
-    endpoints = AvailableEndpoints.get_instance()
+    endpoints = Configuration.get_instance().endpoints
     if endpoints.nlg is not None:
         _validate_component_model_client_config_has_references_to_endpoints(
             component_config=endpoints.nlg.kwargs,
@@ -1224,6 +1226,12 @@ def validate_model_client_configuration_setup_during_inference_time(
 
 def _validate_unique_model_group_ids(model_groups: List[Dict[str, Any]]) -> None:
     # Each model id must be unique within the model_groups
+    structlogger.debug(
+        "engine.validation.validate_unique_model_group_ids",
+        event_info="Validating that model group IDs are unique.",
+        model_groups=model_groups,
+    )
+
     model_ids = [model_group[MODEL_GROUP_ID_CONFIG_KEY] for model_group in model_groups]
     if len(model_ids) != len(set(model_ids)):
         counts = Counter(model_ids)
@@ -1352,7 +1360,10 @@ def _validate_usage_of_environment_variables_in_model_group_config(
         for model_config in model_group[MODELS_CONFIG_KEY]:
             for key, value in model_config.items():
                 if isinstance(value, str):
-                    if re.match(r"\${(\w+)}", value) and key not in allowed_env_vars:
+                    if (
+                        re.match(SECRET_DATA_FORMAT_PATTERN, value)
+                        and key not in allowed_env_vars
+                    ):
                         raise ValidationError(
                             code="engine.validation.validate_model_group_configuration_setup"
                             ".invalid_use_of_environment_variables",
@@ -1379,7 +1390,7 @@ def _validate_sensitive_keys_are_an_environment_variables_for_model_groups(
             for key, value in model_config.items():
                 if key in SENSITIVE_DATA:
                     if isinstance(value, str):
-                        if not re.match(r"\${(\w+)}", value):
+                        if not re.match(SECRET_DATA_FORMAT_PATTERN, value):
                             raise ValidationError(
                                 code="engine.validation.validate_model_group_configuration_setup"
                                 ".sensitive_key_string_value_must_be_set_as_env_var",
@@ -1410,11 +1421,17 @@ def _validate_sensitive_keys_are_an_environment_variables_for_model_groups(
 
 def validate_model_group_configuration_setup() -> None:
     """Validates the model group configuration setup in endpoints.yml."""
-    endpoints = AvailableEndpoints.get_instance()
+    endpoints = Configuration.get_instance().endpoints
 
     if endpoints.model_groups is None:
         return
 
+    structlogger.debug(
+        "engine.validation.validate_model_group_configuration_setup",
+        event_info="Validating the model group configuration setup.",
+        model_groups=endpoints.model_groups,
+        path=endpoints.config_file_path,
+    )
     _validate_unique_model_group_ids(endpoints.model_groups)
     _validate_model_group_with_multiple_models(endpoints.model_groups)
     _validate_usage_of_environment_variables_in_model_group_config(