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

feat: support multi-type factory models (#15893)

Browse Source 
### What problem does this PR solve?
Support factory models with multiple model types, so visual chat models
can be exposed as both image2text and chat while preserving the database
model-type-per-record design.

This also updates the SILICONFLOW model list and adds a helper script to
refresh SiliconFlow models from the provider API.

### Type of change
- [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
buua436
2026-06-10 15:35:21 +08:00
committed by GitHub
parent 478c9846a1
commit dcf623d60d
4 changed files with 897 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/apps/services/models_api_service.py
View File

@@ -53,6 +53,13 @@ def _to_int(v, default=500):
return default
def _factory_model_types(llm: dict) -> list[str]:
model_type = llm.get("model_type")
if isinstance(model_type, list):
return model_type
return [model_type] if model_type else []
def _get_model_info(tenant_id: str, default_model: str, model_type: str):
"""
Parse a composite model string (modelName@instanceName@providerName or modelName@providerName)
@@ -147,7 +154,7 @@ def _get_model_info(tenant_id: str, default_model: str, model_type: str):
return None
# Check if the model_type matches
if target_llm[0].get("model_type") != model_type:
if model_type not in _factory_model_types(target_llm[0]):
logging.warning(f"Model '{model_name}' isn't a {model_type} model")
return None
@@ -217,7 +224,7 @@ def _check_model_available(tenant_id: str, provider_name: str, instance_name: st
return False, f"Model '{model_name}' not found for provider '{provider_name}'"
if target_llm:
if target_llm[0].get("model_type") != model_type:
if model_type not in _factory_model_types(target_llm[0]):
return False, f"Model '{model_name}' isn't a {model_type} model"
return True, None
@@ -347,7 +354,8 @@ def list_tenant_added_models(tenant_id: str, model_type_filter: str=None):
if not factory_instances:
continue
for llm in factory["llm"]:
if model_type_filter and llm["model_type"] != model_type_filter:
factory_model_types = _factory_model_types(llm)
if model_type_filter and model_type_filter not in factory_model_types:
continue
for factory_instance in factory_instances:
@@ -356,7 +364,7 @@ def list_tenant_added_models(tenant_id: str, model_type_filter: str=None):
manual_modified_models = model_record_map.get(model_record_key, [])
active_model_types = [manual_model.model_type for manual_model in manual_modified_models if manual_model.status == ActiveStatusEnum.ACTIVE.value]
inactive_model_types = [manual_model.model_type for manual_model in manual_modified_models if manual_model.status == ActiveStatusEnum.INACTIVE.value]
model_types = list(set([llm["model_type"]] + active_model_types) - set(inactive_model_types))
model_types = list(set(factory_model_types + active_model_types) - set(inactive_model_types))
if not model_types:
continue