rasa-pro 3.14.0rc1__py3-none-any.whl → 3.14.0rc3__py3-none-any.whl

rasa/core/config/configuration.py

@@ -7,6 +7,7 @@ from typing import Literal, Optional
 import structlog
 
 from rasa.cli.validation.config_path_validation import get_validated_path
+from rasa.core.available_agents import DEFAULT_AGENTS_CONFIG_FOLDER, AvailableAgents
 from rasa.core.config.available_endpoints import AvailableEndpoints
 from rasa.core.config.credentials import CredentialsConfig
 from rasa.core.config.message_procesing_config import MessageProcessingConfig
@@ -146,10 +147,12 @@ class Configuration:
     def __init__(
         self,
         endpoints: AvailableEndpoints,
+        available_agents: AvailableAgents,
         credentials: Optional[CredentialsConfig] = None,
         message_processing_config: Optional[MessageProcessingConfig] = None,
     ):
         self.credentials = credentials
+        self.available_agents = available_agents
         self.endpoints = endpoints
         self.message_processing_config = message_processing_config
 
@@ -159,6 +162,7 @@ class Configuration:
             cls._instance = Configuration(
                 credentials=None,
                 endpoints=AvailableEndpoints(),
+                available_agents=AvailableAgents(),
                 message_processing_config=None,
             )
         return cls._instance
@@ -177,7 +181,10 @@ class Configuration:
         )
         if cls._instance is None:
             cls._instance = Configuration(
-                endpoints=endpoints, credentials=None, message_processing_config=None
+                endpoints=endpoints,
+                available_agents=AvailableAgents(),
+                credentials=None,
+                message_processing_config=None,
             )
         else:
             cls._instance.endpoints = endpoints
@@ -189,6 +196,7 @@ class Configuration:
         if cls._instance is None:
             cls._instance = Configuration(
                 endpoints=AvailableEndpoints(),
+                available_agents=AvailableAgents(),
                 credentials=None,
                 message_processing_config=None,
             )
@@ -217,6 +225,7 @@ class Configuration:
                 message_processing_config=message_processing_config,
                 credentials=None,
                 endpoints=AvailableEndpoints(),
+                available_agents=AvailableAgents(),
             )
         else:
             cls._instance.message_processing_config = message_processing_config
@@ -240,12 +249,37 @@ class Configuration:
             cls._instance = Configuration(
                 credentials=credentials,
                 endpoints=AvailableEndpoints(),
+                available_agents=AvailableAgents(),
                 message_processing_config=None,
             )
         else:
             cls._instance.credentials = credentials
         return cls._instance
 
+    @classmethod
+    def initialise_sub_agents(cls, sub_agents_path: Optional[Path]) -> Configuration:
+        sub_agents_folder = (
+            str(sub_agents_path)
+            if sub_agents_path is not None
+            else DEFAULT_AGENTS_CONFIG_FOLDER
+        )
+        logger.debug(
+            "configuration.initialise_sub_agents.start",
+            sub_agents_folder=sub_agents_folder,
+        )
+        available_agents = AvailableAgents.read_from_folder(sub_agents_folder)
+
+        if cls._instance is None:
+            cls._instance = Configuration(
+                endpoints=AvailableEndpoints(),
+                available_agents=available_agents,
+                credentials=None,
+                message_processing_config=None,
+            )
+        else:
+            cls._instance.available_agents = available_agents
+        return cls._instance
+
     @classmethod
     def get_instance(cls) -> Configuration:
         if cls._instance is None:
@@ -254,6 +288,7 @@ class Configuration:
                 "Call appropriate 'initialise' methods to "
                 "load the config when Rasa Pro starts: "
                 "initialise_endpoints(), "
+                "initialise_sub_agents(), "
                 "initialise_credentials(), "
                 "initialise_message_processing()"
             )

rasa/core/constants.py

@@ -123,3 +123,9 @@ SQL_TRACKER_STORE_SSL_ROOT_CERTIFICATE_ENV_VAR_NAME = (
     "SQL_TRACKER_STORE_SSL_ROOT_CERTIFICATE"
 )
 AWS_ELASTICACHE_CLUSTER_NAME_ENV_VAR_NAME = "AWS_ELASTICACHE_CLUSTER_NAME"
+RDS_SQL_DB_AWS_IAM_ENABLED_ENV_VAR_NAME = "RDS_SQL_DB_AWS_IAM_ENABLED"
+ELASTICACHE_REDIS_AWS_IAM_ENABLED_ENV_VAR_NAME = "ELASTICACHE_REDIS_AWS_IAM_ENABLED"
+KAFKA_MSK_AWS_IAM_ENABLED_ENV_VAR_NAME = "KAFKA_MSK_AWS_IAM_ENABLED"
+SQL_SERVICE_NAME = "sql"
+REDIS_SERVICE_NAME = "redis"
+KAFKA_SERVICE_NAME = "kafka"

rasa/core/iam_credentials_providers/aws_iam_credentials_providers.py

@@ -1,7 +1,7 @@
 import os
 import threading
 import time
-from typing import Optional, Tuple
+from typing import Dict, Optional, Tuple
 from urllib.parse import ParseResult, urlencode, urlunparse
 
 import boto3
@@ -14,6 +14,14 @@ from botocore.session import get_session
 from botocore.signers import RequestSigner
 from cachetools import TTLCache, cached
 
+from rasa.core.constants import (
+    ELASTICACHE_REDIS_AWS_IAM_ENABLED_ENV_VAR_NAME,
+    KAFKA_MSK_AWS_IAM_ENABLED_ENV_VAR_NAME,
+    KAFKA_SERVICE_NAME,
+    RDS_SQL_DB_AWS_IAM_ENABLED_ENV_VAR_NAME,
+    REDIS_SERVICE_NAME,
+    SQL_SERVICE_NAME,
+)
 from rasa.core.iam_credentials_providers.credentials_provider_protocol import (
     IAMCredentialsProvider,
     IAMCredentialsProviderInput,
@@ -24,6 +32,25 @@ from rasa.shared.exceptions import ConnectionException
 
 structlogger = structlog.get_logger(__name__)
 
+SERVICE_CONFIG: Dict[Tuple[SupportedServiceType, str], str] = {
+    (
+        SupportedServiceType.TRACKER_STORE,
+        SQL_SERVICE_NAME,
+    ): RDS_SQL_DB_AWS_IAM_ENABLED_ENV_VAR_NAME,
+    (
+        SupportedServiceType.TRACKER_STORE,
+        REDIS_SERVICE_NAME,
+    ): ELASTICACHE_REDIS_AWS_IAM_ENABLED_ENV_VAR_NAME,
+    (
+        SupportedServiceType.EVENT_BROKER,
+        KAFKA_SERVICE_NAME,
+    ): KAFKA_MSK_AWS_IAM_ENABLED_ENV_VAR_NAME,
+    (
+        SupportedServiceType.LOCK_STORE,
+        REDIS_SERVICE_NAME,
+    ): ELASTICACHE_REDIS_AWS_IAM_ENABLED_ENV_VAR_NAME,
+}
+
 
 class AWSRDSIAMCredentialsProvider(IAMCredentialsProvider):
     """Generates temporary credentials for AWS RDS using IAM roles."""
@@ -203,21 +230,59 @@ class AWSElasticacheRedisIAMCredentialsProvider(redis.CredentialProvider):
             return TemporaryCredentials()
 
 
+def is_iam_enabled(provider_input: "IAMCredentialsProviderInput") -> bool:
+    """Checks if IAM authentication is enabled for the given service."""
+    service_type = provider_input.service_type
+    service_name = provider_input.service_name
+    iam_enabled_env_var_name = SERVICE_CONFIG.get((service_type, service_name))
+
+    if not iam_enabled_env_var_name:
+        structlogger.warning(
+            "rasa.core.aws_iam_credentials_providers.is_iam_enabled.unsupported_service",
+            event_info=f"IAM authentication check requested for unsupported service: "
+            f"{service_name}",
+        )
+        return False
+
+    return os.getenv(iam_enabled_env_var_name, "false").lower() == "true"
+
+
 def create_aws_iam_credentials_provider(
     provider_input: "IAMCredentialsProviderInput",
 ) -> Optional["IAMCredentialsProvider"]:
     """Factory function to create an AWS IAM credentials provider."""
-    if provider_input.service_name == SupportedServiceType.TRACKER_STORE:
+    iam_enabled = is_iam_enabled(provider_input)
+    if not iam_enabled:
+        structlogger.debug(
+            "rasa.core.aws_iam_credentials_providers.create_provider.iam_not_enabled",
+            event_info=f"IAM authentication not enabled for service: "
+            f"{provider_input.service_type}",
+        )
+        return None
+
+    if (
+        provider_input.service_type == SupportedServiceType.TRACKER_STORE
+        and provider_input.service_name == SQL_SERVICE_NAME
+    ):
         return AWSRDSIAMCredentialsProvider(
             username=provider_input.username,
             host=provider_input.host,
             port=provider_input.port,
         )
 
-    if provider_input.service_name == SupportedServiceType.EVENT_BROKER:
+    if (
+        provider_input.service_type == SupportedServiceType.TRACKER_STORE
+        and provider_input.service_name == REDIS_SERVICE_NAME
+    ):
+        return AWSElasticacheRedisIAMCredentialsProvider(
+            username=provider_input.username,
+            cluster_name=provider_input.cluster_name,
+        )
+
+    if provider_input.service_type == SupportedServiceType.EVENT_BROKER:
         return AWSMSKafkaIAMCredentialsProvider()
 
-    if provider_input.service_name == SupportedServiceType.LOCK_STORE:
+    if provider_input.service_type == SupportedServiceType.LOCK_STORE:
         return AWSElasticacheRedisIAMCredentialsProvider(
             username=provider_input.username,
             cluster_name=provider_input.cluster_name,

rasa/core/iam_credentials_providers/credentials_provider_protocol.py

@@ -47,7 +47,8 @@ class SupportedServiceType(Enum):
 class IAMCredentialsProviderInput(BaseModel):
     """Input data for creating an IAM credentials provider."""
 
-    service_name: SupportedServiceType
+    service_type: SupportedServiceType
+    service_name: str
     username: Optional[str] = None
     host: Optional[str] = None
     port: Optional[int] = None

rasa/core/lock_store.py

@@ -18,6 +18,9 @@ from pydantic import (
 
 import rasa.shared.utils.common
 from rasa.core.constants import DEFAULT_LOCK_LIFETIME, IAM_CLOUD_PROVIDER_ENV_VAR_NAME
+from rasa.core.iam_credentials_providers.credentials_provider_protocol import (
+    SupportedServiceType,
+)
 from rasa.core.lock import TicketLock
 from rasa.core.redis_connection_factory import (
     DeploymentMode,
@@ -336,6 +339,7 @@ class RedisLockStore(LockStore):
             redis_config = RedisConfig(
                 host=str(self.config.host),
                 port=self.config.port,
+                service_type=SupportedServiceType.LOCK_STORE,
                 db=self.config.db,
                 username=self.config.username,
                 password=self.config.password,

rasa/core/policies/flows/agent_executor.py

@@ -16,7 +16,7 @@ from rasa.agents.constants import (
 from rasa.agents.core.types import AgentStatus, ProtocolType
 from rasa.agents.schemas import AgentInput, AgentOutput
 from rasa.agents.schemas.agent_input import AgentInputSlot
-from rasa.core.available_agents import AvailableAgents
+from rasa.core.config.configuration import Configuration
 from rasa.core.policies.flows.flow_step_result import (
     ContinueFlowWithNextStep,
     FlowActionPrediction,
@@ -47,12 +47,13 @@ from rasa.shared.core.events import (
     AgentStarted,
     Event,
     SlotSet,
+    deserialise_events,
 )
 from rasa.shared.core.flows.steps import (
     CallFlowStep,
 )
 from rasa.shared.core.slots import CategoricalSlot, Slot
-from rasa.shared.core.trackers import DialogueStateTracker
+from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
 from rasa.shared.utils.llm import tracker_as_readable_transcript
 
 structlogger = structlog.get_logger()
@@ -61,8 +62,9 @@ MAX_AGENT_RETRIES = 3
 
 
 def remove_agent_stack_frame(stack: DialogueStack, agent_id: str) -> None:
-    """Finishes the agentic loop by popping the agent stack frame from the
-    provided `stack`. The `tracker.stack` is NOT modified.
+    """Finishes the agentic loop by popping the agent stack frame from provided `stack`.
+
+    The `tracker.stack` is NOT modified.
     """
     agent_stack_frame = stack.find_agent_stack_frame_by_agent(agent_id)
     if not agent_stack_frame:
@@ -136,7 +138,9 @@ async def run_agent(
     final_events.append(AgentStarted(step.call, step.flow_id))
 
     # send the input to the agent and wait for a response
-    protocol_type = get_protocol_type(step, AvailableAgents.get_agent_config(step.call))
+    protocol_type = get_protocol_type(
+        step, Configuration.get_instance().available_agents.get_agent_config(step.call)
+    )
     output: AgentOutput = await _call_agent_with_retry(
         agent_name=step.call,
         protocol_type=protocol_type,
@@ -471,8 +475,9 @@ def _create_action_prediction(
 def _create_agent_request_user_input_prediction(
     message: Optional[str], events: Optional[List[Event]]
 ) -> FlowActionPrediction:
-    """Create a prediction for requesting user input from the agent
-    and waiting for it.
+    """Create a prediction for requesting user input from the agent and waiting for it.
+
+    This function creates a prediction that will pause the flow and wait for user input.
     """
     return _create_action_prediction(
         ACTION_AGENT_REQUEST_USER_INPUT_NAME, message, events
@@ -529,7 +534,9 @@ def _prepare_agent_input(
             tracker.current_slot_values(), slots, step.exit_if
         ),
         conversation_history=tracker_as_readable_transcript(tracker),
-        events=tracker.current_state().get("events") or [],
+        events=deserialise_events(
+            tracker.current_state(EventVerbosity.ALL).get("events") or []
+        ),
         metadata=agent_input_metadata,
     )
 
@@ -550,6 +557,7 @@ def _prepare_slots_for_agent(
     Args:
         slot_values: The full slot dictionary from the tracker.
         slot_definitions: The slot definitions from the domain.
+        exit_if: Optional list of exit conditions that determine which slots to keep.
 
     Returns:
         A list of slots containing the name, current value, type, and allowed values.

rasa/core/redis_connection_factory.py

@@ -6,7 +6,10 @@ import redis
 import structlog
 from pydantic import BaseModel, ConfigDict
 
-from rasa.core.constants import AWS_ELASTICACHE_CLUSTER_NAME_ENV_VAR_NAME
+from rasa.core.constants import (
+    AWS_ELASTICACHE_CLUSTER_NAME_ENV_VAR_NAME,
+    REDIS_SERVICE_NAME,
+)
 from rasa.core.iam_credentials_providers.credentials_provider_protocol import (
     IAMCredentialsProvider,
     IAMCredentialsProviderInput,
@@ -65,6 +68,7 @@ class RedisConfig(BaseModel):
 
     host: Text = "localhost"
     port: int = 6379
+    service_type: SupportedServiceType
     username: Optional[Text] = None
     password: Optional[Text] = None
     use_ssl: bool = False
@@ -117,7 +121,8 @@ class RedisConnectionFactory:
 
         iam_credentials_provider = create_iam_credentials_provider(
             IAMCredentialsProviderInput(
-                service_name=SupportedServiceType.LOCK_STORE,
+                service_type=config.service_type,
+                service_name=REDIS_SERVICE_NAME,
                 username=config.username,
                 cluster_name=os.getenv(AWS_ELASTICACHE_CLUSTER_NAME_ENV_VAR_NAME),
             )

rasa/core/tracker_stores/redis_tracker_store.py

@@ -8,6 +8,9 @@ from pydantic import ValidationError
 
 import rasa.shared
 from rasa.core.brokers.broker import EventBroker
+from rasa.core.iam_credentials_providers.credentials_provider_protocol import (
+    SupportedServiceType,
+)
 from rasa.core.redis_connection_factory import (
     DeploymentMode,
     RedisConfig,
@@ -54,6 +57,7 @@ class RedisTrackerStore(TrackerStore, SerializedTrackerAsText):
             config = RedisConfig(
                 host=host,
                 port=port,
+                service_type=SupportedServiceType.TRACKER_STORE,
                 db=db,
                 username=username,
                 password=password,

rasa/core/tracker_stores/sql_tracker_store.py

@@ -27,6 +27,7 @@ from rasa.core.constants import (
     POSTGRESQL_MAX_OVERFLOW,
     POSTGRESQL_POOL_SIZE,
     POSTGRESQL_SCHEMA,
+    SQL_SERVICE_NAME,
     SQL_TRACKER_STORE_SSL_MODE_ENV_VAR_NAME,
     SQL_TRACKER_STORE_SSL_ROOT_CERTIFICATE_ENV_VAR_NAME,
 )
@@ -229,7 +230,8 @@ class SQLTrackerStore(TrackerStore, SerializedTrackerAsText):
 
         iam_credentials_provider = create_iam_credentials_provider(
             IAMCredentialsProviderInput(
-                service_name=SupportedServiceType.TRACKER_STORE,
+                service_type=SupportedServiceType.TRACKER_STORE,
+                service_name=SQL_SERVICE_NAME,
                 username=username,
                 host=host,
                 port=port,

rasa/dialogue_understanding/commands/start_flow_command.py

@@ -104,7 +104,10 @@ class StartFlowCommand(Command):
             # predicted a start flow command for the flow which is on top of the stack,
             # we just need to remove the pattern_continue_interrupted frame(s) from the
             # stack
-            stack = remove_pattern_continue_interrupted_frames(stack)
+            stack, flow_completed_events = remove_pattern_continue_interrupted_frames(
+                stack
+            )
+            applied_events.extend(flow_completed_events)
             return applied_events + tracker.create_stack_updated_events(stack)
 
         # if the flow is already on the stack, resume it
@@ -114,7 +117,10 @@ class StartFlowCommand(Command):
         ):
             # if pattern_continue_interrupted is active, we need to remove it
             # from the stack before resuming the flow
-            stack = remove_pattern_continue_interrupted_frames(stack)
+            stack, flow_completed_events = remove_pattern_continue_interrupted_frames(
+                stack
+            )
+            applied_events.extend(flow_completed_events)
             applied_events.extend(resume_flow(self.flow, tracker, stack))
             # the current active flow is interrupted
             applied_events.append(
@@ -128,7 +134,8 @@ class StartFlowCommand(Command):
 
         # remove the pattern_continue_interrupted frames from the stack
         # if it is currently active but the user digressed from the pattern
-        stack = remove_pattern_continue_interrupted_frames(stack)
+        stack, flow_completed_events = remove_pattern_continue_interrupted_frames(stack)
+        applied_events.extend(flow_completed_events)
 
         if original_top_flow:
             # if the original top flow is not the same as the flow to start,

rasa/dialogue_understanding/commands/utils.py

@@ -19,6 +19,7 @@ from rasa.shared.constants import ACTION_ASK_PREFIX, UTTER_ASK_PREFIX
 from rasa.shared.core.events import (
     AgentResumed,
     Event,
+    FlowCompleted,
     FlowResumed,
     SlotSet,
 )
@@ -250,18 +251,28 @@ def collect_frames_to_resume(
     return list(frames_to_resume), frame_to_resume
 
 
-def remove_pattern_continue_interrupted_frames(stack: DialogueStack) -> DialogueStack:
-    """Remove pattern_continue_interrupted frames from the stack."""
+def remove_pattern_continue_interrupted_frames(
+    stack: DialogueStack,
+) -> Tuple[DialogueStack, List[FlowCompleted]]:
+    """Remove pattern_continue_interrupted frames from the stack and return events.
+
+    Returns:
+        A tuple containing (updated_stack, flow_completed_events)
+    """
     from rasa.dialogue_understanding.stack.utils import (
         is_continue_interrupted_flow_active,
     )
 
     if not is_continue_interrupted_flow_active(stack):
-        return stack
+        return stack, []
 
+    events = []
     # remove pattern_continue_interrupted from the stack
     top_frame = stack.top()
     while isinstance(top_frame, PatternFlowStackFrame):
+        # Create FlowCompleted event for the pattern frame being removed
+        events.append(FlowCompleted(top_frame.flow_id, top_frame.step_id))
+
         # If the top frame is a pattern frame, we need to remove it
         # before continuing with the active user flow frame.
         # This prevents the pattern frame
@@ -271,4 +282,4 @@ def remove_pattern_continue_interrupted_frames(stack: DialogueStack) -> Dialogue
         stack.pop()
         top_frame = stack.top()
 
-    return stack
+    return stack, events

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -7,7 +7,7 @@ from jinja2 import Environment, Template, select_autoescape
 
 import rasa.dialogue_understanding.generator.utils
 import rasa.shared.utils.io
-from rasa.core.available_agents import AvailableAgents
+from rasa.core.config.configuration import Configuration
 from rasa.dialogue_understanding.commands import (
     Command,
     SetSlotCommand,
@@ -398,7 +398,9 @@ class LLMBasedCommandGenerator(
                     if isinstance(event, AgentStarted) and event.flow_id == flow.id
                 ]
                 available_agents = [
-                    AvailableAgents.get_agent_config(event.agent_id)
+                    Configuration.get_instance().available_agents.get_agent_config(
+                        event.agent_id
+                    )
                     for event in agent_events
                 ]
                 if available_agents:

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, Literal, Optional, Text
 
 import structlog
 
-from rasa.core.available_agents import AvailableAgents
+from rasa.core.config.configuration import Configuration
 from rasa.dialogue_understanding.commands.command_syntax_manager import (
     CommandSyntaxVersion,
 )
@@ -125,7 +125,7 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         """Get the default prompt template file name for the command generator."""
         return (
             AGENT_DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
-            if AvailableAgents.has_agents()
+            if Configuration.get_instance().available_agents.has_agents()
             else DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
         )
 
@@ -134,7 +134,7 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         """Get the fallback prompt template file name for the command generator."""
         return (
             AGENT_FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
-            if AvailableAgents.has_agents()
+            if Configuration.get_instance().available_agents.has_agents()
             else FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
         )
 
@@ -143,7 +143,7 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         """Get the model prompt mapper for the command generator."""
         return (
             AGENT_MODEL_PROMPT_MAPPER
-            if AvailableAgents.has_agents()
+            if Configuration.get_instance().available_agents.has_agents()
             else MODEL_PROMPT_MAPPER
         )
 

rasa/dialogue_understanding/generator/single_step/search_ready_llm_command_generator.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, Literal, Optional, Text
 
 import structlog
 
-from rasa.core.available_agents import AvailableAgents
+from rasa.core.config.configuration import Configuration
 from rasa.dialogue_understanding.commands.command_syntax_manager import (
     CommandSyntaxVersion,
 )
@@ -127,7 +127,7 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         """Get the default prompt template file name for the command generator."""
         return (
             AGENT_DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
-            if AvailableAgents.has_agents()
+            if Configuration.get_instance().available_agents.has_agents()
             else DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
         )
 
@@ -136,7 +136,7 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         """Get the fallback prompt template file name for the command generator."""
         return (
             AGENT_FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
-            if AvailableAgents.has_agents()
+            if Configuration.get_instance().available_agents.has_agents()
             else FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
         )
 
@@ -145,7 +145,7 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         """Get the model prompt mapper for the command generator."""
         return (
             AGENT_MODEL_PROMPT_MAPPER
-            if AvailableAgents.has_agents()
+            if Configuration.get_instance().available_agents.has_agents()
             else MODEL_PROMPT_MAPPER
         )
 

rasa/dialogue_understanding/generator/single_step/single_step_based_llm_command_generator.py

@@ -9,7 +9,7 @@ from rasa.agents.utils import (
     get_active_agent_info,
     get_completed_agents_info,
 )
-from rasa.core.available_agents import AvailableAgents
+from rasa.core.config.configuration import Configuration
 from rasa.dialogue_understanding.commands import (
     CannotHandleCommand,
     Command,
@@ -403,7 +403,7 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
             current_slot_allowed_values = allowed_values_for_slot(
                 tracker.slots.get(current_slot)
             )
-        has_agents = AvailableAgents.has_agents()
+        has_agents = Configuration.get_instance().available_agents.has_agents()
         current_conversation = tracker_as_readable_transcript(
             tracker, highlight_agent_turns=has_agents
         )

rasa/dialogue_understanding_test/du_test_runner.py

@@ -6,9 +6,9 @@ from typing import Any, Dict, List, Optional, Union
 import structlog
 from tqdm import tqdm
 
-from rasa.core.available_agents import AvailableAgents
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.config.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 from rasa.core.exceptions import AgentNotReady
 from rasa.core.persistor import StorageType
 from rasa.dialogue_understanding.commands import Command
@@ -71,7 +71,7 @@ class DialogueUnderstandingTestRunner:
         import rasa.core.agent
 
         self._check_action_server(endpoints)
-        sub_agents = AvailableAgents.get_instance(sub_agents_path)
+        sub_agents = Configuration.get_instance().available_agents
 
         self.agent = asyncio.run(
             rasa.core.agent.load_agent(

rasa/e2e_test/e2e_test_runner.py

@@ -13,9 +13,9 @@ import structlog
 from tqdm import tqdm
 
 import rasa.shared.utils.io
-from rasa.core.available_agents import AvailableAgents
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.config.available_endpoints import AvailableEndpoints
+from rasa.core.config.configuration import Configuration
 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
@@ -96,7 +96,7 @@ class E2ETestRunner:
         if endpoints and not are_custom_actions_stubbed:
             self._action_server_is_reachable(endpoints)
 
-        sub_agents = AvailableAgents.get_instance(sub_agents_path)
+        sub_agents = Configuration.get_instance().available_agents
 
         self.agent = asyncio.run(
             rasa.core.agent.load_agent(