From 82f5d901c89a70857851f2c6cf1a95ef8b492724 Mon Sep 17 00:00:00 2001 From: Kevin Hu Date: Mon, 10 Mar 2025 11:01:06 +0800 Subject: [PATCH] Refa: add model. (#5820) ### What problem does this PR solve? #5783 ### Type of change - [x] Refactoring --- api/apps/llm_app.py | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/api/apps/llm_app.py b/api/apps/llm_app.py index 62ebaf30d..4eb60db1a 100644 --- a/api/apps/llm_app.py +++ b/api/apps/llm_app.py @@ -135,6 +135,8 @@ def set_api_key(): def add_llm(): req = request.json factory = req["llm_factory"] + api_key = req.get("api_key", "") + llm_name = req["llm_name"] def apikey_json(keys): nonlocal req @@ -143,7 +145,6 @@ def add_llm(): if factory == "VolcEngine": # For VolcEngine, due to its special authentication method # Assemble ark_api_key endpoint_id into api_key - llm_name = req["llm_name"] api_key = apikey_json(["ark_api_key", "endpoint_id"]) elif factory == "Tencent Hunyuan": @@ -157,52 +158,38 @@ def add_llm(): elif factory == "Bedrock": # For Bedrock, due to its special authentication method # Assemble bedrock_ak, bedrock_sk, bedrock_region - llm_name = req["llm_name"] api_key = apikey_json(["bedrock_ak", "bedrock_sk", "bedrock_region"]) elif factory == "LocalAI": - llm_name = req["llm_name"] + "___LocalAI" - api_key = "xxxxxxxxxxxxxxx" + llm_name += "___LocalAI" elif factory == "HuggingFace": - llm_name = req["llm_name"] + "___HuggingFace" - api_key = "xxxxxxxxxxxxxxx" + llm_name += "___HuggingFace" elif factory == "OpenAI-API-Compatible": - llm_name = req["llm_name"] + "___OpenAI-API" - api_key = req.get("api_key", "xxxxxxxxxxxxxxx") + llm_name += "___OpenAI-API" elif factory == "VLLM": - llm_name = req["llm_name"] + "___VLLM" - api_key = req.get("api_key", "xxxxxxxxxxxxxxx") + llm_name += "___VLLM" elif factory == "XunFei Spark": - llm_name = req["llm_name"] if req["model_type"] == "chat": - api_key = req.get("spark_api_password", "xxxxxxxxxxxxxxx") + api_key = req.get("spark_api_password", "") elif req["model_type"] == "tts": api_key = apikey_json(["spark_app_id", "spark_api_secret", "spark_api_key"]) elif factory == "BaiduYiyan": - llm_name = req["llm_name"] api_key = apikey_json(["yiyan_ak", "yiyan_sk"]) elif factory == "Fish Audio": - llm_name = req["llm_name"] api_key = apikey_json(["fish_audio_ak", "fish_audio_refid"]) elif factory == "Google Cloud": - llm_name = req["llm_name"] api_key = apikey_json(["google_project_id", "google_region", "google_service_account_key"]) elif factory == "Azure-OpenAI": - llm_name = req["llm_name"] api_key = apikey_json(["api_key", "api_version"]) - else: - llm_name = req["llm_name"] - api_key = req.get("api_key", "xxxxxxxxxxxxxxx") - llm = { "tenant_id": current_user.id, "llm_factory": factory,