角色的资源过滤掉删除的

zhaoqingang

2024-12-24 ee8df9424fc4e3fb30a8b8e39436b26c902defb7

 app/api/files.py

@@ -10,11 +10,13 @@

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
from app.models.agent_model import AgentType, AgentModel
from app.models.base_model import get_db
from app.models.user_model import UserModel
from app.service.basic import BasicService
from app.service.bisheng import BishengService
from app.service.v2.api_token import DfTokenDao
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_token
@@ -49,7 +51,7 @@
            return Response(code=400, msg=str(e))

        if agent.agent_type == AgentType.RAGFLOW:
            token = get_ragflow_token(db, current_user.id)
            token = await get_ragflow_token(db, current_user.id)
            ragflow_service = RagflowService(base_url=settings.fwr_base_url)
            # 查询会话是否存在，不存在先创建会话
            history = await ragflow_service.get_session_history(token, chat_id)
@@ -64,7 +66,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.upload(token, file.filename, file_content)
            except Exception as e:
                raise HTTPException(status_code=500, detail=str(e))
@@ -91,13 +93,16 @@
            return Response(code=200, msg="", data=result)

        elif agent_id == "basic_paper_agent":
            service = BasicService(base_url=settings.basic_paper_url)
            ...
            # service = BasicService(base_url=settings.basic_paper_url)
            # result = await service.paper_file_upload(chat_id, file.filename, file_content)

    elif agent.agent_type == AgentType.DIFY:
        token = settings.dify_api_token
        dify_service = DifyService(base_url=settings.dify_base_url)
        if agent.type == "imageTalk":
            token = DfTokenDao(db).get_token_by_id(IMAGE_TO_TEXT)
            if not token:
                raise HTTPException(status_code=500, detail="获取token失败，image_and_text_conversion！")
            file = file[0]
            # 读取上传的文件内容
            try:
@@ -108,7 +113,10 @@
                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.type == "reportWorkflow":
        elif agent.type == "reportWorkflow" or agent.type == "documentIa":
            token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_REPORT)
            if not token:
                raise HTTPException(status_code=500, detail="获取token失败，document_to_report！")
            result = []
            for f in file:
                try: