adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 优化知识库和模型引用解析逻辑

Browse Source 
移除对字符串长度的UUID验证，仅检查是否为有效UUID或非"None"字符串
This commit is contained in:
wwq
2026-04-21 11:55:00 +08:00
parent 20ddc76a4d
commit f1dc507b5c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/app/services/app_dsl_service.py
View File

@@ -587,14 +587,12 @@ class AppDslService:
if not kb_id: if not kb_id:
continue continue
kb_ref = {} kb_ref = {}
if isinstance(kb_id, str) and len(kb_id) >= 36: if isinstance(kb_id, str) and kb_id != "None":
try: try:
uuid.UUID(kb_id) uuid.UUID(kb_id)
kb_ref["id"] = kb_id kb_ref["id"] = kb_id
except ValueError: except ValueError:
kb_ref["name"] = kb_id kb_ref["name"] = kb_id
else:
kb_ref["name"] = kb_id
resolved_id = self._resolve_kb(kb_ref, workspace_id, []) resolved_id = self._resolve_kb(kb_ref, workspace_id, [])
if resolved_id: if resolved_id:
resolved_kbs.append({**kb, "kb_id": resolved_id}) resolved_kbs.append({**kb, "kb_id": resolved_id})
@@ -612,14 +610,12 @@ class AppDslService:
ref_dict = {"id": ref_id} ref_dict = {"id": ref_id}
elif ref_name and ref_name != "None": elif ref_name and ref_name != "None":
ref_dict = {"name": ref_name, "provider": model_ref.get("provider"), "type": model_ref.get("type")} ref_dict = {"name": ref_name, "provider": model_ref.get("provider"), "type": model_ref.get("type")}
elif isinstance(model_ref, str) and model_ref != "None" and len(model_ref) >= 36: elif isinstance(model_ref, str) and model_ref != "None":
try: try:
uuid.UUID(model_ref) uuid.UUID(model_ref)
ref_dict = {"id": model_ref} ref_dict = {"id": model_ref}
except ValueError: except ValueError:
ref_dict = {"name": model_ref} ref_dict = {"name": model_ref}
elif isinstance(model_ref, str) and model_ref != "None":
ref_dict = {"name": model_ref}
if ref_dict: if ref_dict:
resolved_model_id = self._resolve_model(ref_dict, tenant_id, warnings) resolved_model_id = self._resolve_model(ref_dict, tenant_id, warnings)
if resolved_model_id: if resolved_model_id: