增加设备分析

app/api/chat.py

@@ -11,7 +11,8 @@ from Log import logger
 from app.api import get_current_user_websocket
 from app.config.config import settings
 from app.config.const import IMAGE_TO_TEXT, DOCUMENT_TO_REPORT, DOCUMENT_TO_CLEANING, DOCUMENT_IA_QUESTIONS, \
-    DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS
+    DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS, \
+    DOCUMENT_IA_QUESTIONS_EQUIPMENT
 from app.models import MenuCapacityModel
 from app.models.agent_model import AgentModel, AgentType
 from app.models.base_model import get_db
@@ -39,6 +40,7 @@ async def handle_client(websocket: WebSocket,
     print(f"Client {agent_id} connected")
     agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
     if not agent:
+        print("Agent not found")
         agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
         agent_type = agent.agent_type
         chat_type = agent.type
@@ -808,10 +810,11 @@ async def handle_client(websocket: WebSocket,
                                         result = {"message": f"内部错误： {e2}", "type": "close"}
                                         await websocket.send_json(result)
                                         print(f"Error process message of ragflow: {e2}")
-                elif chat_type == "documentIa" or chat_type == "documentIaDs":
+                elif chat_type == "documentIa" or chat_type == "documentIaDs" or chat_type == "documentIaEq":
                     token_dict = {
                         "documentIa": DOCUMENT_IA_QUESTIONS,
                         "documentIaDs": DOCUMENT_IA_QUESTIONS_DS,
+                        "documentIaEq": DOCUMENT_IA_QUESTIONS_EQUIPMENT,
                     }
                     token = DfTokenDao(db).get_token_by_id(token_dict[chat_type])
                     # print(token)

app/api/files.py

@@ -12,7 +12,7 @@ from Log import logger
 from app.api import Response, get_current_user, ResponseList
 from app.config.config import settings
 from app.config.const import DOCUMENT_TO_REPORT, IMAGE_TO_TEXT, DOCUMENT_TO_REPORT_TITLE, DOCUMENT_IA_QUESTIONS, \
-    DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS
+    DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS, DOCUMENT_IA_QUESTIONS_EQUIPMENT
 from app.models import MenuCapacityModel
 from app.models.agent_model import AgentType, AgentModel
 from app.models.base_model import get_db
@@ -118,12 +118,13 @@ async def upload_files(
                 data = await dify_service.upload(token, file.filename, file_content, current_user.id)
             except Exception as e:
                 raise HTTPException(status_code=500, detail=str(e))
-        elif agent.chat_type == "reportWorkflow" or agent.chat_type == "documentIa" or agent.chat_type == "paperTalk" or agent.chat_type == "documentIaDs":
+        elif agent.chat_type == "reportWorkflow" or agent.chat_type == "documentIa" or agent.chat_type == "paperTalk" or agent.chat_type == "documentIaDs" or agent.chat_type == "documentIaEq":
             token_dict = {
                 "reportWorkflow": DOCUMENT_TO_REPORT_TITLE,
                 "documentIa": DOCUMENT_IA_QUESTIONS,
                 "paperTalk": DOCUMENT_TO_PAPER,
                 "documentIaDs": DOCUMENT_IA_QUESTIONS_DS,
+                "documentIaEq": DOCUMENT_IA_QUESTIONS_EQUIPMENT,
             }
             token = DfTokenDao(db).get_token_by_id(token_dict[agent.chat_type])
             if not token:

app/api/v2/public_api.py

@@ -6,7 +6,8 @@ from Log import logger
 from app.api import Response
 from app.api.auth import login
 from app.config.const import IMAGE_TO_TEXT, DOCUMENT_TO_CLEANING, DOCUMENT_TO_REPORT, DIFY, BISHENG, RAGFLOW, \
-    DOCUMENT_IA_QUESTIONS, DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER
+    DOCUMENT_IA_QUESTIONS, DOCUMENT_TO_REPORT_TITLE, DOCUMENT_TO_TITLE, DOCUMENT_TO_PAPER, \
+    DOCUMENT_IA_QUESTIONS_EQUIPMENT
 from app.models.base_model import get_db
 from app.models.public_api_model import DfToken, AppRegister
 from app.service.v2.api_token import DfTokenDao
@@ -19,7 +20,7 @@ public_api = APIRouter()
 
 @public_api.post("/sync/df_token", response_model=Response)
 async def sync_df_token(df: DfToken, db=Depends(get_db)):
-    token_dict = {IMAGE_TO_TEXT: df.image, DOCUMENT_TO_CLEANING: df.clean,
+    token_dict = {IMAGE_TO_TEXT: df.image, DOCUMENT_TO_CLEANING: df.clean,DOCUMENT_IA_QUESTIONS_EQUIPMENT: df.equipment,
                   DOCUMENT_IA_QUESTIONS: df.doc, DOCUMENT_TO_REPORT_TITLE: df.report,DOCUMENT_TO_TITLE: df.title,DOCUMENT_TO_PAPER: df.paper}
 
     try:

app/config/const.py

@@ -5,6 +5,7 @@ DOCUMENT_TO_REPORT = "document_to_report"
 IMAGE_TO_TEXT = "image_and_text_conversion"
 DOCUMENT_IA_QUESTIONS = "document_ia_questions"
 DOCUMENT_IA_QUESTIONS_DS = "document_ia_questions_ds"
+DOCUMENT_IA_QUESTIONS_EQUIPMENT = "document_ia_questions_equipment"
 DOCUMENT_TO_REPORT_TITLE = "document_to_report_title"
 DOCUMENT_TO_TITLE = "document_to_title"
 DOCUMENT_TO_PAPER = "document_to_paper"

app/config/env_conf/menu_conf.json

@@ -181,6 +181,23 @@
           "agentType": 4
         }
       ]
+    },
+    {
+      "id": 11,
+      "title": "设备分析",
+      "icon": "7",
+      "img": "/src/assets/index/7.png",
+      "desc": "设备分析助手，基于您上传的设备数据进行问答，支持多设备",
+      "describe": "设备分析助手，基于您上传的文档进行问答，支持多文档，大小在30M以内。",
+      "rank": 89,
+      "dialog": [
+        {
+          "id": "a6c01e15-378e-4f56-bd8c-cde5155d37f1",
+          "chat_id": "a6c01e15-378e-4f56-bd8c-cde5155d37f1",
+          "chat_type": "documentIaEq",
+          "agentType": 4
+        }
+      ]
     }
   ]
 }

app/models/public_api_model.py

@@ -53,6 +53,10 @@ class DfToken(BaseModel):
     image: Optional[str] = ""
     clean: Optional[str] = ""
     report: Optional[str] = ""
+    doc: Optional[str] = ""
+    title: Optional[str] = ""
+    paper: Optional[str] = ""
+    equipment: Optional[str] = ""
 
 
 class AppRegister(BaseModel):

app/service/session.py

@@ -28,6 +28,7 @@ class SessionService:
         """
         existing_session = self.get_session_by_id(session_id)
         if existing_session:
+            print("update success")
             # existing_session.add_message({"role": "user", "content": name})
             existing_session.add_message(message)
             existing_session.update_date = current_time()