Update app.py

app.py

@@ -42,23 +42,31 @@ models = {}
 
 def get_model(model_name: str):
     logger.info(f"尝试获取模型: {model_name}")
+    # 1. 定义所有支持的模型（映射名 + 直接支持的模型名）
+    supported_models = set(MODEL_MAPPING.keys())  # 包含text-embedding-3-*和bge-*
     model_to_load = MODEL_MAPPING.get(model_name, model_name)
-    
-    # 提前检查模型是否在已知支持列表中（可选）
-    known_models = set(MODEL_MAPPING.keys()).union(set(MODEL_MAPPING.values()))
-    if model_to_load not in known_models and not model_to_load.startswith(("BAAI/", "sentence-transformers/")):
-        raise HTTPException(status_code=400, detail=f"不支持的模型: {model_name}")
-    
+
+    # 2. 提前拦截无效模型：若不在支持列表且非已知机构前缀，直接返回400
+    known_prefixes = ("BAAI/", "sentence-transformers/")  # 允许合法机构的模型
+    if (model_name not in supported_models) and (not model_to_load.startswith(known_prefixes)):
+        error_msg = f"不支持的模型: {model_name}"
+        logger.error(error_msg)
+        raise HTTPException(status_code=400, detail=error_msg)
+
+    # 3. 加载支持的模型（含合法机构前缀的模型）
     if model_name not in models:
         try:
             hf_token = os.getenv("HUGGINGFACE_HUB_TOKEN")
-            models[model_name] = SentenceTransformer(model_to_load, use_auth_token=hf_token)
+            models[model_name] = SentenceTransformer(
+                model_to_load,
+                use_auth_token=hf_token
+            )
             logger.info(f"模型 {model_name} 加载成功")
         except Exception as e:
-            if "not a valid model identifier" in str(e):
-                raise HTTPException(status_code=400, detail=f"不支持的模型: {model_name}")
-            else:
-                raise HTTPException(status_code=500, detail=f"加载模型失败: {str(e)}")
+            # 若合法模型加载失败（如网络问题），返回500；无效模型已提前拦截
+            error_msg = f"加载模型 {model_name} 失败: {str(e)}"
+            logger.error(error_msg)
+            raise HTTPException(status_code=500, detail=error_msg)
     return models[model_name]