修复空异常

AIDotNet · Jan 13, 2025 · d2e9597 · d2e9597
1 parent ba10923
commit d2e9597
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/ThorChat.Service/Options/WebOptions.cs b/src/ThorChat.Service/Options/WebOptions.cs
@@ -16,7 +16,7 @@ public static void Init(IConfiguration configuration)
         OPENAI_MODEL_LIST = Environment.GetEnvironmentVariable("OPENAI_MODEL_LIST") ?? string.Empty;
 
         // 获取wwwroot下的index.html
-        var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "wwwroot", "index.html");
+        var path = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "index.html");
 
         if (!File.Exists(path))
         {

diff --git a/src/ThorChat.Service/Properties/launchSettings.json b/src/ThorChat.Service/Properties/launchSettings.json
@@ -17,7 +17,7 @@
       "applicationUrl": "http://localhost:5269",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "OPENAI_MODEL_LIST": "gpt-4=gpt-4<16385>,gpt-4-32k=gpt-4-32k<32768>,gpt-3.5-turbo-16k=gpt-3.5-turbo-16k<16_385>,gpt-3.5-turbo-1106=gpt-3.5-turbo-16k<16385>,gpt-4-0125-preview=gpt-4-turbo<32768>,gpt-4-vision-preview=gpt-4-vision<32768:vision>"
+        "OPENAI_MODEL_LIST": "gpt-4=gpt-4<128000>,gpt-4-32k=gpt-4-32k<32768>,gpt-4-32k-0613=gpt-4-32k-0613<32768>,gpt-4-32k-0314=gpt-4-32k-0314<32768>,gpt-4-0613=gpt-4-0613<128000>,gpt-4-0314=gpt-4-0314<128000>,gpt-4-0125-preview=gpt-4-0125-preview<128000>,gpt-4-vision-preview=gpt-4-vision-preview<8000:vision>,gpt-4-turbo-preview=gpt-4-turbo-preview<8000>,gpt-4-turbo-2024-04-09=gpt-4-turbo-2024-04-09<128000>,gpt-4-turbo=gpt-4-turbo<128000>,gpt-4-all=gpt-4-all<128000:vision>,gpt-4-1106-vision-preview=gpt-4-1106-vision-preview<128000:vision>,gpt-4-1106-preview=gpt-4-1106-preview<128000>,gpt-3.5-turbo-instruct=gpt-3.5-turbo-instruct<128000>,gpt-3.5-turbo-16k-0613=gpt-3.5-turbo-16k-0613<16000>,gpt-3.5-turbo-16k=gpt-3.5-turbo-16k<16000>,gpt-3.5-turbo-1106=gpt-3.5-turbo-1106<128000>,gpt-3.5-turbo-0613=gpt-3.5-turbo-0613<128000>,claude-3-opus-20240229=claude-3-opus-20240229<128000>,claude-3-haiku-20240307=claude-3-haiku-20240307<128000>,claude-2.1=claude-2.1<128000>,claude-2.0=claude-2.0<128000>,claude-2=claude-2<128000>,claude-instant-1.2=claude-instant-1.2<128000>,claude-instant-1=claude-instant-1<128000>,gemini-1.5-flash=gemini-1.5-flash<128000>,gemini-pro-vision=gemini-pro-vision<128000:vision>,gemini-pro=gemini-pro<128000>,gemini-1.5-pro=gemini-1.5-pro<128000>,glm-4v=glm-4v<128000:vision>,glm-4-all=glm-4-all<128000>,glm-4=glm-4<128000>,glm-3-turbo=glm-3-turbo<128000>,qwen-max=qwen-max<128000:vision>,qwen-plus=qwen-plus<128000>,deepseek-chat=deepseek-chat<64000:vision>,Qwen2-7B-Instruct=Qwen2-7B-Instruct<128000:vision>,Qwen2-VL-72B=Qwen2-VL-72B<128000:vision>,Qwen2.5-Coder-14B-Instruct=Qwen2.5-Coder-14B-Instruct<128000:vision>,Qwen2.5-Coder-32B-Instruct=Qwen2.5-Coder-32B-Instruct<128000:vision>,Qwen2.5-7B-Instruct=Qwen2.5-7B-Instruct<128000:vision>,Qwen2.5-72B-Instruct=Qwen2.5-72B-Instruct<128000:vision>,Qwen2.5-32B-Instruct=Qwen2.5-32B-Instruct<128000:vision>,o1-pro=o1-pro<128000:vision>,o1=o1<128000:vision>,net-o1=net-o1<128000>,net-o1-mini=net-o1-mini<128000:vision>,o1-mini-all=o1-mini-all<128000:vision>,o1-preview-all=o1-preview-all<128000:vision>,o1-pro-all=o1-pro-all<128000:vision>,gpt-4o-2024-11-20=gpt-4o-2024-11-20<128000:vision:fc>,gpt-4o-2024-08-06=gpt-4o-2024-08-06<128000:vision:audio>,gpt-4o-2024-05-13=gpt-4o-2024-05-13<128000:vision:audio>,gpt-4o-mini-2024-07-18=gpt-4o-mini-2024-07-18<128000:vision:audio>,gpt-4o-mini=gpt-4o-mini<128000:vision:audio>"
       }
     },
     "https": {

diff --git a/web/src/config/modelProviders/openai.ts b/web/src/config/modelProviders/openai.ts
@@ -204,7 +204,7 @@ let OpenAI: ModelProviderCard = {
   name: 'OpenAI'
 };
 
-if (window.thor.OPENAI_MODEL_LIST) {
+if (window?.thor?.OPENAI_MODEL_LIST) {
   const enabledModels = window.thor.OPENAI_MODEL_LIST.split(',');
   const models = [] as ChatModelCard[];
   for (const model of enabledModels) {