Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(api): enable strict typing for console workspace model tests (#43857)

Eddy ZHANG09ae6dc936a8
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_models.py b/api/tests/unit_tests/controllers/console/workspace/test_models.py
index 2afd26c4644..bb26734f578 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_models.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_models.py
@@ -41,7 +41,7 @@ def _account() -> Account:
class TestDefaultModelApi:
- def test_get_success(self, app: Flask):
+ def test_get_success(self, app: Flask) -> None:
api = DefaultModelApi()
method = unwrap(api.get)
@@ -67,7 +67,7 @@ class TestDefaultModelApi:
assert "data" in result
- def test_post_success(self, app: Flask):
+ def test_post_success(self, app: Flask) -> None:
api = DefaultModelApi()
method = unwrap(api.post)
@@ -171,7 +171,7 @@ class TestDefaultModelApi:
assert result["result"] == "success"
assert sqlite_session.scalar(select(TenantDefaultModel)) is None
- def test_get_returns_empty_when_no_default(self, app: Flask):
+ def test_get_returns_empty_when_no_default(self, app: Flask) -> None:
api = DefaultModelApi()
method = unwrap(api.get)
@@ -187,7 +187,7 @@ class TestDefaultModelApi:
class TestModelProviderModelApi:
- def test_get_models_success(self, app: Flask):
+ def test_get_models_success(self, app: Flask) -> None:
api = ModelProviderModelApi()
method = unwrap(api.get)
@@ -195,13 +195,13 @@ class TestModelProviderModelApi:
app.test_request_context("/"),
patch("controllers.console.workspace.models.ModelProviderService") as service_mock,
):
- service_mock.return_value.get_models_by_provider.return_value = []
+ service_mock.return_value.get_models_by_provider.return_value = list[object]()
result = method(api, "tenant1", "openai")
assert "data" in result
- def test_post_models_success(self, app: Flask):
+ def test_post_models_success(self, app: Flask) -> None:
api = ModelProviderModelApi()
method = unwrap(api.post)
@@ -223,7 +223,7 @@ class TestModelProviderModelApi:
assert status == 200
- def test_delete_model_success(self, app: Flask):
+ def test_delete_model_success(self, app: Flask) -> None:
api = ModelProviderModelApi()
method = unwrap(api.delete)
@@ -240,7 +240,7 @@ class TestModelProviderModelApi:
assert status == 204
- def test_delete_model_via_query_params(self, app: Flask):
+ def test_delete_model_via_query_params(self, app: Flask) -> None:
api = ModelProviderModelApi()
method = unwrap(api.delete)
@@ -257,7 +257,7 @@ class TestModelProviderModelApi:
assert status == 204
- def test_get_models_returns_empty(self, app: Flask):
+ def test_get_models_returns_empty(self, app: Flask) -> None:
api = ModelProviderModelApi()
method = unwrap(api.get)
@@ -265,7 +265,7 @@ class TestModelProviderModelApi:
app.test_request_context("/"),
patch("controllers.console.workspace.models.ModelProviderService") as service,
):
- service.return_value.get_models_by_provider.return_value = []
+ service.return_value.get_models_by_provider.return_value = list[object]()
result = method(api, "t1", "openai")
@@ -273,7 +273,7 @@ class TestModelProviderModelApi:
class TestModelProviderModelCredentialApi:
- def test_get_credentials_success(self, app: Flask):
+ def test_get_credentials_success(self, app: Flask) -> None:
api = ModelProviderModelCredentialApi()
method = unwrap(api.get)
@@ -289,12 +289,14 @@ class TestModelProviderModelCredentialApi:
patch("controllers.console.workspace.models.ModelLoadBalancingService") as lb_service,
):
provider_service.return_value.get_model_credential.return_value = {
- "credentials": {},
+ "credentials": dict[str, object](),
"current_credential_id": None,
"current_credential_name": None,
}
- provider_service.return_value.provider_manager.get_provider_model_available_credentials.return_value = []
- lb_service.return_value.get_load_balancing_configs.return_value = (False, [])
+ provider_service.return_value.provider_manager.get_provider_model_available_credentials.return_value = list[
+ object
+ ]()
+ lb_service.return_value.get_load_balancing_configs.return_value = (False, list[object]())
result = method(
api,
@@ -306,7 +308,7 @@ class TestModelProviderModelCredentialApi:
assert "credentials" in result
- def test_create_credential_success(self, app: Flask):
+ def test_create_credential_success(self, app: Flask) -> None:
api = ModelProviderModelCredentialApi()
method = unwrap(api.post)
@@ -324,7 +326,7 @@ class TestModelProviderModelCredentialApi:
assert status == 201
- def test_get_empty_credentials(self, app: Flask):
+ def test_get_empty_credentials(self, app: Flask) -> None:
api = ModelProviderModelCredentialApi()
method = unwrap(api.get)
@@ -334,8 +336,8 @@ class TestModelProviderModelCredentialApi:
patch("controllers.console.workspace.models.ModelLoadBalancingService") as lb,
):
service.return_value.get_model_credential.return_value = None
- service.return_value.provider_manager.get_provider_model_available_credentials.return_value = []
- lb.return_value.get_load_balancing_configs.return_value = (False, [])
+ service.return_value.provider_manager.get_provider_model_available_credentials.return_value = list[object]()
+ lb.return_value.get_load_balancing_configs.return_value = (False, list[object]())
result = method(
api,
@@ -347,7 +349,7 @@ class TestModelProviderModelCredentialApi:
assert result["credentials"] == {}
- def test_delete_success(self, app: Flask):
+ def test_delete_success(self, app: Flask) -> None:
api = ModelProviderModelCredentialApi()
method = unwrap(api.delete)
@@ -365,7 +367,7 @@ class TestModelProviderModelCredentialApi:
assert status == 204
- def test_delete_credential_via_query_params(self, app: Flask):
+ def test_delete_credential_via_query_params(self, app: Flask) -> None:
api = ModelProviderModelCredentialApi()
method = unwrap(api.delete)
@@ -385,7 +387,7 @@ class TestModelProviderModelCredentialApi:
class TestModelProviderModelCredentialSwitchApi:
- def test_switch_success(self, app: Flask):
+ def test_switch_success(self, app: Flask) -> None:
api = ModelProviderModelCredentialSwitchApi()
method = unwrap(api.post)
@@ -405,7 +407,7 @@ class TestModelProviderModelCredentialSwitchApi:
class TestModelEnableDisableApis:
- def test_enable_model(self, app: Flask):
+ def test_enable_model(self, app: Flask) -> None:
api = ModelProviderModelEnableApi()
method = unwrap(api.patch)
@@ -422,7 +424,7 @@ class TestModelEnableDisableApis:
assert result["result"] == "success"
- def test_disable_model(self, app: Flask):
+ def test_disable_model(self, app: Flask) -> None:
api = ModelProviderModelDisableApi()
method = unwrap(api.patch)
@@ -441,7 +443,7 @@ class TestModelEnableDisableApis:
class TestModelProviderModelValidateApi:
- def test_validate_success(self, app: Flask):
+ def test_validate_success(self, app: Flask) -> None:
api = ModelProviderModelValidateApi()
method = unwrap(api.post)
@@ -460,14 +462,14 @@ class TestModelProviderModelValidateApi:
assert result["result"] == "success"
@pytest.mark.parametrize("model_name", ["gpt-4", "gpt"])
- def test_validate_failure(self, app: Flask, model_name: str):
+ def test_validate_failure(self, app: Flask, model_name: str) -> None:
api = ModelProviderModelValidateApi()
method = unwrap(api.post)
payload = {
"model": model_name,
"model_type": ModelType.LLM,
- "credentials": {},
+ "credentials": dict[str, object](),
}
with (
@@ -482,7 +484,7 @@ class TestModelProviderModelValidateApi:
class TestParameterAndAvailableModels:
- def test_parameter_rules(self, app: Flask):
+ def test_parameter_rules(self, app: Flask) -> None:
api = ModelProviderModelParameterRuleApi()
method = unwrap(api.get)
@@ -490,13 +492,13 @@ class TestParameterAndAvailableModels:
app.test_request_context("/", query_string={"model": "gpt-4"}),
patch("controllers.console.workspace.models.ModelProviderService") as service_mock,
):
- service_mock.return_value.get_model_parameter_rules.return_value = []
+ service_mock.return_value.get_model_parameter_rules.return_value = list[object]()
result = method(api, ParserParameter(model="gpt-4"), "tenant1", "openai")
assert "data" in result
- def test_available_models(self, app: Flask):
+ def test_available_models(self, app: Flask) -> None:
api = ModelProviderAvailableModelApi()
method = unwrap(api.get)
@@ -504,13 +506,13 @@ class TestParameterAndAvailableModels:
app.test_request_context("/"),
patch("controllers.console.workspace.models.ModelProviderService") as service_mock,
):
- service_mock.return_value.get_models_by_model_type.return_value = []
+ service_mock.return_value.get_models_by_model_type.return_value = list[object]()
result = method(api, "tenant1", ModelType.LLM)
assert "data" in result
- def test_empty_rules(self, app: Flask):
+ def test_empty_rules(self, app: Flask) -> None:
api = ModelProviderModelParameterRuleApi()
method = unwrap(api.get)
@@ -518,13 +520,13 @@ class TestParameterAndAvailableModels:
app.test_request_context("/", query_string={"model": "gpt"}),
patch("controllers.console.workspace.models.ModelProviderService") as service,
):
- service.return_value.get_model_parameter_rules.return_value = []
+ service.return_value.get_model_parameter_rules.return_value = list[object]()
result = method(api, ParserParameter(model="gpt"), "t1", "openai")
assert result["data"] == []
- def test_no_models(self, app: Flask):
+ def test_no_models(self, app: Flask) -> None:
api = ModelProviderAvailableModelApi()
method = unwrap(api.get)
@@ -532,7 +534,7 @@ class TestParameterAndAvailableModels:
app.test_request_context("/"),
patch("controllers.console.workspace.models.ModelProviderService") as service,
):
- service.return_value.get_models_by_model_type.return_value = []
+ service.return_value.get_models_by_model_type.return_value = list[object]()
result = method(api, "t1", ModelType.LLM)
diff --git a/api/tests/unit_tests/pyrefly.toml b/api/tests/unit_tests/pyrefly.toml
index ef2a8e3b425..203f960f68b 100644
--- a/api/tests/unit_tests/pyrefly.toml
+++ b/api/tests/unit_tests/pyrefly.toml
@@ -123,7 +123,6 @@ project-excludes = [
"controllers/console/workspace/test_load_balancing_config.py",
"controllers/console/workspace/test_members.py",
"controllers/console/workspace/test_model_providers.py",
- "controllers/console/workspace/test_models.py",
"controllers/console/workspace/test_plugin.py",
"controllers/console/workspace/test_snippets.py",
"controllers/console/workspace/test_tool_providers.py",