andre/gpt_academic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决一些合并冲突遗漏

Browse Source
This commit is contained in:
w_xiaolizu
2023-06-27 15:54:20 +08:00
parent 8bcb8dee18
commit 8046900b89
6 changed files with 243 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
toolbox.py
View File

@ -595,7 +595,7 @@ def is_api2d_key(key):
return False
def is_proxy_key(key):
if 'proxy' in key:
if key.startswith('proxy-') and len(key) == 37:
return True
else:
return False
@ -621,7 +621,14 @@ def what_keys(keys):
if is_api2d_key(k):
avail_key_list['API2D Key'] += 1
return f"检测到： OpenAI Key {avail_key_list['OpenAI Key']} 个，API2D Key {avail_key_list['API2D Key']} 个"
for k in key_list:
if is_proxy_key(k):
avail_key_list['Proxy Key'] += 1
return f"检测到： \n" \
f"OpenAI Key {avail_key_list['OpenAI Key']} 个\n" \
f"API2D Key {avail_key_list['API2D Key']} 个\n" \
f"Proxy Key {avail_key_list['API2D Key']} 个\n"
def select_api_key(keys, llm_model):
import random
@ -636,7 +643,7 @@ def select_api_key(keys, llm_model):
for k in key_list:
if is_api2d_key(k): avail_key_list.append(k)
if llm_model.startswith('proxy'):
if llm_model.startswith('proxy-'):
for k in key_list:
if is_proxy_key(k): avail_key_list.append(k.replace('proxy-', ''))