From 6b241749aea8960c83ee2943093e95230ebb7eaa Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Sun, 31 Aug 2025 08:44:03 +0800 Subject: [PATCH] 'commit' --- dsLightRag/Util/XueBanUtil.py | 121 +----------------- .../__pycache__/XueBanUtil.cpython-310.pyc | Bin 4706 -> 2465 bytes dsLightRag/static/QwenImage/qwen-image.html | 26 +++- 3 files changed, 29 insertions(+), 118 deletions(-) diff --git a/dsLightRag/Util/XueBanUtil.py b/dsLightRag/Util/XueBanUtil.py index 5825f45a..053a4597 100644 --- a/dsLightRag/Util/XueBanUtil.py +++ b/dsLightRag/Util/XueBanUtil.py @@ -1,7 +1,9 @@ -from openai import OpenAI, AsyncOpenAI -from Config.Config import * import sys +from openai import AsyncOpenAI + +from Config.Config import * + # 保留原有的prompt定义 # prompt=""" | @@ -46,6 +48,7 @@ async def get_xueban_response_async(query_text: str, stream: bool = True): 绝不： - 长篇大论，叽叽歪歪 - 长时间严肃对话 + - 每次回答不要太长，控制在3分钟以内 """ # 打开文件读取知识内容 f = open(r"D:\dsWork\dsProject\dsLightRag\static\YunXiao.txt", "r", encoding="utf-8") @@ -87,117 +90,3 @@ async def get_xueban_response_async(query_text: str, stream: bool = True): except Exception as e: print(f"大模型请求异常: {str(e)}", file=sys.stderr) yield f"处理请求时发生异常: {str(e)}" - - -# 同步获取大模型响应 -def get_xueban_response(query_text: str, stream: bool = True): - """ - 获取学伴角色的大模型响应 - @param query_text: 查询文本 - @param stream: 是否使用流式输出 - @return: 完整响应文本 - """ - client = OpenAI( - api_key=LLM_API_KEY, - base_url=LLM_BASE_URL, - ) - - # 创建请求 - completion = client.chat.completions.create( - model=LLM_MODEL_NAME, - messages=[ - {'role': 'system', 'content': prompt.strip()}, - {'role': 'user', 'content': query_text} - ], - stream=stream - ) - - full_response = [] - - if stream: - for chunk in completion: - # 提取当前块的内容 - if chunk.choices and chunk.choices[0].delta and chunk.choices[0].delta.content: - content = chunk.choices[0].delta.content - full_response.append(content) - # 实时输出内容，不换行 - print(content, end='', flush=True) - else: - # 非流式处理 - full_response.append(completion.choices[0].message.content) - - return ''.join(full_response) - - -# 测试用例 main 函数 -def main(): - """ - 测试学伴工具接口的主函数 - """ - print("===== 测试学伴工具接口 =====") - - # 测试同步接口 - test_sync_interface() - - # 测试异步接口 - import asyncio - print("\n测试异步接口...") - asyncio.run(test_async_interface()) - - print("\n===== 测试完成 =====") - - -def test_sync_interface(): - """测试同步接口""" - print("\n测试同步接口...") - # 测试问题 - questions = [ - "你是谁？", - "讲个冷笑话", - "你男朋友是做什么的？" - ] - - for question in questions: - print(f"\n问题: {question}") - try: - # 调用同步接口获取响应 - print("获取学伴响应中...") - response = get_xueban_response(question, stream=False) - print(f"学伴响应: {response}") - - # 简单验证响应 - assert response.strip(), "响应内容为空" - print("✅ 同步接口测试通过") - except Exception as e: - print(f"❌ 同步接口测试失败: {str(e)}") - - -async def test_async_interface(): - """测试异步接口""" - # 测试问题 - questions = [ - "你是谁？", - "讲个冷笑话", - "你男朋友是做什么的？" - ] - - for question in questions: - print(f"\n问题: {question}") - try: - # 调用异步接口获取响应 - print("获取学伴响应中...") - response_generator = get_xueban_response_async(question, stream=False) - response = "" - async for chunk in response_generator: - response += chunk - print(f"学伴响应: {response}") - - # 简单验证响应 - assert response.strip(), "响应内容为空" - print("✅ 异步接口测试通过") - except Exception as e: - print(f"❌ 异步接口测试失败: {str(e)}") - - -if __name__ == "__main__": - main() diff --git a/dsLightRag/Util/__pycache__/XueBanUtil.cpython-310.pyc b/dsLightRag/Util/__pycache__/XueBanUtil.cpython-310.pyc index cf7625d24c75c9498195cb5640bba35c5e6023e4..52144c365c14e0230ca2733b5a24c77dbf6caf61 100644 GIT binary patch delta 461 zcmaE)vQU^WpO=@50SLAVZpc`~Kao!+#01DoVMt-jVTc0JOgW6XOi@gXAU1Oja|lBU zX9{a7OA1>mYZ^-mdkRMjYZO}wV=#jz*GrH=ewvK8xE+ft^OF4wQu7==fm}wdjVC5C ziEA?5Voxl{jL%N3yv31}SezPPT9i|&wYiWvf@!iG+iX(>1zm+_>-(RrS@?AJyyt7D zJlWCvVp-$UC97Ue-T!`1&$GVePdm0fowLIDX-C`3N%NoVUi!4Hb@CRr#g;&$S&H&= zQg5**=jWBA=9S!HDJ@Pd(qz8Hnwy`JnsbXIH?_DpF+H`oh!y01G&GL14wW%@Gx;ONr(Xe>IIAB delta 2573 zcmZ`*?Q;`F7~kEyTrQV16bg(eBN2HqqD8?`>G+0NRKTi3N3@P+V(+M}X+k%5BFu#g z6bi~q#Q=7oNQ>4X2n7@eC}sSh|AHU9k4!E}XPj}y8NT>Ie4b4cTE*+^Z+D-4b}#$< ze$R6qZn(K9oT{tS2t2?1e&NH<<{u8vcRq%hPIQ_e-L#E%vo=O?&Jt29_EJJ_ll57; z&+zGrp=_3Qzpn1~wfU#n0=fn^RS)W+-J~s`*Xd#CHGPI&4}H)G=`%lKe3cRCC2+d5 zQM72o1R)Cui85DteT$J?{i+*Wo!*vguS}xUr4P4U+VKUW`P@ut4sHHnsq{8mUmiVE z9vv(0K2_}96S>*-P>1l#X2S`u7)Z^c6q5RLq`PSh#-7>pxo< zKR%J&IdNpPbYj4}kt=;OUivhjvwS1DR^_WzdFIMIl`vd?dn#!fNz;|Bw88U|>+4SG zM#5FQjdVKRVWhbN@oM1|&?T+;+%o@L4H8a*8#cTaTm8nXvGvXGxS`yj{|Oq-{pw#v z>vL3HsrbN$E4e21={bvWSdXw2H&P={_=?x zvwd9w-i)X#^GKIg8@~&au3&8{W*NnnheEb8OerzzYz0N22M$V<^hA=HSd%6X3U>w3 zOZN}Wu;pR8kwi7?EBMV?1fE=s?Q*=)1I444z1%@>>`3w0-s0dnvBvS5ybd9ZFcV=G z0tTDU0choO0i*RCqr>k-xDVle1W*#;5rhX29z|G)@E}4h=&qy0w}9Goz69-p0=X;I znT+~*g(NgTg0LLGt=nuR5;1P1x1^FFiN|n3khcOy0#>45Lx*9;KCz4s;>nu#`>>G4 zqnMvjMwP!+g;6KORLcHlvhtT4kYOBQVXDzEV_Ejs?10Aj)3Bo*TJ6CApvZ&(o`iu3 z3EPWYP?1m!(v)S;Dx=jVLy{@?62TVHeQ3j^iz-$lAx?#g;*a~w7mj-8zb%Yk_O6V0 zd#)4@jd=ZEmyYi)T)pn?y-_@RQSf3df)_rEPvrmhM8vY-sl`Hyv`NqLUB&Ywm2(># z8?AY`u5I5x~uxNRK8H zQ`+_#B^gMm?K5CSGi6)qt-W9qd57r1jI=}Q(JK8`x)m%yYRJMQnGE>n2WkPIM#L1m z15D&43xiR(F;pD5P`-AkJojY8#z~;P$>ys-yU!DTH)$gDL-b-2lLIrJrQrp1u9pa$R02Mv{(GXno zQ>0~5S0b&TA~+zChu~Nq1&GRSpvMBebwYN#YIW$UwS<2hU4@!zlH#kt_9e75#z$rF zr-UKDRTiRQS}!5qPt`2DE#DHp(mgy>V*2V zN%i@K`r1H!zDe~3L48m*s+)!S{2AX4UyolGy-=V3-|Cx^?)*8p7=Iq&1%S1DH4d?e zJ1zW09Ak>z;djc`yYu@Whbq5SdhxSaDfoBTRrpJ2Z3b{>O;YL@u?{0?@VJ@cd@U}E zntnH)pMlkj(9%l)SQg4gjc1wGL(yip!)zMge{$U8s<9YWomebNTcdTZl7bITytDGz zawPPqTa!v|?(Ar+bo^nk2|>E@2dPwoi_745K$IvUqT0#Hc()OYP0?gcn6CN^{JUZ$ hjOXx+k;Y0~PgJVX*>h(%s}HF&)p_cDvPR|G{{RlA^LzjR diff --git a/dsLightRag/static/QwenImage/qwen-image.html b/dsLightRag/static/QwenImage/qwen-image.html index defa30f3..1d1e1bc6 100644 --- a/dsLightRag/static/QwenImage/qwen-image.html +++ b/dsLightRag/static/QwenImage/qwen-image.html @@ -272,10 +272,32 @@
- 示例图像 + 示例图像
-

未来城市，赛博朋克风格

+

一张写有「山高水长，风清月明」的水墨画，搭配山川、竹林和飞鸟，文字清晰自然，风格一致

+
+
+
+
+ +
+
+ 示例图像 +
+
+

一位身着淡雅水粉色交领襦裙的年轻女子背对镜头而坐，俯身专注地手持毛笔在素白宣纸上书写“通義千問”四个遒劲汉字。古色古香的室内陈设典雅考究，案头错落摆放着青瓷茶盏与鎏金香炉，一缕熏香轻盈升腾；柔和光线洒落肩头，勾勒出她衣裙的柔美质感与专注神情，仿佛凝固了一段宁静温润的旧时光。

+
+
+
+
+ +
+
+ 示例图像 +
+
+

一个咖啡店门口有一个黑板，上面写着 AI 咖啡，2元一杯，旁边有个霓虹灯，写着开源中国，旁边有个海报，海报上面是一个中国美女，海报下方写着 Gitee AI。