Optimize log display

main.py

@@ -105,9 +105,14 @@ class ModelRequestHandler:
                         models_list = provider['model'].keys()
                 if (model and model_name in models_list) or (model == "*" and model_name in models_list):
                     provider_rules.append(provider_name)
+            else:
+                for provider in config['providers']:
+                    if model in provider['model'].keys():
+                        provider_rules.append(provider['provider'])
+
         provider_list = []
         for provider in config['providers']:
-            if model_name in provider['model'].keys() and ((provider_rules and provider['provider'] in provider_rules) or provider_rules == []):
+            if model_name in provider['model'].keys() and (provider_rules and provider['provider'] in provider_rules):
                 provider_list.append(provider)
         return provider_list
 
@@ -115,7 +120,6 @@ class ModelRequestHandler:
         model_name = request.model
         matching_providers = self.get_matching_providers(model_name, token)
         # print("matching_providers", json.dumps(matching_providers, indent=4, ensure_ascii=False))
-
         if not matching_providers:
             raise HTTPException(status_code=404, detail="No matching model found")
 
@@ -136,19 +140,10 @@ class ModelRequestHandler:
             try:
                 response = await process_request(request, provider)
                 return response
-            except HTTPException as e:
-                print('\033[31m')
-                print(f"Error with provider {provider['provider']}: {str(e)}")
-                traceback.print_exc()
-                print('\033[0m')
-                if use_round_robin:
-                    continue
-                else:
-                    raise HTTPException(status_code=500, detail="Error: Current provider response failed!")
-            except Exception as e:
+            except (Exception, HTTPException) as e:
                 print('\033[31m')
                 print(f"Error with provider {provider['provider']}: {str(e)}")
-                traceback.print_exc()
+                # traceback.print_exc()
                 print('\033[0m')
                 if use_round_robin:
                     continue

response.py

@@ -70,7 +70,7 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
     async with client.stream('POST', url, headers=headers, json=payload) as response:
         # print("response.status_code", response.status_code)
         if response.status_code != 200:
-            print("请求失败，状态码是", response.status_code)
+            # print("请求失败，状态码是", response.status_code)
             error_message = await response.aread()
             # error_str = error_message.decode('utf-8', errors='replace')
             # error_json = json.loads(error_str)
@@ -89,13 +89,13 @@ async def fetch_claude_response_stream(client, url, headers, payload, model):
     async with client.stream('POST', url, headers=headers, json=payload) as response:
         if response.status_code != 200:
             print('\033[31m')
-            print(f"请求失败，状态码是{response.status_code}，错误信息：")
+            # print(f"请求失败，状态码是{response.status_code}，错误信息：")
             error_message = await response.aread()
             error_str = error_message.decode('utf-8', errors='replace')
             error_json = json.loads(error_str)
-            print(json.dumps(error_json, indent=4, ensure_ascii=False))
+            # print(json.dumps(error_json, indent=4, ensure_ascii=False))
             print('\033[0m')
-            yield {"error": f"HTTP Error {response.status_code}", "details": error_json}
+            yield {"error": f"fetch_claude_response_stream HTTP Error {response.status_code}", "details": error_json}
         buffer = ""
         async for chunk in response.aiter_text():
             buffer += chunk

test/provider_test.py

@@ -14,9 +14,13 @@ def test_client():
 def api_key():
     return os.environ.get("API")
 
-def test_request_model(test_client, api_key, model="claude-3-5-sonnet-20240620"):
+@pytest.fixture
+def get_model():
+    return os.environ.get("MODEL", "claude-3-5-sonnet-20240620")
+
+def test_request_model(test_client, api_key, get_model):
     request_data = {
-        "model": model,
+        "model": get_model,
         "messages": [
             {
                 "role": "user",