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

Fix: model list (#15860)

Browse Source 
### What problem does this PR solve?

Remove tenant_llm call in rag.

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Lynn
2026-06-10 14:59:57 +08:00
committed by GitHub
parent 899f76af6b
commit 478c9846a1
12 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rag/app/naive.py
View File

@@ -219,10 +219,10 @@ def by_opendataloader(
if tenant_id:
if not opendataloader_llm_name:
try:
from api.db.services.tenant_llm_service import TenantLLMService
from api.db.joint_services.tenant_model_service import get_models_by_tenant_and_provider_and_model_type, ensure_opendataloader_from_env
env_name = TenantLLMService.ensure_opendataloader_from_env(tenant_id)
candidates = TenantLLMService.query(tenant_id=tenant_id, llm_factory="OpenDataLoader", model_type=LLMType.OCR)
env_name = ensure_opendataloader_from_env(tenant_id)
candidates = get_models_by_tenant_and_provider_and_model_type(tenant_id=tenant_id, provider_name="OpenDataLoader", model_type=LLMType.OCR)
if candidates:
opendataloader_llm_name = candidates[0].llm_name
elif env_name:

8
rag/flow/parser/parser.py
View File

@@ -446,9 +446,11 @@ class Parser(ProcessBase):
tenant_id = self._canvas._tenant_id
if not tenant_id:
return None
from api.db.services.tenant_llm_service import TenantLLMService
env_name = TenantLLMService.ensure_opendataloader_from_env(tenant_id)
candidates = TenantLLMService.query(tenant_id=tenant_id, llm_factory="OpenDataLoader", model_type=LLMType.OCR.value)
from api.db.joint_services.tenant_model_service import ensure_opendataloader_from_env, get_models_by_tenant_and_provider_and_model_type
env_name = ensure_opendataloader_from_env(tenant_id)
candidates = get_models_by_tenant_and_provider_and_model_type(tenant_id=tenant_id, provider_name="OpenDataLoader", model_type=LLMType.OCR)
if candidates:
return candidates[0].llm_name
return env_name