Skip to content

修正weighted_round_robin和all混用无效的问题 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenedictKing wants to merge 1 commit into
base: main
Choose a base branch
from
Open

修正weighted_round_robin和all混用无效的问题 #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,20 @@ async def update_config(config_data, use_config_url=False):
if model_name in model_dict.keys():
weights_dict.update({provider_name + "/" + model_name: int(value)})
elif model_name == "*":
weights_dict.update({provider_name + "/" + model_name: int(value) for model_item in model_dict.keys()})
for model_item in model_dict.keys():
weights_dict.update({provider_name + "/" + model_item: int(value)})

models.append(key)
if isinstance(model, str):
elif isinstance(model, str):
# 处理字符串格式的模型配置
if model == "all":
# 如果有权重配置，为所有模型设置默认权重1
if weights_dict or any(isinstance(m, dict) for m in api_key.get('model')):
for provider_item in config_data["providers"]:
model_dict = get_model_dict(provider_item)
for model_item in model_dict.keys():
if f"{provider_item['provider']}/{model_item}" not in weights_dict:
weights_dict.update({f"{provider_item['provider']}/{model_item}": 1})
models.append(model)
if weights_dict:
config_data['api_keys'][index]['weights'] = weights_dict
Expand Down Expand Up @@ -544,4 +554,4 @@ def calculate_total_cost(all_tokens_info, model_price):

total_cost += model_cost

return total_cost
return total_cost