#10,etc

katsumiar · May 19, 2024 · ce8430d · ce8430d
1 parent 9a2e0ed
commit ce8430d
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 27 deletions.
diff --git a/WiseOwlChat/ChatViewModel.cs b/WiseOwlChat/ChatViewModel.cs
@@ -10,6 +10,7 @@
 using System.Windows;
 using static WiseOwlChat.DirectionsFileManager;
 using System.Windows.Input;
+using Newtonsoft.Json.Linq;
 
 namespace WiseOwlChat
 {
@@ -58,13 +59,33 @@ public ObservableCollection<PluginInfo> PluginInfos
             get => openAIChat.FunctionCallingRegistry.PluginInfos;
         }
 
-        public MODEL_TYPE ModelType
+        public string ModelType
         {
-            get { return openAIChat.ModelType; }
+            get {
+                string? modelName = EnumHelper.GetDescription(openAIChat.ModelType);
+                if (modelName == null)
+                {
+                    return openAIChat.ModelType.ToString();
+                }
+                return modelName;
+            }
             set
             {
-                openAIChat.ModelType = value;
-                OnPropertyChanged();
+                foreach (MODEL_TYPE model in Enum.GetValues(typeof(MODEL_TYPE)))
+                {
+                    string? modelName = EnumHelper.GetDescription(model);
+                    if (modelName == value)
+                    {
+                        openAIChat.ModelType = model;
+                        OnPropertyChanged();
+                        return;
+                    }
+                }
+                if (Enum.TryParse<MODEL_TYPE>(value, out MODEL_TYPE mode))
+                {
+                    openAIChat.ModelType = (MODEL_TYPE)mode;
+                    OnPropertyChanged();
+                }
             }
         }
 
@@ -230,7 +251,11 @@ public ChatViewModel()
 
             foreach (MODEL_TYPE model in Enum.GetValues(typeof(MODEL_TYPE)))
             {
-                ModelTypeItems.Add(model.ToString());
+                string? modelName = EnumHelper.GetDescription(model);
+                if (modelName != null)
+                {
+                    ModelTypeItems.Add(modelName);
+                }
             }
 
             forbiddenExpressionChecker = new ForbiddenExpressionChecker();
@@ -459,9 +484,10 @@ private async Task query(Action update, Action<string?>? callback, string messag
 
             if (FunctionMode)
             {
-                if (ModelType == MODEL_TYPE.GPT_35_TURBO)
+                string? modelName = EnumHelper.GetDescription(MODEL_TYPE.GPT_35_TURBO);
+                if (ModelType == modelName)
                 {
-                    ModelType = MODEL_TYPE.GPT_35_TURBO_16K;
+                    ModelType = modelName;
                     popupMessageAction("Changed MODEL_TYPE to GPT_35_TURBO_16K.");
                 }
             }
@@ -771,25 +797,8 @@ private async Task queryPipeline(List<Task> delayedTaskList, Action update, Acti
                     continue;
                 }
 
-                await openAIChat.SystemRequestStreamForPipeline(update,
-                    (content) =>
-                    {
-                        if (content != null)
-                        {
-                            logMessage.content = content;
-                            delayedTranslation(delayedTaskList, logMessage);
-                        }
-                    }, viewThinkingMessage, tempRequest, ModelType);
-
-                string? elaboration = QueryManager.Instance.GetNameAndText("$Elaboration:");
-                if (elaboration != null)
+                if (Enum.TryParse<MODEL_TYPE>(ModelType, out MODEL_TYPE mode))
                 {
-                    // 推敲
-                    List<ConversationEntry> elaborationRequest = openAIChat.MakeRequest(
-                        false,
-                        elaboration.Replace("{response}", logMessage.content),
-                        null, true);
-
                     await openAIChat.SystemRequestStreamForPipeline(update,
                         (content) =>
                         {
@@ -798,7 +807,27 @@ await openAIChat.SystemRequestStreamForPipeline(update,
                                 logMessage.content = content;
                                 delayedTranslation(delayedTaskList, logMessage);
                             }
-                        }, viewThinkingMessage, elaborationRequest, ModelType);
+                        }, viewThinkingMessage, tempRequest, mode);
+
+                    string? elaboration = QueryManager.Instance.GetNameAndText("$Elaboration:");
+                    if (elaboration != null)
+                    {
+                        // 推敲
+                        List<ConversationEntry> elaborationRequest = openAIChat.MakeRequest(
+                            false,
+                            elaboration.Replace("{response}", logMessage.content),
+                            null, true);
+
+                        await openAIChat.SystemRequestStreamForPipeline(update,
+                            (content) =>
+                            {
+                                if (content != null)
+                                {
+                                    logMessage.content = content;
+                                    delayedTranslation(delayedTaskList, logMessage);
+                                }
+                            }, viewThinkingMessage, elaborationRequest, mode);
+                    }
                 }
 
                 if (logMessage == null || logMessage.content == null)

diff --git a/WiseOwlChat/Control/ChatControl.xaml.cs b/WiseOwlChat/Control/ChatControl.xaml.cs
@@ -48,7 +48,7 @@ public ChatControl()
 
             modelSelector.Dispatcher.BeginInvoke(new Action(() =>
             {
-                chatViewModel.ModelType = OpenAIChat.MODEL_TYPE.GPT_35_TURBO;
+                chatViewModel.ModelType = OpenAIChat.MODEL_TYPE.GPT_35_TURBO.ToString();
             }), DispatcherPriority.Loaded);
 
             Instance = this;

diff --git a/WiseOwlChat/OpenAIChat.cs b/WiseOwlChat/OpenAIChat.cs
@@ -49,9 +49,15 @@ public enum MODEL_TYPE
             [Description("gpt-3.5-turbo")]
             GPT_35_TURBO,
 
+            [Description("gpt-4o")]
+            GPT_4o,
+
             [Description("gpt-3.5-turbo-16k")]
             GPT_35_TURBO_16K,
 
+            [Description("gpt-4-turbo")]
+            GPT_4_TURBO,
+
             [Description("gpt-4")]
             GPT_4,