zhaoqingang
2024-11-26 56d8dce48022692c5a7541114ef84f4fa395ff9d
app/service/difyService.py
@@ -5,6 +5,8 @@
from typing import Union, Dict, List
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
@@ -15,6 +17,8 @@
    def _handle_response(self, response: httpx.Response) -> Union[Dict, List]:
        if response.status_code != 200:
            if response.status_code == 201:
                return response.json()
            return {}
        data = response.json()
@@ -24,8 +28,8 @@
                status_code=status.HTTP_401_UNAUTHORIZED,
                detail="登录过期",
            )
        if ret_code != 0:
            return {}
        # if ret_code != 0:
        #     return {}
        # 检查返回的数据类型
        if isinstance(data.get("data"), dict):
@@ -33,7 +37,7 @@
        elif isinstance(data.get("data"), list):
            return data.get("data", [])
        else:
            return {}
            return data
    async def register(self, username: str, password: str):
        password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
@@ -79,7 +83,7 @@
            "inputs": {},
            "query": message,
            "response_mode": "streaming",
            "conversation_id": conversation_id,
            "conversation_id": "",
            "user": str(user_id),
            "files": files
        }
@@ -93,7 +97,7 @@
                if response.status_code == 200:
                    try:
                        async for answer in response.aiter_text():
                            print(f"response of ragflow chat: {answer}")
                            # print(f"response of ragflow chat: {answer}")
                            yield answer
                    except GeneratorExit as e:
                        print(e)
@@ -103,16 +107,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"
@@ -128,12 +138,8 @@
        async with httpx.AsyncClient() as client:
            response = await client.post(url, headers=headers, files=files, data=data)
            data = self._handle_response(response)
            # file_path = data.get("file_path", "")
            result = {
                "file_path": data
            }
            return result
            return data