diff --git a/json/kdb.json b/json/kdb.json index dfa8b8a..77df98e 100644 --- a/json/kdb.json +++ b/json/kdb.json @@ -16,7 +16,13 @@ "label":"文件管理", "selected_row": true, "icon":"{{entire_url('/bricks/imgs/folder.svg')}}" - } + }, + { + "name": "test", + "label": "测试知识库", + "selected_data": true, + "icon": "{{entire_url('/bricks/imgs/folder.svg')}}" + } ] }, "binds":[ @@ -34,6 +40,21 @@ "options":{ "url":"{{entire_url('/rag/folder')}}" } + }, + { + "wid": "self", + "event": "test", + "actiontype": "urlwidget", + "target": "PopupWindow", + "popup_options": { + "width": "80%", + "height": "80%", + "icon": "{{entire_url('/bricks/imgs/app.svg')}}", + "title": "知识库测试" + }, + "options": { + "url": "{{entire_url('/rag/test.ui')}}" + } } ] } diff --git a/rag/rag_operations.py b/rag/rag_operations.py index e9a0d41..871f743 100644 --- a/rag/rag_operations.py +++ b/rag/rag_operations.py @@ -443,7 +443,19 @@ class RagOperations: def format_search_results(self, results: List[Dict], limit: int) -> List[Dict]: """格式化搜索结果为统一格式""" formatted_results = [] - + # for res in results[:limit]: + # score = res.get('rerank_score', res.get('distance', 0)) + # + # content = res.get('text', '') + # title = res.get('metadata', {}).get('filename', 'Untitled') + # document_id = res.get('metadata', {}).get('document_id', '') + # + # formatted_results.append({ + # "content": content, + # "title": title, + # "metadata": {"document_id": document_id, "score": score}, + # }) + #得分归一化 for res in results[:limit]: rerank_score = res.get('rerank_score', 0) score = 1 / (1 + math.exp(-rerank_score)) if rerank_score is not None else 1 - res.get('distance', 0) diff --git a/wwwroot/test_fusesearch.dspy b/wwwroot/test_fusesearch.dspy index dfc9965..857ee0a 100644 --- a/wwwroot/test_fusesearch.dspy +++ b/wwwroot/test_fusesearch.dspy @@ -1,8 +1,9 @@ debug(f'{params_kw=}') -fiid = params_kw.ffid +fiids = params_kw.fiids query = params_kw.query +limit = params_kw.limit env = DictObject(**globals()) keys = [k for k in env.keys()] debug(f'{keys=}') -x = await rfexe('fusedsearch', params_kw, **env) +x = await rfexe('fusedsearch', request, params_kw) return x