rasa-pro 3.12.0.dev1__py3-none-any.whl → 3.12.0.dev3__py3-none-any.whl

rasa/shared/providers/_ssl_verification_utils.py

@@ -3,16 +3,15 @@ from typing import Optional, Union
 
 import httpx
 import litellm
+import structlog
+
 from rasa.shared.constants import (
+    LITELLM_SSL_CERTIFICATE_ENV_VAR,
+    LITELLM_SSL_VERIFY_ENV_VAR,
     RASA_CA_BUNDLE_ENV_VAR,
-    REQUESTS_CA_BUNDLE_ENV_VAR,
     RASA_SSL_CERTIFICATE_ENV_VAR,
-    LITELLM_SSL_VERIFY_ENV_VAR,
-    LITELLM_SSL_CERTIFICATE_ENV_VAR,
+    REQUESTS_CA_BUNDLE_ENV_VAR,
 )
-
-import structlog
-
 from rasa.shared.utils.io import raise_deprecation_warning
 
 structlogger = structlog.get_logger()

rasa/shared/providers/_utils.py

@@ -1,17 +1,17 @@
 import structlog
+from litellm import validate_environment
 
 from rasa.shared.constants import (
-    AWS_ACCESS_KEY_ID_ENV_VAR,
     AWS_ACCESS_KEY_ID_CONFIG_KEY,
-    AWS_SECRET_ACCESS_KEY_ENV_VAR,
-    AWS_SECRET_ACCESS_KEY_CONFIG_KEY,
-    AWS_REGION_NAME_ENV_VAR,
+    AWS_ACCESS_KEY_ID_ENV_VAR,
     AWS_REGION_NAME_CONFIG_KEY,
+    AWS_REGION_NAME_ENV_VAR,
+    AWS_SECRET_ACCESS_KEY_CONFIG_KEY,
+    AWS_SECRET_ACCESS_KEY_ENV_VAR,
     AWS_SESSION_TOKEN_CONFIG_KEY,
     AWS_SESSION_TOKEN_ENV_VAR,
 )
 from rasa.shared.exceptions import ProviderClientValidationError
-from litellm import validate_environment
 from rasa.shared.providers.embedding._base_litellm_embedding_client import (
     _VALIDATE_ENVIRONMENT_MISSING_KEYS_KEY,
 )

rasa/shared/providers/embedding/_base_litellm_embedding_client.py

@@ -19,7 +19,7 @@ from rasa.shared.providers.embedding.embedding_response import (
     EmbeddingResponse,
     EmbeddingUsage,
 )
-from rasa.shared.utils.io import suppress_logs, resolve_environment_variables
+from rasa.shared.utils.io import resolve_environment_variables, suppress_logs
 
 structlogger = structlog.get_logger()
 

rasa/shared/providers/embedding/azure_openai_embedding_client.py

@@ -19,15 +19,8 @@ from rasa.shared.constants import (
 )
 from rasa.shared.exceptions import ProviderClientValidationError
 from rasa.shared.providers._configs.azure_openai_client_config import (
-    AzureOAuthConfig,
     AzureOpenAIClientConfig,
 )
-from rasa.shared.providers.constants import (
-    DEFAULT_AZURE_API_KEY_NAME,
-    LITE_LLM_API_KEY_FIELD,
-    LITE_LLM_AZURE_AD_TOKEN,
-    LITE_LLM_AZURE_AD_TOKEN_PROVIDER,
-)
 from rasa.shared.providers.embedding._base_litellm_embedding_client import (
     _BaseLiteLLMEmbeddingClient,
 )
@@ -48,8 +41,6 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
             If not provided, it will be set via environment variable.
         api_version (Optional[str]): The version of the API to use.
             If not provided, it will be set via environment variable.
-        oauth (Optional[AzureOAuthConfig]): Optional OAuth configuration. If provided,
-            the client will use OAuth for authentication.
         kwargs (Optional[Dict[str, Any]]): Optional configuration parameters specific
             to the embedding model deployment.
 
@@ -66,7 +57,6 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
         api_base: Optional[str] = None,
         api_type: Optional[str] = None,
         api_version: Optional[str] = None,
-        oauth: Optional[AzureOAuthConfig] = None,
         **kwargs: Any,
     ):
         super().__init__()  # type: ignore
@@ -94,11 +84,7 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
         # Litellm does not support use of OPENAI_API_KEY, so we need to map it
         # because of backward compatibility. However, we're first looking at
         # AZURE_API_KEY.
-
-        self._oauth = oauth
-        self._api_key_env_var = (
-            self._resolve_api_key_env_var() if not self._oauth else None
-        )
+        self._api_key_env_var = self._resolve_api_key_env_var()
 
         self.validate_client_setup()
 
@@ -114,7 +100,7 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
             return self._extra_parameters[API_KEY]
 
         if os.getenv(AZURE_API_KEY_ENV_VAR) is not None:
-            return f"${DEFAULT_AZURE_API_KEY_NAME}"
+            return "${AZURE_API_KEY}"
 
         if os.getenv(OPENAI_API_KEY_ENV_VAR) is not None:
             # API key can be set through OPENAI_API_KEY too,
@@ -177,7 +163,6 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
             api_base=azure_openai_config.api_base,
             api_type=azure_openai_config.api_type,
             api_version=azure_openai_config.api_version,
-            oauth=azure_openai_config.oauth,
             **azure_openai_config.extra_parameters,
         )
 
@@ -192,7 +177,6 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
             api_base=self.api_base,
             api_type=self.api_type,
             api_version=self.api_version,
-            oauth=self._oauth,
             extra_parameters=self._extra_parameters,
         )
         return config.to_dict()
@@ -235,22 +219,13 @@ class AzureOpenAIEmbeddingClient(_BaseLiteLLMEmbeddingClient):
 
     @property
     def _embedding_fn_args(self) -> dict:
-        auth_parameter = (
-            {
-                LITE_LLM_AZURE_AD_TOKEN: self._oauth.get_bearer_token(),
-                LITE_LLM_AZURE_AD_TOKEN_PROVIDER: self._oauth.get_bearer_token_provider(),  # noqa: E501
-            }
-            if self._oauth
-            else {LITE_LLM_API_KEY_FIELD: self._api_key_env_var}
-        )
-
         return {
             **self._litellm_extra_parameters,
             "model": self._litellm_model_name,
             "api_base": self.api_base,
             "api_type": self.api_type,
             "api_version": self.api_version,
-            **auth_parameter,
+            "api_key": self._api_key_env_var,
         }
 
     @property

rasa/shared/providers/embedding/embedding_client.py

@@ -1,4 +1,4 @@
-from typing import Protocol, Dict, List, TYPE_CHECKING, runtime_checkable
+from typing import TYPE_CHECKING, Dict, List, Protocol, runtime_checkable
 
 if TYPE_CHECKING:
     from rasa.shared.providers.embedding.embedding_response import EmbeddingResponse

rasa/shared/providers/embedding/litellm_router_embedding_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from typing import Any, Dict, List
 
@@ -48,7 +46,7 @@ class LiteLLMRouterEmbeddingClient(
         )
 
     @classmethod
-    def from_config(cls, config: Dict[str, Any]) -> LiteLLMRouterEmbeddingClient:
+    def from_config(cls, config: Dict[str, Any]) -> "LiteLLMRouterEmbeddingClient":
         """Instantiates a LiteLLM Router Embedding client from a configuration dict.
 
         Args:

rasa/shared/providers/llm/_base_litellm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from abc import abstractmethod
 from typing import Any, Dict, List, Union
@@ -52,7 +50,7 @@ class _BaseLiteLLMClient:
 
     @classmethod
     @abstractmethod
-    def from_config(cls, config: Dict[str, Any]) -> _BaseLiteLLMClient:
+    def from_config(cls, config: Dict[str, Any]) -> "_BaseLiteLLMClient":
         pass
 
     @property

rasa/shared/providers/llm/azure_openai_llm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import os
 import re
 from typing import Any, Dict, Optional
@@ -23,39 +21,13 @@ from rasa.shared.constants import (
 )
 from rasa.shared.exceptions import ProviderClientValidationError
 from rasa.shared.providers._configs.azure_openai_client_config import (
-    AzureOAuthConfig,
     AzureOpenAIClientConfig,
 )
-from rasa.shared.providers.constants import (
-    DEFAULT_AZURE_API_KEY_NAME,
-    LITE_LLM_API_BASE_FIELD,
-    LITE_LLM_API_KEY_FIELD,
-    LITE_LLM_API_VERSION_FIELD,
-    LITE_LLM_AZURE_AD_TOKEN,
-    LITE_LLM_AZURE_AD_TOKEN_PROVIDER,
-)
 from rasa.shared.providers.llm._base_litellm_client import _BaseLiteLLMClient
 from rasa.shared.utils.io import raise_deprecation_warning
 
 structlogger = structlog.get_logger()
 
-AZURE_CLIENT_ID = "AZURE_CLIENT_ID"
-AZURE_CLIENT_SECRET = "AZURE_CLIENT_SECRET"
-AZURE_TENANT_ID = "AZURE_TENANT_ID"
-CLIENT_SECRET_VARS = (AZURE_CLIENT_ID, AZURE_CLIENT_SECRET, AZURE_TENANT_ID)
-
-AZURE_CLIENT_CERTIFICATE_PATH = "AZURE_CLIENT_CERTIFICATE_PATH"
-AZURE_CLIENT_CERTIFICATE_PASSWORD = "AZURE_CLIENT_CERTIFICATE_PASSWORD"
-AZURE_CLIENT_SEND_CERTIFICATE_CHAIN = "AZURE_CLIENT_SEND_CERTIFICATE_CHAIN"
-CERT_VARS = (AZURE_CLIENT_ID, AZURE_CLIENT_CERTIFICATE_PATH, AZURE_TENANT_ID)
-
-
-class AzureADConfig:
-    def __init__(
-        self, client_id: str, client_secret: str, tenant_id: str, scopes: str
-    ) -> None:
-        self.scopes = scopes
-
 
 class AzureOpenAILLMClient(_BaseLiteLLMClient):
     """A client for interfacing with Azure's OpenAI LLM deployments.
@@ -69,7 +41,6 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
             it will be set via environment variables.
         api_version (Optional[str]): The version of the API to use. If not provided,
             it will be set via environment variable.
-
         kwargs (Optional[Dict[str, Any]]): Optional configuration parameters specific
             to the model deployment.
 
@@ -86,7 +57,6 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
         api_type: Optional[str] = None,
         api_base: Optional[str] = None,
         api_version: Optional[str] = None,
-        oauth: Optional[AzureOAuthConfig] = None,
         **kwargs: Any,
     ):
         super().__init__()  # type: ignore
@@ -110,6 +80,8 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
             or os.getenv(OPENAI_API_VERSION_ENV_VAR)
         )
 
+        self._api_key_env_var = self._resolve_api_key_env_var()
+
         # Not used by LiteLLM, here for backward compatibility
         self._api_type = (
             api_type
@@ -117,19 +89,6 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
             or os.getenv(OPENAI_API_TYPE_ENV_VAR)
         )
 
-        os.unsetenv("OPENAI_API_KEY")
-        os.unsetenv("AZURE_API_KEY")
-
-        self._oauth = oauth
-
-        if self._oauth:
-            os.unsetenv(DEFAULT_AZURE_API_KEY_NAME)
-            os.unsetenv(AZURE_API_KEY_ENV_VAR)
-            os.unsetenv(OPENAI_API_KEY_ENV_VAR)
-        self._api_key_env_var = (
-            self._resolve_api_key_env_var() if not self._oauth else None
-        )
-
         # Run helper function to check and raise deprecation warning if
         # deprecated environment variables were used for initialization of the
         # client settings
@@ -198,7 +157,7 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
             return self._extra_parameters[API_KEY]
 
         if os.getenv(AZURE_API_KEY_ENV_VAR) is not None:
-            return f"${DEFAULT_AZURE_API_KEY_NAME}"
+            return "${AZURE_API_KEY}"
 
         if os.getenv(OPENAI_API_KEY_ENV_VAR) is not None:
             # API key can be set through OPENAI_API_KEY too,
@@ -229,7 +188,7 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
         )
 
     @classmethod
-    def from_config(cls, config: Dict[str, Any]) -> AzureOpenAILLMClient:
+    def from_config(cls, config: Dict[str, Any]) -> "AzureOpenAILLMClient":
         """Initializes the client from given configuration.
 
         Args:
@@ -256,12 +215,11 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
             raise
 
         return cls(
-            deployment=azure_openai_config.deployment,
-            model=azure_openai_config.model,
-            api_type=azure_openai_config.api_type,
-            api_base=azure_openai_config.api_base,
-            api_version=azure_openai_config.api_version,
-            oauth=azure_openai_config.oauth,
+            azure_openai_config.deployment,
+            azure_openai_config.model,
+            azure_openai_config.api_type,
+            azure_openai_config.api_base,
+            azure_openai_config.api_version,
             **azure_openai_config.extra_parameters,
         )
 
@@ -276,7 +234,6 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
             api_base=self._api_base,
             api_version=self._api_version,
             api_type=self._api_type,
-            oauth=self._oauth,
             extra_parameters=self._extra_parameters,
         )
         return config.to_dict()
@@ -325,22 +282,12 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
         """Returns the completion arguments for invoking a call through
         LiteLLM's completion functions.
         """
-        # Set the API key env var to None if OAuth is used
-        auth_parameter = (
-            {
-                LITE_LLM_AZURE_AD_TOKEN: self._oauth.get_bearer_token(),
-                LITE_LLM_AZURE_AD_TOKEN_PROVIDER: self._oauth.get_bearer_token_provider(),  # noqa: E501
-            }
-            if self._oauth
-            else {LITE_LLM_API_KEY_FIELD: self._api_key_env_var}
-        )
-
         fn_args = super()._completion_fn_args
         fn_args.update(
             {
-                LITE_LLM_API_BASE_FIELD: self.api_base,
-                LITE_LLM_API_VERSION_FIELD: self.api_version,
-                **auth_parameter,
+                "api_base": self.api_base,
+                "api_version": self.api_version,
+                "api_key": self._api_key_env_var,
             }
         )
         return fn_args
@@ -367,44 +314,41 @@ class AzureOpenAILLMClient(_BaseLiteLLMClient):
 
             return info.format(setting=setting, options=options)
 
-        env_var_field = "env_var"
-        config_key_field = "config_key"
-        current_value_field = "current_value"
         # All required settings for Azure OpenAI client
         settings: Dict[str, Dict[str, Any]] = {
             "API Base": {
-                current_value_field: self.api_base,
-                env_var_field: AZURE_API_BASE_ENV_VAR,
-                config_key_field: API_BASE_CONFIG_KEY,
+                "current_value": self.api_base,
+                "env_var": AZURE_API_BASE_ENV_VAR,
+                "config_key": API_BASE_CONFIG_KEY,
             },
             "API Version": {
-                current_value_field: self.api_version,
-                env_var_field: AZURE_API_VERSION_ENV_VAR,
-                config_key_field: API_VERSION_CONFIG_KEY,
+                "current_value": self.api_version,
+                "env_var": AZURE_API_VERSION_ENV_VAR,
+                "config_key": API_VERSION_CONFIG_KEY,
             },
             "Deployment Name": {
-                current_value_field: self.deployment,
-                env_var_field: None,
-                config_key_field: DEPLOYMENT_CONFIG_KEY,
+                "current_value": self.deployment,
+                "env_var": None,
+                "config_key": DEPLOYMENT_CONFIG_KEY,
             },
         }
 
         missing_settings = [
             setting_name
             for setting_name, setting_info in settings.items()
-            if setting_info[current_value_field] is None
+            if setting_info["current_value"] is None
         ]
 
         if missing_settings:
             event_info = f"Client settings not set: " f"{', '.join(missing_settings)}. "
 
             for missing_setting in missing_settings:
-                if settings[missing_setting][current_value_field] is not None:
+                if settings[missing_setting]["current_value"] is not None:
                     continue
                 event_info += generate_event_info_for_missing_setting(
                     missing_setting,
-                    settings[missing_setting][env_var_field],
-                    settings[missing_setting][config_key_field],
+                    settings[missing_setting]["env_var"],
+                    settings[missing_setting]["config_key"],
                 )
 
             structlogger.error(

rasa/shared/providers/llm/default_litellm_llm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any, Dict
 
 from rasa.shared.constants import (
@@ -37,7 +35,7 @@ class DefaultLiteLLMClient(_BaseLiteLLMClient):
         self.validate_client_setup()
 
     @classmethod
-    def from_config(cls, config: Dict[str, Any]) -> DefaultLiteLLMClient:
+    def from_config(cls, config: Dict[str, Any]) -> "DefaultLiteLLMClient":
         default_config = DefaultLiteLLMClientConfig.from_dict(config)
         return cls(
             model=default_config.model,

rasa/shared/providers/llm/litellm_router_llm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from typing import Any, Dict, List, Union
 
@@ -9,7 +7,6 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.providers._configs.litellm_router_client_config import (
     LiteLLMRouterClientConfig,
 )
-from rasa.shared.providers.constants import LITE_LLM_MODEL_FIELD
 from rasa.shared.providers.llm._base_litellm_client import _BaseLiteLLMClient
 from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.providers.router._base_litellm_router_client import (
@@ -45,7 +42,7 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
         )
 
     @classmethod
-    def from_config(cls, config: Dict[str, Any]) -> LiteLLMRouterLLMClient:
+    def from_config(cls, config: Dict[str, Any]) -> "LiteLLMRouterLLMClient":
         """Instantiates a LiteLLM Router LLM client from a configuration dict.
 
         Args:
@@ -90,10 +87,6 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
             ProviderClientAPIException: If the API request fails.
         """
         try:
-            structlogger.info(
-                "litellm_router_llm_client.text_completion",
-                _completion_fn_args=self._completion_fn_args,
-            )
             response = self.router_client.text_completion(
                 prompt=prompt, **self._completion_fn_args
             )
@@ -114,10 +107,6 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
             ProviderClientAPIException: If the API request fails.
         """
         try:
-            structlogger.info(
-                "litellm_router_llm_client.atext_completion",
-                _completion_fn_args=self._completion_fn_args,
-            )
             response = await self.router_client.atext_completion(
                 prompt=prompt, **self._completion_fn_args
             )
@@ -147,10 +136,6 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
             return self._text_completion(messages)
         try:
             formatted_messages = self._format_messages(messages)
-            structlogger.info(
-                "litellm_router_llm_client.completion",
-                _completion_fn_args=self._completion_fn_args,
-            )
             response = self.router_client.completion(
                 messages=formatted_messages, **self._completion_fn_args
             )
@@ -180,10 +165,6 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
             return await self._atext_completion(messages)
         try:
             formatted_messages = self._format_messages(messages)
-            structlogger.info(
-                "litellm_router_llm_client.acompletion",
-                _completion_fn_args=self._completion_fn_args,
-            )
             response = await self.router_client.acompletion(
                 messages=formatted_messages, **self._completion_fn_args
             )
@@ -198,5 +179,5 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
         """
         return {
             **self._litellm_extra_parameters,
-            LITE_LLM_MODEL_FIELD: self.model_group_id,
+            "model": self.model_group_id,
         }

rasa/shared/providers/llm/llm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Dict, List, Protocol, Union, runtime_checkable
 
 from rasa.shared.providers.llm.llm_response import LLMResponse
@@ -13,7 +11,7 @@ class LLMClient(Protocol):
     """
 
     @classmethod
-    def from_config(cls, config: dict) -> LLMClient:
+    def from_config(cls, config: dict) -> "LLMClient":
         """
         Initializes the llm client with the given configuration.
 

rasa/shared/providers/llm/llm_response.py

@@ -1,5 +1,9 @@
-from dataclasses import dataclass, field, asdict
-from typing import Dict, List, Optional
+from dataclasses import asdict, dataclass, field
+from typing import Any, Dict, List, Optional, Text, Union
+
+import structlog
+
+structlogger = structlog.get_logger()
 
 
 @dataclass
@@ -16,6 +20,17 @@ class LLMUsage:
     def __post_init__(self) -> None:
         self.total_tokens = self.prompt_tokens + self.completion_tokens
 
+    @classmethod
+    def from_dict(cls, data: Dict[Text, Any]) -> "LLMUsage":
+        """Creates an LLMUsage object from a dictionary.
+        If any keys are missing, they will default to zero
+        or whatever default you prefer.
+        """
+        return cls(
+            prompt_tokens=data.get("prompt_tokens"),
+            completion_tokens=data.get("completion_tokens"),
+        )
+
     def to_dict(self) -> dict:
         """Converts the LLMUsage dataclass instance into a dictionary."""
         return asdict(self)
@@ -42,6 +57,30 @@ class LLMResponse:
     """Optional dictionary for storing additional information related to the
     completion that may not be covered by other fields."""
 
+    @classmethod
+    def from_dict(cls, data: Dict[Text, Any]) -> "LLMResponse":
+        """Creates an LLMResponse from a dictionary."""
+        usage_data = data.get("usage", {})
+        usage_obj = LLMUsage.from_dict(usage_data) if usage_data else None
+
+        return cls(
+            id=data["id"],
+            choices=data["choices"],
+            created=data["created"],
+            model=data.get("model"),
+            usage=usage_obj,
+            additional_info=data.get("additional_info"),
+        )
+
+    @classmethod
+    def ensure_llm_response(cls, response: Union[str, "LLMResponse"]) -> "LLMResponse":
+        if isinstance(response, LLMResponse):
+            return response
+
+        structlogger.warn("llm_response.deprecated_response_type", response=response)
+        data = {"id": None, "choices": [response], "created": None}
+        return LLMResponse.from_dict(data)
+
     def to_dict(self) -> dict:
         """Converts the LLMResponse dataclass instance into a dictionary."""
         result = asdict(self)

rasa/shared/providers/llm/openai_llm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import os
 import re
 from typing import Any, Dict, Optional
@@ -13,10 +11,6 @@ from rasa.shared.constants import (
     OPENAI_PROVIDER,
 )
 from rasa.shared.providers._configs.openai_client_config import OpenAIClientConfig
-from rasa.shared.providers.constants import (
-    LITE_LLM_API_KEY_FIELD,
-    LITE_LLM_API_VERSION_FIELD,
-)
 from rasa.shared.providers.llm._base_litellm_client import _BaseLiteLLMClient
 
 structlogger = structlog.get_logger()
@@ -63,7 +57,7 @@ class OpenAILLMClient(_BaseLiteLLMClient):
         self.validate_client_setup()
 
     @classmethod
-    def from_config(cls, config: Dict[str, Any]) -> OpenAILLMClient:
+    def from_config(cls, config: Dict[str, Any]) -> "OpenAILLMClient":
         """
         Initializes the client from given configuration.
 
@@ -154,8 +148,8 @@ class OpenAILLMClient(_BaseLiteLLMClient):
         fn_args = super()._completion_fn_args
         fn_args.update(
             {
-                LITE_LLM_API_KEY_FIELD: self.api_base,
-                LITE_LLM_API_VERSION_FIELD: self.api_version,
+                "api_base": self.api_base,
+                "api_version": self.api_version,
             }
         )
         return fn_args

rasa/shared/providers/llm/rasa_llm_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any, Dict, Optional
 
 import structlog
@@ -11,10 +9,6 @@ from rasa.shared.constants import (
 from rasa.shared.providers._configs.rasa_llm_client_config import (
     RasaLLMClientConfig,
 )
-from rasa.shared.providers.constants import (
-    LITE_LLM_API_BASE_FIELD,
-    LITE_LLM_API_KEY_FIELD,
-)
 from rasa.shared.providers.llm._base_litellm_client import _BaseLiteLLMClient
 from rasa.utils.licensing import retrieve_license_from_env
 
@@ -22,7 +16,7 @@ structlogger = structlog.get_logger()
 
 
 class RasaLLMClient(_BaseLiteLLMClient):
-    """A client for interfacing with a Rasa-Hosted LLM endpoint that uses
+    """A client for interfacing with a Rasa-Hosted LLM endpoint that uses.
 
     Parameters:
         model (str): The model or deployment name.
@@ -55,15 +49,12 @@ class RasaLLMClient(_BaseLiteLLMClient):
 
     @property
     def api_base(self) -> Optional[str]:
-        """
-        Returns the base API URL for the openai llm client.
-        """
+        """Returns the base API URL for the openai llm client."""
         return self._api_base
 
     @property
     def provider(self) -> str:
-        """
-        Returns the provider name for the self hosted llm client.
+        """Returns the provider name for the self hosted llm client.
 
         Returns:
             String representing the provider name.
@@ -88,20 +79,15 @@ class RasaLLMClient(_BaseLiteLLMClient):
 
     @property
     def _completion_fn_args(self) -> Dict[str, Any]:
-        """Returns the completion arguments for invoking a call through
-        LiteLLM's completion functions.
-        """
+        """Returns the completion arguments for invoking a call using completions."""
         fn_args = super()._completion_fn_args
         fn_args.update(
-            {
-                LITE_LLM_API_BASE_FIELD: self.api_base,
-                LITE_LLM_API_KEY_FIELD: retrieve_license_from_env(),
-            }
+            {"api_base": self.api_base, "api_key": retrieve_license_from_env()}
         )
         return fn_args
 
     @classmethod
-    def from_config(cls, config: Dict[str, Any]) -> RasaLLMClient:
+    def from_config(cls, config: Dict[str, Any]) -> "RasaLLMClient":
         try:
             client_config = RasaLLMClientConfig.from_dict(config)
         except ValueError as e: