From 32798cbaff373bd63f6376928d6c7ff6912c56df Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Sun, 29 Jun 2025 19:48:17 +0800
Subject: [PATCH] 'commit'

---
 dsRag/Start.py                                |  20 +-------
 dsRag/Util/ALiYunUtil.py                      |  23 ++++++++-
 .../__pycache__/ALiYunUtil.cpython-310.pyc    | Bin 1283 -> 1927 bytes
 dsRag/错误日志.txt                        |  47 ++++++++++++++++++
 4 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 dsRag/错误日志.txt

diff --git a/dsRag/Start.py b/dsRag/Start.py
index 525a29b7..fdb6eb33 100644
--- a/dsRag/Start.py
+++ b/dsRag/Start.py
@@ -133,25 +133,7 @@ async def rag_stream(request: fastapi.Request):
     search_results = queryByEs(query, query_tags, logger)
 
     # 流式调用大模型
-    return StreamingResponse(
-        callLLM(request, query, search_results, logger, True),
-        media_type="text/event-stream"
-    )
-    data = await request.json()
-    query = data.get('query', '')
-    query_tags = data.get('tags', [])
-
-    # 调用es进行混合搜索
-    search_results = queryByEs(query, query_tags, logger)
-
-    # 调用大模型
-    markdown_content = callLLM(request, query, search_results, logger, False)
-
-    # 如果有正确的结果
-    if markdown_content:
-        return {"data": markdown_content, "format": "markdown"}
-
-    return {"data": "没有在知识库中找到相关的信息，无法回答此问题。"}
+    return callLLM(request, query, search_results, logger, True)
 
 
 if __name__ == "__main__":
diff --git a/dsRag/Util/ALiYunUtil.py b/dsRag/Util/ALiYunUtil.py
index 8d88d746..c186db61 100644
--- a/dsRag/Util/ALiYunUtil.py
+++ b/dsRag/Util/ALiYunUtil.py
@@ -25,4 +25,25 @@ class ALiYunUtil:
             )
             return completion.choices[0].message.content
         except Exception as e:
-            return f"发生错误: {str(e)}"
\ No newline at end of file
+            return f"发生错误: {str(e)}"
+            
+    async def chat_stream(self, prompt, model=None):
+        """
+        与阿里云大模型流式对话
+        :param prompt: 用户输入的问题
+        :param model: 可选，指定使用的模型
+        :return: 异步生成器，返回模型流式响应
+        """
+        try:
+            stream = await self.client.chat.completions.create(
+                model=model or self.model_name,
+                messages=[
+                    {'role': 'user', 'content': prompt}
+                ],
+                stream=True
+            )
+            async for chunk in stream:
+                if chunk.choices[0].delta.content:
+                    yield chunk.choices[0].delta.content
+        except Exception as e:
+            yield f"发生错误: {str(e)}"
\ No newline at end of file
diff --git a/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc b/dsRag/Util/__pycache__/ALiYunUtil.cpython-310.pyc
index a0ffb6f1ba8eaadd5c47d7b11273a0af26a9c251..676bd1617203c00c1d39b3e0d3ccc15ea2e0a77a 100644
GIT binary patch
delta 725
zcmY+CUq}>D6vofFcV>26bzRLh?2l|4gcBu{(1UML4;5(-R*Ulz!``KJ(%tRuEY`By
zt|=I#mW)K<pAd=+3h5z8S@5-|px1qNHhl_$APBO1S24Q}zxlp1-<)%XnKA!FQy|sY
z=m&8wp0E<Xw3)!Ou1?|NU?KyPFl1yLOv-eoFm)VFMJSE=gi;yp2cz!8=V^j(-6-wE
zpKghUvEnY#Qy6r=(Bs(b{-6<Tbwf&bF-GN>-J^-C9D9KPWafn!CAl+su)#)~*fdYl
z^};C(^J0N{avK?C$`ri}OuYmJnx|(W7wWFLC=`^uVyjGR2V1j!ylcO^2?%%F&q1^(
z!u_Ctqu=jED5wazCgyYM^6D7Q!2*%NC=7^HL4Bag?2a125is=ZSGjO__iTKc-g>^i
zH8HudHsif|Q(a#279UqXj(X)M-pcCc%EDf<Cv9<SIGpAw_Z_)b{8#63C(DyPVXyqK
z`u_E|*_YKvPrVn*-^-Jm>$Be6;(tBeDQ|6d?^zxYyYMD~>jve`(zFOvw2Z^!)^Hz3
zSvnwK__;21t3(K(2)s?oI*Ee<6_v$@9E%5Kp<UvTfT3~uZTMk{TK}U$Rn%A_o4mu1
z$ZGu_8sx3|Si*8{?ac2Gg-k?%l!(udI_iXM6WZ`Q=sO+2Ad-^)CqO$;FOltB+xe@5
z1KH#aXK<)%Uk?NO49)FTPHMH)!|pxhSVX>x4m$dMfflX`BQmCzO2?DdAQ%4;nC_}_
F<u5smx8eW*

delta 152
zcmZqYZ|365=jG*M0D``c2^rUzC-O~GkpuEl8KM|d7^0X`7*m*97^0X{*iu+hSX&sQ
zSW=jS88q29Ug~3F)SR5itif11xr<qWF>3N^W*tWU$v2pl83iW)VOC-knk>&^%&N)g
yr^!0`6q^>1|BFpgfemOl2LlHqAA1oikm;w%7R8odkeZj6S;Pe7-<oX8?gapOXd+es

diff --git a/dsRag/错误日志.txt b/dsRag/错误日志.txt
new file mode 100644
index 00000000..ecd3dedb
--- /dev/null
+++ b/dsRag/错误日志.txt
@@ -0,0 +1,47 @@
+2025-06-29 19:39:37,205 - __main__ - INFO - 正在调用阿里云大模型生成回答...
+INFO:     127.0.0.1:63054 - "POST /api/rag_stream HTTP/1.1" 200 OK
+ERROR:    Exception in ASGI application
+Traceback (most recent call last):
+  File "D:\anaconda3\envs\rag\lib\site-packages\uvicorn\protocols\http\h11_impl.py", line 403, in run_asgi
+    result = await app(  # type: ignore[func-returns-value]
+  File "D:\anaconda3\envs\rag\lib\site-packages\uvicorn\middleware\proxy_headers.py", line 60, in __call__
+    return await self.app(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\fastapi\applications.py", line 1054, in __call__
+    await super().__call__(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\applications.py", line 112, in __call__
+    await self.middleware_stack(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\middleware\errors.py", line 187, in __call__
+    raise exc
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\middleware\errors.py", line 165, in __call__
+    await self.app(scope, receive, _send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\middleware\exceptions.py", line 62, in __call__
+    await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app
+    raise exc
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\_exception_handler.py", line 42, in wrapped_app
+    await app(scope, receive, sender)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\routing.py", line 714, in __call__
+    await self.middleware_stack(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\routing.py", line 734, in app
+    await route.handle(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\routing.py", line 288, in handle
+    await self.app(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\routing.py", line 76, in app
+    await wrap_app_handling_exceptions(app, request)(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\_exception_handler.py", line 53, in wrapped_app
+    raise exc
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\_exception_handler.py", line 42, in wrapped_app
+    await app(scope, receive, sender)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\routing.py", line 74, in app
+    await response(scope, receive, send)
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\responses.py", line 263, in __call__
+    async with anyio.create_task_group() as task_group:
+  File "D:\anaconda3\envs\rag\lib\site-packages\anyio\_backends\_asyncio.py", line 597, in __aexit__
+    raise exceptions[0]
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\responses.py", line 266, in wrap
+    await func()
+  File "D:\anaconda3\envs\rag\lib\site-packages\starlette\responses.py", line 246, in stream_response
+    async for chunk in self.body_iterator:
+  File "D:\dsWork\dsProject\dsRag\Util\SearchUtil.py", line 171, in generate
+    async for chunk in aliyun_util.chat_stream(prompt):
+AttributeError: 'ALiYunUtil' object has no attribute 'chat_stream'
\ No newline at end of file