'commit'

dsLightRag/Start.py

@@ -27,6 +27,7 @@ logger.addHandler(handler)
 async def lifespan(app: FastAPI):
     yield
 
+
 app = FastAPI(lifespan=lifespan)
 
 # 挂载静态文件目录
@@ -340,32 +341,28 @@ async def chat(request: fastapi.Request):
     data = await request.json()
     topic = 'ShiJi'
     mode = data.get("mode", "hybrid")  # 默认为hybrid模式
-    # 拼接路径
     WORKING_PATH = "./Topic/" + topic
-    # 查询的问题
     query = data.get("query")
-    # 关闭参考资料
     user_prompt = "\n 1、总结回答时，要注意不要太繁琐！"
+    user_prompt = user_prompt + "\n 2、最后将以语音的形式进行播报，无法语音输出的内容不可返回！"
+    user_prompt = user_prompt + "\n 3、不要返回引用等信息！"
 
-    async def generate_response_stream(query: str):
+    try:
-        try:
+        rag = await initialize_rag(WORKING_PATH)
-            rag = await initialize_rag(WORKING_PATH)
+        # 设置stream=False以禁用流式调用
-            resp = await rag.aquery(
+        resp = await rag.aquery(
-                query=query,
+            query=query,
-                param=QueryParam(mode=mode, stream=True, user_prompt=user_prompt, enable_rerank=True))
+            param=QueryParam(mode=mode, stream=False, user_prompt=user_prompt, enable_rerank=True))
 
-            async for chunk in resp:
+        # 直接返回JSON格式的完整响应
-                if not chunk:
+        return {"code": 0, "data": {"reply": resp}}
-                    continue
+
-                yield f"data: {json.dumps({'reply': chunk})}\n\n"
+    except Exception as e:
-                print(chunk, end='', flush=True)
+        return {"code": 1, "msg": str(e)}
-        except Exception as e:
+    finally:
-            yield f"data: {json.dumps({'error': str(e)})}\n\n"
+        # 清理资源
-        finally:
+        await rag.finalize_storages()
-            # 清理资源
-            await rag.finalize_storages()
 
-    return EventSourceResponse(generate_response_stream(query=query))
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)