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

Fix: model list (#15905)

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

Set OpenDataLoader and call in parser and naive

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Lynn
2026-06-10 17:44:50 +08:00
committed by GitHub
parent ad63877f04
commit 7355db183f
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rag/app/naive.py
View File

@@ -33,6 +33,7 @@ from common.constants import LLMType, MAXIMUM_PAGE_NUMBER
from api.db.services.llm_service import LLMBundle
from api.db.joint_services.tenant_model_service import (
ensure_mineru_from_env,
ensure_opendataloader_from_env,
ensure_paddleocr_from_env,
get_first_provider_model_name,
get_model_config_from_provider_instance,
@@ -219,15 +220,8 @@ def by_opendataloader(
if tenant_id:
if not opendataloader_llm_name:
try:
from api.db.joint_services.tenant_model_service import get_models_by_tenant_and_provider_and_model_type, ensure_opendataloader_from_env
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:
opendataloader_llm_name = env_name
except Exception as e:
opendataloader_llm_name = get_first_provider_model_name(tenant_id, "OpenDataLoader", LLMType.OCR) or ensure_opendataloader_from_env(tenant_id)
except Exception as e: # best-effort fallback
logging.warning(f"fallback to env opendataloader: {e}")
if opendataloader_llm_name:

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

@@ -29,6 +29,7 @@ from api.db.services.file_service import FileService
from api.db.services.llm_service import LLMBundle
from api.db.joint_services.tenant_model_service import (
ensure_mineru_from_env,
ensure_opendataloader_from_env,
ensure_paddleocr_from_env,
get_first_provider_model_name,
get_model_config_from_provider_instance,
@@ -447,13 +448,7 @@ class Parser(ProcessBase):
if not tenant_id:
return None
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
return get_first_provider_model_name(tenant_id, "OpenDataLoader", LLMType.OCR) or ensure_opendataloader_from_env(tenant_id)
parser_model_name = resolve_opendataloader_llm_name()
if not parser_model_name: