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

fix: synchronize chat model configuration (#17717)

Browse Source
This commit is contained in:
buua436
2026-08-03 16:43:53 +08:00
committed by GitHub
parent a12dee5524
commit 8ac047d11a
6 changed files with 126 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/testcases/restful_api/test_chats.py
View File

@@ -765,6 +765,15 @@ def _load_chat_routes_unit_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: {}
def _get_model_config_by_id(_tenant_id, _model_type, model_ref):
if model_ref == "tenant-llm-id":
return {}
raise LookupError(f"unknown tenant model id: {model_ref}")
tenant_model_service_mod.get_model_config_by_id = _get_model_config_by_id
tenant_model_service_mod.resolve_model_id = lambda _tenant_id, _model_type, model_name: model_name
tenant_model_service_mod.get_composite_model_name_by_id = lambda model_id: model_id
tenant_model_service_mod.resolve_model_config = lambda *_args, **_kwargs: {}
tenant_model_service_mod.get_tenant_default_model_by_type = lambda *_args, **_kwargs: {}
tenant_model_service_mod.get_api_key = lambda *_args, **_kwargs: SimpleNamespace(id=1)
@@ -1149,11 +1158,11 @@ def test_chat_create_accepts_provider_scoped_rerank_id_unit(monkeypatch):
monkeypatch.setattr(module.KnowledgebaseService, "query", lambda **_kwargs: [_DummyKB()])
monkeypatch.setattr(module.KnowledgebaseService, "get_by_id", lambda _id: (True, _DummyKB()))
def _get_model_config_from_provider_instance(**kwargs):
query_calls.append(kwargs)
return {}
def _resolve_model_id(tenant_id, model_type, model_name):
query_calls.append({"tenant_id": tenant_id, "model_ref": model_name, "model_type": model_type})
return model_name
monkeypatch.setattr(module, "resolve_model_config", _get_model_config_from_provider_instance)
monkeypatch.setattr(module, "resolve_model_id", _resolve_model_id)
def _save(**kwargs):
saved.update(kwargs)

9
test/testcases/restful_api/test_user_tenant_routes_unit.py
View File

@@ -1503,6 +1503,15 @@ def _load_chat_routes_unit_module(monkeypatch):
tenant_model_provider_mod = ModuleType("api.db.joint_services.tenant_model_service")
tenant_model_provider_mod.get_model_config_from_provider_instance = lambda *_args, **_kwargs: {}
def _get_model_config_by_id(_tenant_id, _model_type, model_ref):
if model_ref == "tenant-llm-id":
return {}
raise LookupError(f"unknown tenant model id: {model_ref}")
tenant_model_provider_mod.get_model_config_by_id = _get_model_config_by_id
tenant_model_provider_mod.resolve_model_id = lambda _tenant_id, _model_type, model_name: model_name
tenant_model_provider_mod.get_composite_model_name_by_id = lambda model_id: model_id
tenant_model_provider_mod.resolve_model_config = lambda *_args, **_kwargs: {}
tenant_model_provider_mod.get_tenant_default_model_by_type = lambda *_args, **_kwargs: {}