From d864801678ed7b39f4c38d8fb90f2b39b3337cfc Mon Sep 17 00:00:00 2001 From: GuoQing Zhang Date: Sat, 9 Aug 2025 15:06:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E8=AF=84=E6=B5=8B=E4=BB=BB=E5=8A=A1=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E7=9A=84=E7=AD=94=E6=A1=88=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bisheng/api/services/evaluation.py | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/backend/bisheng/api/services/evaluation.py b/src/backend/bisheng/api/services/evaluation.py index b0b660a14..f993b009b 100644 --- a/src/backend/bisheng/api/services/evaluation.py +++ b/src/backend/bisheng/api/services/evaluation.py @@ -1,37 +1,36 @@ import asyncio -import os import io import json -from typing import List - -from bisheng.api.services.llm import LLMService -from bisheng.utils import generate_uuid -from fastapi import UploadFile, HTTPException -import pandas as pd +import os from collections import defaultdict from copy import deepcopy +from typing import List -from bisheng.api.services.user_service import UserPayload -from bisheng.api.v1.schemas import (UnifiedResponseModel, resp_200, StreamData, BuildStatus) -from bisheng.cache import InMemoryCache -from bisheng.database.models.flow import FlowDao -from bisheng.database.models.flow_version import FlowVersionDao -from bisheng.database.models.assistant import AssistantDao -from bisheng.api.services.flow import FlowService -from bisheng.database.models.evaluation import (Evaluation, EvaluationDao, ExecType, EvaluationTaskStatus) -from bisheng.database.models.user import UserDao -from bisheng.utils.minio_client import MinioClient -from fastapi.encoders import jsonable_encoder -from bisheng.utils.logger import logger -from bisheng.api.services.assistant_agent import AssistantAgent +import pandas as pd from bisheng_ragas import evaluate from bisheng_ragas.llms.langchain import LangchainLLM from bisheng_ragas.metrics import AnswerCorrectnessBisheng from datasets import Dataset -from bisheng_langchain.gpts.utils import import_by_type -from bisheng.cache.redis import redis_client +from fastapi import UploadFile, HTTPException +from fastapi.encoders import jsonable_encoder + +from bisheng.api.services.assistant_agent import AssistantAgent +from bisheng.api.services.flow import FlowService +from bisheng.api.services.llm import LLMService +from bisheng.api.services.user_service import UserPayload from bisheng.api.utils import build_flow, build_input_keys_response +from bisheng.api.v1.schemas import (UnifiedResponseModel, resp_200) +from bisheng.cache import InMemoryCache +from bisheng.cache.redis import redis_client +from bisheng.database.models.assistant import AssistantDao +from bisheng.database.models.evaluation import (Evaluation, EvaluationDao, ExecType, EvaluationTaskStatus) +from bisheng.database.models.flow import FlowDao +from bisheng.database.models.flow_version import FlowVersionDao +from bisheng.database.models.user import UserDao from bisheng.graph.graph.base import Graph +from bisheng.utils import generate_uuid +from bisheng.utils.logger import logger +from bisheng.utils.minio_client import MinioClient flow_data_store = redis_client @@ -277,7 +276,7 @@ def add_evaluation_task(evaluation_id: int): for index, one in enumerate(csv_data): messages = asyncio.run(gpts_agent.run(one.get('question'))) if len(messages): - one["answer"] = messages[0].content + one["answer"] = messages[-1].content current_progress += progress_increment redis_client.set(redis_key, round(current_progress))