diff --git a/src/.vs/HmChatGPT35Turbo/DesignTimeBuild/.dtbcache.v2 b/src/.vs/HmChatGPT35Turbo/DesignTimeBuild/.dtbcache.v2 index fca0986..f84ec41 100644 Binary files a/src/.vs/HmChatGPT35Turbo/DesignTimeBuild/.dtbcache.v2 and b/src/.vs/HmChatGPT35Turbo/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/.vs/HmChatGPT35Turbo/FileContentIndex/46d8025d-1f16-43d0-98ea-a8b2145e74b3.vsidx b/src/.vs/HmChatGPT35Turbo/FileContentIndex/2b8174ed-81e6-43f7-a4e6-38223ece8ff1.vsidx similarity index 100% rename from src/.vs/HmChatGPT35Turbo/FileContentIndex/46d8025d-1f16-43d0-98ea-a8b2145e74b3.vsidx rename to src/.vs/HmChatGPT35Turbo/FileContentIndex/2b8174ed-81e6-43f7-a4e6-38223ece8ff1.vsidx diff --git a/src/.vs/HmChatGPT35Turbo/FileContentIndex/cb66ecfc-ed4c-481e-ba30-e61022c4c515.vsidx b/src/.vs/HmChatGPT35Turbo/FileContentIndex/411aae31-f8a2-4ad0-a7d0-e47d697fa37b.vsidx similarity index 67% rename from src/.vs/HmChatGPT35Turbo/FileContentIndex/cb66ecfc-ed4c-481e-ba30-e61022c4c515.vsidx rename to src/.vs/HmChatGPT35Turbo/FileContentIndex/411aae31-f8a2-4ad0-a7d0-e47d697fa37b.vsidx index 8089fdd..a76c0a5 100644 Binary files a/src/.vs/HmChatGPT35Turbo/FileContentIndex/cb66ecfc-ed4c-481e-ba30-e61022c4c515.vsidx and b/src/.vs/HmChatGPT35Turbo/FileContentIndex/411aae31-f8a2-4ad0-a7d0-e47d697fa37b.vsidx differ diff --git a/src/.vs/HmChatGPT35Turbo/FileContentIndex/64822b4d-cf57-44ac-8ddb-11cbf022c231.vsidx b/src/.vs/HmChatGPT35Turbo/FileContentIndex/64822b4d-cf57-44ac-8ddb-11cbf022c231.vsidx deleted file mode 100644 index 2a3a14c..0000000 Binary files a/src/.vs/HmChatGPT35Turbo/FileContentIndex/64822b4d-cf57-44ac-8ddb-11cbf022c231.vsidx and /dev/null differ diff --git a/src/.vs/HmChatGPT35Turbo/FileContentIndex/f9839cd1-ad86-40fe-804e-2fa2a08e7da9.vsidx b/src/.vs/HmChatGPT35Turbo/FileContentIndex/f9839cd1-ad86-40fe-804e-2fa2a08e7da9.vsidx new file mode 100644 index 0000000..47ae025 Binary files /dev/null and b/src/.vs/HmChatGPT35Turbo/FileContentIndex/f9839cd1-ad86-40fe-804e-2fa2a08e7da9.vsidx differ diff --git a/src/.vs/HmChatGPT35Turbo/FileContentIndex/abc60252-479a-4743-b939-ce77010e7180.vsidx b/src/.vs/HmChatGPT35Turbo/FileContentIndex/fa489ca6-4e8b-45c1-8d0d-222883a363a9.vsidx similarity index 82% rename from src/.vs/HmChatGPT35Turbo/FileContentIndex/abc60252-479a-4743-b939-ce77010e7180.vsidx rename to src/.vs/HmChatGPT35Turbo/FileContentIndex/fa489ca6-4e8b-45c1-8d0d-222883a363a9.vsidx index c3ca88d..72e6349 100644 Binary files a/src/.vs/HmChatGPT35Turbo/FileContentIndex/abc60252-479a-4743-b939-ce77010e7180.vsidx and b/src/.vs/HmChatGPT35Turbo/FileContentIndex/fa489ca6-4e8b-45c1-8d0d-222883a363a9.vsidx differ diff --git a/src/.vs/HmChatGPT35Turbo/v17/.futdcache.v2 b/src/.vs/HmChatGPT35Turbo/v17/.futdcache.v2 index 88cc6ba..c131ef9 100644 Binary files a/src/.vs/HmChatGPT35Turbo/v17/.futdcache.v2 and b/src/.vs/HmChatGPT35Turbo/v17/.futdcache.v2 differ diff --git a/src/.vs/HmChatGPT35Turbo/v17/.suo b/src/.vs/HmChatGPT35Turbo/v17/.suo index 7f783cf..b2b4929 100644 Binary files a/src/.vs/HmChatGPT35Turbo/v17/.suo and b/src/.vs/HmChatGPT35Turbo/v17/.suo differ diff --git a/src/.vs/ProjectEvaluation/hmchatgpt35turbo.metadata.v6.1 b/src/.vs/ProjectEvaluation/hmchatgpt35turbo.metadata.v6.1 index 5e77594..b3496f5 100644 Binary files a/src/.vs/ProjectEvaluation/hmchatgpt35turbo.metadata.v6.1 and b/src/.vs/ProjectEvaluation/hmchatgpt35turbo.metadata.v6.1 differ diff --git a/src/.vs/ProjectEvaluation/hmchatgpt35turbo.projects.v6.1 b/src/.vs/ProjectEvaluation/hmchatgpt35turbo.projects.v6.1 index 25e29e7..242cefd 100644 Binary files a/src/.vs/ProjectEvaluation/hmchatgpt35turbo.projects.v6.1 and b/src/.vs/ProjectEvaluation/hmchatgpt35turbo.projects.v6.1 differ diff --git a/src/HmChatGPT35Turbo/HmChatGPT35Turbo.csproj b/src/HmChatGPT35Turbo/HmChatGPT35Turbo.csproj index 742e118..cff73ab 100644 --- a/src/HmChatGPT35Turbo/HmChatGPT35Turbo.csproj +++ b/src/HmChatGPT35Turbo/HmChatGPT35Turbo.csproj @@ -10,9 +10,9 @@ bin\$(PlatformTarget) Akitsugu Komiyama $(Authors) - 1.0.5.7 - 1.0.5.7 - 1.0.5.7 + 1.0.5.8 + 1.0.5.8 + 1.0.5.8 diff --git a/src/HmChatGPT35Turbo/WinForm.cs b/src/HmChatGPT35Turbo/WinForm.cs index e0b2993..c3ff570 100644 --- a/src/HmChatGPT35Turbo/WinForm.cs +++ b/src/HmChatGPT35Turbo/WinForm.cs @@ -41,7 +41,7 @@ void SetForm() this.Width = (int)((500 * DisplayDpi) / 96); this.Height = (int)((210 * DisplayDpi) / 96); this.FormClosing += AppForm_FormClosing; - this.AutoScaleMode = AutoScaleMode.Dpi; + // this.AutoScaleMode = AutoScaleMode.Dpi; } private void AppForm_FormClosing(object? sender, FormClosingEventArgs e) @@ -101,9 +101,14 @@ public void UpdateTextBox() tb.Text = selectedText; } - this.ActiveControl = tb; - tb.Focus(); - tb.Select(tb.Text.Length, 0); // カーソルの位置を末尾に配置しておく。 + // 見えてない時は、以下はエラーを履くので、tryでくくっておく + try { + this.ActiveControl = tb; + tb.Focus(); + tb.Select(tb.Text.Length, 0); // カーソルの位置を末尾に配置しておく。 + } + catch (Exception) { + } } } diff --git a/src/HmChatGPT35Turbo/WinFormCOMInterface.cs b/src/HmChatGPT35Turbo/WinFormCOMInterface.cs index 82996aa..88051b0 100644 --- a/src/HmChatGPT35Turbo/WinFormCOMInterface.cs +++ b/src/HmChatGPT35Turbo/WinFormCOMInterface.cs @@ -17,24 +17,32 @@ public class HmChatGPT35Turbo public long CreateForm(string key = "") { - if (form != null) + try { - form.UpdateTextBox(); - } + if (form != null) + { + form.UpdateTextBox(); + } - if (form == null || !form.Visible) - { - output = new HmOutputWriter(); - input = new HmInputReader(); - form = new AppForm(key, output, input); + if (form == null || !form.Visible) + { + output = new HmOutputWriter(); + input = new HmInputReader(); + form = new AppForm(key, output, input); - sm.CreateSharedMemory(); - } + sm.CreateSharedMemory(); + } - form.Show(); + form.Show(); - // フォームを前に持ってくるだけ - form.BringToFront(); + // フォームを前に持ってくるだけ + form.BringToFront(); + } + catch (Exception ex) + { + string err = ex.Message + "\r\n" + ex.StackTrace; + output?.WriteLine(err); + } return -1; } diff --git a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll index 2bb25cf..b0acf99 100644 Binary files a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll and b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll differ diff --git a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.deps.json b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.deps.json index 91a20d3..7efeec6 100644 --- a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.deps.json +++ b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "HmChatGPT35Turbo/1.0.5.7": { + "HmChatGPT35Turbo/1.0.5.8": { "dependencies": { "Betalgo.OpenAI.GPT3": "6.8.1", "HmNetCOM": "2.0.7.9" @@ -154,7 +154,7 @@ } }, "libraries": { - "HmChatGPT35Turbo/1.0.5.7": { + "HmChatGPT35Turbo/1.0.5.8": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.dll b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.dll index f106f6a..420c97a 100644 Binary files a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.dll and b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo.dll differ diff --git a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo_x64.zip b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo_x64.zip index a8c2305..50b7c94 100644 Binary files a/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo_x64.zip and b/src/HmChatGPT35Turbo/bin/x64/Release/net6.0-windows/HmChatGPT35Turbo_x64.zip differ diff --git a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll index 9c0f418..912b5cc 100644 Binary files a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll and b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll differ diff --git a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.deps.json b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.deps.json index 91a20d3..7efeec6 100644 --- a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.deps.json +++ b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v6.0": { - "HmChatGPT35Turbo/1.0.5.7": { + "HmChatGPT35Turbo/1.0.5.8": { "dependencies": { "Betalgo.OpenAI.GPT3": "6.8.1", "HmNetCOM": "2.0.7.9" @@ -154,7 +154,7 @@ } }, "libraries": { - "HmChatGPT35Turbo/1.0.5.7": { + "HmChatGPT35Turbo/1.0.5.8": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.dll b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.dll index 68365f7..e006c33 100644 Binary files a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.dll and b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo.dll differ diff --git a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo_x86.zip b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo_x86.zip index c07a7bf..0f626ee 100644 Binary files a/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo_x86.zip and b/src/HmChatGPT35Turbo/bin/x86/Release/net6.0-windows/HmChatGPT35Turbo_x86.zip differ diff --git a/src/HmChatGPT35Turbo/obj/HmChatGPT35Turbo.csproj.nuget.dgspec.json b/src/HmChatGPT35Turbo/obj/HmChatGPT35Turbo.csproj.nuget.dgspec.json index 082988d..90de7e3 100644 --- a/src/HmChatGPT35Turbo/obj/HmChatGPT35Turbo.csproj.nuget.dgspec.json +++ b/src/HmChatGPT35Turbo/obj/HmChatGPT35Turbo.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj": { - "version": "1.0.5.7", + "version": "1.0.5.8", "restore": { "projectUniqueName": "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj", "projectName": "HmChatGPT35Turbo", diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfo.cs b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfo.cs index 30a3b54..b4ee6f2 100644 --- a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfo.cs +++ b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfo.cs @@ -14,11 +14,11 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("Akitsugu Komiyama")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyCopyrightAttribute("Akitsugu Komiyama")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.7")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5.7")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.5.8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.5.8")] [assembly: System.Reflection.AssemblyProductAttribute("HmChatGPT35Turbo")] [assembly: System.Reflection.AssemblyTitleAttribute("HmChatGPT35Turbo")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.7")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.5.8")] [assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] [assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfoInputs.cache b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfoInputs.cache index eaa6036..4b4ef68 100644 --- a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfoInputs.cache +++ b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.AssemblyInfoInputs.cache @@ -1 +1 @@ -2bc6103f1247fe53a6c2642ebfcddc1a9720f49a +250069fc9e7849a6c0b846693174cc037a91d385 diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.clsidmap b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.clsidmap index 1dc1c3f..69bfd65 100644 --- a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.clsidmap +++ b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.clsidmap @@ -1 +1 @@ -{"{cf709244-a284-419e-832d-0b354ee2950d}":{"type":"HmNetCOM.HmMacroCOMVar","assembly":"HmChatGPT35Turbo, Version=1.0.5.7, Culture=neutral, PublicKeyToken=null","progid":"HmNetCOM.HmMacroCOMVar"},"{bccbe82c-56e1-4056-ae7c-3c4f62806732}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo","assembly":"HmChatGPT35Turbo, Version=1.0.5.7, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo"},"{9818f69e-a37d-4a03-bca1-c4c172366473}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory","assembly":"HmChatGPT35Turbo, Version=1.0.5.7, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory"}} \ No newline at end of file +{"{cf709244-a284-419e-832d-0b354ee2950d}":{"type":"HmNetCOM.HmMacroCOMVar","assembly":"HmChatGPT35Turbo, Version=1.0.5.8, Culture=neutral, PublicKeyToken=null","progid":"HmNetCOM.HmMacroCOMVar"},"{bccbe82c-56e1-4056-ae7c-3c4f62806732}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo","assembly":"HmChatGPT35Turbo, Version=1.0.5.8, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35Turbo"},"{9818f69e-a37d-4a03-bca1-c4c172366473}":{"type":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory","assembly":"HmChatGPT35Turbo, Version=1.0.5.8, Culture=neutral, PublicKeyToken=null","progid":"HmOpenAIChatGpt35Turbo.HmChatGPT35TurboSharedMemory"}} \ No newline at end of file diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll index 2bb25cf..b0acf99 100644 Binary files a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll and b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.comhost.dll differ diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.dll b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.dll index f106f6a..420c97a 100644 Binary files a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.dll and b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/HmChatGPT35Turbo.dll differ diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/ref/HmChatGPT35Turbo.dll b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/ref/HmChatGPT35Turbo.dll index 929ea3c..9227eda 100644 Binary files a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/ref/HmChatGPT35Turbo.dll and b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/ref/HmChatGPT35Turbo.dll differ diff --git a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/refint/HmChatGPT35Turbo.dll b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/refint/HmChatGPT35Turbo.dll index 929ea3c..9227eda 100644 Binary files a/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/refint/HmChatGPT35Turbo.dll and b/src/HmChatGPT35Turbo/obj/Release/net6.0-windows/refint/HmChatGPT35Turbo.dll differ diff --git a/src/HmChatGPT35Turbo/obj/project.assets.json b/src/HmChatGPT35Turbo/obj/project.assets.json index ec35733..9358268 100644 --- a/src/HmChatGPT35Turbo/obj/project.assets.json +++ b/src/HmChatGPT35Turbo/obj/project.assets.json @@ -592,7 +592,7 @@ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { - "version": "1.0.5.7", + "version": "1.0.5.8", "restore": { "projectUniqueName": "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj", "projectName": "HmChatGPT35Turbo", diff --git a/src/HmChatGPT35Turbo/obj/project.nuget.cache b/src/HmChatGPT35Turbo/obj/project.nuget.cache index 18b67f6..20b3903 100644 --- a/src/HmChatGPT35Turbo/obj/project.nuget.cache +++ b/src/HmChatGPT35Turbo/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "7Bmoa+w+6vseaW7D+Zf1M1GiLp7iDIIwTOm0fMNzvPDHRluKACGJyFTBQ4/SxyRwx1RNN9N2qSFqeZ01Z7TyDw==", + "dgSpecHash": "bghu/b/3b6cvU6tZCmTyo3ovUs+jiEz/OoNIFfHkqttlkko475rXYq0CdkpqGAtx44fcoRtnaMY5LNMvohVekg==", "success": true, "projectFilePath": "G:\\repogitory\\hm_openai_chatgpt35_turbo\\src\\HmChatGPT35Turbo\\HmChatGPT35Turbo.csproj", "expectedPackageFiles": [