added error messages, adjusted config

Eisenhuth · Mar 26, 2023 · 4515ba3 · 4515ba3
1 parent 9ec3d84
commit 4515ba3
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 17 deletions.
diff --git a/dalamud-chatgpt/ChatGPTPlugin.cs b/dalamud-chatgpt/ChatGPTPlugin.cs
@@ -70,9 +70,9 @@ private void GPTCommand(string command, string args)
         private async Task SendPrompt(string input)
         {
             var client = new HttpClient();
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", configuration.ApiKey);
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", configKey);
 
-            var requestBody = $"{{\"model\": \"{Configuration.Model}\", \"prompt\": \"{input}\", \"max_tokens\": {configuration.MaxTokens}}}";
+            var requestBody = $"{{\"model\": \"{Configuration.Model}\", \"prompt\": \"{input}\", \"max_tokens\": {configMaxTokens}}}";
             var content = new StringContent(requestBody, Encoding.UTF8, "application/json");
 
             var response = await client.PostAsync(Configuration.Endpoint, content);
@@ -92,11 +92,30 @@ private async Task SendPrompt(string input)
                 chunks = chunks.ToList();
 
                 if(configAdditionalInfo)
-                    chatGui.Print($"ChatGPT \nprompt: {input}\nmodel: {Configuration.Model}\nmax_tokens: {configMaxTokens}\nresponse length: {text.Length}\nchunks: {chunks.Count()}");
+                    chatGui.Print($"ChatGPT>>\nprompt: {input}" +
+                                  $"\nmodel: {Configuration.Model}" +
+                                  $"\nmax_tokens: {configMaxTokens}" +
+                                  $"\nresponse length: {text.Length}" +
+                                  $"\nchunks: {chunks.Count()}");
 
                 foreach (var chunk in chunks)
                     chatGui.Print($"ChatGPT: {chunk}");
             }
+            else
+            {
+                var errorMessage = "ChatGPT>> Error: text is null";
+
+                if (configAdditionalInfo)
+                {
+                    errorMessage += $"\nmodel: {Configuration.Model}" +
+                                    $"\nmax_tokens: {configMaxTokens}" +
+                                    $"\nresponse code: {(int) response.StatusCode} - {response.StatusCode}";
+                }
+                else
+                    errorMessage += "\nYou can enable additional info in the configuration. If the issue persists, please report it on github.";
+
+                chatGui.Print(errorMessage);
+            }
         }
 
         #region configuration
@@ -108,22 +127,32 @@ private void DrawConfiguration()
 
             ImGui.Begin($"{Name} Configuration", ref drawConfiguration);
 
-            ImGui.Separator();
-            ImGui.Checkbox("remove line breaks from responses", ref configLineBreaks);
-            ImGui.Checkbox("show additional info", ref configAdditionalInfo);
-            ImGui.InputInt("max_tokens", ref configMaxTokens);
-            ImGui.InputText("API Key", ref configKey, 60, ImGuiInputTextFlags.Password);
-
-            if (ImGui.Button("Get API Key"))
+            ImGui.Text("currently used model:");
+            ImGui.SameLine();
+            if (ImGui.SmallButton($"GPT-3.5/{Configuration.Model}"))
+            {
+                const string modelsDocs = "https://platform.openai.com/docs/models/gpt-3-5";
+                Util.OpenLink(modelsDocs);
+            }
+            ImGui.Spacing();
+            ImGui.InputText("API key", ref configKey, 60, ImGuiInputTextFlags.Password);
+            ImGui.SameLine();
+            if (ImGui.SmallButton("get API key"))
             {
                 const string apiKeysUrl = "https://platform.openai.com/account/api-keys";
                 Util.OpenLink(apiKeysUrl);
             }
-
-            ImGui.Separator();        
-
-
-
+            ImGui.Spacing();
+            ImGui.SliderInt("max_tokens", ref configMaxTokens, 8, 4096);
+            ImGui.SameLine();
+            if (ImGui.SmallButton("learn more"))
+            {
+                const string conceptsDocs = "https://platform.openai.com/docs/introduction/key-concepts";
+                Util.OpenLink(conceptsDocs);
+            }
+            ImGui.Separator();
+            ImGui.Checkbox("remove line breaks from responses", ref configLineBreaks);
+            ImGui.Checkbox("show additional info", ref configAdditionalInfo);
             if (ImGui.Button("Save and Close"))
             {
                 SaveConfiguration();

diff --git a/dalamud-chatgpt/Configuration.cs b/dalamud-chatgpt/Configuration.cs
@@ -6,7 +6,7 @@ namespace xivgpt
     public class Configuration : IPluginConfiguration
     {
         public int Version { get; set; }
-        public bool RemoveLineBreaks { get; set; } = false;
+        public bool RemoveLineBreaks { get; set; }
         public bool ShowAdditionalInfo { get; set; }
         public string ApiKey { get; set; } = "";
         public int MaxTokens { get; set; }

diff --git a/dalamud-chatgpt/dalamud-chatgpt.csproj b/dalamud-chatgpt/dalamud-chatgpt.csproj
@@ -10,7 +10,7 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <OutputPath>$(AppData)\Eisenhuth\DalamudDevPlugins\ChatGPTPlugin\</OutputPath>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-        <AssemblyVersion>1.0.4.0</AssemblyVersion>
+        <AssemblyVersion>1.0.5.0</AssemblyVersion>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
         <PackageProjectUrl>https://github.com/Eisenhuth/dalamud-chatgpt</PackageProjectUrl>