📖 Docs: Update documentation

README.md

@@ -49,11 +49,10 @@ providers:
   - provider: provider_name # Service provider name, such as openai, anthropic, gemini, openrouter, deepbricks, can be any name, required
     base_url: https://api.your.com/v1/chat/completions # Backend service API address, required
     api: sk-YgS6GTi0b4bEabc4C # Provider's API Key, required, automatically uses base_url and api to get all available models through the /v1/models endpoint.
-  # Multiple providers can be configured here, each provider can have multiple API Keys, and each API Key can have multiple models configured.
+  # Multiple providers can be configured here, each provider can configure multiple API Keys, and each API Key can configure multiple models.
 api_keys:
-  - api: sk-Pkj60Yf8JFWxfgRmXQFWyGtWUddGZnmi3KlvowmRWpWpQxx # API Key, required for user requests to uni-api
-    model: # Models that can be used by this API Key, required. Channel-level round-robin load balancing is enabled by default, and each request to the model follows the order configured in model. It is independent of the original channel order in providers. Therefore, you can set a different request order for each API key.
-      - all # Can use all models from all channels set under providers, no need to add available channels one by one. If you don't want to set available channels for each api in api_keys, uni-api supports setting the api key to use all models from all channels under providers.
+  - api: sk-Pkj60Yf8JFWxfgRmXQFWyGtWUddGZnmi3KlvowmRWpWpQxx # API Key, user request uni-api requires API key, required
+  # This API Key can use all models, that is, it can use all models in all channels set under providers, without needing to add available channels one by one.
 ```
 
 Detailed advanced configuration of `api.yaml`:

README_CN.md

@@ -52,8 +52,7 @@ providers:
   # 这里可以配置多个提供商，每个提供商可以配置多个 API Key，每个 API Key 可以配置多个模型。
 api_keys:
   - api: sk-Pkj60Yf8JFWxfgRmXQFWyGtWUddGZnmi3KlvowmRWpWpQxx # API Key，用户请求 uni-api 需要 API key，必填
-    model: # 该 API Key 可以使用的模型，必填。默认开启渠道级轮询负载均衡，每次请求模型按照 model 配置的顺序依次请求。与 providers 里面原始的渠道顺序无关。因此你可以设置每个 API key 请求顺序不一样。
-      - all # 可以使用 providers 下面设置的所有渠道里面的所有模型，不需要一个个添加可用渠道。如果你不想在 `api_keys` 里面给每个 `api` 一个个设置可用渠道，`uni-api` 支持将 `api key` 设置为可以使用 providers 下面所有渠道的所有模型。
+  # 该 API Key 可以使用所有模型，即可以使用 providers 下面设置的所有渠道里面的所有模型，不需要一个个添加可用渠道。
 ```
 
 `api.yaml` 详细的高级配置：

main.py

@@ -631,7 +631,7 @@ class ModelRequestHandler:
 
         for model in config['api_keys'][api_index]['model']:
             if model == "all":
-                # 如果模型名为 *，则返回所有模型
+                # 如果模型名为 all，则返回所有模型
                 for provider in config["providers"]:
                     model_dict = get_model_dict(provider)
                     for model in model_dict.keys():
@@ -661,7 +661,7 @@ class ModelRequestHandler:
                     # api_keys 中 model 为 provider_name/* 时，表示所有模型都匹配
                     if model_name_split == "*":
                         if model_name in models_list:
-                            provider_rules.append(provider_name)
+                            provider_rules.append(provider_name + "/" + model_name)
 
                         # 如果请求模型名： gpt-4* ，则匹配所有以模型名开头且不以 * 结尾的模型
                         for models_list_model in models_list:
@@ -684,21 +684,16 @@ class ModelRequestHandler:
         # print("provider_rules", provider_rules)
         for item in provider_rules:
             for provider in config['providers']:
-                # print("provider", provider, provider['provider'] == item, item)
-                if provider['provider'] == item.split("/")[0]:
+                if "/" in item and provider['provider'] == item.split("/")[0]:
                     new_provider = copy.deepcopy(provider)
                     model_dict = get_model_dict(provider)
-                    # print("model_dict", model_dict)
                     model_name_split = "/".join(item.split("/")[1:])
-                    if model_name in model_dict.keys():
-                        if "/" in item and model_name_split == model_name:
-                            new_provider["model"] = [{model_dict[model_name]: model_name}]
-                        # 如果 item 不包含 /，则直接匹配 provider，说明整个渠道所有模型都能用
+                    # old: new
+                    new_provider["model"] = [{model_dict[model_name_split]: model_name}]
+                    if model_name in model_dict.keys() and model_name_split == model_name:
                         provider_list.append(new_provider)
 
-                    elif model_name.endswith("*") and "/" in item and model_name_split.startswith(model_name.rstrip("*")):
-                        # old: new
-                        new_provider["model"] = [{model_dict[model_name_split]: model_name}]
+                    elif model_name.endswith("*") and model_name_split.startswith(model_name.rstrip("*")):
                         provider_list.append(new_provider)
 
         # print("provider_list", provider_list)