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

Fix: parse by somark in parser (#17355)

Browse Source
This commit is contained in:
Lynn
2026-07-24 18:58:49 +08:00
committed by GitHub
parent 7180d3024e
commit a154d751b4
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,9 @@ from api.db.joint_services.tenant_model_service import (
resolve_model_config,
get_tenant_default_model_by_type,
)
from api.db.services.tenant_model_instance_service import TenantModelInstanceService
from api.db.services.tenant_model_provider_service import TenantModelProviderService
from api.db.services.tenant_model_service import TenantModelService
from common import settings
from common.constants import LLMType
from common.misc_utils import get_uuid, thread_pool_exec
@@ -337,6 +340,17 @@ class Parser(ProcessBase):
# Normalize parser selection and optional provider-specific model name.
raw_parse_method = conf.get("parse_method", "")
# If raw_parse_method is a tenant_model ID, resolve it to
# model_name@instance_name@provider_name so the provider-specific
# branches below can match the per-provider suffix.
if isinstance(raw_parse_method, str) and raw_parse_method:
exist, model_obj = TenantModelService.get_by_id(raw_parse_method)
if exist:
provider_ok, provider_obj = TenantModelProviderService.get_by_id(model_obj.provider_id)
instance_ok, instance_obj = TenantModelInstanceService.get_by_id(model_obj.instance_id)
if provider_ok and instance_ok:
raw_parse_method = f"{model_obj.model_name}@{instance_obj.instance_name}@{provider_obj.provider_name}"
parser_model_name = None
parse_method = raw_parse_method
parse_method = parse_method or ""