Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsProject

dsRag/ElasticSearch/T2_SplitTxt.py

@@ -4,7 +4,6 @@ import shutil
 import warnings
 import zipfile
 
-import docx
 from docx import Document
 from docx.oxml.ns import nsmap
 

dsRag/Start.py

@@ -134,13 +134,13 @@ async def rag(request: fastapi.Request):
             {context}
 
             回答要求
-            1. 严格保持原文中图片与上下文的顺序关系，确保语义相关性
-            2. 图片引用使用Markdown格式: ![图片描述](图片路径)
-            3. 使用Markdown格式返回，包含适当的标题、列表和代码块
-            4. 直接返回Markdown内容，不要包含额外解释或说明
-            5. 依托给定的资料，快速准确地回答问题，可以添加一些额外的信息，但请勿重复内容
-            6. 如果未提供相关信息，请不要回答
-            7. 如果发现相关信息与原来的问题契合度低，也不要回答
+            1. 请仔细甄别原问题与提供材料的关联性，不相关的材料必须忽略，绝对不要包含无关信息！
+            2. 如果发现相关信息与原来的问题契合度低，请直接回答"未找到相关信息"
+            3. 严格保持原文中图片与上下文的顺序关系，确保语义相关性
+            4. 使用Markdown格式返回，包含适当的标题、列表和代码块
+            5. 直接返回Markdown内容，不要包含额外解释或说明
+            6. 依托给定的资料，快速准确地回答问题
+            7. 如果未提供相关信息，请直接回答"未找到相关信息"
             8. 确保内容结构清晰，便于前端展示
             """
 

dsRag/Txt/CHEMISTRY_1_1.txt

@@ -0,0 +1,2 @@
+氧化铁和硝酸的反应方程式
+$$ FeO+4HNO_{ 3 }  ⇒Fe(NO_{ 3 }  )_{ 3 }  +2H_{ 2 }  O+NO_{ 2 }  ↑ $$

dsRag/Util/EsSearchUtil.py

@@ -176,7 +176,7 @@ class EsSearchUtil:
             filtered_vector_hits = []
             vector_int = 0
             for hit in vector_results['hits']['hits']:
-                if hit['_score'] > 0.4:  # 阀值0.4
+                if hit['_score'] > 0.6:  # 阀值0.6
                     logger.info(f"   {vector_int + 1}. 文档ID: {hit['_id']}, 相似度分数: {hit['_score']:.2f}")
                     logger.info(f"      内容: {hit['_source']['user_input']}")
                     filtered_vector_hits.append(hit)

dsRag/static/ai.html

@@ -220,7 +220,7 @@
                         帮我写一下 “如何理解点、线、面、体、角”的教学设计
                     </div>
                     <div class="example-item" onclick="fillExample('文言虚词')">请解释一下“文言虚词”</div>
-                    <div class="example-item" onclick="fillExample('氢气与氧气燃烧的方程式')">氢气与氧气燃烧的方程式</div>
+                    <div class="example-item" onclick="fillExample('氧化铁和硝酸')">氧化铁和硝酸</div>
                 </div>
             </div>
 

dsRag/错误日志.txt

@@ -1,47 +0,0 @@
-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'