zhangqian
2024-10-25 7ee38c3bbcdd563ab941cf6a7dfa7165abb35460
改名
7个文件已修改
42 ■■■■ 已修改文件
app/api/agent.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/api/auth.py 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/api/chat.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/api/files.py 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/api/report.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/config/config.py 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/config/config.yaml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/api/agent.py
@@ -30,7 +30,7 @@
        return ResponseList(code=404, msg="Agent not found")
    if agent.agent_type == AgentType.RAGFLOW:
        ragflow_service = RagflowService(base_url=settings.ragflow_base_url)
        ragflow_service = RagflowService(base_url=settings.fwr_base_url)
        try:
            token = get_ragflow_token(db, current_user.id)
            result = await ragflow_service.get_chat_sessions(token, agent_id)
@@ -39,7 +39,7 @@
        return ResponseList(code=200, msg="", data=result)
    elif agent.agent_type == AgentType.BISHENG:
        bisheng_service = BishengService(base_url=settings.bisheng_base_url)
        bisheng_service = BishengService(base_url=settings.sgb_base_url)
        try:
            token = get_bisheng_token(db, current_user.id)
            result = await bisheng_service.get_chat_sessions(token)
app/api/auth.py
@@ -20,8 +20,8 @@
    if db_user:
        return Response(code=200, msg="Username already registered")
    bisheng_service = BishengService(settings.bisheng_base_url)
    ragflow_service = RagflowService(settings.ragflow_base_url)
    bisheng_service = BishengService(settings.sgb_base_url)
    ragflow_service = RagflowService(settings.fwr_base_url)
    # 注册到毕昇
    try:
@@ -50,8 +50,8 @@
    if not user:
        return Response(code=400, msg="Incorrect username or password")
    bisheng_service = BishengService(settings.bisheng_base_url)
    ragflow_service = RagflowService(settings.ragflow_base_url)
    bisheng_service = BishengService(settings.sgb_base_url)
    ragflow_service = RagflowService(settings.fwr_base_url)
    # 登录到毕昇
    try:
app/api/chat.py
@@ -38,7 +38,7 @@
        return
    if agent_type == AgentType.RAGFLOW:
        ragflow_service = RagflowService(settings.ragflow_base_url)
        ragflow_service = RagflowService(settings.fwr_base_url)
        token = get_ragflow_token(db, current_user.id)
        try:
            async def forward_to_ragflow():
@@ -102,7 +102,7 @@
    elif agent_type == AgentType.BISHENG:
        token = get_bisheng_token(db, current_user.id)
        service_uri = f"{settings.bisheng_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
        service_uri = f"{settings.sgb_websocket_url}/api/v1/assistant/chat/{agent_id}?t=&chat_id={chat_id}"
        headers = {'cookie': f"access_token_cookie={token};"}
        async with websockets.connect(service_uri, extra_headers=headers) as service_websocket:
app/api/files.py
@@ -37,20 +37,20 @@
    if agent.agent_type == AgentType.RAGFLOW:
        token = get_ragflow_token(db, current_user.id)
        ragflow_service = RagflowService(base_url=settings.ragflow_base_url)
        ragflow_service = RagflowService(base_url=settings.fwr_base_url)
        # 查询会话是否存在,不存在先创建会话
        history = await ragflow_service.get_session_history(token, chat_id)
        if len(history) == 0:
            message = {"role": "user", "message": file.filename}
            await ragflow_service.set_session(token, agent_id, message, chat_id, True)
        ragflow_service = RagflowService(base_url=settings.ragflow_base_url)
        ragflow_service = RagflowService(base_url=settings.fwr_base_url)
        token = get_ragflow_token(db, current_user.id)
        doc_ids = await ragflow_service.upload_and_parse(token, chat_id, file.filename, file_content)
        return Response(code=200, msg="", data={"doc_ids": doc_ids, "file_name": file.filename})
    elif agent.agent_type == AgentType.BISHENG:
        bisheng_service = BishengService(base_url=settings.bisheng_base_url)
        bisheng_service = BishengService(base_url=settings.sgb_base_url)
        try:
            token = get_bisheng_token(db, current_user.id)
            result = await bisheng_service.upload(token, file.filename, file_content)
@@ -80,11 +80,11 @@
        # 从 URL 中提取文件名
        parsed_url = urllib.parse.urlparse(url)
        filename = urllib.parse.unquote(parsed_url.path.split('/')[-1])
        url = url.replace("http://minio:9000", settings.bisheng_base_url)
        url = url.replace("http://minio:9000", settings.sgb_base_url)
    elif agent.agent_type == AgentType.RAGFLOW:
        if not doc_id:
            return Response(code=400, msg="doc_id is required")
        url = f"{settings.ragflow_base_url}/v1/document/get/{doc_id}"
        url = f"{settings.fwr_base_url}/v1/document/get/{doc_id}"
        filename = doc_name
    else:
        return Response(code=400, msg="Unsupported agent type")
app/api/report.py
@@ -35,7 +35,7 @@
        return websocket.send_json(ret)
    token = get_bisheng_token(db, current_user.id)
    service_uri = f"{settings.bisheng_websocket_url}/api/v1/chat/{agent_id}?type=L1&t=&chat_id={chat_id}"
    service_uri = f"{settings.sgb_websocket_url}/api/v1/chat/{agent_id}?type=L1&t=&chat_id={chat_id}"
    headers = {'cookie': f"access_token_cookie={token};"}
    await websocket.accept()
@@ -97,7 +97,7 @@
    agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
    if not agent:
        return ResponseList(code=404, msg="Agent not found")
    bisheng_service = BishengService(base_url=settings.bisheng_base_url)
    bisheng_service = BishengService(base_url=settings.sgb_base_url)
    try:
        token = get_bisheng_token(db, current_user.id)
        result = await bisheng_service.variable_list(token, agent_id)
app/config/config.py
@@ -4,9 +4,9 @@
class Settings:
    secret_key: str = ''
    bisheng_base_url: str = ''
    bisheng_websocket_url: str = ''
    ragflow_base_url: str = ''
    sgb_base_url: str = ''
    sgb_websocket_url: str = ''
    fwr_base_url: str = ''
    database_url: str = ''
    PUBLIC_KEY: str
    PRIVATE_KEY: str
app/config/config.yaml
@@ -1,7 +1,7 @@
secret_key: your-secret-key
bisheng_base_url: http://192.168.20.119:13001
bisheng_websocket_url: ws://192.168.20.119:13001
ragflow_base_url: http://192.168.20.119:11080
sgb_base_url: http://192.168.20.119:13001
sgb_websocket_url: ws://192.168.20.119:13001
fwr_base_url: http://192.168.20.119:11080
database_url: mysql+pymysql://root:infini_rag_flow@192.168.20.116:5455/rag_basic
PUBLIC_KEY: |
  -----BEGIN PUBLIC KEY-----