dify报告合并

zhaoqingang

2024-12-03 319e3e93bbb4807da58db2ac72bb8f3029738dd7

 app/service/difyService.py

@@ -6,7 +6,6 @@
from fastapi import HTTPException
from starlette import status

from Log import logger
from app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto

@@ -28,8 +27,8 @@
                status_code=status.HTTP_401_UNAUTHORIZED,
                detail="登录过期",
            )
        if ret_code != 0:
            return {}
        # if ret_code != 0:
        #     return {}

        # 检查返回的数据类型
        if isinstance(data.get("data"), dict):
@@ -83,7 +82,7 @@
            "inputs": {},
            "query": message,
            "response_mode": "streaming",
            "conversation_id": "",
            "conversation_id": conversation_id,
            "user": str(user_id),
            "files": files
        }
@@ -107,16 +106,22 @@



    async def get_session_history(self, token: str, chat_id: str, is_all: int=0):
        url = f"{self.base_url}/v1/conversation/get?conversation_id={chat_id}"
        headers = {"Authorization": token}
    async def get_session_history(self, token: str, conversation_id: str, user: str):
        url = f"{self.base_url}/v1/messages"
        params = {
            'user': user,
            'conversation_id': conversation_id
        }
        headers = {"Authorization": f'Bearer {token}'}
        async with httpx.AsyncClient() as client:
            response = await client.get(url, headers=headers)
            response = await client.get(url, params=params, headers=headers)
            # print(response.text)
            # print(response.status_code)
            # print(response.res)
            data = self._handle_response(response)
            # print("----------------data----------------------:", data)
            if is_all:
                return data
            return data.get("message", [])

            return data

    async def upload(self, token: str, filename: str, file: bytes, user_id) -> dict:
        url = f"{self.base_url}/v1/files/upload"
@@ -135,14 +140,54 @@

            return data

    async def save_images(self, url: str, filename: str):
        url = f"{self.base_url}{url}"

        async with httpx.AsyncClient() as client:
            response = await client.get(url)

            response.raise_for_status()

            # 打开一个文件用于写入
            with open(f"app/images/{filename}", 'wb') as f:
                # 写入请求的内容
                f.write(response.content)


    async def workflow(self, token: str, user_id: int,  inputs: dict):

        target_url = f"{self.base_url}/v1/workflows/run"
        data = {
            "inputs": inputs,
            "response_mode": "streaming",
            "user": str(user_id),
            "files":[]
        }

        async with httpx.AsyncClient(timeout=1800) as client:
            headers = {
                'Content-Type': 'application/json',
                'Authorization': f'Bearer {token}'
            }
            async with client.stream("POST", target_url, data=json.dumps(data), headers=headers) as response:
                if response.status_code == 200:
                    try:
                        async for answer in response.aiter_text():
                            # print(f"response of ragflow chat: {answer}")
                            yield answer
                    except GeneratorExit as e:
                        print(e)
                        return
                else:
                    yield f"Error: {response.status_code}"



if __name__ == "__main__":
    async def a():
        a = DifyService("http://192.168.20.119:11080")
        b = await a.get_knowledge_list("ImY3ZTZlZWQwYTY2NTExZWY5ZmFiMDI0MmFjMTMwMDA2Ig.Zzxwmw.uI_HAWzOkipQuga1aeQtoeIc3IM", 1,
                                 10)
        a = DifyService("http://192.168.20.116")
        b = await a.get_session_history("app-YmOAMDsPpDDlqryMHnc9TzTO", "f94c6328-8ff0-4713-af3f-e823d547682d",
                                 "63")
        print(b)

    import asyncio