Merge branch 'master' of https://git.97id.com/ouyangyouzhang/QueryRewrite

.env

@@ -1,27 +1,27 @@
 OPENAI_API_BASE=https://api.siliconflow.cn/v1/
 MODEL_NAME=deepseek-ai/DeepSeek-V3
 
-RERANKER_BASE_URL=http://10.1.16.39:9995
-RERANKER_MODEL_NAME=bge-reranker-v2-m3
-RERANKER_API_KEY=test
+# RERANKER_BASE_URL=http://10.1.16.39:9995
+# RERANKER_MODEL_NAME=bge-reranker-v2-m3
+# RERANKER_API_KEY=test
 
-EMBEDDING_BASE_URL=http://10.1.16.39:9995
-EMBEDDING_MODEL_NAME=bge-m3
-EMBEDDING_API_KEY=test
+# EMBEDDING_BASE_URL=http://10.1.16.39:9995
+# EMBEDDING_MODEL_NAME=bge-m3
+# EMBEDDING_API_KEY=test
 
 
-DIFY_BSAE_URL=http://10.1.16.39/v1
-DIFY_APP_KEY=app-CPoOMaGDsLRPAe9TW7Xjhszy
-DIFY_DATASET_KEY=dataset-skLjmPVonjHo119OWNf3kAmY
+# DIFY_BSAE_URL=http://10.1.16.39/v1
+# DIFY_APP_KEY=app-CPoOMaGDsLRPAe9TW7Xjhszy
+# DIFY_DATASET_KEY=dataset-skLjmPVonjHo119OWNf3kAmY
 
-DIFY_PG_HOST = 10.1.16.39
-DIFY_PG_PORT = 5432
-DIFY_PG_USER = postgres
-DIFY_PG_PASSWORD = difyai123456
-DIFY_PG_DATABASE = dify
+# DIFY_PG_HOST = 10.1.16.39
+# DIFY_PG_PORT = 5432
+# DIFY_PG_USER = postgres
+# DIFY_PG_PASSWORD = difyai123456
+# DIFY_PG_DATABASE = dify
 
 
-ENABLE_LANGFUSE=true
-LANGFUSE_PUBLIC_KEY=pk-lf-4e9b7cbe-528c-4697-b73c-33257a60072c
-LANGFUSE_SECRET_KEY=sk-lf-cd8a78c5-2538-455e-a85a-87b6e1aa69d0
-LANGFUSE_HOST=http://10.1.6.34:3000
+# ENABLE_LANGFUSE=true
+# LANGFUSE_PUBLIC_KEY=pk-lf-4e9b7cbe-528c-4697-b73c-33257a60072c
+# LANGFUSE_SECRET_KEY=sk-lf-cd8a78c5-2538-455e-a85a-87b6e1aa69d0
+# LANGFUSE_HOST=http://10.1.6.34:3000

.vscode/launch.json

@@ -10,7 +10,10 @@
             "request": "launch",
             "program": "${file}",
             "console": "integratedTerminal",
-            "justMyCode": true
+            "justMyCode": true,
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}"
+            }
         },
         {
             "name": "IntentRecognition",
@@ -18,7 +21,10 @@
             "request": "launch",
             "program": "${workspaceFolder}/rag2_0/demo/intent_recognition_example.py",
             "console": "integratedTerminal",
-            "justMyCode": true
+            "justMyCode": true,
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}"
+            }
         }
     ]
 }

rag2_0/api/AnswerType_api.py

@@ -29,7 +29,6 @@ def main(query: str) -> dict:
 
 
 import sys
-sys.path.append(os.getcwd())
 from rag2_0.dify.DifyQueryRetrieval import DifyQueryRetrieval
 
 # 定义数据库路径

rag2_0/api/DifyQueryRetrieval_api.py

@@ -18,7 +18,6 @@ import logging
 load_dotenv()
 
 import sys
-sys.path.append(os.getcwd())
 from rag2_0.dify.DifyQueryRetrieval import DifyQueryRetrieval
 
 # 确保日志目录存在

rag2_0/api/create_qingdan_dinge_database.py

@@ -5,7 +5,6 @@ import pandas as pd
 from openpyxl import load_workbook
 import logging
 import numpy as np
-sys.path.append(os.getcwd())
 from rag2_0.tool.ModelTool import XinferenceEmbeddings
 from langchain_community.vectorstores import SQLiteVSS
 

rag2_0/api/intent_recognition_api.py

@@ -15,7 +15,6 @@ import logging
 load_dotenv()
 
 import sys
-sys.path.append(os.getcwd())
 from rag2_0.intent_recognition import AsyncIntentRecognizer
 
 # 确保日志目录存在

rag2_0/api/query_dinge_qingdan_api.py

@@ -10,7 +10,6 @@ import sys
 import os
 
 # 导入ExcelToSQLiteProcessor类
-sys.path.append(os.getcwd())
 from rag2_0.api.create_qingdan_dinge_database import ExcelToSQLiteProcessor, create_db
 # 导入向量检索相关类
 from rag2_0.tool.ModelTool import XinferenceEmbeddings

rag2_0/demo/dialogue_to_workorder.py

@@ -18,8 +18,6 @@ from tqdm import tqdm
 import glob
 import shutil
 
-# 将项目根目录添加到Python路径
-sys.path.append(os.getcwd())
 from rag2_0.tool.ModelTool import OpenAiLLM
 
 load_dotenv()

rag2_0/demo/intent_recognition_example.py

@@ -20,7 +20,6 @@ import argparse
 from typing import List, Dict, Any
 from langchain.output_parsers import PydanticOutputParser
 from pydantic import BaseModel, Field
-sys.path.append(os.getcwd())
 from rag2_0.intent_recognition import AsyncIntentRecognizer
 from rag2_0.dify.DifyQueryRetrieval import DifyQueryRetrieval
 from rag2_0.intent_recognition.DataModels import Classification

rag2_0/demo/vectorize_save_noun.py

@@ -10,7 +10,6 @@ import os
 import json
 from dotenv import load_dotenv
 import sys
-sys.path.append(os.getcwd())
 from rag2_0.intent_recognition import ProfessionalNounVectorizer
 import logging
 

rag2_0/dify/DifyCompareTest.py

@@ -15,7 +15,6 @@ from datetime import datetime
 import os
 from langchain_core.output_parsers import JsonOutputParser
 
-sys.path.append(os.getcwd())
 from rag2_0.dify.dify_client import ChatClient
 from rag2_0.tool.ModelTool import OpenAiLLM
 from rag2_0.dify.dify_tool import DifyTool

rag2_0/dify/DifyQueryRetrieval.py

@@ -6,7 +6,6 @@ import logging
 import time
 import asyncio
 import httpx
-sys.path.append(os.getcwd())
 
 from rag2_0.dify.dify_client.client import DifyClient, KnowledgeBaseClient
 from rag2_0.tool.ModelTool import XinferenceReRankerModel

rag2_0/dify/GenerateSoftwareWikiLibrary.py

@@ -5,7 +5,6 @@ import sys
 from dotenv import load_dotenv
 
 load_dotenv()
-sys.path.append(os.getcwd())
 
 from rag2_0.dify.dify_client import DifyApi
 

rag2_0/dify/WorkorderToDify.py

@@ -17,7 +17,6 @@ logging.basicConfig(
     ]
 )
 
-sys.path.append(os.getcwd())
 import rag2_0.dify.dify_client.dify_api as DifyApi
 import pandas as pd
 

rag2_0/dify/dify_tool.py

@@ -6,7 +6,6 @@ import json
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 import sys
-sys.path.append(os.getcwd())
 from rag2_0.dify.dify_client import ChatClient
 from pydantic import BaseModel, Field
 from langchain.output_parsers import PydanticOutputParser

rag2_0/dify/export_new_dify.py

@@ -6,7 +6,6 @@ import pandas as pd
 
 
 import sys
-sys.path.append(os.getcwd())
 from rag2_0.dify.dify_tool import DifyTool
 import requests