kudzues/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-05 16:50:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use EnumText for model_type in provider models (#34300)

Browse Source 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
tmimmanuel
2026-03-31 02:31:33 +02:00
committed by GitHub
parent 5897b28355
commit 1344c3b280
8 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/tests/test_containers_integration_tests/services/test_model_load_balancing_service.py
View File

@@ -141,7 +141,7 @@ class TestModelLoadBalancingService:
tenant_id=tenant_id,
provider_name="openai",
model_name="gpt-3.5-turbo",
model_type="text-generation", # Use the origin model type that matches the query
model_type="llm",
enabled=True,
load_balancing_enabled=False,
)
@@ -298,7 +298,7 @@ class TestModelLoadBalancingService:
tenant_id=tenant.id,
provider_name="openai",
model_name="gpt-3.5-turbo",
model_type="text-generation", # Use the origin model type that matches the query
model_type="llm",
name="config1",
encrypted_config='{"api_key": "test_key"}',
enabled=True,
@@ -417,7 +417,7 @@ class TestModelLoadBalancingService:
tenant_id=tenant.id,
provider_name="openai",
model_name="gpt-3.5-turbo",
model_type="text-generation", # Use the origin model type that matches the query
model_type="llm",
name="config1",
encrypted_config='{"api_key": "test_key"}',
enabled=True,

22
api/tests/unit_tests/core/test_provider_manager.py
View File

@@ -48,7 +48,7 @@ def test__to_model_settings(mocker: MockerFixture, mock_provider_entity):
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
enabled=True,
load_balancing_enabled=True,
)
@@ -61,7 +61,7 @@ def test__to_model_settings(mocker: MockerFixture, mock_provider_entity):
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
name="__inherit__",
encrypted_config=None,
enabled=True,
@@ -70,7 +70,7 @@ def test__to_model_settings(mocker: MockerFixture, mock_provider_entity):
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
name="first",
encrypted_config='{"openai_api_key": "fake_key"}',
enabled=True,
@@ -110,7 +110,7 @@ def test__to_model_settings_only_one_lb(mocker: MockerFixture, mock_provider_ent
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
enabled=True,
load_balancing_enabled=True,
)
@@ -121,7 +121,7 @@ def test__to_model_settings_only_one_lb(mocker: MockerFixture, mock_provider_ent
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
name="__inherit__",
encrypted_config=None,
enabled=True,
@@ -157,7 +157,7 @@ def test__to_model_settings_lb_disabled(mocker: MockerFixture, mock_provider_ent
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
enabled=True,
load_balancing_enabled=False,
)
@@ -168,7 +168,7 @@ def test__to_model_settings_lb_disabled(mocker: MockerFixture, mock_provider_ent
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
name="__inherit__",
encrypted_config=None,
enabled=True,
@@ -177,7 +177,7 @@ def test__to_model_settings_lb_disabled(mocker: MockerFixture, mock_provider_ent
tenant_id="tenant_id",
provider_name="openai",
model_name="gpt-4",
model_type="text-generation",
model_type="llm",
name="first",
encrypted_config='{"openai_api_key": "fake_key"}',
enabled=True,
@@ -270,7 +270,7 @@ def test_get_default_model_uses_injected_runtime_for_existing_default_record(moc
tenant_id="tenant-id",
provider_name="openai",
model_name="gpt-4",
model_type=ModelType.LLM.to_origin_model_type(),
model_type=ModelType.LLM,
)
mock_session = Mock()
mock_session.scalar.return_value = existing_default_model
@@ -449,7 +449,7 @@ def test_update_default_model_record_updates_existing_record(mocker: MockerFixtu
tenant_id="tenant-id",
provider_name="anthropic",
model_name="claude-3-sonnet",
model_type=ModelType.LLM.to_origin_model_type(),
model_type=ModelType.LLM,
)
mock_session = Mock()
mock_session.scalar.return_value = existing_default_model
@@ -487,7 +487,7 @@ def test_update_default_model_record_creates_record_with_origin_model_type(mocke
assert created_default_model.tenant_id == "tenant-id"
assert created_default_model.provider_name == "openai"
assert created_default_model.model_name == "gpt-4"
assert created_default_model.model_type == ModelType.LLM.to_origin_model_type()
assert created_default_model.model_type == ModelType.LLM
mock_session.commit.assert_called_once()

2
api/tests/unit_tests/services/test_model_load_balancing_service.py
View File

@@ -317,7 +317,7 @@ def test_init_inherit_config_should_create_and_persist_inherit_configuration(
assert inherit_config.tenant_id == "tenant-1"
assert inherit_config.provider_name == "openai"
assert inherit_config.model_name == "gpt-4o-mini"
assert inherit_config.model_type == "text-generation"
assert inherit_config.model_type == "llm"
assert inherit_config.name == "__inherit__"
mock_db.session.add.assert_called_once_with(inherit_config)
mock_db.session.commit.assert_called_once()