yym68686 commited on
Commit
b54a508
·
1 Parent(s): d37cc67

Support setting whether to poll for each API key separately.

Browse files
Files changed (3) hide show
  1. README.md +2 -3
  2. main.py +6 -3
  3. test/curl.py +42 -0
README.md CHANGED
@@ -70,9 +70,8 @@ api_keys:
70
  - api: sk-pkhf60Yf0JGyJygRmXqFQyTgWUd9GZnmi3KlvowmRWpWqrhy
71
  model:
72
  - anthropic/claude-3-5-sonnet # 可以使用的模型名称,仅可以使用名为 anthropic 提供商提供的 claude-3-5-sonnet 模型。其他提供商的 claude-3-5-sonnet 模型不可以使用。
73
-
74
- preferences:
75
- USE_ROUND_ROBIN: true # 是否使用轮询负载均衡,true 为使用,false 为不使用,默认为 true
76
  ```
77
 
78
  ## Docker Local Deployment
 
70
  - api: sk-pkhf60Yf0JGyJygRmXqFQyTgWUd9GZnmi3KlvowmRWpWqrhy
71
  model:
72
  - anthropic/claude-3-5-sonnet # 可以使用的模型名称,仅可以使用名为 anthropic 提供商提供的 claude-3-5-sonnet 模型。其他提供商的 claude-3-5-sonnet 模型不可以使用。
73
+ preferences:
74
+ USE_ROUND_ROBIN: true # 是否使用轮询负载均衡,true 为使用,false 为不使用,默认为 true
 
75
  ```
76
 
77
  ## Docker Local Deployment
main.py CHANGED
@@ -93,8 +93,8 @@ async def process_request(request: RequestModel, provider: Dict):
93
  engine = "gpt"
94
 
95
  if "claude" not in provider['model'][request.model] \
96
- and "gpt" not in provider['model'][request.model] \
97
- and "gemini" not in provider['model'][request.model]:
98
  engine = "openrouter"
99
 
100
  if provider.get("engine"):
@@ -160,7 +160,10 @@ class ModelRequestHandler:
160
  raise HTTPException(status_code=404, detail="No matching model found")
161
 
162
  # 检查是否启用轮询
163
- use_round_robin = config["preferences"].get("USE_ROUND_ROBIN")
 
 
 
164
 
165
  return await self.try_all_providers(request, matching_providers, use_round_robin)
166
 
 
93
  engine = "gpt"
94
 
95
  if "claude" not in provider['model'][request.model] \
96
+ and "gpt" not in provider['model'][request.model] \
97
+ and "gemini" not in provider['model'][request.model]:
98
  engine = "openrouter"
99
 
100
  if provider.get("engine"):
 
160
  raise HTTPException(status_code=404, detail="No matching model found")
161
 
162
  # 检查是否启用轮询
163
+ api_index = api_list.index(token)
164
+ use_round_robin = False
165
+ if config['api_keys'][api_index].get("preferences"):
166
+ use_round_robin = config['api_keys'][api_index]["preferences"].get("USE_ROUND_ROBIN")
167
 
168
  return await self.try_all_providers(request, matching_providers, use_round_robin)
169
 
test/curl.py ADDED
@@ -0,0 +1,42 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ import json
2
+ import sys
3
+ import os
4
+ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
5
+ from main import load_config
6
+
7
+ provider_name = "linuxdoi"
8
+ model = "claude-3-5-sonnet"
9
+
10
+ config, api_keys_db, api_list = load_config()
11
+ providers = config["providers"]
12
+ provider_config = None
13
+ for provider in providers:
14
+ if provider["provider"] == provider_name:
15
+ provider_config = provider
16
+ break
17
+ if provider_config == None:
18
+ print("Provider not found")
19
+ sys.exit(1)
20
+ model_name = provider_config["model"][model]
21
+ # 定义请求的内容
22
+ request_content = {
23
+ "model": model_name,
24
+ "messages": [
25
+ {"role": "user", "content": {"text": "What is the meaning of life?"}}
26
+ ],
27
+ "stream": True
28
+ }
29
+
30
+ # 将请求内容转换为JSON字符串
31
+ request_json = json.dumps(request_content)
32
+
33
+ # 定义curl命令
34
+ curl_command = f"""
35
+ curl {provider_config["base_url"]} \\
36
+ -H "Content-Type: application/json" \\
37
+ -H "Authorization: Bearer {provider_config['api']}" \\
38
+ -d '{request_json}'
39
+ """
40
+
41
+ # 打印生成的curl命令
42
+ print(curl_command)