change get_conf

toolbox.py

@@ -152,7 +152,7 @@ def CatchException(f):
         except Exception as e:
             from check_proxy import check_proxy
             from toolbox import get_conf
-            proxies, = get_conf('proxies')
+            proxies = get_conf('proxies')
             tb_str = '```\n' + trimmed_format_exc() + '```'
             if len(chatbot_with_cookie) == 0:
                 chatbot_with_cookie.clear()
@@ -555,14 +555,14 @@ def disable_auto_promotion(chatbot):
     return
 
 def is_the_upload_folder(string):
-    PATH_PRIVATE_UPLOAD, = get_conf('PATH_PRIVATE_UPLOAD')
+    PATH_PRIVATE_UPLOAD = get_conf('PATH_PRIVATE_UPLOAD')
     pattern = r'^PATH_PRIVATE_UPLOAD/[A-Za-z0-9_-]+/\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}$'
     pattern = pattern.replace('PATH_PRIVATE_UPLOAD', PATH_PRIVATE_UPLOAD)
     if re.match(pattern, string): return True
     else: return False
 
 def del_outdated_uploads(outdate_time_seconds):
-    PATH_PRIVATE_UPLOAD, = get_conf('PATH_PRIVATE_UPLOAD')
+    PATH_PRIVATE_UPLOAD = get_conf('PATH_PRIVATE_UPLOAD')
     current_time = time.time()
     one_hour_ago = current_time - outdate_time_seconds
     # Get a list of all subdirectories in the PATH_PRIVATE_UPLOAD folder
@@ -588,7 +588,7 @@ def on_file_uploaded(request: gradio.Request, files, chatbot, txt, txt2, checkbo
     # 创建工作路径
     user_name = "default" if not request.username else request.username
     time_tag = gen_time_str()
-    PATH_PRIVATE_UPLOAD, = get_conf('PATH_PRIVATE_UPLOAD')
+    PATH_PRIVATE_UPLOAD = get_conf('PATH_PRIVATE_UPLOAD')
     target_path_base = pj(PATH_PRIVATE_UPLOAD, user_name, time_tag)
     os.makedirs(target_path_base, exist_ok=True)
 
@@ -626,7 +626,7 @@ def on_file_uploaded(request: gradio.Request, files, chatbot, txt, txt2, checkbo
 
 def on_report_generated(cookies, files, chatbot):
     from toolbox import find_recent_files
-    PATH_LOGGING, = get_conf('PATH_LOGGING')
+    PATH_LOGGING = get_conf('PATH_LOGGING')
     if 'files_to_promote' in cookies:
         report_files = cookies['files_to_promote']
         cookies.pop('files_to_promote')
@@ -669,7 +669,7 @@ def load_chat_cookies():
     return {'api_key': API_KEY, 'llm_model': LLM_MODEL, 'customize_fn_overwrite': customize_fn_overwrite_}
 
 def is_openai_api_key(key):
-    CUSTOM_API_KEY_PATTERN, = get_conf('CUSTOM_API_KEY_PATTERN')
+    CUSTOM_API_KEY_PATTERN = get_conf('CUSTOM_API_KEY_PATTERN')
     if len(CUSTOM_API_KEY_PATTERN) != 0:
         API_MATCH_ORIGINAL = re.match(CUSTOM_API_KEY_PATTERN, key)
     else:
@@ -732,6 +732,7 @@ def select_api_key(keys, llm_model):
         raise RuntimeError(f"您提供的api-key不满足要求，不包含任何可用于{llm_model}的api-key。您可能选择了错误的模型或请求源（右下角更换模型菜单中可切换openai,azure,claude,api2d等请求源）。")
 
     api_key = random.choice(avail_key_list) # 随机负载均衡
+    if ENABLE
     return api_key
 
 def read_env_variable(arg, default_value):
@@ -828,6 +829,7 @@ def get_conf(*args):
     for arg in args:
         r = read_single_conf_with_lru_cache(arg)
         res.append(r)
+    if len(res) == 1: return res[0]
     return res
 
 
@@ -989,7 +991,7 @@ def gen_time_str():
     return time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime())
 
 def get_log_folder(user='default', plugin_name='shared'):
-    PATH_LOGGING, = get_conf('PATH_LOGGING')
+    PATH_LOGGING = get_conf('PATH_LOGGING')
     _dir = pj(PATH_LOGGING, user, plugin_name)
     if not os.path.exists(_dir): os.makedirs(_dir)
     return _dir
@@ -1006,13 +1008,13 @@ class ProxyNetworkActivate():
         else:
             # 给定了task, 我们检查一下
             from toolbox import get_conf
-            WHEN_TO_USE_PROXY, = get_conf('WHEN_TO_USE_PROXY')
+            WHEN_TO_USE_PROXY = get_conf('WHEN_TO_USE_PROXY')
             self.valid = (task in WHEN_TO_USE_PROXY)
 
     def __enter__(self):
         if not self.valid: return self
         from toolbox import get_conf
-        proxies, = get_conf('proxies')
+        proxies = get_conf('proxies')
         if 'no_proxy' in os.environ: os.environ.pop('no_proxy')
         if proxies is not None:
             if 'http' in proxies: os.environ['HTTP_PROXY'] = proxies['http']
@@ -1054,7 +1056,7 @@ def Singleton(cls):
 """
 ========================================================================
 第四部分
-接驳虚空终端:
+接驳void-terminal:
     - set_conf:                     在运行过程中动态地修改配置
     - set_multi_conf:               在运行过程中动态地修改多个配置
     - get_plugin_handle:            获取插件的句柄
@@ -1069,7 +1071,7 @@ def set_conf(key, value):
     read_single_conf_with_lru_cache.cache_clear()
     get_conf.cache_clear()
     os.environ[key] = str(value)
-    altered, = get_conf(key)
+    altered = get_conf(key)
     return altered
 
 def set_multi_conf(dic):