Add MODEL_PROVIDER to EnabledModelProvider fixture

Author: mliu-cloudera

llm-service/app/config.py

@@ -49,6 +49,7 @@
 from enum import Enum
 from typing import cast, Optional, Literal
 
+MODEL_PROVIDER_ENV_VAR_NAME = "MODEL_PROVIDER"
 
 SummaryStorageProviderType = Literal["Local", "S3"]
 ChatStoreProviderType = Literal["Local", "S3"]
@@ -196,7 +197,7 @@ def model_provider(self) -> Optional[ModelSource]:
         """The preferred model provider to use.
         Options: 'AZURE', 'CAII', 'OPENAI', 'BEDROCK'
         If not set, will use the first available provider in priority order."""
-        provider = os.environ.get("MODEL_PROVIDER")
+        provider = os.environ.get(MODEL_PROVIDER_ENV_VAR_NAME)
         try:
             return ModelSource(provider)
         except ValueError:

llm-service/app/tests/services/test_models.py

@@ -35,10 +35,9 @@
 #  BUSINESS ADVANTAGE OR UNAVAILABILITY, OR LOSS OR CORRUPTION OF
 #  DATA.
 #
-import itertools
-
 import pytest
 
+from app.config import MODEL_PROVIDER_ENV_VAR_NAME
 from app.services import models
 from app.services.caii import caii
 from app.services.caii.types import ListEndpointEntry
@@ -61,6 +60,10 @@ def EnabledModelProvider(
         monkeypatch.delenv(name, raising=False)
     for name in ModelProviderSubcls.get_env_var_names():
         monkeypatch.setenv(name, "test")
+    monkeypatch.setenv(
+        MODEL_PROVIDER_ENV_VAR_NAME,
+        ModelProviderSubcls.get_model_source(),
+    )
 
     return ModelProviderSubcls