diff --git a/shared_utils/key_pattern_manager.py b/shared_utils/key_pattern_manager.py index e0d101d1..34843485 100644 --- a/shared_utils/key_pattern_manager.py +++ b/shared_utils/key_pattern_manager.py @@ -4,7 +4,6 @@ from functools import wraps, lru_cache from shared_utils.advanced_markdown_format import format_io from shared_utils.config_loader import get_conf as get_conf - pj = os.path.join default_user_name = 'default_user' @@ -12,11 +11,13 @@ default_user_name = 'default_user' openai_regex = re.compile( r"sk-[a-zA-Z0-9_-]{48}$|" + r"sk-[a-zA-Z0-9_-]{92}$|" + - r"sk-proj-[a-zA-Z0-9_-]{48}$|"+ - r"sk-proj-[a-zA-Z0-9_-]{124}$|"+ - r"sk-proj-[a-zA-Z0-9_-]{156}$|"+ #新版apikey位数不匹配故修改此正则表达式 + r"sk-proj-[a-zA-Z0-9_-]{48}$|" + + r"sk-proj-[a-zA-Z0-9_-]{124}$|" + + r"sk-proj-[a-zA-Z0-9_-]{156}$|" + #新版apikey位数不匹配故修改此正则表达式 r"sess-[a-zA-Z0-9]{40}$" ) + + def is_openai_api_key(key): CUSTOM_API_KEY_PATTERN = get_conf('CUSTOM_API_KEY_PATTERN') if len(CUSTOM_API_KEY_PATTERN) != 0: @@ -27,7 +28,7 @@ def is_openai_api_key(key): def is_azure_api_key(key): - API_MATCH_AZURE = re.match(r"[a-zA-Z0-9]{32}$", key) + API_MATCH_AZURE = re.match(r"^[a-zA-Z0-9]{32}$|^[a-zA-Z0-9]{84}", key) return bool(API_MATCH_AZURE) @@ -35,10 +36,12 @@ def is_api2d_key(key): API_MATCH_API2D = re.match(r"fk[a-zA-Z0-9]{6}-[a-zA-Z0-9]{32}$", key) return bool(API_MATCH_API2D) + def is_openroute_api_key(key): API_MATCH_OPENROUTE = re.match(r"sk-or-v1-[a-zA-Z0-9]{64}$", key) return bool(API_MATCH_OPENROUTE) + def is_cohere_api_key(key): API_MATCH_AZURE = re.match(r"[a-zA-Z0-9]{40}$", key) return bool(API_MATCH_AZURE) @@ -94,7 +97,7 @@ def select_api_key(keys, llm_model): if llm_model.startswith('cohere-'): for k in key_list: if is_cohere_api_key(k): avail_key_list.append(k) - + if llm_model.startswith('openrouter-'): for k in key_list: if is_openroute_api_key(k): avail_key_list.append(k) @@ -102,7 +105,7 @@ def select_api_key(keys, llm_model): if len(avail_key_list) == 0: raise RuntimeError(f"您提供的api-key不满足要求,不包含任何可用于{llm_model}的api-key。您可能选择了错误的模型或请求源(左上角更换模型菜单中可切换openai,azure,claude,cohere等请求源)。") - api_key = random.choice(avail_key_list) # 随机负载均衡 + api_key = random.choice(avail_key_list) # 随机负载均衡 return api_key @@ -118,5 +121,5 @@ def select_api_key_for_embed_models(keys, llm_model): if len(avail_key_list) == 0: raise RuntimeError(f"您提供的api-key不满足要求,不包含任何可用于{llm_model}的api-key。您可能选择了错误的模型或请求源。") - api_key = random.choice(avail_key_list) # 随机负载均衡 + api_key = random.choice(avail_key_list) # 随机负载均衡 return api_key