chore: finish renaming UserConfiguration

This commit is contained in:
Abhishek Kumar 2026-06-09 16:30:03 +05:30
parent cdbd06c8d9
commit 91ac460799
16 changed files with 62 additions and 62 deletions

View file

@ -203,7 +203,7 @@ async def create_workflow_run_rows(
Returns:
Tuple of (workflow_run, user, workflow).
"""
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
org = OrganizationModel(provider_id=f"test-org-{provider_id_suffix}")
async_session.add(org)
@ -218,7 +218,7 @@ async def create_workflow_run_rows(
await db_session.update_user_configuration(
user_id=user.id,
configuration=UserConfiguration.model_validate(USER_CONFIGURATION),
configuration=EffectiveAIModelConfiguration.model_validate(USER_CONFIGURATION),
)
workflow = await db_session.create_workflow(

View file

@ -6,7 +6,7 @@ from api.schemas.ai_model_configuration import (
OrganizationAIModelConfigurationV2,
compile_ai_model_configuration_v2,
)
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
from api.services.configuration.ai_model_configuration import (
WORKFLOW_MODEL_CONFIGURATION_V2_OVERRIDE_KEY,
check_for_masked_keys_in_ai_model_configuration_v2,
@ -142,7 +142,7 @@ def test_masked_v2_configuration_masks_nested_service_keys():
def test_legacy_all_dograh_pipeline_converts_to_dograh_v2():
legacy = UserConfiguration(
legacy = EffectiveAIModelConfiguration(
llm=DograhLLMService(
provider="dograh",
api_key=["mps-secret"],
@ -170,7 +170,7 @@ def test_legacy_all_dograh_pipeline_converts_to_dograh_v2():
def test_legacy_mixed_dograh_pipeline_converts_to_dograh_v2():
legacy = UserConfiguration(
legacy = EffectiveAIModelConfiguration(
llm=OpenAILLMService(
provider="openai",
api_key="sk-llm",
@ -202,7 +202,7 @@ def test_legacy_mixed_dograh_pipeline_converts_to_dograh_v2():
def test_legacy_byok_pipeline_converts_to_byok_v2():
legacy = UserConfiguration(
legacy = EffectiveAIModelConfiguration(
llm=OpenAILLMService(
provider="openai",
api_key="sk-llm",
@ -235,7 +235,7 @@ def test_legacy_byok_pipeline_converts_to_byok_v2():
def test_workflow_model_override_migration_removes_v1_override_and_sets_v2():
base = UserConfiguration(
base = EffectiveAIModelConfiguration(
llm=OpenAILLMService(
provider="openai",
api_key="sk-llm",
@ -279,7 +279,7 @@ def test_workflow_model_override_migration_removes_v1_override_and_sets_v2():
def test_workflow_model_override_migration_removes_invalid_v1_override_marker():
base = UserConfiguration()
base = EffectiveAIModelConfiguration()
workflow_configurations = {
"ambient_noise_configuration": {"enabled": False},
"model_overrides": None,

View file

@ -7,7 +7,7 @@ from pipecat.processors.aggregators.llm_context import LLMContext
from pipecat.processors.frame_processor import FrameDirection
from pipecat.services.xai.realtime import events
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
from api.services.configuration.registry import GrokRealtimeLLMConfiguration
from api.services.pipecat.realtime.grok_realtime import (
DograhGrokRealtimeLLMService,
@ -120,7 +120,7 @@ async def test_completed_input_transcription_is_broadcast_as_finalized():
def test_factory_creates_dograh_grok_realtime_service():
user_config = UserConfiguration(
user_config = EffectiveAIModelConfiguration(
is_realtime=True,
realtime=GrokRealtimeLLMConfiguration(
provider="grok_realtime",

View file

@ -5,7 +5,7 @@ from fastapi import FastAPI
from fastapi.testclient import TestClient
from api.routes.user import router
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
from api.services.auth.depends import get_user
from api.services.configuration.masking import mask_key
from api.services.configuration.registry import (
@ -33,7 +33,7 @@ MASKED_KEY = mask_key(REAL_KEY) # "**************************cdef"
def _existing_openai_config():
return UserConfiguration(
return EffectiveAIModelConfiguration(
llm=OpenAILLMService(
provider="openai",
api_key=REAL_KEY,
@ -111,7 +111,7 @@ class TestMaskedKeyRejection:
client = TestClient(app)
new_key = "AIzaSyNewRealKey12345678"
updated = UserConfiguration(
updated = EffectiveAIModelConfiguration(
llm=GoogleLLMService(
provider="google",
api_key=new_key,
@ -178,7 +178,7 @@ class TestMaskedKeyRejection:
real_credentials = '{"type":"service_account","project_id":"demo-project"}'
masked_credentials = mask_key(real_credentials)
existing = UserConfiguration(
existing = EffectiveAIModelConfiguration(
llm=GoogleVertexLLMConfiguration(
provider="google_vertex",
api_key=None,

View file

@ -2,14 +2,14 @@
TDD tests for resolve_effective_config().
This function deep-merges workflow-level model_overrides onto the global
UserConfiguration. Fields not overridden inherit from global.
EffectiveAIModelConfiguration. Fields not overridden inherit from global.
Module under test: api.services.configuration.resolve
"""
import pytest
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
from api.services.configuration.masking import (
contains_masked_key,
mask_workflow_configurations,
@ -35,9 +35,9 @@ from api.services.configuration.resolve import (
@pytest.fixture
def global_config() -> UserConfiguration:
def global_config() -> EffectiveAIModelConfiguration:
"""A realistic global user configuration."""
return UserConfiguration(
return EffectiveAIModelConfiguration(
llm=OpenAILLMService(
provider="openai", api_key="sk-global-llm", model="gpt-4.1"
),
@ -59,9 +59,9 @@ def global_config() -> UserConfiguration:
@pytest.fixture
def global_config_realtime() -> UserConfiguration:
def global_config_realtime() -> EffectiveAIModelConfiguration:
"""Global config with realtime enabled."""
return UserConfiguration(
return EffectiveAIModelConfiguration(
llm=OpenAILLMService(
provider="openai", api_key="sk-global-llm", model="gpt-4.1"
),
@ -302,7 +302,7 @@ class TestRealtimeOverride:
class TestOverrideOnNullGlobal:
def test_override_stt_when_global_is_none(self):
"""When global has no STT config, override creates one from scratch."""
config = UserConfiguration(
config = EffectiveAIModelConfiguration(
llm=OpenAILLMService(provider="openai", api_key="sk-key", model="gpt-4.1"),
stt=None,
tts=None,
@ -325,7 +325,7 @@ class TestOverrideOnNullGlobal:
def test_override_realtime_when_global_is_none(self):
"""Realtime section can be created from override even if global has none."""
config = UserConfiguration(
config = EffectiveAIModelConfiguration(
llm=OpenAILLMService(provider="openai", api_key="sk-key", model="gpt-4.1"),
is_realtime=False,
realtime=None,

View file

@ -10,7 +10,7 @@ from pipecat.processors.frame_processor import FrameDirection
from websockets.exceptions import ConnectionClosedError
from websockets.frames import Close
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
from api.services.configuration.registry import UltravoxRealtimeLLMConfiguration
from api.services.pipecat.realtime.ultravox_realtime import (
_RESUMPTION_USER_MESSAGE,
@ -430,7 +430,7 @@ async def test_receive_messages_reports_unexpected_websocket_close():
def test_factory_creates_dograh_ultravox_realtime_service():
user_config = UserConfiguration(
user_config = EffectiveAIModelConfiguration(
is_realtime=True,
realtime=UltravoxRealtimeLLMConfiguration(
provider="ultravox_realtime",

View file

@ -4,7 +4,7 @@ from unittest.mock import AsyncMock, patch
import pytest
from api.db.models import OrganizationModel, UserModel
from api.schemas.user_configuration import UserConfiguration
from api.schemas.user_configuration import EffectiveAIModelConfiguration
from api.tests.integrations._run_pipeline_helpers import USER_CONFIGURATION
from pipecat.tests import MockLLMService
@ -38,7 +38,7 @@ async def _create_user_and_workflow(
await db_session.update_user_configuration(
user_id=user.id,
configuration=UserConfiguration.model_validate(USER_CONFIGURATION),
configuration=EffectiveAIModelConfiguration.model_validate(USER_CONFIGURATION),
)
workflow = await db_session.create_workflow(
@ -1041,7 +1041,7 @@ async def test_text_chat_session_creation_requires_selected_org_scope(
await db_session.update_user_configuration(
user_id=user.id,
configuration=UserConfiguration.model_validate(USER_CONFIGURATION),
configuration=EffectiveAIModelConfiguration.model_validate(USER_CONFIGURATION),
)
workflow = await db_session.create_workflow(