From 8eca72ece8a055daa2869657477e9e91975721d6 Mon Sep 17 00:00:00 2001
From: yym68686 <yym68686@outlook.com>
Date: Sat, 7 Sep 2024 00:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Bug:=201.=20Fix=20the=20bug=20of?=
 =?UTF-8?q?=20log=20errors=20being=20repeatedly=20displayed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2. Fix the bug when the model list is empty.

💻 Code: Remove the redundant redirection code from the GPT model interface
---
 main.py     |  6 ++----
 response.py | 52 ++++++++++++----------------------------------------
 utils.py    | 25 +++++++++++++------------
 3 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/main.py b/main.py
index 726d7d5..df4107b 100644
--- a/main.py
+++ b/main.py
@@ -220,8 +220,6 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest],
 
         return response
     except (Exception, HTTPException, asyncio.CancelledError, httpx.ReadError) as e:
-        logger.error(f"Error with provider {provider['provider']}: {str(e)}")
-
         # 更新失败计数
         async with app.middleware_stack.app.lock:
             app.middleware_stack.app.channel_failure_counts[provider['provider']] += 1
@@ -340,9 +338,9 @@ async def request_model(self, request: Union[RequestModel, ImageGenerationReques
                     if provider['provider'] == provider_name:
                         new_matching_providers.append(provider)
             matching_providers = new_matching_providers
-            # import json
-            # print("matching_providers", json.dumps(matching_providers, indent=4, ensure_ascii=False, default=circular_list_encoder))
 
+        # import json
+        # print("matching_providers", json.dumps(matching_providers, indent=4, ensure_ascii=False, default=circular_list_encoder))
         use_round_robin = True
         auto_retry = True
         if safe_get(config, 'api_keys', api_index, "preferences", "USE_ROUND_ROBIN") == False:
diff --git a/response.py b/response.py
index 5d3f831..f4cc127 100644
--- a/response.py
+++ b/response.py
@@ -140,48 +140,20 @@ async def fetch_vertex_claude_response_stream(client, url, headers, payload, mod
         yield "data: [DONE]\n\r\n"
 
 async def fetch_gpt_response_stream(client, url, headers, payload, max_redirects=5):
-    redirect_count = 0
-    while redirect_count < max_redirects:
-        # logger.info(f"fetch_gpt_response_stream: {url}")
-        async with client.stream('POST', url, headers=headers, json=payload) as response:
-            error_message = await check_response(response, "fetch_gpt_response_stream")
-            if error_message:
-                yield error_message
-                return
-
-            buffer = ""
-            try:
-                async for chunk in response.aiter_text():
-                    # logger.info(f"chunk: {repr(chunk)}")
-                    buffer += chunk
-                    if chunk.startswith("<script"):
-                        import re
-                        redirect_match = re.search(r"window\.location\.href\s*=\s*'([^']+)'", chunk)
-                        if redirect_match:
-                            new_url = redirect_match.group(1)
-                            # logger.info(f"new_url: {new_url}")
-                            if not new_url.startswith('http'):
-                                # 如果是相对路径，构造完整URL
-                                # logger.info(url.split('/'))
-                                base_url = '/'.join(url.split('/')[:3])
-                                new_url = base_url + new_url
-                            url = new_url
-                            # logger.info(f"new_url: {new_url}")
-                            redirect_count += 1
-                            break
-                    redirect_count = 0
-                    while "\n" in buffer:
-                        line, buffer = buffer.split("\n", 1)
-                        # logger.info("line: %s", repr(line))
-                        if line and line != "data: " and line != "data:" and not line.startswith(": "):
-                            yield line.strip() + "\n\r\n"
-            except httpx.RemoteProtocolError as e:
-                yield {"error": f"fetch_gpt_response_stream RemoteProtocolError {e.__class__.__name__}", "details": str(e)}
-                return
-        if redirect_count == 0:
+    async with client.stream('POST', url, headers=headers, json=payload) as response:
+        error_message = await check_response(response, "fetch_gpt_response_stream")
+        if error_message:
+            yield error_message
             return
 
-    yield {"error": "Too many redirects", "details": f"Reached maximum of {max_redirects} redirects"}
+        buffer = ""
+        async for chunk in response.aiter_text():
+            buffer += chunk
+            while "\n" in buffer:
+                line, buffer = buffer.split("\n", 1)
+                # logger.info("line: %s", repr(line))
+                if line and line != "data: " and line != "data:" and not line.startswith(": "):
+                    yield line.strip() + "\n\r\n"
 
 async def fetch_claude_response_stream(client, url, headers, payload, model):
     timestamp = datetime.timestamp(datetime.now())
diff --git a/utils.py b/utils.py
index 9c2fa42..e376ede 100644
--- a/utils.py
+++ b/utils.py
@@ -29,18 +29,19 @@ def update_config(config_data):
     for index, api_key in enumerate(config_data['api_keys']):
         weights_dict = {}
         models = []
-        for model in api_key.get('model'):
-            if isinstance(model, dict):
-                key, value = list(model.items())[0]
-                provider_name = key.split("/")[0]
-                if "/" in key:
-                    weights_dict.update({provider_name: int(value)})
-                models.append(key)
-            if isinstance(model, str):
-                models.append(model)
-        config_data['api_keys'][index]['weights'] = weights_dict
-        config_data['api_keys'][index]['model'] = models
-        api_keys_db[index]['model'] = models
+        if api_key.get('model'):
+            for model in api_key.get('model'):
+                if isinstance(model, dict):
+                    key, value = list(model.items())[0]
+                    provider_name = key.split("/")[0]
+                    if "/" in key:
+                        weights_dict.update({provider_name: int(value)})
+                    models.append(key)
+                if isinstance(model, str):
+                    models.append(model)
+            config_data['api_keys'][index]['weights'] = weights_dict
+            config_data['api_keys'][index]['model'] = models
+            api_keys_db[index]['model'] = models
 
     api_list = [item["api"] for item in api_keys_db]
     # logger.info(json.dumps(config_data, indent=4, ensure_ascii=False, default=circular_list_encoder))