12.10 16

zhaoqingang

2024-12-10 08c8e8c9a4d65677de6a493446a605d70efee631

 app/api/agent.py

@@ -6,7 +6,8 @@
from pydantic import BaseModel
from sqlalchemy.orm import Session

from app.api import Response, get_current_user, ResponseList
from app.api import Response, get_current_user, ResponseList, process_files
from app.api.user import reset_user_pwd
from app.config.config import settings
from app.models.agent_model import AgentType, AgentModel
from app.models.base_model import get_db
@@ -41,7 +42,7 @@
    if agent.agent_type == AgentType.RAGFLOW:
        ragflow_service = RagflowService(base_url=settings.fwr_base_url)
        try:
            token = get_ragflow_token(db, current_user.id)
            token = await get_ragflow_token(db, current_user.id)
            result = await ragflow_service.get_chat_sessions(token, agent_id)
            if not result:
                result = await get_session_history(db, current_user.id, agent_id)
@@ -52,7 +53,7 @@
    elif agent.agent_type == AgentType.BISHENG:
        bisheng_service = BishengService(base_url=settings.sgb_base_url)
        try:
            token = get_bisheng_token(db, current_user.id)
            token = await get_bisheng_token(db, current_user.id)
            result = await bisheng_service.get_chat_sessions(token, agent_id,  page, limit)
        except Exception as e:
            raise HTTPException(status_code=500, detail=str(e))
@@ -83,7 +84,7 @@
    if agent.agent_type == AgentType.RAGFLOW:
        ragflow_service = RagflowService(base_url=settings.fwr_base_url)
        try:
            token = get_ragflow_token(db, current_user.id)
            token = await get_ragflow_token(db, current_user.id)
            result = await ragflow_service.get_session_log(token, conversation_id)
            if 'session_log' in result and 'reference' in result:
                combined_logs = []
@@ -112,37 +113,67 @@
        except Exception as e:
            raise HTTPException(status_code=500, detail=str(e))
    elif agent.agent_type == AgentType.BISHENG:
        is_join = False
        if agent.name == "报告生成":
            is_join = True
        bisheng_service = BishengService(base_url=settings.sgb_base_url)
        try:
            token = get_bisheng_token(db, current_user.id)
            token = await get_bisheng_token(db, current_user.id)
            result = await bisheng_service.get_session_log(token, agent_id, conversation_id)
            combined_logs = []
            last_question = None

            answer_str = ""
            files = []
            for session in result:
                message = session['message']
                # print(session)
                # 检查 session 是否为 None
                if session is None:
                    continue

                # 判断message是字符串还是json 对象,如果是json取其中的question字段，或者report_name字段赋值给message
                try:
                    message_json = json.loads(message)
                    if 'question' in message_json:
                        message = message_json['question']
                    elif 'query' in message_json:
                        message = message_json['query']
                    elif 'report_name' in message_json:
                        message = message_json['report_name']
                except json.JSONDecodeError:
                    pass
                message = session.get('message')

                if session['role'] == 'question':
                    last_question = message
                elif session['role'] == 'answer' and last_question:
                    combined_logs.append({
                        'question': last_question,
                        'answer': message
                    })
                    last_question = None
            return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs})
                # 判断 message 是否是字符串，然后尝试解析为 JSON 对象
                if isinstance(message, str):
                    try:
                        message_json = json.loads(message)
                        if 'question' in message_json:
                            message = message_json['question']
                        elif 'query' in message_json:
                            message = message_json['query']
                        elif 'report_name' in message_json:
                            message = message_json['report_name']

                    except Exception as e:
                        pass  # 非 JSON 字符串，继续使用原始 message
                if session.get('files') and isinstance(session.get('files'), str):
                    try:
                        files = json.loads(session.get('files'))
                        process_files(files, agent_id)

                    except Exception as e:
                        pass  # 非 JSON 字符串，继续使用原始 message

                # 检查 message 是否为 None
                if message is None:
                    continue
                if is_join:
                    ...
                    if session.get('role') == 'question':
                        last_question = message
                    elif session.get('role') == 'answer':
                        answer_str += message

                else:
                    if session.get('role') == 'question':
                        last_question = message
                    elif session.get('role') == 'answer' and last_question:
                        combined_logs.append({
                            'question': last_question,
                            'answer': message
                        })
                        last_question = None
            return JSONResponse(status_code=200, content={"code": 200, "data": combined_logs if combined_logs else [{'question': last_question,
                            'answer': answer_str, 'files': files}]})
        except Exception as e:
            raise HTTPException(status_code=500, detail=str(e))
    elif agent.agent_type == AgentType.BASIC:
@@ -154,12 +185,29 @@
                if i.get("role") == "user":
                    tmp_data["question"]=i.get("content")
                elif i.get("role") == "assistant":

                    if isinstance(i.get("content"), dict):
                        tmp_data["answer"] = i.get("content", {}).get("message")
                        if "file_name" in i.get("content", {}):
                            tmp_data["files"] = [{"file_name":i.get("content", {}).get("file_name"), "file_url":i.get("content", {}).get("file_url")}]
                    else:
                        tmp_data["answer"] = i.get("content")

                    if "excel_url" in i:
                        tmp_data["excel_url"] = i.get("excel_url")
                    if "image_url" in i:
                        tmp_data["image_url"] = i.get("image_url")
                    if "sql" in i:
                        tmp_data["sql"] = i.get("sql")
                    if "code" in i:
                        tmp_data["code"] = i.get("code")
                    if "e" in i:
                        tmp_data["e"] = i.get("e")

                    if "image_name" in i:
                        tmp_data["image_name"] = i.get("image_name")
                    if "excel_name" in i:
                        tmp_data["excel_name"] = i.get("excel_name")
                    data.append(tmp_data)
                    tmp_data = {}

@@ -183,6 +231,9 @@
                                                  "file_url": i.get("content", {}).get("file_url")}]
                        if "images" in i.get("content", {}):
                            tmp_data["images"] = i.get("content", {}).get("images")

                        if "download_url" in i.get("content", {}):
                            tmp_data["download_url"] = i.get("content", {}).get("download_url")
                    else:
                        tmp_data["answer"] = i.get("content")
                    data.append(tmp_data)