mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-06-29 15:31:05 +08:00
Fix: model list (#15905)
### 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:
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -669,7 +669,7 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
|
||||
modelInfo: [
|
||||
{
|
||||
model_name: values.model_name,
|
||||
model_type: 'ocr',
|
||||
model_type: ['ocr'],
|
||||
max_tokens: 0,
|
||||
},
|
||||
],
|
||||
@@ -692,7 +692,7 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
|
||||
model_info: [
|
||||
{
|
||||
model_name: values.model_name,
|
||||
model_type: 'ocr',
|
||||
model_type: ['ocr'],
|
||||
max_tokens: 0,
|
||||
},
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user