zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-31 13:03:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

refa: resolve tenant model refs consistently (#16744)

Browse Source
This commit is contained in:
buua436
2026-07-09 14:02:08 +08:00
committed by GitHub
parent 794fcc2517
commit 6a77523bf0
51 changed files with 300 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/testcases/test_http_api/test_chat_assistant_management/test_chat_sdk_routes_unit.py
View File

@@ -368,6 +368,7 @@ def _load_chat_module(monkeypatch):
tenant_model_service_mod = ModuleType("api.db.joint_services.tenant_model_service")
tenant_model_service_mod.get_model_config_from_provider_instance = lambda *_args, **_kwargs: {}
tenant_model_service_mod.resolve_model_config = lambda *_args, **_kwargs: {}
tenant_model_service_mod.get_tenant_default_model_by_type = lambda *_args, **_kwargs: {}
monkeypatch.setitem(sys.modules, "api.db.joint_services.tenant_model_service", tenant_model_service_mod)

1
test/testcases/test_http_api/test_dataset_management/test_dify_retrieval_routes_unit.py
View File

@@ -246,6 +246,7 @@ def _load_dify_retrieval_module(monkeypatch):
tenant_model_service_mod.get_model_config_by_id = _get_model_config_by_id
tenant_model_service_mod.get_model_config_from_provider_instance = _get_model_config_from_provider_instance
tenant_model_service_mod.resolve_model_config = _get_model_config_from_provider_instance
tenant_model_service_mod.get_tenant_default_model_by_type = _get_tenant_default_model_by_type
monkeypatch.setitem(sys.modules, "api.db.joint_services.tenant_model_service", tenant_model_service_mod)

1
test/testcases/test_http_api/test_file_management_within_dataset/test_doc_sdk_routes_unit.py
View File

@@ -472,6 +472,7 @@ def _load_doc_module(monkeypatch, module_basename="chunk_api"):
tenant_model_service_mod.get_model_config_by_id = _get_model_config_by_id
tenant_model_service_mod.get_model_config_from_provider_instance = _get_model_config_from_provider_instance
tenant_model_service_mod.resolve_model_config = _get_model_config_from_provider_instance
tenant_model_service_mod.get_tenant_default_model_by_type = _get_tenant_default_model_by_type
monkeypatch.setitem(sys.modules, "api.db.joint_services.tenant_model_service", tenant_model_service_mod)

2
test/testcases/test_http_api/test_session_management/test_session_sdk_routes_unit.py
View File

@@ -520,6 +520,7 @@ def _load_session_module(monkeypatch):
tenant_model_service_mod.get_model_config_by_id = _get_model_config_by_id
tenant_model_service_mod.get_model_config_from_provider_instance = _get_model_config_from_provider_instance
tenant_model_service_mod.resolve_model_config = _get_model_config_from_provider_instance
tenant_model_service_mod.get_tenant_default_model_by_type = _get_tenant_default_model_by_type
tenant_model_service_mod.get_api_key = _get_api_key
tenant_model_service_mod.split_model_name = _split_model_name
@@ -2243,6 +2244,7 @@ def _load_chat_api_module(monkeypatch):
tenant_model_svc = ModuleType("api.db.joint_services.tenant_model_service")
tenant_model_svc.get_tenant_default_model_by_type = lambda *_a, **_k: {}
tenant_model_svc.get_model_config_from_provider_instance = lambda **_k: {}
tenant_model_svc.resolve_model_config = lambda **_k: {}
tenant_model_svc.get_api_key = lambda **_k: "fake-api-key"
tenant_model_svc.split_model_name = lambda model_name: (model_name, "", "")
monkeypatch.setitem(sys.modules, "api.db.joint_services.tenant_model_service", tenant_model_svc)