✨ Feature: 1. Add support for experimental frontend.

2. Add support for configuration files without listing models.

.gitignore

@@ -1,5 +1,5 @@
 api.json
-api.yaml
+*.yaml
 .env
 __pycache__
 .vscode

components/provider_table.py

@@ -0,0 +1,230 @@
+from xue import Div, Table, Thead, Tbody, Tr, Th, Td, Button, Input, Script, Head, Style, Span
+from xue.components.checkbox import checkbox
+from xue.components.dropdown import dropdown_menu, dropdown_menu_content
+from xue.components.button import button
+from xue.components.input import input
+
+Head.add_default_children([
+    Style("""
+        .data-table-container {
+            width: 100%;
+            overflow-x: auto;
+            border: 1px solid #e2e8f0;
+            border-radius: 0.5rem;
+            overflow-x: visible !important;
+        }
+        .data-table {
+            width: 100%;
+            border-collapse: separate;
+            border-spacing: 0;
+        }
+        .data-table th, .data-table td {
+            padding: 0.75rem 1rem;
+            text-align: left;
+            border-bottom: 1px solid #e2e8f0;
+        }
+        .data-table th {
+            font-weight: 500;
+            font-size: 0.875rem;
+            color: #4b5563;
+            height: 2.5rem;
+            transition: background-color 0.2s;
+        }
+        .data-table thead tr:hover th,
+        .data-table tbody tr:hover {
+            background-color: #f8fafc;
+        }
+        .data-table tbody tr:last-child td {
+            border-bottom: none;
+        }
+        .sortable-header {
+            cursor: pointer;
+            user-select: none;
+            display: inline-flex;
+            align-items: center;
+            padding: 0.25rem 0.5rem;
+            border-radius: 0.25rem;
+            transition: background-color 0.2s;
+        }
+        .sortable-header:hover {
+            background-color: #e5e7eb;
+        }
+        .sort-icon {
+            display: inline-block;
+            width: 1rem;
+            height: 1rem;
+            margin-left: 0.25rem;
+            transition: transform 0.2s;
+            opacity: 0;
+        }
+        .sortable-header:hover .sort-icon,
+        .sort-asc .sort-icon,
+        .sort-desc .sort-icon {
+            opacity: 1;
+        }
+        .sort-asc .sort-icon {
+            transform: rotate(180deg);
+        }
+        .table-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 1rem;
+        }
+        .table-footer {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-top: 1rem;
+        }
+        .pagination {
+            display: flex;
+            gap: 0.5rem;
+        }
+        @media (prefers-color-scheme: dark) {
+            .data-table-container {
+                border-color: #4b5563;
+            }
+            .data-table th, .data-table td {
+                border-color: #4b5563;
+            }
+            .data-table th {
+                color: #d1d5db;
+            }
+            .data-table thead tr:hover th,
+            .data-table tbody tr:hover {
+                background-color: #1f2937;
+            }
+            .sortable-header:hover {
+                background-color: #374151;
+            }
+        }
+    """, id="data-table-style"),
+    Script("""
+        function toggleAllRows(checked) {
+            const checkboxes = document.querySelectorAll('.row-checkbox');
+            checkboxes.forEach(cb => cb.checked = checked);
+            updateSelectedCount();
+        }
+
+        function updateSelectedCount() {
+            const selectedCount = document.querySelectorAll('.row-checkbox:checked').length;
+            const totalCount = document.querySelectorAll('.row-checkbox').length;
+            document.getElementById('selected-count').textContent = `${selectedCount} of ${totalCount} row(s) selected.`;
+        }
+
+        function sortTable(columnIndex, accessor) {
+            const table = document.querySelector('.data-table');
+            const header = table.querySelector(`th[data-accessor="${accessor}"]`);
+            const isAscending = !header.classList.contains('sort-asc');
+
+            // Update sort direction
+            table.querySelectorAll('th').forEach(th => th.classList.remove('sort-asc', 'sort-desc'));
+            header.classList.add(isAscending ? 'sort-asc' : 'sort-desc');
+
+            // Sort the table
+            const rows = Array.from(table.querySelectorAll('tbody tr'));
+            rows.sort((a, b) => {
+                const aValue = a.querySelector(`td[data-accessor="${accessor}"]`).textContent;
+                const bValue = b.querySelector(`td[data-accessor="${accessor}"]`).textContent;
+                return isAscending ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+            });
+
+            // Update the table
+            const tbody = table.querySelector('tbody');
+            rows.forEach(row => tbody.appendChild(row));
+        }
+
+        document.addEventListener('change', function(event) {
+            if (event.target.classList.contains('row-checkbox')) {
+                updateSelectedCount();
+            }
+        });
+    """, id="data-table-script"),
+])
+
+def data_table(columns, data, id, with_filter=True):
+    return Div(
+        Div(
+            input(type="text", placeholder="Filter...", id=f"{id}-filter", class_="mr-auto"),
+            Div(
+                button(
+                    "Add Provider",
+                    variant="secondary",
+                    hx_get="/add-provider-sheet",
+                    hx_target="#sheet-container",
+                    hx_swap="innerHTML",
+                    class_="h-[2.625rem]"
+                ),
+                dropdown_menu("Columns"),
+            ),
+            class_="table-header flex items-center"
+        ) if with_filter else None,
+        Div(
+            Div(
+                Table(
+                    Thead(
+                        Tr(
+                            Th(checkbox("select-all", "", onclick="toggleAllRows(this.checked)")),
+                            *[Th(
+                                Div(
+                                    col['label'],
+                                    Span("▼", class_="sort-icon"),
+                                    class_="sortable-header" if col.get('sortable', False) else "",
+                                    onclick=f"sortTable({i}, '{col['value']}')" if col.get('sortable', False) else None
+                                ),
+                                data_accessor=col['value']
+                            ) for i, col in enumerate(columns)],
+                            Th("Actions")  # 新增的操作列
+                        )
+                    ),
+                    Tbody(
+                        *[Tr(
+                            Td(checkbox(f"row-{i}", "", class_="row-checkbox")),
+                            *[Td(row[col['value']], data_accessor=col['value']) for col in columns],
+                            Td(row_actions_menu(i)),  # 使用行索引作为 row_id
+                            id=f"row-{i}"
+                        ) for i, row in enumerate(data)]
+                    ),
+                    class_="data-table"
+                ),
+                class_="data-table-container"
+            ),
+            Div(
+                Div(id="selected-count", class_="text-sm text-gray-500"),
+                Div(
+                    button("Previous", variant="outline", class_="mr-2"),
+                    button("Next", variant="outline"),
+                    class_="pagination"
+                ),
+                class_="table-footer"
+            ),
+            id=id
+        ),
+    )
+
+def get_column_visibility_menu(id, columns):
+    return dropdown_menu_content(id, [
+        {"label": col['label'], "value": col['value']}
+        for col in columns if col.get('can_hide', True)
+    ])
+
+def row_actions_menu(row_id):
+    return dropdown_menu("⋮", id=f"row-actions-menu-{row_id}", hx_get=f"/dropdown-menu/dropdown-menu-⋮/{row_id}")
+
+def get_row_actions_menu(row_id):
+    return dropdown_menu_content(f"row-actions-{row_id}", [
+        {"label": "Edit", "icon": "pencil"},
+        {"label": "Duplicate", "icon": "copy"},
+        {"label": "Delete", "icon": "trash"},
+        "separator",
+        {"label": "More...", "icon": "more-horizontal"},
+    ])
+
+def render_row(row_data, row_id, columns):
+    return Tr(
+        Td(checkbox(f"row-{row_id}", "", class_="row-checkbox")),
+        *[Td(row_data[col['value']], data_accessor=col['value']) for col in columns],
+        Td(row_actions_menu(row_id)),
+        id=f"row-{row_id}"
+    ).render()

main.py

@@ -18,7 +18,7 @@ from fastapi.exceptions import RequestValidationError
 from models import RequestModel, ImageGenerationRequest, AudioTranscriptionRequest, ModerationRequest, UnifiedRequest
 from request import get_payload
 from response import fetch_response, fetch_response_stream
-from utils import error_handling_wrapper, post_all_models, load_config, safe_get, circular_list_encoder
+from utils import error_handling_wrapper, post_all_models, load_config, safe_get, circular_list_encoder, get_model_dict
 
 from collections import defaultdict
 from typing import List, Dict, Union
@@ -492,20 +492,21 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest, A
     else:
         engine = "gpt"
 
-    if "claude" not in provider['model'][request.model] \
-    and "gpt" not in provider['model'][request.model] \
-    and "gemini" not in provider['model'][request.model] \
+    model_dict = get_model_dict(provider)
+    if "claude" not in model_dict[request.model] \
+    and "gpt" not in model_dict[request.model] \
+    and "gemini" not in model_dict[request.model] \
     and parsed_url.netloc != 'api.cloudflare.com' \
     and parsed_url.netloc != 'api.cohere.com':
         engine = "openrouter"
 
-    if "claude" in provider['model'][request.model] and engine == "vertex":
+    if "claude" in model_dict[request.model] and engine == "vertex":
         engine = "vertex-claude"
 
-    if "gemini" in provider['model'][request.model] and engine == "vertex":
+    if "gemini" in model_dict[request.model] and engine == "vertex":
         engine = "vertex-gemini"
 
-    if "o1-preview" in provider['model'][request.model] or "o1-mini" in provider['model'][request.model]:
+    if "o1-preview" in model_dict[request.model] or "o1-mini" in model_dict[request.model]:
         engine = "o1"
         request.stream = False
 
@@ -536,7 +537,7 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest, A
     current_info = request_info.get()
     try:
         if request.stream:
-            model = provider['model'][request.model]
+            model = model_dict[request.model]
             generator = fetch_response_stream(app.state.client, url, headers, payload, engine, model)
             wrapped_generator, first_response_time = await error_handling_wrapper(generator)
             response = StarletteStreamingResponse(wrapped_generator, media_type="text/event-stream")
@@ -603,7 +604,8 @@ class ModelRequestHandler:
             if model == "all":
                 # 如果模型名为 *，则返回所有模型
                 for provider in config["providers"]:
-                    for model in provider["model"].keys():
+                    model_dict = get_model_dict(provider)
+                    for model in model_dict.keys():
                         provider_rules.append(provider["provider"] + "/" + model)
                 break
             if "/" in model:
@@ -611,15 +613,17 @@ class ModelRequestHandler:
                     model = model[1:-1]
                     # 处理带斜杠的模型名
                     for provider in config['providers']:
-                        if model in provider['model'].keys():
+                        model_dict = get_model_dict(provider)
+                        if model in model_dict.keys():
                             provider_rules.append(provider['provider'] + "/" + model)
                 else:
                     provider_name = model.split("/")[0]
                     model_name_split = "/".join(model.split("/")[1:])
                     models_list = []
                     for provider in config['providers']:
+                        model_dict = get_model_dict(provider)
                         if provider['provider'] == provider_name:
-                            models_list.extend(list(provider['model'].keys()))
+                            models_list.extend(list(model_dict.keys()))
                     # print("models_list", models_list)
                     # print("model_name", model_name)
                     # print("model_name_split", model_name_split)
@@ -632,7 +636,8 @@ class ModelRequestHandler:
                             provider_rules.append(provider_name)
             else:
                 for provider in config['providers']:
-                    if model in provider['model'].keys():
+                    model_dict = get_model_dict(provider)
+                    if model in model_dict.keys():
                         provider_rules.append(provider['provider'] + "/" + model)
 
         provider_list = []
@@ -642,10 +647,13 @@ class ModelRequestHandler:
                 # print("provider", provider, provider['provider'] == item, item)
                 if "/" in item:
                     if provider['provider'] == item.split("/")[0]:
-                        if model_name in provider['model'].keys() and "/".join(item.split("/")[1:]) == model_name:
+                        model_dict = get_model_dict(provider)
+                        if model_name in model_dict.keys() and "/".join(item.split("/")[1:]) == model_name:
                             provider_list.append(provider)
+                # 如果 item 不包含 /，则直接匹配 provider，说明整个渠道所有模型都能用
                 elif provider['provider'] == item:
-                    if model_name in provider['model'].keys():
+                    model_dict = get_model_dict(provider)
+                    if model_name in model_dict.keys():
                         provider_list.append(provider)
                 else:
                     pass
@@ -655,7 +663,8 @@ class ModelRequestHandler:
                 #         if item.split("/")[1] == model_name:
                 #             provider_list.append(provider)
                 #     else:
-                #         if model_name in provider['model'].keys():
+                #         model_dict = get_model_dict(provider)
+                #         if model_name in model_dict.keys():
                 #             provider_list.append(provider)
         if is_debug:
             for provider in provider_list:

models.py

@@ -1,5 +1,5 @@
 from io import IOBase
-from pydantic import BaseModel, Field, model_validator
+from pydantic import BaseModel, Field, model_validator, ConfigDict
 from typing import List, Dict, Optional, Union, Tuple, Literal, Any
 from log_config import logger
 
@@ -61,10 +61,16 @@ class ToolChoice(BaseModel):
 class BaseRequest(BaseModel):
     request_type: Optional[Literal["chat", "image", "audio", "moderation"]] = Field(default=None, exclude=True)
 
-class JsonSchema(BaseModel):
-    name: str
-    schema: Dict[str, Any]
+def create_json_schema_class():
+    class JsonSchema(BaseModel):
+        name: str
+
+        model_config = ConfigDict(protected_namespaces=())
+
+    JsonSchema.__annotations__['schema'] = Dict[str, Any]
+    return JsonSchema
 
+JsonSchema = create_json_schema_class()
 class ResponseFormat(BaseModel):
     type: Literal["text", "json_object", "json_schema"]
     json_schema: Optional[JsonSchema] = None

request.py

@@ -6,7 +6,7 @@ import base64
 import urllib.parse
 
 from models import RequestModel
-from utils import c35s, c3s, c3o, c3h, gem, BaseAPI
+from utils import c35s, c3s, c3o, c3h, gem, BaseAPI, get_model_dict, provider_api_circular_list
 
 import imghdr
 
@@ -120,13 +120,14 @@ async def get_gemini_payload(request, engine, provider):
     headers = {
         'Content-Type': 'application/json'
     }
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     gemini_stream = "streamGenerateContent"
     url = provider['base_url']
     if url.endswith("v1beta"):
-        url = "https://generativelanguage.googleapis.com/v1beta/models/{model}:{stream}?key={api_key}".format(model=model, stream=gemini_stream, api_key=provider['api'].next())
+        url = "https://generativelanguage.googleapis.com/v1beta/models/{model}:{stream}?key={api_key}".format(model=model, stream=gemini_stream, api_key=await provider_api_circular_list[provider['provider']].next())
     if url.endswith("v1"):
-        url = "https://generativelanguage.googleapis.com/v1/models/{model}:{stream}?key={api_key}".format(model=model, stream=gemini_stream, api_key=provider['api'].next())
+        url = "https://generativelanguage.googleapis.com/v1/models/{model}:{stream}?key={api_key}".format(model=model, stream=gemini_stream, api_key=await provider_api_circular_list[provider['provider']].next())
 
     messages = []
     systemInstruction = None
@@ -312,7 +313,8 @@ async def get_vertex_gemini_payload(request, engine, provider):
         project_id = provider.get("project_id")
 
     gemini_stream = "streamGenerateContent"
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     location = gem
     url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(LOCATION=location.next(), PROJECT_ID=project_id, MODEL_ID=model, stream=gemini_stream)
 
@@ -449,7 +451,8 @@ async def get_vertex_claude_payload(request, engine, provider):
     if provider.get("project_id"):
         project_id = provider.get("project_id")
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     if "claude-3-5-sonnet" in model:
         location = c35s
     elif "claude-3-opus" in model:
@@ -460,7 +463,7 @@ async def get_vertex_claude_payload(request, engine, provider):
         location = c3h
 
     claude_stream = "streamRawPredict"
-    url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/anthropic/models/{MODEL}:{stream}".format(LOCATION=location.next(), PROJECT_ID=project_id, MODEL=model, stream=claude_stream)
+    url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/anthropic/models/{MODEL}:{stream}".format(LOCATION=await location.next(), PROJECT_ID=project_id, MODEL=model, stream=claude_stream)
 
     messages = []
     system_prompt = None
@@ -534,7 +537,8 @@ async def get_vertex_claude_payload(request, engine, provider):
         else:
             message_index = message_index + 1
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     payload = {
         "anthropic_version": "vertex-2023-10-16",
         "messages": messages,
@@ -593,7 +597,7 @@ async def get_gpt_payload(request, engine, provider):
         'Content-Type': 'application/json',
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
     url = provider['base_url']
 
     messages = []
@@ -633,7 +637,8 @@ async def get_gpt_payload(request, engine, provider):
         else:
             messages.append({"role": msg.role, "content": content})
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     payload = {
         "model": model,
         "messages": messages,
@@ -659,7 +664,7 @@ async def get_openrouter_payload(request, engine, provider):
         'Content-Type': 'application/json'
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
 
     url = provider['base_url']
 
@@ -691,7 +696,8 @@ async def get_openrouter_payload(request, engine, provider):
             else:
                 messages.append({"role": msg.role, "content": content})
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     payload = {
         "model": model,
         "messages": messages,
@@ -725,7 +731,7 @@ async def get_cohere_payload(request, engine, provider):
         'Content-Type': 'application/json'
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
 
     url = provider['base_url']
 
@@ -753,7 +759,8 @@ async def get_cohere_payload(request, engine, provider):
         else:
             messages.append({"role": role_map[msg.role], "message": content})
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     chat_history = messages[:-1]
     query = messages[-1].get("message")
     payload = {
@@ -792,9 +799,10 @@ async def get_cloudflare_payload(request, engine, provider):
         'Content-Type': 'application/json'
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     url = "https://api.cloudflare.com/client/v4/accounts/{cf_account_id}/ai/run/{cf_model_id}".format(cf_account_id=provider['cf_account_id'], cf_model_id=model)
 
     msg = request.messages[-1]
@@ -808,7 +816,7 @@ async def get_cloudflare_payload(request, engine, provider):
         content = msg.content
         name = msg.name
 
-    model = provider['model'][request.model]
+    model = model_dict[request.model]
     payload = {
         "prompt": content,
     }
@@ -841,7 +849,7 @@ async def get_o1_payload(request, engine, provider):
         'Content-Type': 'application/json'
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
 
     url = provider['base_url']
 
@@ -863,7 +871,8 @@ async def get_o1_payload(request, engine, provider):
         elif msg.role != "system":
             messages.append({"role": msg.role, "content": content})
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     payload = {
         "model": model,
         "messages": messages,
@@ -912,10 +921,11 @@ async def gpt2claude_tools_json(json_dict):
     return json_dict
 
 async def get_claude_payload(request, engine, provider):
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     headers = {
         "content-type": "application/json",
-        "x-api-key": f"{provider['api'].next()}",
+        "x-api-key": f"{await provider_api_circular_list[provider['provider']].next()}",
         "anthropic-version": "2023-06-01",
         "anthropic-beta": "max-tokens-3-5-sonnet-2024-07-15" if "claude-3-5-sonnet" in model else "tools-2024-05-16",
     }
@@ -993,7 +1003,8 @@ async def get_claude_payload(request, engine, provider):
         else:
             message_index = message_index + 1
 
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     payload = {
         "model": model,
         "messages": messages,
@@ -1051,12 +1062,13 @@ async def get_claude_payload(request, engine, provider):
     return url, headers, payload
 
 async def get_dalle_payload(request, engine, provider):
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     headers = {
         "Content-Type": "application/json",
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
     url = provider['base_url']
     url = BaseAPI(url).image_url
 
@@ -1070,12 +1082,13 @@ async def get_dalle_payload(request, engine, provider):
     return url, headers, payload
 
 async def get_whisper_payload(request, engine, provider):
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     headers = {
         # "Content-Type": "multipart/form-data",
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
     url = provider['base_url']
     url = BaseAPI(url).audio_transcriptions
 
@@ -1096,12 +1109,13 @@ async def get_whisper_payload(request, engine, provider):
     return url, headers, payload
 
 async def get_moderation_payload(request, engine, provider):
-    model = provider['model'][request.model]
+    model_dict = get_model_dict(provider)
+    model = model_dict[request.model]
     headers = {
         "Content-Type": "application/json",
     }
     if provider.get("api"):
-        headers['Authorization'] = f"Bearer {provider['api'].next()}"
+        headers['Authorization'] = f"Bearer {await provider_api_circular_list[provider['provider']].next()}"
     url = provider['base_url']
     url = BaseAPI(url).moderations
 

requirements.txt

@@ -1,4 +1,4 @@
-pyyaml
+xue
 pytest
 uvicorn
 fastapi
@@ -7,6 +7,7 @@ greenlet
 aiosqlite
 sqlalchemy
 watchfiles
+ruamel.yaml
 httpx[http2]
 cryptography
 python-multipart

test/test_ruamel_yaml.py

@@ -0,0 +1,44 @@
+from ruamel.yaml import YAML
+
+# 假设我们有以下 YAML 内容
+yaml_content = """
+# 这是顶级注释
+key1: value1  # 行尾注释
+key2: value2
+
+# 这是嵌套结构的注释
+nested:
+  subkey1: subvalue1
+  subkey2: subvalue2  # 嵌套的行尾注释
+
+# 列表的注释
+list_key:
+  - item1
+  - item2  # 列表项的注释
+"""
+
+# 创建 YAML 对象
+yaml = YAML()
+yaml.preserve_quotes = True
+yaml.indent(mapping=2, sequence=4, offset=2)
+
+with open('api.yaml', 'r', encoding='utf-8') as file:
+    data = yaml.load(file)
+
+# data = yaml.load(yaml_content)
+# 加载 YAML 数据
+print(data)
+
+# # 修改数据
+# data['key1'] = 'new_value1'
+# data['nested']['subkey1'] = 'new_subvalue1'
+# data['list_key'].append('new_item')
+
+# 将修改后的数据写回文件（这里我们使用 StringIO 来模拟文件操作）
+# from io import StringIO
+# output = StringIO()
+# yaml.dump(data, output)
+# print(output.getvalue())
+
+with open('formatted.yaml', 'w', encoding='utf-8') as file:
+    yaml.dump(data, file)

test/xue/test_dropdown_sheet.py

@@ -0,0 +1,75 @@
+from fastapi import FastAPI
+from fastapi.responses import HTMLResponse
+from xue import HTML, Head, Body, Div, xue_initialize, Script
+from xue.components import dropdown, sheet, button, form, input
+
+xue_initialize(tailwind=True)
+app = FastAPI()
+
+@app.get("/", response_class=HTMLResponse)
+async def root():
+    result = HTML(
+        Head(
+            title="Dropdown with Edit Sheet Example",
+        ),
+        Body(
+            Div(
+                dropdown.dropdown_menu("Actions"),
+                Div(id="sheet-container"),  # 这里是 sheet 将被加载的地方
+                class_="container mx-auto p-4"
+            )
+        )
+    ).render()
+    print(result)
+    return result
+
+@app.get("/dropdown-menu/{menu_id}", response_class=HTMLResponse)
+async def get_dropdown_menu_content(menu_id: str):
+    items = [
+        {
+            "icon": "pencil",
+            "label": "Edit",
+            "hx-get": "/edit-sheet",
+            "hx-target": "#sheet-container",
+            "hx-swap": "innerHTML"
+        },
+        {"icon": "trash", "label": "Delete"},
+        {"icon": "copy", "label": "Duplicate"},
+    ]
+    result = dropdown.dropdown_menu_content(menu_id, items).render()
+    print("dropdown-menu result", result)
+    return result
+
+@app.get("/edit-sheet", response_class=HTMLResponse)
+async def get_edit_sheet():
+    edit_sheet_content = sheet.SheetContent(
+        sheet.SheetHeader(
+            sheet.SheetTitle("Edit Item"),
+            sheet.SheetDescription("Make changes to your item here.")
+        ),
+        sheet.SheetBody(
+            form.Form(
+                form.FormField("Name", "name", placeholder="Enter item name"),
+                form.FormField("Description", "description", placeholder="Enter item description"),
+                Div(
+                    button.button("Save", class_="bg-blue-500 text-white"),
+                    button.button("Cancel", class_="bg-gray-300 text-gray-700 ml-2", data_close_sheet="true"),
+                    class_="flex justify-end mt-4"
+                ),
+                class_="space-y-4"
+            )
+        )
+    )
+
+    result = sheet.Sheet(
+        "edit-sheet",
+        Div(),
+        edit_sheet_content,
+        width="80%",
+        max_width="800px"
+    ).render()
+    return result
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run("__main__:app", host="0.0.0.0", port=8000, reload=True)

test/xue/test_form_uni_api.py

@@ -0,0 +1,116 @@
+from fastapi import FastAPI, Form as FastAPIForm
+from fastapi.responses import HTMLResponse
+from xue import HTML, Head, Body, Div, xue_initialize, Strong, Span, Ul, Li
+from xue.components import form, button, checkbox, input
+from xue.components.model_config_row import model_config_row
+from typing import List, Optional
+import time
+
+xue_initialize(tailwind=True)
+app = FastAPI()
+
+@app.get("/", response_class=HTMLResponse)
+async def root():
+    result = HTML(
+        Head(
+            title="Provider Configuration Form"
+        ),
+        Body(
+            Div(
+                form.Form(
+                    form.FormField("Provider", "provider", placeholder="Enter provider name", required=True),
+                    form.FormField("Base URL", "base_url", placeholder="Enter base URL", required=True),
+                    form.FormField("API Key", "api_key", type="password", placeholder="Enter API key"),
+                    Div(
+                        Div("Models", class_="text-lg font-semibold mb-2"),
+                        Div(
+                            model_config_row("model1", "gpt-4o: deepbricks-gpt-4o-mini", True),
+                            model_config_row("model2", "gpt-4o"),
+                            model_config_row("model3", "gpt-3.5-turbo"),
+                            model_config_row("model4", "claude-3-5-sonnet-20240620: claude-3-5-sonnet"),
+                            model_config_row("model5", "o1-mini-all"),
+                            model_config_row("model6", "o1-preview-all"),
+                            model_config_row("model7", "whisper-1"),
+                            id="models-container"
+                        ),
+                        button.button(
+                            "Add Model",
+                            class_="mt-2",
+                            hx_post="/add-model",
+                            hx_target="#models-container",
+                            hx_swap="beforeend"
+                        ),
+                        class_="mb-4"
+                    ),
+                    Div(
+                        checkbox.checkbox("tools", "Enable Tools", checked=True),
+                        class_="mb-4"
+                    ),
+                    form.FormField("Notes", "notes", placeholder="Enter any additional notes"),
+                    Div(
+                        button.button("Submit", class_="bg-blue-500 text-white"),
+                        button.button("Cancel", class_="bg-gray-300 text-gray-700 ml-2"),
+                        class_="flex justify-end mt-4"
+                    ),
+                    hx_post="/submit",
+                    hx_swap="outerHTML",
+                    class_="space-y-4"
+                ),
+                class_="container mx-auto p-4 max-w-2xl"
+            )
+        )
+    ).render()
+    print(result)
+    return result
+
+@app.post("/add-model", response_class=HTMLResponse)
+async def add_model():
+    new_model_id = f"model{hash(str(time.time()))}"  # 生成一个唯一的ID
+    new_model = model_config_row(new_model_id).render()
+    return new_model
+
+def form_success_message(provider, base_url, api_key, models, tools_enabled, notes):
+    return Div(
+        Strong("Success!", class_="font-bold"),
+        Span("Form submitted successfully.", class_="block sm:inline"),
+        Ul(
+            Li(f"Provider: {provider}"),
+            Li(f"Base URL: {base_url}"),
+            Li(f"API Key: {'*' * len(api_key)}"),
+            Li(f"Models: {', '.join(models)}"),
+            Li(f"Tools Enabled: {'Yes' if tools_enabled else 'No'}"),
+            Li(f"Notes: {notes}"),
+            class_="mt-3"
+        ),
+        class_="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative",
+        role="alert"
+    )
+
+@app.post("/submit", response_class=HTMLResponse)
+async def submit_form(
+    provider: str = FastAPIForm(...),
+    base_url: str = FastAPIForm(...),
+    api_key: str = FastAPIForm(...),
+    models: List[str] = FastAPIForm([]),
+    tools: Optional[str] = FastAPIForm(None),
+    notes: Optional[str] = FastAPIForm(None)
+):
+    # 处理提交的数据
+    print(f"Received: provider={provider}, base_url={base_url}, api_key={api_key}")
+    print(f"Models: {models}")
+    print(f"Tools Enabled: {tools is not None}")
+    print(f"Notes: {notes}")
+
+    # 返回处理结果
+    return form_success_message(
+        provider,
+        base_url,
+        api_key,
+        models,
+        tools is not None,
+        notes or "No notes provided"
+    ).render()
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run("__main__:app", host="0.0.0.0", port=8000, reload=True)

test/xue/test_home.py

@@ -0,0 +1,476 @@
+from fastapi import FastAPI, Request
+from fastapi import Form as FastapiForm, HTTPException, Depends
+from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
+from fastapi.security import APIKeyHeader
+from typing import Optional, List
+
+from xue import HTML, Head, Body, Div, xue_initialize, Script
+from xue.components.menubar import (
+    Menubar, MenubarMenu, MenubarTrigger, MenubarContent,
+    MenubarItem, MenubarSeparator
+)
+from xue.components import input
+from xue.components import dropdown, sheet, form, button, checkbox
+from xue.components.model_config_row import model_config_row
+import time
+
+import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+from components.provider_table import data_table
+
+
+from ruamel.yaml import YAML
+yaml = YAML()
+yaml.preserve_quotes = True
+yaml.indent(mapping=2, sequence=4, offset=2)
+
+xue_initialize(tailwind=True)
+
+from starlette.middleware.base import BaseHTTPMiddleware
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+class RequestBodyLoggerMiddleware(BaseHTTPMiddleware):
+    async def dispatch(self, request: Request, call_next):
+        if request.method == "POST" and request.url.path.startswith("/submit/"):
+        # if request.method == "POST":
+            body = await request.body()
+            logger.info(f"Request body for {request.url.path}: {body.decode()}")
+
+        response = await call_next(request)
+        return response
+
+from utils import load_config
+from contextlib import asynccontextmanager
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    # app.state.client = httpx.AsyncClient(timeout=timeout)
+    app.state.config, app.state.api_keys_db, app.state.api_list = await load_config()
+    for item in app.state.api_keys_db:
+        if item.get("role") == "admin":
+            app.state.admin_api_key = item.get("api")
+    if not hasattr(app.state, "admin_api_key"):
+        if len(app.state.api_keys_db) >= 1:
+            app.state.admin_api_key = app.state.api_keys_db[0].get("api")
+        else:
+            raise Exception("No admin API key found")
+
+    global data
+    # providers_data = app.state.config["providers"]
+
+    # print("data", data)
+    yield
+    # 关闭时的代码
+    await app.state.client.aclose()
+
+app = FastAPI(lifespan=lifespan)
+# app.add_middleware(RequestBodyLoggerMiddleware)
+app.add_middleware(RequestBodyLoggerMiddleware)
+
+data_table_columns = [
+    # {"label": "Status", "value": "status", "sortable": True},
+    {"label": "Provider", "value": "provider", "sortable": True},
+    {"label": "Base url", "value": "base_url", "sortable": True},
+    # {"label": "Engine", "value": "engine", "sortable": True},
+    {"label": "Tools", "value": "tools", "sortable": True},
+]
+
+API_KEY_NAME = "X-API-Key"
+api_key_header = APIKeyHeader(name=API_KEY_NAME, auto_error=False)
+
+@app.get("/login", response_class=HTMLResponse)
+async def login_page():
+    return HTML(
+        Head(title="登录"),
+        Body(
+            Div(
+                form.Form(
+                    form.FormField("API Key", "x_api_key", type="password", placeholder="输入API密钥", required=True),
+                    Div(id="error-message", class_="text-red-500 mt-2"),
+                    Div(
+                        button.button("提交", variant="primary", type="submit"),
+                        class_="flex justify-end mt-4"
+                    ),
+                    hx_post="/verify-api-key",
+                    hx_target="#error-message",
+                    hx_swap="innerHTML",
+                    class_="space-y-4"
+                ),
+                class_="container mx-auto p-4 max-w-md"
+            )
+        )
+    ).render()
+
+
+@app.post("/verify-api-key", response_class=HTMLResponse)
+async def verify_api_key(x_api_key: str = FastapiForm(...)):
+    if x_api_key == app.state.admin_api_key:  # 替换为实际的管理员API密钥
+        response = JSONResponse(content={"success": True})
+        response.headers["HX-Redirect"] = "/"  # 添加这一行
+        response.set_cookie(
+            key="x_api_key",
+            value=x_api_key,
+            httponly=True,
+            max_age=1800,  # 30分钟
+            secure=False,  # 在开发环境中设置为False，生产环境中使用HTTPS时设置为True
+            samesite="lax"  # 改为"lax"以允许重定向时携带cookie
+        )
+        return response
+    else:
+        return Div("无效的API密钥", class_="text-red-500").render()
+
+async def get_api_key(request: Request, x_api_key: Optional[str] = Depends(api_key_header)):
+    if not x_api_key:
+        x_api_key = request.cookies.get("x_api_key") or request.query_params.get("x_api_key")
+    # print(f"Cookie x_api_key: {request.cookies.get('x_api_key')}")  # 添加此行
+    # print(f"Query param x_api_key: {request.query_params.get('x_api_key')}")  # 添加此行
+    # print(f"Header x_api_key: {x_api_key}")  # 添加此��
+    # logger.info(f"x_api_key: {x_api_key} {x_api_key == 'your_admin_api_key'}")
+
+    if x_api_key == app.state.admin_api_key:  # 替换为实际的管理员API密钥
+        return x_api_key
+    else:
+        return None
+
+@app.get("/", response_class=HTMLResponse)
+async def root(x_api_key: str = Depends(get_api_key)):
+    if not x_api_key:
+        return RedirectResponse(url="/login", status_code=303)
+
+    result = HTML(
+        Head(
+            Script("""
+                document.addEventListener('DOMContentLoaded', function() {
+                    const filterInput = document.getElementById('users-table-filter');
+                    filterInput.addEventListener('input', function() {
+                        const filterValue = this.value;
+                        htmx.ajax('GET', `/filter-table?filter=${filterValue}`, '#users-table');
+                    });
+                });
+            """),
+            title="Menubar Example"
+        ),
+        Body(
+            Div(
+                Menubar(
+                    MenubarMenu(
+                        MenubarTrigger("File", "file-menu"),
+                        MenubarContent(
+                            MenubarItem("New Tab", shortcut="⌘T"),
+                            MenubarItem("New Window", shortcut="⌘N"),
+                            MenubarItem("New Incognito Window", disabled=True),
+                            MenubarSeparator(),
+                            MenubarItem("Print...", shortcut="⌘P"),
+                        ),
+                        id="file-menu"
+                    ),
+                    MenubarMenu(
+                        MenubarTrigger("Edit", "edit-menu"),
+                        MenubarContent(
+                            MenubarItem("Undo", shortcut="⌘Z"),
+                            MenubarItem("Redo", shortcut="⇧⌘Z"),
+                            MenubarSeparator(),
+                            MenubarItem("Cut"),
+                            MenubarItem("Copy"),
+                            MenubarItem("Paste"),
+                        ),
+                        id="edit-menu"
+                    ),
+                    MenubarMenu(
+                        MenubarTrigger("View", "view-menu"),
+                        MenubarContent(
+                            MenubarItem("Always Show Bookmarks Bar"),
+                            MenubarItem("Always Show Full URLs"),
+                            MenubarSeparator(),
+                            MenubarItem("Reload", shortcut="⌘R"),
+                            MenubarItem("Force Reload", shortcut="⇧⌘R", disabled=True),
+                            MenubarSeparator(),
+                            MenubarItem("Toggle Fullscreen"),
+                            MenubarItem("Hide Sidebar"),
+                        ),
+                        id="view-menu"
+                    ),
+                ),
+                class_="p-4"
+            ),
+            Div(
+                data_table(data_table_columns, app.state.config["providers"], "users-table"),
+                class_="p-4"
+            ),
+            Div(id="sheet-container"),  # 这里是 sheet 将被加载的地方
+            class_="container mx-auto",
+            id="body"
+        )
+    ).render()
+    # print(result)
+    return result
+
+@app.get("/dropdown-menu/{menu_id}/{row_id}", response_class=HTMLResponse)
+async def get_columns_menu(menu_id: str, row_id: str):
+    columns = [
+        {
+            "label": "Edit",
+            "value": "edit",
+            "hx-get": f"/edit-sheet/{row_id}",
+            "hx-target": "#sheet-container",
+            "hx-swap": "innerHTML"
+        },
+        {
+            "label": "Duplicate",
+            "value": "duplicate",
+            "hx-post": f"/duplicate/{row_id}",
+            "hx-target": "body",
+            "hx-swap": "outerHTML"
+        },
+        {
+            "label": "Delete",
+            "value": "delete",
+            "hx-delete": f"/delete/{row_id}",
+            "hx-target": "body",
+            "hx-swap": "outerHTML",
+            "hx-confirm": "确定要删除这个配置吗？"
+        },
+    ]
+    result = dropdown.dropdown_menu_content(menu_id, columns).render()
+    print(result)
+    return result
+
+@app.get("/dropdown-menu/{menu_id}", response_class=HTMLResponse)
+async def get_columns_menu(menu_id: str):
+    result = dropdown.dropdown_menu_content(menu_id, data_table_columns).render()
+    print(result)
+    return result
+
+@app.get("/filter-table", response_class=HTMLResponse)
+async def filter_table(filter: str = ""):
+    filtered_data = [
+        provider for provider in app.state.config["providers"]
+        if filter.lower() in str(provider["provider"]).lower() or
+           filter.lower() in str(provider["base_url"]).lower() or
+           filter.lower() in str(provider["tools"]).lower()
+    ]
+    return data_table(data_table_columns, filtered_data, "users-table", with_filter=False).render()
+
+@app.post("/add-model", response_class=HTMLResponse)
+async def add_model():
+    new_model_id = f"model{hash(str(time.time()))}"  # 生成一个唯一的ID
+    new_model = model_config_row(new_model_id).render()
+    return new_model
+
+@app.get("/edit-sheet/{row_id}", response_class=HTMLResponse)
+async def get_edit_sheet(row_id: str, x_api_key: str = Depends(get_api_key)):
+    row_data = get_row_data(row_id)
+    print("row_data", row_data)
+
+    model_list = []
+    for index, model in enumerate(row_data["model"]):
+        if isinstance(model, str):
+            model_list.append(model_config_row(f"model{index}", model, "", True))
+        if isinstance(model, dict):
+            # print("model", model, list(model.items())[0])
+            key, value = list(model.items())[0]
+            model_list.append(model_config_row(f"model{index}", key, value, True))
+
+    sheet_id = "edit-sheet"
+    edit_sheet_content = sheet.SheetContent(
+        sheet.SheetHeader(
+            sheet.SheetTitle("Edit Item"),
+            sheet.SheetDescription("Make changes to your item here.")
+        ),
+        sheet.SheetBody(
+            Div(
+                form.Form(
+                    form.FormField("Provider", "provider", value=row_data["provider"], placeholder="Enter provider name", required=True),
+                    form.FormField("Base URL", "base_url", value=row_data["base_url"], placeholder="Enter base URL", required=True),
+                    form.FormField("API Key", "api_key", value=row_data["api"], type="text", placeholder="Enter API key"),
+                    Div(
+                        Div("Models", class_="text-lg font-semibold mb-2"),
+                        Div(
+                            *model_list,
+                            id="models-container"
+                        ),
+                        button.button(
+                            "Add Model",
+                            class_="mt-2",
+                            hx_post="/add-model",
+                            hx_target="#models-container",
+                            hx_swap="beforeend"
+                        ),
+                        class_="mb-4"
+                    ),
+                    Div(
+                        checkbox.checkbox("tools", "Enable Tools", checked=row_data["tools"], name="tools"),
+                        class_="mb-4"
+                    ),
+                    form.FormField("Notes", "notes", value=row_data.get("notes", ""), placeholder="Enter any additional notes"),
+                    Div(
+                        button.button("Submit", variant="primary", type="submit"),
+                        button.button("Cancel", variant="outline", type="button", class_="ml-2", onclick=f"toggleSheet('{sheet_id}')"),
+                        class_="flex justify-end mt-4"
+                    ),
+                    hx_post=f"/submit/{row_id}",
+                    hx_swap="outerHTML",
+                    hx_target="body",
+                    class_="space-y-4"
+                ),
+                class_="container mx-auto p-4 max-w-2xl"
+            )
+        )
+    )
+
+    result = sheet.Sheet(
+        sheet_id,
+        Div(),
+        edit_sheet_content,
+        width="80%",
+        max_width="800px"
+    ).render()
+    return result
+
+@app.get("/add-provider-sheet", response_class=HTMLResponse)
+async def get_add_provider_sheet():
+    edit_sheet_content = sheet.SheetContent(
+        sheet.SheetHeader(
+            sheet.SheetTitle("Add New Provider"),
+            sheet.SheetDescription("Enter details for the new provider.")
+        ),
+        sheet.SheetBody(
+            Div(
+                form.Form(
+                    form.FormField("Provider", "provider", placeholder="Enter provider name", required=True),
+                    form.FormField("Base URL", "base_url", placeholder="Enter base URL", required=True),
+                    form.FormField("API Key", "api_key", type="text", placeholder="Enter API key"),
+                    Div(
+                        Div("Models", class_="text-lg font-semibold mb-2"),
+                        Div(id="models-container"),
+                        button.button(
+                            "Add Model",
+                            class_="mt-2",
+                            hx_post="/add-model",
+                            hx_target="#models-container",
+                            hx_swap="beforeend"
+                        ),
+                        class_="mb-4"
+                    ),
+                    Div(
+                        checkbox.checkbox("tools", "Enable Tools", name="tools"),
+                        class_="mb-4"
+                    ),
+                    form.FormField("Notes", "notes", placeholder="Enter any additional notes"),
+                    Div(
+                        button.button("Submit", variant="primary", type="submit"),
+                        button.button("Cancel", variant="outline", class_="ml-2"),
+                        class_="flex justify-end mt-4"
+                    ),
+                    hx_post="/submit/new",
+                    hx_swap="outerHTML",
+                    hx_target="body",
+                    class_="space-y-4"
+                ),
+                class_="container mx-auto p-4 max-w-2xl"
+            )
+        )
+    )
+
+    result = sheet.Sheet(
+        "add-provider-sheet",
+        Div(),
+        edit_sheet_content,
+        width="80%",
+        max_width="800px"
+    ).render()
+    return result
+
+def get_row_data(row_id):
+    index = int(row_id)
+    # print(app.state.config["providers"])
+    return app.state.config["providers"][index]
+
+def update_row_data(row_id, updated_data):
+    print(row_id, updated_data)
+    index = int(row_id)
+    app.state.config["providers"][index] = updated_data
+    with open("./api1.yaml", "w", encoding="utf-8") as f:
+        yaml.dump(app.state.config, f)
+
+@app.post("/submit/{row_id}", response_class=HTMLResponse)
+async def submit_form(
+    row_id: str,
+    request: Request,
+    provider: str = FastapiForm(...),
+    base_url: str = FastapiForm(...),
+    api_key: Optional[str] = FastapiForm(None),
+    tools: Optional[str] = FastapiForm(None),
+    notes: Optional[str] = FastapiForm(None),
+    x_api_key: str = Depends(get_api_key)
+):
+    form_data = await request.form()
+
+    # 收集模型数据
+    models = []
+    for key, value in form_data.items():
+        if key.startswith("model_name_"):
+            model_id = key.split("_")[-1]
+            enabled = form_data.get(f"model_enabled_{model_id}") == "on"
+            rename = form_data.get(f"model_rename_{model_id}")
+            if value:
+                if rename:
+                    models.append({value: rename})
+                else:
+                    models.append(value)
+
+    updated_data = {
+        "provider": provider,
+        "base_url": base_url,
+        "api": api_key,
+        "model": models,
+        "tools": tools == "on",
+        "notes": notes,
+    }
+
+    print("updated_data", updated_data)
+
+    if row_id == "new":
+        # 添加新提供者
+        app.state.config["providers"].append(updated_data)
+    else:
+        # 更新现有提供者
+        update_row_data(row_id, updated_data)
+
+    # 保存更新后的配置
+    with open("./api1.yaml", "w", encoding="utf-8") as f:
+        yaml.dump(app.state.config, f)
+
+    return await root()
+
+@app.post("/duplicate/{row_id}", response_class=HTMLResponse)
+async def duplicate_row(row_id: str):
+    index = int(row_id)
+    original_data = app.state.config["providers"][index]
+    new_data = original_data.copy()
+    new_data["provider"] += "-copy"
+    app.state.config["providers"].insert(index + 1, new_data)
+
+    # 保存更新后的配置
+    with open("./api1.yaml", "w", encoding="utf-8") as f:
+        yaml.dump(app.state.config, f)
+
+    return await root()
+
+@app.delete("/delete/{row_id}", response_class=HTMLResponse)
+async def delete_row(row_id: str):
+    index = int(row_id)
+    del app.state.config["providers"][index]
+
+    # 保存更新后的配置
+    with open("./api1.yaml", "w", encoding="utf-8") as f:
+        yaml.dump(app.state.config, f)
+
+    return await root()
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run("__main__:app", host="0.0.0.0", port=8000, reload=True)

utils.py

@@ -3,26 +3,74 @@ from fastapi import HTTPException
 import httpx
 
 from log_config import logger
+from collections import defaultdict
+
+import asyncio
+
+class ThreadSafeCircularList:
+    def __init__(self, items):
+        self.items = items
+        self.index = 0
+        self.lock = asyncio.Lock()
+
+    async def next(self):
+        async with self.lock:
+            item = self.items[self.index]
+            self.index = (self.index + 1) % len(self.items)
+            return item
+
+def circular_list_encoder(obj):
+    if isinstance(obj, ThreadSafeCircularList):
+        return obj.to_dict()
+    raise TypeError(f'Object of type {obj.__class__.__name__} is not JSON serializable')
+
+provider_api_circular_list = defaultdict(ThreadSafeCircularList)
+
+def get_model_dict(provider):
+    model_dict = {}
+    for model in provider['model']:
+        if type(model) == str:
+            model_dict[model] = model
+        if type(model) == dict:
+            model_dict.update({new: old for old, new in model.items()})
+    return model_dict
+
+def update_initial_model(api_url, api):
+    try:
+        endpoint = BaseAPI(api_url=api_url)
+        endpoint_models_url = endpoint.v1_models
+        response = httpx.get(
+            endpoint_models_url,
+            headers={"Authorization": f"Bearer {api}"},
+        )
+        models = response.json()
+        # print(models)
+        models_list = models["data"]
+        models_id = [model["id"] for model in models_list]
+        set_models = set()
+        for model_item in models_id:
+            set_models.add(model_item)
+        models_id = list(set_models)
+        # print(models_id)
+        return models_id
+    except Exception as e:
+        print("error:", e)
+        return []
 
 def update_config(config_data):
     for index, provider in enumerate(config_data['providers']):
-        model_dict = {}
-        for model in provider['model']:
-            if type(model) == str:
-                model_dict[model] = model
-            if type(model) == dict:
-                model_dict.update({new: old for old, new in model.items()})
-        provider['model'] = model_dict
         if provider.get('project_id'):
             provider['base_url'] = 'https://aiplatform.googleapis.com/'
         if provider.get('cf_account_id'):
             provider['base_url'] = 'https://api.cloudflare.com/'
 
-        if provider.get('api'):
-            if isinstance(provider.get('api'), str):
-                provider['api'] = CircularList([provider.get('api')])
-            if isinstance(provider.get('api'), list):
-                provider['api'] = CircularList(provider.get('api'))
+        provider_api_circular_list[provider['provider']] = ThreadSafeCircularList([provider.get('api', None)])
+
+        if not provider.get("model"):
+            provider["model"] = update_initial_model(provider['base_url'], provider['api'])
+
+        if provider.get("tools") == None:
+            provider["tools"] = True
 
         config_data['providers'][index] = provider
 
@@ -46,31 +94,24 @@ def update_config(config_data):
             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))
+    # logger.info(json.dumps(config_data, indent=4, ensure_ascii=False))
     return config_data, api_keys_db, api_list
 
 # 读取YAML配置文件
 async def load_config(app=None):
-    import yaml
     try:
-        # with open('./api.yaml', 'r') as f:
-        #     tokens = yaml.scan(f)
-        #     for token in tokens:
-        #         if isinstance(token, yaml.ScalarToken):
-        #             value = token.value
-        #             # 如果plain为False，表示字符串被引号包裹
-        #             is_quoted = not token.plain
-        #             print(f"值: {value}, 是否被引号包裹: {is_quoted}")
-
-        with open("./api.yaml", "r", encoding="utf-8") as f:
-            # 判断是否为空文件
-            conf = yaml.safe_load(f)
-            # conf = None
-            if conf:
-                config, api_keys_db, api_list = update_config(conf)
-            else:
-                # logger.error("配置文件 'api.yaml' 为空。请检查文件内容。")
-                config, api_keys_db, api_list = [], [], []
+        from ruamel.yaml import YAML
+        yaml = YAML()
+        yaml.preserve_quotes = True
+        yaml.indent(mapping=2, sequence=4, offset=2)
+        with open('api.yaml', 'r', encoding='utf-8') as file:
+            conf = yaml.load(file)
+
+        if conf:
+            config, api_keys_db, api_list = update_config(conf)
+        else:
+            # logger.error("配置文件 'api.yaml' 为空。请检查文件内容。")
+            config, api_keys_db, api_list = [], [], []
     except FileNotFoundError:
         logger.error("'api.yaml' not found. Please check the file path.")
         config, api_keys_db, api_list = [], [], []
@@ -228,7 +269,8 @@ def get_all_models(config):
     unique_models = set()
 
     for provider in config["providers"]:
-        for model in provider['model'].keys():
+        model_dict = get_model_dict(provider)
+        for model in model_dict.keys():
             if model not in unique_models:
                 unique_models.add(model)
                 model_info = {
@@ -260,35 +302,12 @@ def get_all_models(config):
 # europe-west1
 # europe-west4
 
-def circular_list_encoder(obj):
-    if isinstance(obj, CircularList):
-        return obj.to_dict()
-    raise TypeError(f'Object of type {obj.__class__.__name__} is not JSON serializable')
-
-from collections import deque
-class CircularList:
-    def __init__(self, items):
-        self.queue = deque(items)
-
-    def next(self):
-        if not self.queue:
-            return None
-        item = self.queue.popleft()
-        self.queue.append(item)
-        return item
-
-    def to_dict(self):
-        return {
-            'queue': list(self.queue)
-        }
-
-
 
-c35s = CircularList(["us-east5", "europe-west1"])
-c3s = CircularList(["us-east5", "us-central1", "asia-southeast1"])
-c3o = CircularList(["us-east5"])
-c3h = CircularList(["us-east5", "us-central1", "europe-west1", "europe-west4"])
-gem = CircularList(["us-central1", "us-east4", "us-west1", "us-west4", "europe-west1", "europe-west2"])
+c35s = ThreadSafeCircularList(["us-east5", "europe-west1"])
+c3s = ThreadSafeCircularList(["us-east5", "us-central1", "asia-southeast1"])
+c3o = ThreadSafeCircularList(["us-east5"])
+c3h = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west1", "europe-west4"])
+gem = ThreadSafeCircularList(["us-central1", "us-east4", "us-west1", "us-west4", "europe-west1", "europe-west2"])
 
 class BaseAPI:
     def __init__(