v1.8.9-beta1 fix bugs

Author: lanqian528

chatgpt/ChatService.py

@@ -404,7 +404,7 @@ async def get_download_url(self, file_id):
         url = f"{self.base_url}/files/{file_id}/download"
         headers = self.base_headers.copy()
         try:
-            r = await self.s.get(url, headers=headers, timeout=10)
+            r = await self.s.get(url, headers=headers, timeout=30)
             if r.status_code == 200:
                 download_url = r.json().get('download_url')
                 return download_url
@@ -418,7 +418,7 @@ async def get_attachment_url(self, file_id, conversation_id):
         url = f"{self.base_url}/conversation/{conversation_id}/attachment/{file_id}/download"
         headers = self.base_headers.copy()
         try:
-            r = await self.s.get(url, headers=headers, timeout=10)
+            r = await self.s.get(url, headers=headers, timeout=30)
             if r.status_code == 200:
                 download_url = r.json().get('download_url')
                 return download_url
@@ -432,7 +432,7 @@ async def get_download_url_from_upload(self, file_id):
         url = f"{self.base_url}/files/{file_id}/uploaded"
         headers = self.base_headers.copy()
         try:
-            r = await self.s.post(url, headers=headers, json={}, timeout=10)
+            r = await self.s.post(url, headers=headers, json={}, timeout=30)
             if r.status_code == 200:
                 download_url = r.json().get('download_url')
                 return download_url
@@ -450,7 +450,7 @@ async def get_upload_url(self, file_name, file_size, use_case="multimodal"):
                 url,
                 headers=headers,
                 json={"file_name": file_name, "file_size": file_size, "reset_rate_limits": False, "timezone_offset_min": -480, "use_case": use_case},
-                timeout=5,
+                timeout=30,
             )
             if r.status_code == 200:
                 res = r.json()

chatgpt/chatFormat.py

@@ -138,6 +138,7 @@ async def stream_response(service, response, model, max_tokens):
     last_role = None
     last_content_type = None
     last_status = None
+    last_completed_rate = None
     model_slug = None
     end = False
 
@@ -237,7 +238,9 @@ async def stream_response(service, response, model, max_tokens):
                             current_height = part.get('metadata', {}).get("generation", {}).get("height", 0)
                             if full_height > current_height:
                                 completed_rate = current_height / full_height
-                                new_text = f"\n> {completed_rate:.2%}\n"
+                                if last_completed_rate and last_completed_rate == completed_rate:
+                                    completed_rate = min(completed_rate + random.uniform(1, 3), 99.99)
+                                new_text = f"\n> {completed_rate:.2%...}\n"
                                 if last_role != role:
                                     new_text = f"\n```{new_text}"
                             else:

gateway/reverseProxy.py

@@ -269,11 +269,12 @@ async def chatgpt_reverse_proxy(request: Request, path: str):
                                 .replace("cdn.oaistatic.com", origin_host)
                                 .replace("https", petrol)}, background=background)
             elif 'stream' in r.headers.get("content-type", ""):
-                logger.info(f"Request token: {req_token}")
-                logger.info(f"Request proxy: {proxy_url}")
-                logger.info(f"Request UA: {user_agent}")
-                logger.info(f"Request impersonate: {impersonate}")
-                conv_key = r.cookies.get("conv_key", "")
+                if path.endswith("backend-api/conversation") or path.endswith("backend-alt/conversation"):
+                    logger.info(f"Request token: {req_token}")
+                    logger.info(f"Request proxy: {proxy_url}")
+                    logger.info(f"Request UA: {user_agent}")
+                    logger.info(f"Request impersonate: {impersonate}")
+                    conv_key = r.cookies.get("conv_key", "")
                 response = StreamingResponse(content_generator(r, token, history), media_type=r.headers.get("content-type", ""),
                                   background=background)
                 response.set_cookie("conv_key", value=conv_key)

requirements.txt

@@ -1,6 +1,6 @@
 fastapi==0.115.3
-python-multipart==0.0.13
-curl_cffi==0.7.3
+python-multipart==0.0.19
+curl_cffi==0.10.0
 uvicorn
 tiktoken
 python-dotenv

utils/Client.py

@@ -4,7 +4,7 @@
 
 
 class Client:
-    def __init__(self, proxy=None, timeout=15, verify=True, impersonate='safari15_3'):
+    def __init__(self, proxy=None, timeout=30, verify=True, impersonate='safari15_3'):
         self.proxies = {"http": proxy, "https": proxy}
         self.timeout = timeout
         self.verify = verify
@@ -16,17 +16,15 @@ def __init__(self, proxy=None, timeout=15, verify=True, impersonate='safari15_3'
         # self.akamai = ""
         # ja3=self.ja3, akamai=self.akamai
         self.session = AsyncSession(proxies=self.proxies, timeout=self.timeout, impersonate=self.impersonate, verify=self.verify)
-        self.session2 = AsyncSession(proxies=self.proxies, timeout=self.timeout, impersonate=self.impersonate, verify=self.verify)
 
     async def post(self, *args, **kwargs):
         r = await self.session.post(*args, **kwargs)
         return r
 
-    async def post_stream(self, *args, headers=None, cookies=None, **kwargs):
-        if self.session:
-            headers = headers or self.session.headers
-            cookies = cookies or self.session.cookies
-        r = await self.session2.post(*args, headers=headers, cookies=cookies, **kwargs)
+    async def post_stream(self, *args, **kwargs):
+        self.session.timeout = 600
+        r = await self.session.post(*args, **kwargs)
+        self.session.timeout = 30
         return r
 
     async def get(self, *args, **kwargs):

version.txt

@@ -1 +1 @@
-1.8.8-beta6
+1.8.9-beta1