rasa-pro 3.13.2__tar.gz → 3.13.4__tar.gz

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.2
+Version: 3.13.4
 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.2 → rasa_pro-3.13.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.13.2"
+version = "3.13.4"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -379,6 +379,8 @@ convention = "google"
 
 
 
+
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/__main__.py

@@ -34,6 +34,7 @@ from rasa.cli.utils import (
     warn_if_rasa_plus_package_installed,
 )
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
+from rasa.exceptions import DetailedRasaException
 from rasa.plugin import plugin_manager
 from rasa.shared.exceptions import RasaException
 from rasa.utils.common import configure_logging_and_warnings
@@ -152,6 +153,13 @@ def main(raw_arguments: Optional[List[str]] = None) -> None:
             structlogger.error("cli.no_command", event_info="No command specified.")
             arg_parser.print_help()
             sys.exit(1)
+    except DetailedRasaException as exc:
+        structlogger.error(
+            exc.code,
+            event_info=exc.info,
+            **exc.ctx,
+        )
+        sys.exit(1)
     except RasaException as exc:
         # these are exceptions we expect to happen (e.g. invalid training data format)
         # it doesn't make sense to print a stacktrace for these if we are not in

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/cli/data.py

@@ -205,9 +205,14 @@ def _build_training_data_importer(args: argparse.Namespace) -> "TrainingDataImpo
         args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=False
     )
 
-    return TrainingDataImporter.load_from_config(
-        domain_path=domain, training_data_paths=args.data, config_path=config
-    )
+    if config:
+        return TrainingDataImporter.load_from_config(
+            domain_path=domain, training_data_paths=args.data, config_path=config
+        )
+    else:
+        return TrainingDataImporter.load_from_dict(
+            domain_path=domain, training_data_paths=args.data, config_path=config
+        )
 
 
 def _append_story_structure_arguments(parser: argparse.ArgumentParser) -> None:

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/cli/project_templates/defaults.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import tempfile
 from typing import Any, Dict, List, Optional, Text
 
@@ -78,14 +79,35 @@ def _get_domain_from_importer(config: Dict[Text, Any]) -> Domain:
     Returns:
         A Domain object .
     """
-    with tempfile.NamedTemporaryFile("w+", suffix=".yml") as tmp:
-        write_yaml(config, tmp.name)
+    # We create the file with delete=False so that it can be re-opened on
+    # Windows. If delete=True, the file is opened with the _O_TEMPORARY flag
+    # which blocks any second open() call.
+    tmp = tempfile.NamedTemporaryFile("w+", suffix=".yml", delete=False)
+
+    try:
+        path = tmp.name
+
+        # write_yaml() re-opens the same path. On Windows an already-open
+        # handle keeps the file locked for further opens, so we close
+        # the first handle before we call write_yaml().
+        tmp.close()
+        write_yaml(config, path)
+
         importer = TrainingDataImporter.load_from_config(
             domain_path=FlowSyncImporter.default_pattern_path(),
-            config_path=tmp.name,
+            config_path=path,
         )
         return importer.get_domain()
 
+    finally:
+        # Because we passed delete=False above, Python will not clean the file
+        # To avoid leaving garbage in the temp directory after the tests run,
+        # we remove it explicitly.
+        try:
+            os.remove(path)
+        except FileNotFoundError:
+            pass
+
 
 def get_pattern_defaults(config: Dict[Text, Any]) -> PatternDefaults:
     """Get the default flows, responses and slots for patterns.

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/cli/train.py

@@ -15,6 +15,7 @@ from rasa.core.nlg.contextual_response_rephraser import ContextualResponseRephra
 from rasa.core.nlg.generator import NaturalLanguageGenerator
 from rasa.core.train import do_compare_training
 from rasa.engine.validation import validate_api_type_config_key_usage
+from rasa.exceptions import ValidationError
 from rasa.shared.constants import (
     CONFIG_MANDATORY_KEYS,
     CONFIG_MANDATORY_KEYS_CORE,
@@ -81,6 +82,13 @@ def _check_nlg_endpoint_validity(endpoint: Union[Path, str]) -> None:
                 ContextualResponseRephraser.__name__,
             )
         NaturalLanguageGenerator.create(endpoints.nlg)
+    except ValidationError as e:
+        structlogger.error(
+            e.code,
+            event_info=e.info,
+            **e.ctx,
+        )
+        sys.exit(1)
     except Exception as e:
         structlogger.error(
             "cli.train.nlg_failed_to_initialise.validation_error",

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/cli/utils.py

@@ -14,7 +14,7 @@ import structlog
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
 from rasa import telemetry
-from rasa.exceptions import ModelNotFound
+from rasa.exceptions import ModelNotFound, ValidationError
 from rasa.shared.constants import (
     ASSISTANT_ID_DEFAULT_VALUE,
     ASSISTANT_ID_KEY,
@@ -191,16 +191,15 @@ def validate_config_path(
     config = rasa.cli.utils.get_validated_path(config, "config", default_config)
 
     if not config or not os.path.exists(config):
-        structlogger.error(
-            "cli.validate_config_path.does_not_exists",
+        display_research_study_prompt()
+        raise ValidationError(
+            code="cli.validate_config_path.does_not_exists",
             config=config,
             event_info=(
                 f"The config file '{config}' does not exist. "
                 f"Use '--config' to specify a valid config file."
             ),
         )
-        display_research_study_prompt()
-        sys.exit(1)
 
     return str(config)
 
@@ -221,8 +220,9 @@ def validate_mandatory_config_keys(
     """
     missing_keys = set(rasa.cli.utils.missing_config_keys(config, mandatory_keys))
     if missing_keys:
-        structlogger.error(
-            "cli.validate_mandatory_config_keys.missing_keys",
+        display_research_study_prompt()
+        raise ValidationError(
+            code="cli.validate_mandatory_config_keys.missing_keys",
             config=config,
             missing_keys=missing_keys,
             event_info=(
@@ -232,8 +232,6 @@ def validate_mandatory_config_keys(
                 )
             ),
         )
-        display_research_study_prompt()
-        sys.exit(1)
 
     return str(config)
 
@@ -287,7 +285,10 @@ def validate_files(
                 event_info="Encountered empty domain during validation.",
             )
             display_research_study_prompt()
-            sys.exit(1)
+            raise ValidationError(
+                code="cli.validate_files.empty_domain",
+                event_info="Encountered empty domain during validation.",
+            )
 
         valid_domain = _validate_domain(validator)
         valid_nlu = _validate_nlu(validator, fail_on_warnings)
@@ -295,7 +296,10 @@ def validate_files(
             validator, max_history, fail_on_warnings
         )
         valid_flows = validator.verify_flows()
-        valid_translations = validator.verify_translations(summary_mode=True)
+        if validator.config:
+            valid_translations = validator.verify_translations(summary_mode=True)
+        else:
+            valid_translations = True
         valid_CALM_slot_mappings = validator.validate_CALM_slot_mappings()
 
         all_good = (
@@ -307,7 +311,8 @@ def validate_files(
             and valid_CALM_slot_mappings
         )
 
-    validator.warn_if_config_mandatory_keys_are_not_set()
+    if validator.config:
+        validator.warn_if_config_mandatory_keys_are_not_set()
 
     telemetry.track_validate_files(all_good)
     if not all_good:
@@ -316,7 +321,10 @@ def validate_files(
             event_info="Project validation completed with errors.",
         )
         display_research_study_prompt()
-        sys.exit(1)
+        raise ValidationError(
+            code="cli.validate_files.project_validation_error",
+            event_info="Project validation completed with errors.",
+        )
 
 
 def _validate_domain(validator: "Validator") -> bool:
@@ -354,7 +362,7 @@ def _validate_story_structure(
     # Check if a valid setting for `max_history` was given
     if isinstance(max_history, int) and max_history < 1:
         raise argparse.ArgumentTypeError(
-            f"The value of `--max-history {max_history}` " f"is not a positive integer."
+            f"The value of `--max-history {max_history}` is not a positive integer."
         )
 
     return validator.verify_story_structure(
@@ -391,7 +399,15 @@ def cancel_cause_not_found(
         ),
     )
     display_research_study_prompt()
-    sys.exit(1)
+    raise ValidationError(
+        code="cli.path_does_not_exist",
+        path=current,
+        event_info=(
+            f"The path '{current}' does not exist. "
+            f"Please make sure to {default_clause} specify it "
+            f"with '--{parameter}'."
+        ),
+    )
 
 
 def parse_last_positional_argument_as_model_path() -> None:

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/core/actions/action.py

@@ -910,8 +910,8 @@ class RemoteAction(Action):
 
             # Avoid overwriting `draft` values with empty values
             response = {k: v for k, v in response.items() if v}
-            draft.update(response)
-            bot_messages.append(create_bot_utterance(draft, tracker.current_language))
+            response.update(draft)
+            bot_messages.append(create_bot_utterance(response))
 
         return bot_messages
 

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/core/channels/inspector/package.json

@@ -50,13 +50,14 @@
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
     "typescript": "5.0.2",
-    "vite": "4.5.2"
+    "vite": "4.5.12"
   },
   "resolutions": {
     "cross-spawn": "7.0.5",
     "dompurify": "3.1.3",
     "braces": "3.0.3",
     "ws": "8.17.1",
-    "rollup": "3.29.5"
+    "rollup": "3.29.5",
+    "@adobe/css-tools": "^4.3.2"
   }
 }

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/core/channels/inspector/yarn.lock

@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
-"@adobe/css-tools@^4.3.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28"
-  integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==
+"@adobe/css-tools@^4.3.1", "@adobe/css-tools@^4.3.2":
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.3.tgz#beebbefb0264fdeb32d3052acae0e0d94315a9a2"
+  integrity sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==
 
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"
@@ -6064,10 +6064,10 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^2.0.0"
 
-vite@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.2.tgz#d6ea8610e099851dad8c7371599969e0f8b97e82"
-  integrity sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==
+vite@4.5.12:
+  version "4.5.12"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.12.tgz#48f48dbcf789722765e91bc32a99cb66c628eadc"
+  integrity sha512-qrMwavANtSz91nDy3zEiUHMtL09x0mniQsSMvDkNxuCBM1W5vriJ22hEmwTth6DhLSWsZnHBT0yHFAQXt6efGA==
   dependencies:
     esbuild "^0.18.10"
     postcss "^8.4.27"

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/core/nlg/callback.py

@@ -19,7 +19,7 @@ def nlg_response_format_spec() -> Dict[Text, Any]:
     return {
         "type": "object",
         "properties": {
-            "text": {"type": "string"},
+            "text": {"type": ["string", "null"]},
             "id": {"type": ["string", "null"]},
             "buttons": {"type": ["array", "null"], "items": {"type": "object"}},
             "elements": {"type": ["array", "null"], "items": {"type": "object"}},

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/core/policies/enterprise_search_policy.py

@@ -50,6 +50,7 @@ from rasa.engine.graph import ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
+from rasa.exceptions import EnterpriseSearchPolicyError
 from rasa.graph_components.providers.forms_provider import Forms
 from rasa.graph_components.providers.responses_provider import Responses
 from rasa.shared.constants import (
@@ -82,7 +83,6 @@ from rasa.shared.providers.embedding._langchain_embedding_client_adapter import
     _LangchainEmbeddingClientAdapter,
 )
 from rasa.shared.providers.llm.llm_response import LLMResponse, measure_llm_latency
-from rasa.shared.utils.cli import print_error_and_exit
 from rasa.shared.utils.constants import (
     LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
     LOG_COMPONENT_SOURCE_METHOD_INIT,
@@ -343,14 +343,11 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
         try:
             embeddings = self._create_plain_embedder(self.embeddings_config)
         except (ValidationError, Exception) as e:
-            structlogger.error(
-                "enterprise_search_policy.train.embedder_instantiation_failed",
-                message="Unable to instantiate the embedding client.",
-                error=e,
-            )
-            print_error_and_exit(
-                "Unable to create embedder. Please make sure you specified the "
-                f"required environment variables. Error: {e}"
+            raise EnterpriseSearchPolicyError(
+                code="core.policies.enterprise_search_policy.train"
+                ".embedder_instantiation_failed",
+                event_info=f"Unable to create embedder. Please make sure you "
+                f"specified the required environment variables. Error: {e}",
             )
 
         if self.vector_store_type == DEFAULT_VECTOR_STORE_TYPE:
@@ -788,23 +785,23 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
                 "Please specify a valid path to the documents source directory in the "
                 "vector_store configuration."
             )
-            structlogger.error(
-                "enterprise_search_policy.train.faiss.invalid_source_directory",
-                message=error_message,
+            error_code = (
+                "core.policies.enterprise_search_policy.train"
+                ".faiss.invalid_source_directory"
             )
-            print_error_and_exit(error_message)
+            raise EnterpriseSearchPolicyError(code=error_code, event_info=error_message)
 
-        docs = glob.glob(os.path.join(docs_folder, "*.txt"), recursive=True)
+        docs = glob.glob(os.path.join(docs_folder, "**", "*.txt"), recursive=True)
         if not docs or len(docs) < 1:
             error_message = (
                 f"Document source directory is empty: '{docs_folder}'. "
                 "Please add documents to this directory or specify a different one."
             )
-            structlogger.error(
-                "enterprise_search_policy.train.faiss.source_directory_empty",
-                message=error_message,
+            error_code = (
+                "core.policies.enterprise_search_policy.train"
+                ".faiss.source_directory_empty"
             )
-            print_error_and_exit(error_message)
+            raise EnterpriseSearchPolicyError(code=error_code, event_info=error_message)
 
     @classmethod
     def load(

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/dialogue_understanding/generator/command_parser.py

@@ -1,5 +1,4 @@
 import re
-import sys
 from functools import lru_cache
 from typing import Any, Callable, Dict, List, Optional, Type, Union
 
@@ -19,6 +18,7 @@ from rasa.dialogue_understanding.commands import (
 )
 from rasa.dialogue_understanding.commands.prompt_command import PromptCommand
 from rasa.dialogue_understanding.commands.utils import start_flow_by_name
+from rasa.exceptions import ValidationError
 from rasa.shared.core.flows import FlowsList
 
 structlogger = structlog.get_logger()
@@ -87,16 +87,13 @@ def validate_custom_commands(command_classes: List[Type[PromptCommand]]) -> None
     ]
 
     if clz_not_inheriting_from_command_clz:
-        structlogger.error(
-            "command_parser.validate_custom_commands.invalid_command",
+        raise ValidationError(
+            code="command_parser.validate_custom_commands.invalid_command",
+            event_info="The additional command classes must be a subclass of the "
+            "'Command' class. Please refer to the class in "
+            "`rasa.dialogue_understanding.commands.command.Command`",
             invalid_commands=clz_not_inheriting_from_command_clz,
-            event_info=(
-                "The additional command classes must be a subclass of the 'Command' "
-                "class. Please refer to the class in "
-                "`rasa.dialogue_understanding.commands.command.Command`"
-            ),
         )
-        sys.exit(1)
 
     clz_not_adhering_to_prompt_command_protocol = [
         command_clz.__name__
@@ -105,16 +102,15 @@ def validate_custom_commands(command_classes: List[Type[PromptCommand]]) -> None
     ]
 
     if clz_not_adhering_to_prompt_command_protocol:
-        structlogger.error(
-            "command_parser.validate_custom_commands.invalid_command",
-            invalid_commands=clz_not_adhering_to_prompt_command_protocol,
+        raise ValidationError(
+            code="command_parser.validate_custom_commands.invalid_command",
             event_info=(
                 "The additional command classes must adhere to the 'PromptCommand' "
                 "protocol. Please refer to the protocol in "
                 "`rasa.dialogue_understanding.commands.prompt_command.PromptCommand`"
             ),
+            invalid_commands=clz_not_adhering_to_prompt_command_protocol,
         )
-        sys.exit(1)
 
 
 def parse_commands(

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/dialogue_understanding_test/validation.py

@@ -1,5 +1,4 @@
 import argparse
-import sys
 from typing import List, Optional
 
 import structlog
@@ -9,6 +8,7 @@ from rasa.dialogue_understanding_test.constants import (
     PLACEHOLDER_GENERATED_ANSWER_TEMPLATE,
 )
 from rasa.dialogue_understanding_test.du_test_case import DialogueUnderstandingTestCase
+from rasa.exceptions import ValidationError
 from rasa.shared.core.domain import Domain
 
 structlogger = structlog.get_logger()
@@ -28,14 +28,14 @@ def validate_cli_arguments(args: argparse.Namespace) -> None:
         args.remote_storage
         and args.remote_storage.lower() not in supported_remote_storages
     ):
-        structlogger.error(
-            "dialogue_understanding_test.validate_cli_arguments.invalid_remote_storage",
+        raise ValidationError(
+            code="dialogue_understanding_test.validate_cli_arguments"
+            ".invalid_remote_storage",
             event_info=(
                 f"Invalid remote storage option - '{args.remote_storage}'. Supported "
                 f"options are: {supported_remote_storages}"
             ),
         )
-        sys.exit(1)
 
 
 def validate_test_cases(
@@ -48,11 +48,10 @@ def validate_test_cases(
         domain: Domain of the assistant.
     """
     if not domain:
-        structlogger.error(
-            "dialogue_understanding_test.validate_test_cases.no_domain",
+        raise ValidationError(
+            code="dialogue_understanding_test.validate_test_cases.no_domain",
             event_info="No domain found. Retrain the model with a valid domain.",
         )
-        sys.exit(1)
 
     # Retrieve all valid templates from the domain
     valid_templates = domain.utterances_for_response
@@ -64,8 +63,9 @@ def validate_test_cases(
         for step in test_case.steps:
             if step.actor == ACTOR_BOT and step.template:
                 if step.template not in valid_templates:
-                    structlogger.error(
-                        "dialogue_understanding_test.validate_test_cases.invalid_template",
+                    raise ValidationError(
+                        code="dialogue_understanding_test.validate_test_cases"
+                        ".invalid_template",
                         event_info=(
                             f"Invalid bot utterance template '{step.template}' in test "
                             f"case '{test_case.name}' at line {step.line}. Please "
@@ -74,4 +74,3 @@ def validate_test_cases(
                         test_case=test_case.name,
                         template=step.template,
                     )
-                    sys.exit(1)

{rasa_pro-3.13.2 → rasa_pro-3.13.4}/rasa/e2e_test/e2e_config.py

@@ -67,26 +67,33 @@ class LLMJudgeConfig(BaseModel):
     @classmethod
     def from_dict(cls, config_data: Dict[str, Any]) -> LLMJudgeConfig:
         """Loads the configuration from a dictionary."""
-        embeddings = config_data.pop(EMBEDDINGS_CONFIG_KEY, None)
+        embeddings = config_data.pop(EMBEDDINGS_CONFIG_KEY, {})
         llm_config = config_data.pop("llm", {})
 
         llm_config = resolve_model_client_config(llm_config)
-        llm_config, extra_parameters = cls.extract_attributes(llm_config)
+        llm_config, llm_extra_parameters = cls.extract_attributes(llm_config)
         llm_config = combine_custom_and_default_config(
             llm_config, cls.get_default_llm_config()
         )
         embeddings_config = resolve_model_client_config(embeddings)
+        embeddings_config, embeddings_extra_parameters = cls.extract_attributes(
+            embeddings_config
+        )
 
         return LLMJudgeConfig(
-            llm_config=BaseModelConfig(extra_parameters=extra_parameters, **llm_config),
-            embeddings=BaseModelConfig(**embeddings_config)
+            llm_config=BaseModelConfig(
+                extra_parameters=llm_extra_parameters, **llm_config
+            ),
+            embeddings=BaseModelConfig(
+                extra_parameters=embeddings_extra_parameters, **embeddings_config
+            )
             if embeddings_config
             else None,
         )
 
     @classmethod
     def extract_attributes(
-        cls, llm_config: Dict[str, Any]
+        cls, config: Dict[str, Any]
     ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
         """Extract the expected fields from the configuration."""
         required_config = {}
@@ -96,22 +103,22 @@ class LLMJudgeConfig(BaseModel):
             MODEL_CONFIG_KEY,
         ]
 
-        if PROVIDER_CONFIG_KEY in llm_config:
+        if PROVIDER_CONFIG_KEY in config:
             required_config = {
-                expected_field: llm_config.pop(expected_field, None)
+                expected_field: config.pop(expected_field, None)
                 for expected_field in expected_fields
             }
 
-        elif MODELS_CONFIG_KEY in llm_config:
-            llm_config = llm_config.pop(MODELS_CONFIG_KEY)[0]
+        elif MODELS_CONFIG_KEY in config:
+            config = config.pop(MODELS_CONFIG_KEY)[0]
 
             required_config = {
-                expected_field: llm_config.pop(expected_field, None)
+                expected_field: config.pop(expected_field, None)
                 for expected_field in expected_fields
             }
 
         clean_config = clean_up_config(required_config)
-        return clean_config, llm_config
+        return clean_config, config
 
     @property
     def llm_config_as_dict(self) -> Dict[str, Any]: