Upload 8 files

app/api/config.py

@@ -24,16 +24,16 @@ class Settings(BaseSettings):
         'accept-language': 'zh-CN,zh;q=0.9',
         'content-type': 'application/json',
         'origin': 'http://216.24.57.252',
-        'priority': 'u=1, i',
-        'sec-ch-ua': '"Chromium";v="130", "Google Chrome";v="130", "Not?A_Brand";v="99"',
+        'referer': 'http://216.24.57.252/',
+        'host': '216.24.57.252',
+        'connection': 'keep-alive',
+        'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
         'sec-ch-ua-mobile': '?0',
         'sec-ch-ua-platform': '"Windows"',
         'sec-fetch-dest': 'empty',
         'sec-fetch-mode': 'cors',
         'sec-fetch-site': 'same-origin',
-        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36',
-        'Host': '216.24.57.252',
-        'referer': 'http://216.24.57.252/'
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
     }
 
     ALLOWED_MODELS: List[Dict[str, str]] = [

app/api/utils.py

@@ -61,8 +61,6 @@ def message_to_dict(message):
         return {"role": message.role, "content": message.content}
 
 async def process_streaming_response(request: ChatRequest):
-    search_results = []  # 初始化搜索结果数组
-
     json_data = {
         "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
@@ -82,71 +80,60 @@ async def process_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": MODEL_MAPPING.get(request.model),
+        "userSelectedModel": settings.MODEL_MAPPING.get(request.model),
         "validated": validate.getVid(),
         "webSearchModePrompt": True if request.model.endswith("-search") else False
     }
 
-    async with httpx.AsyncClient(verify=False) as client:
-        try:
+    try:
+        async with httpx.AsyncClient(verify=False) as client:
             async with client.stream(
-                "POST",
-                f"{BASE_URL}/api/chat",
+                method="POST",
+                url=f"{settings.BASE_URL}/api/chat",
                 headers=settings.HEADERS,
-                json=json_data,
-                timeout=100,
+                json=json_data
             ) as response:
                 response.raise_for_status()
                 timestamp = int(datetime.now().timestamp())
-                async for line in response.aiter_lines():
-                    if line:
-                        if line.startswith("$~~~$"):  # 处理搜索结果
-                            try:
-                                json_str = line[5:-5]  # 提取中间的JSON字符串
-                                results = json.loads(json_str)
-                                search_results = results  # 保存搜索结果
-                                continue
-                            except json.JSONDecodeError:
-                                logger.error("Failed to parse search results")
-                                continue
+                search_results = None
 
-                        if line == "**":
+                async for line in response.aiter_lines():
+                    if not line:
+                        continue
+                    
+                    if line.startswith("$~~~$"):  # 处理搜索结果
+                        try:
+                            json_str = line[5:-5]  # 提取中间的JSON字符串
+                            results = json.loads(json_str)
+                            search_results = results  # 保存搜索结果
                             continue
-                        content = line + "\n"
-                        print(content)
-                        if "http://216.24.57.252" in content:
-                            validate.getVid(True)
-                            content = "vid已刷新,重新对话即可\n"
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
-                            break
-                        if content.startswith("$@$v=undefined-rv1$@$"):
-                            yield f"data: {json.dumps(create_chat_completion_data(content[21:], request.model, timestamp))}\n\n"
-                        else:
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
-                    elif line == "":
-                        content = line + "\n\n"
-                        print(content)
-                        if "http://216.24.57.252" in content:
-                            validate.getVid(True)
-                            content = "vid已刷新,重新对话即可\n"
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
-                            break
-                        if content.startswith("$@$v=undefined-rv1$@$"):
-                            yield f"data: {json.dumps(create_chat_completion_data(content[21:], request.model, timestamp))}\n\n"
-                        else:
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                        except json.JSONDecodeError:
+                            logger.error("Failed to parse search results")
+                            continue
+
+                    if line == "**":
+                        continue
+                    content = line + "\n"
+                    print(content)
+                    if "http://216.24.57.252" in content:
+                        validate.getVid(True)
+                        content = "vid已刷新,重新对话即可\n"
+                        yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                        break
+                    if content.startswith("$@$v=undefined-rv1$@$"):
+                        yield f"data: {json.dumps(create_chat_completion_data(content[21:], request.model, timestamp))}\n\n"
+                    else:
+                        yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+
                 if search_results:  # 在结束前输出引用来源
                     sources = "\n\n**引用来源**\n" + "\n".join([f"- [{r['title']}]({r['link']})" for r in search_results])
                     yield f"data: {json.dumps(create_chat_completion_data(sources, request.model, timestamp))}\n\n"
-
-                yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
-                yield "data: [DONE]\n\n"
-        except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
-        except httpx.RequestError as e:
-            logger.error(f"Error occurred during request: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
+    except httpx.HTTPStatusError as e:
+        logger.error(f"HTTP error occurred: {str(e)}")
+        raise HTTPException(status_code=e.response.status_code, detail=str(e))
+    except Exception as e:
+        logger.error(f"Error occurred: {str(e)}")
+        raise HTTPException(status_code=500, detail=str(e))
 
 async def process_non_streaming_response(request: ChatRequest):
     json_data = {