🐛 Bug: Fix the bug where the model is not persisted to the file after being automatically retrieved.

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, get_model_dict
+from utils import error_handling_wrapper, post_all_models, load_config, safe_get, circular_list_encoder, get_model_dict, save_api_yaml
 
 from collections import defaultdict
 from typing import List, Dict, Union
@@ -1120,8 +1120,6 @@ async def frontend_rate_limit_dependency(request: Request, x_api_key: str = Depe
 
 xue_initialize(tailwind=True)
 
-API_YAML_PATH = "./api.yaml"
-
 data_table_columns = [
     # {"label": "Status", "value": "status", "sortable": True},
     {"label": "Provider", "value": "provider", "sortable": True},
@@ -1500,10 +1498,6 @@ def update_row_data(row_id, updated_data):
     index = int(row_id)
     app.state.config["providers"][index] = updated_data
 
-def save_api_yaml():
-    with open(API_YAML_PATH, "w", encoding="utf-8") as f:
-        yaml.dump(app.state.config, f)
-
 @frontend_router.post("/submit/{row_id}", response_class=HTMLResponse, dependencies=[Depends(frontend_rate_limit_dependency)])
 async def submit_form(
     row_id: str,
@@ -1551,7 +1545,8 @@ async def submit_form(
         update_row_data(row_id, updated_data)
 
     # 保存更新后的配置
-    save_api_yaml()
+    if not DISABLE_DATABASE:
+        save_api_yaml(app.state.config)
 
     return await root()
 
@@ -1564,7 +1559,8 @@ async def duplicate_row(row_id: str):
     app.state.config["providers"].insert(index + 1, new_data)
 
     # 保存更新后的配置
-    save_api_yaml()
+    if not DISABLE_DATABASE:
+        save_api_yaml(app.state.config)
 
     return await root()
 
@@ -1574,7 +1570,8 @@ async def delete_row(row_id: str):
     del app.state.config["providers"][index]
 
     # 保存更新后的配置
-    save_api_yaml()
+    if not DISABLE_DATABASE:
+        save_api_yaml(app.state.config)
 
     return await root()
 

utils.py

@@ -63,7 +63,18 @@ def update_initial_model(api_url, api):
         traceback.print_exc()
         return []
 
-def update_config(config_data):
+from ruamel.yaml import YAML, YAMLError
+yaml = YAML()
+yaml.preserve_quotes = True
+yaml.indent(mapping=2, sequence=4, offset=2)
+
+API_YAML_PATH = "./api.yaml"
+
+def save_api_yaml(config_data):
+    with open(API_YAML_PATH, "w", encoding="utf-8") as f:
+        yaml.dump(config_data, f)
+
+def update_config(config_data, use_config_url=False):
     for index, provider in enumerate(config_data['providers']):
         if provider.get('project_id'):
             provider['base_url'] = 'https://aiplatform.googleapis.com/'
@@ -78,7 +89,11 @@ def update_config(config_data):
                 provider_api_circular_list[provider['provider']] = ThreadSafeCircularList(provider_api)
 
         if not provider.get("model"):
-            provider["model"] = update_initial_model(provider['base_url'], provider['api'])
+            model_list = update_initial_model(provider['base_url'], provider['api'])
+            if model_list:
+                provider["model"] = model_list
+                if not use_config_url:
+                    save_api_yaml(config_data)
 
         if provider.get("tools") == None:
             provider["tools"] = True
@@ -128,16 +143,12 @@ async def load_config(app=None):
             follow_redirects=True,  # 自动跟随重定向
         )
 
-    from ruamel.yaml import YAML, YAMLError
-    yaml = YAML()
-    yaml.preserve_quotes = True
-    yaml.indent(mapping=2, sequence=4, offset=2)
     try:
-        with open('api.yaml', 'r', encoding='utf-8') as file:
+        with open(API_YAML_PATH, 'r', encoding='utf-8') as file:
             conf = yaml.load(file)
 
         if conf:
-            config, api_keys_db, api_list = update_config(conf)
+            config, api_keys_db, api_list = update_config(conf, use_config_url=False)
         else:
             logger.error("配置文件 'api.yaml' 为空。请检查文件内容。")
             config, api_keys_db, api_list = {}, {}, []
@@ -166,7 +177,7 @@ async def load_config(app=None):
             # 更新配置
             # logger.info(config_data)
             if config_data:
-                config, api_keys_db, api_list = update_config(config_data)
+                config, api_keys_db, api_list = update_config(config_data, use_config_url=True)
             else:
                 logger.error(f"Error fetching or parsing config from {config_url}")
                 config, api_keys_db, api_list = {}, {}, []