From 9a3392e5aaf42096daad728fe19388fe336f5d0b Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Sun, 6 Jul 2025 22:22:06 +0800 Subject: [PATCH] 'commit' --- .../Config/__pycache__/Config.cpython-310.pyc | Bin 681 -> 636 bytes dsRagAnything/StartMath.py | 11 +++++++---- .../Chinese/kv_store_llm_response_cache.json | 12 +----------- .../Util/__pycache__/RagUtil.cpython-310.pyc | Bin 2956 -> 2849 bytes 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dsRagAnything/Config/__pycache__/Config.cpython-310.pyc b/dsRagAnything/Config/__pycache__/Config.cpython-310.pyc index 12ea7fee3fe3b66a997adb7386f7a7eadf2e0f93..80ab4d4a2348f0de78b0deaf1d598a3d9cf4e8b7 100644 GIT binary patch delta 105 zcmZ3<`iF%#pO=@50SHQ4vNCih^2#zAOw?8pWQ^iS;fUf);f&%+;Ru8f+D+>`SeYbSFsnX~Z#wHEPAc4cyt5(6?>7~zl!%mR`ei~zU%5>WsE delta 146 zcmeyvvXYfIpO=@50SL63vobO#^2#z=Ow?A9Q2k^{Mh`~b$w`d0GEv+!o`;6vnyg>Cu Wypv^^+~lNyOcq8sWI|?fFaiKzZX4GC diff --git a/dsRagAnything/StartMath.py b/dsRagAnything/StartMath.py index a14adca6..a69e83c1 100644 --- a/dsRagAnything/StartMath.py +++ b/dsRagAnything/StartMath.py @@ -88,12 +88,14 @@ async def rag(request: fastapi.Request): vision_model_func=vision_model_func, ) + # 使用stream=True参数确保流式输出 resp = await rag.aquery( - query, - mode="hybrid" + query=query, + mode="hybrid", # 直接传入mode参数 + stream=True # 直接传入stream参数 ) - print("查询结果:", resp) - + + # 直接处理流式响应,不再打印完整结果 async for chunk in resp: if not chunk: continue @@ -101,6 +103,7 @@ async def rag(request: fastapi.Request): print(chunk, end='', flush=True) except Exception as e: yield f"data: {json.dumps({'error': str(e)})}\n\n" + logger.error(f"处理查询时出错: {query}. 错误: {str(e)}") return EventSourceResponse(generate_response_stream(query=query)) diff --git a/dsRagAnything/Topic/Chinese/kv_store_llm_response_cache.json b/dsRagAnything/Topic/Chinese/kv_store_llm_response_cache.json index 1f179763..3031a990 100644 --- a/dsRagAnything/Topic/Chinese/kv_store_llm_response_cache.json +++ b/dsRagAnything/Topic/Chinese/kv_store_llm_response_cache.json @@ -2183,7 +2183,7 @@ "original_prompt": "小学数学有哪些模型" }, "9b50a199b83407c62d8532b7b904c17d": { - "return": "{\"high_level_keywords\": [\"\\u82cf\\u8f7c\", \"\\u5bb6\\u4eba\", \"\\u5bb6\\u5ead\\u5173\\u7cfb\"], \"low_level_keywords\": [\"\\u7236\\u4eb2\", \"\\u6bcd\\u4eb2\", \"\\u5144\\u5f1f\", \"\\u59bb\\u5b50\", \"\\u5b50\\u5973\"]}", + "return": "{\"high_level_keywords\": [\"\\u82cf\\u8f7c\", \"\\u5bb6\\u4eba\", \"\\u5bb6\\u5ead\\u5173\\u7cfb\"], \"low_level_keywords\": [\"\\u7236\\u4eb2\", \"\\u6bcd\\u4eb2\", \"\\u5144\\u5f1f\", \"\\u59d0\\u59b9\", \"\\u59bb\\u5b50\", \"\\u5b50\\u5973\"]}", "cache_type": "keywords", "chunk_id": null, "embedding": null, @@ -2191,16 +2191,6 @@ "embedding_min": null, "embedding_max": null, "original_prompt": "苏轼的家人都有谁?" - }, - "6535772a4135aa020c182aaef52bd9e1": { - "return": "根据知识图谱提供的信息,苏轼的直系亲属成员如下:\n\n### 父母\n1. **苏洵**(父亲):北宋著名文学家,唐宋八大家之一,对苏轼兄弟的文学启蒙影响深远。 \n2. **程夫人**(母亲):出身名门,是苏轼与苏辙的启蒙教师,曾以东汉名士范滂的事迹勉励苏轼砥砺名节。 \n\n### 兄弟姐妹\n- **苏辙**(弟弟):北宋文学家、政治家,与苏轼并称\"二苏\",同属\"三苏\"及唐宋八大家,政治与文学上相互支持。 \n\n### 配偶与伴侣\n1. **王弗**(结发妻子):聪慧谦谨,通诗书,曾辅助苏轼读书,早逝。 \n2. **王闰之**(第二任妻子):王弗堂妹,性格温顺。 \n3. **王朝云**(侍妾):晚年陪伴苏轼,生幼子苏遁,以\"一肚皮不合时宜\"评价苏轼性情。 \n\n### 子女\n1. **苏迈**(长子):生母王弗,北宋官员、诗人。 \n2. **苏迨**(次子):曾任官职。 \n3. **苏过**(三子):文学家,遵嘱将苏轼灵柩运至郏城安葬。 \n4. **苏遁**(幼子):生母王朝云,早夭。 \n\n### 其他重要关系\n- **程颐**:非亲属但关系密切,因礼法观念冲突与苏轼结怨。 \n- **陈季常**:好友,以\"河东狮吼\"典故闻名。 \n\n苏轼家族以文学成就著称,父子三人合称\"三苏\",代表北宋文学巅峰。其家庭成员关系紧密,尤其在政治挫折中相互扶持(如乌台诗案期间苏辙上书救兄)。\n\n**参考资料:** \n[KG] 苏轼与苏辙的兄弟关系(权重32.0) \n[KG] 苏洵对苏轼的教育影响(权重18.0) \n[KG] 王朝云与苏轼的伴侣关系(权重9.0) \n[KG] 苏轼子女信息(权重5.0-15.0) \n[KG] 程夫人对苏轼的启蒙(权重8.0)", - "cache_type": "query", - "chunk_id": null, - "embedding": null, - "embedding_shape": null, - "embedding_min": null, - "embedding_max": null, - "original_prompt": "苏轼的家人都有谁?" } } } \ No newline at end of file diff --git a/dsRagAnything/Util/__pycache__/RagUtil.cpython-310.pyc b/dsRagAnything/Util/__pycache__/RagUtil.cpython-310.pyc index dc5b78ad2bd828c73fd09bca8bb759d1839d54f9..99a602dc2af3b9cd8a1f79f7bfd7b82f400ff457 100644 GIT binary patch delta 1050 zcmZWn%}*0S6yKTs=ix9v>jq!uT=*2Z=U6=(Ib_>oHK|R<5 z7ZVPWxq0)V;p9J|7ypF4=nek}1mA0k2zJxod-L9J-u&L1+3ERMwb$}_OMzc&d*%7B z{H{Il_5-ZA!bzmK1T2kcthy?}m>OxZ?&@t{i;OtqW@6^D_F9k3*mAA5Z$#Ng3eRx1 zt++XEatmypXL$~+Z4%zY^Fd*Wa+?>nb+^ciK`AKoDG((qLtRT6FY&Hz&F$vhybN2) zyuzzsE1W!3oZj7^FJz0}C5c=ikBK9{lIaTeAhH0dvAXGtKMq?3+CK`ZEw5;fnk@|zA@}5>BgK}M~ zkDS9I=K&mDoCsiXkR<+ckcb@S^YWW^eXNA;3C9X!V0heb`l1U{RfM*vvK-f|q+j0F zUk+fvp&iAwzl=7wEK_~3)Ca-D05GV1q}9Z*WX2og_}q8K&Au~zvgyc=7q~xjL+%^1 zQ)xbk7Xr@1#Uk9m%QxI7HpMf2#^fUdHIXoV_q69yK7{5hb zzR%3pO$a)wz~KoSp@2|CI4!B&+^D(e#ogysvlzswQ|jv{fV;u?cM% zhhho>4xOKOs&dEbhX?lAng!gqoULIMRExr-nPwW?7s7ufP_vjsz&iiP s?OYS?Wz+DaH=Plv;LQnf6?qxs&vdEfK<=FPnBe^GVj3x%u(-{GaX z*~#KdXX}%9;0aBTP~%-oI0c`EdSq~e;GQ0uk;Sdf+6Xfd<1Dhd-SN#Z8|8Sev$n$g z75GzAo1r2j*b?CdVTPsCmo>Nc^26<#jwf0F46qrP=U}d>=VY2Js}(X)$$>BP z0I7BBt|y!EvL-9)AU#Xg)MHvVWffxT7&$*KZKPs%WD%hUp|Sz}xI!{cIRKzu(XlEL zmPse@J6V0E^&+OkD9j;7PS#aM|3bK0)d$Hol`}?1wnIqn0B}vYsgp&19D7YamIaJE z>bh}ivKN;d9G(p#U^Il6c(M;eHH3~>ESi?@1aUCmYDDwG4;wQJt(zn2t8wQnGF;kK zJG7C~N$%tg+?2kT_>F(khk+bh02XzA8iR6Jy)hqJ>jH1 zI#J>UKf2)y5ww~O5ky>lw6>HsQ@X;{H>+MbkA?6OD8XS7>$^Ol_GYF=ansc$_EVM+ z$_W3vrD^pxvxDx@)QVYEtC^i=Mv%Q5!A00C-Z{9lsSmr=1WN1x(8aC}#QZlorY^9n zBl{rW>S^xoyu8&tk?gi~3rFB+ayh zC#82^;(6pD1g!DfQMy-%X>0;s-9qReC*Z~S%9zGT9!3c!qmIsUtjKmz$M{KU_Q!z3 H?0oqb*RAr|