lhy: update openai models 2023-11-06

modules/presets.py

@@ -15,8 +15,8 @@ LLAMA_INFERENCER = None
 INITIAL_SYSTEM_PROMPT = "You are a helpful assistant."
 API_HOST = "api.openai.com"
 COMPLETION_URL = "https://api.openai.com/v1/chat/completions"
-BALANCE_API_URL="https://api.openai.com/dashboard/billing/credit_grants"
-USAGE_API_URL="https://api.openai.com/dashboard/billing/usage"
+BALANCE_API_URL = "https://api.openai.com/dashboard/billing/credit_grants"
+USAGE_API_URL = "https://api.openai.com/dashboard/billing/usage"
 HISTORY_DIR = Path("history")
 HISTORY_DIR = "history"
 TEMPLATES_DIR = "templates"
@@ -31,23 +31,25 @@ PROXY_ERROR_MSG = i18n("代理错误，无法获取对话。")  # 代理错误
 SSL_ERROR_PROMPT = i18n("SSL错误，无法获取对话。")  # SSL 错误
 NO_APIKEY_MSG = i18n("API key为空，请检查是否输入正确。")  # API key 长度不足 51 位
 NO_INPUT_MSG = i18n("请输入对话内容。")  # 未输入对话内容
-BILLING_NOT_APPLICABLE_MSG = i18n("账单信息不适用") # 本地运行的模型返回的账单信息
+BILLING_NOT_APPLICABLE_MSG = i18n("账单信息不适用")  # 本地运行的模型返回的账单信息
 
 TIMEOUT_STREAMING = 60  # 流式对话时的超时时间
 TIMEOUT_ALL = 200  # 非流式对话时的超时时间
 ENABLE_STREAMING_OPTION = True  # 是否启用选择选择是否实时显示回答的勾选框
 HIDE_MY_KEY = False  # 如果你想在UI中隐藏你的 API 密钥，将此值设置为 True
-CONCURRENT_COUNT = 100 # 允许同时使用的用户数量
+CONCURRENT_COUNT = 100  # 允许同时使用的用户数量
 
 SIM_K = 5
 INDEX_QUERY_TEMPRATURE = 1.0
 
 CHUANHU_TITLE = i18n("川虎Chat 🚀")
 
-CHUANHU_DESCRIPTION = i18n("由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536)、[明昭MZhao](https://space.bilibili.com/24807452) 和 [Keldos](https://github.com/Keldos-Li) 开发<br />访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本")
-
+CHUANHU_DESCRIPTION = i18n(
+    "由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536)、[明昭MZhao](https://space.bilibili.com/24807452) 和 [Keldos](https://github.com/Keldos-Li) 开发<br />访问川虎Chat的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本")
 
 ONLINE_MODELS = [
+    "gpt-3.5-turbo-1106",
+    "gpt-4-1106-preview",
     "gpt-3.5-turbo",
     "gpt-3.5-turbo-16k",
     "gpt-3.5-turbo-0301",
@@ -97,6 +99,8 @@ for dir_name in os.listdir("models"):
             MODELS.append(dir_name)
 
 MODEL_TOKEN_LIMIT = {
+    "gpt-3.5-turbo-1106": 16385,
+    "gpt-4-1106-preview": 128000,
     "gpt-3.5-turbo": 4096,
     "gpt-3.5-turbo-16k": 16384,
     "gpt-3.5-turbo-0301": 4096,
@@ -109,9 +113,9 @@ MODEL_TOKEN_LIMIT = {
     "gpt-4-32k-0613": 32768
 }
 
-TOKEN_OFFSET = 1000 # 模型的token上限减去这个值，得到软上限。到达软上限之后，自动尝试减少token占用。
-DEFAULT_TOKEN_LIMIT = 3000 # 默认的token上限
-REDUCE_TOKEN_FACTOR = 0.5 # 与模型token上限想乘，得到目标token数。减少token占用时，将token占用减少到目标token数以下。
+TOKEN_OFFSET = 1000  # 模型的token上限减去这个值，得到软上限。到达软上限之后，自动尝试减少token占用。
+DEFAULT_TOKEN_LIMIT = 3000  # 默认的token上限
+REDUCE_TOKEN_FACTOR = 0.5  # 与模型token上限想乘，得到目标token数。减少token占用时，将token占用减少到目标token数以下。
 
 REPLY_LANGUAGES = [
     "简体中文",
@@ -124,7 +128,6 @@ REPLY_LANGUAGES = [
     "跟随问题语言（不稳定）"
 ]
 
-
 WEBSEARCH_PTOMPT_TEMPLATE = """\
 Web search results:
 
@@ -172,69 +175,69 @@ CONCISE SUMMARY IN 中文:"""
 ALREADY_CONVERTED_MARK = "<!-- ALREADY CONVERTED BY PARSER. -->"
 
 small_and_beautiful_theme = gr.themes.Soft(
-        primary_hue=gr.themes.Color(
-            c50="#EBFAF2",
-            c100="#CFF3E1",
-            c200="#A8EAC8",
-            c300="#77DEA9",
-            c400="#3FD086",
-            c500="#02C160",
-            c600="#06AE56",
-            c700="#05974E",
-            c800="#057F45",
-            c900="#04673D",
-            c950="#2E5541",
-            name="small_and_beautiful",
-        ),
-        secondary_hue=gr.themes.Color(
-            c50="#576b95",
-            c100="#576b95",
-            c200="#576b95",
-            c300="#576b95",
-            c400="#576b95",
-            c500="#576b95",
-            c600="#576b95",
-            c700="#576b95",
-            c800="#576b95",
-            c900="#576b95",
-            c950="#576b95",
-        ),
-        neutral_hue=gr.themes.Color(
-            name="gray",
-            c50="#f6f7f8",
-            # c100="#f3f4f6",
-            c100="#F2F2F2",
-            c200="#e5e7eb",
-            c300="#d1d5db",
-            c400="#B2B2B2",
-            c500="#808080",
-            c600="#636363",
-            c700="#515151",
-            c800="#393939",
-            # c900="#272727",
-            c900="#2B2B2B",
-            c950="#171717",
-        ),
-        radius_size=gr.themes.sizes.radius_sm,
-    ).set(
-        # button_primary_background_fill="*primary_500",
-        button_primary_background_fill_dark="*primary_600",
-        # button_primary_background_fill_hover="*primary_400",
-        # button_primary_border_color="*primary_500",
-        button_primary_border_color_dark="*primary_600",
-        button_primary_text_color="wihte",
-        button_primary_text_color_dark="white",
-        button_secondary_background_fill="*neutral_100",
-        button_secondary_background_fill_hover="*neutral_50",
-        button_secondary_background_fill_dark="*neutral_900",
-        button_secondary_text_color="*neutral_800",
-        button_secondary_text_color_dark="white",
-        # background_fill_primary="#F7F7F7",
-        # background_fill_primary_dark="#1F1F1F",
-        # block_title_text_color="*primary_500",
-        block_title_background_fill_dark="*primary_900",
-        block_label_background_fill_dark="*primary_900",
-        input_background_fill="#F6F6F6",
-        chatbot_code_background_color="*neutral_950",
-        chatbot_code_background_color_dark="*neutral_950",
-    )
+    primary_hue=gr.themes.Color(
+        c50="#EBFAF2",
+        c100="#CFF3E1",
+        c200="#A8EAC8",
+        c300="#77DEA9",
+        c400="#3FD086",
+        c500="#02C160",
+        c600="#06AE56",
+        c700="#05974E",
+        c800="#057F45",
+        c900="#04673D",
+        c950="#2E5541",
+        name="small_and_beautiful",
+    ),
+    secondary_hue=gr.themes.Color(
+        c50="#576b95",
+        c100="#576b95",
+        c200="#576b95",
+        c300="#576b95",
+        c400="#576b95",
+        c500="#576b95",
+        c600="#576b95",
+        c700="#576b95",
+        c800="#576b95",
+        c900="#576b95",
+        c950="#576b95",
+    ),
+    neutral_hue=gr.themes.Color(
+        name="gray",
+        c50="#f6f7f8",
+        # c100="#f3f4f6",
+        c100="#F2F2F2",
+        c200="#e5e7eb",
+        c300="#d1d5db",
+        c400="#B2B2B2",
+        c500="#808080",
+        c600="#636363",
+        c700="#515151",
+        c800="#393939",
+        # c900="#272727",
+        c900="#2B2B2B",
+        c950="#171717",
+    ),
+    radius_size=gr.themes.sizes.radius_sm,
+).set(
+    # button_primary_background_fill="*primary_500",
+    button_primary_background_fill_dark="*primary_600",
+    # button_primary_background_fill_hover="*primary_400",
+    # button_primary_border_color="*primary_500",
+    button_primary_border_color_dark="*primary_600",
+    button_primary_text_color="wihte",
+    button_primary_text_color_dark="white",
+    button_secondary_background_fill="*neutral_100",
+    button_secondary_background_fill_hover="*neutral_50",
+    button_secondary_background_fill_dark="*neutral_900",
+    button_secondary_text_color="*neutral_800",
+    button_secondary_text_color_dark="white",
+    # background_fill_primary="#F7F7F7",
+    # background_fill_primary_dark="#1F1F1F",
+    # block_title_text_color="*primary_500",
+    block_title_background_fill_dark="*primary_900",
+    block_label_background_fill_dark="*primary_900",
+    input_background_fill="#F6F6F6",
+    chatbot_code_background_color="*neutral_950",
+    chatbot_code_background_color_dark="*neutral_950",
+)