From 5c9a3a7ca76ea304145a7e44718b6067a25f2216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E9=9C=87=E5=B7=8D?= Date: Mon, 2 Oct 2023 00:49:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20OpenAIEndpoint=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E3=80=82=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E5=B7=B2?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Samples/Senparc.AI.Samples.Consoles/appsettings.json | 1 + src/Senparc.AI.Tests/RegisterTest.cs | 3 +++ src/Senparc.AI.Tests/appsettings.json | 1 + src/Senparc.AI/Entities/Keys/OpenAIKeys.cs | 1 + src/Senparc.AI/Entities/SenparcAiSettingBase.cs | 4 ++++ src/Senparc.AI/Interfaces/ISenparcAiSetting.cs | 6 ++++++ 6 files changed, 16 insertions(+) diff --git a/Samples/Senparc.AI.Samples.Consoles/appsettings.json b/Samples/Senparc.AI.Samples.Consoles/appsettings.json index 156729c..03dd164 100644 --- a/Samples/Senparc.AI.Samples.Consoles/appsettings.json +++ b/Samples/Senparc.AI.Samples.Consoles/appsettings.json @@ -25,6 +25,7 @@ }, "OpenAIKeys": { "ApiKey": "YourOpenAIKey", //TODO:加密 + "Endpoint": "", "OrgaizationId": "YourOpenAIOrgId" }, "HunggingFaceKeys": { diff --git a/src/Senparc.AI.Tests/RegisterTest.cs b/src/Senparc.AI.Tests/RegisterTest.cs index 8f65ea6..cab44c9 100644 --- a/src/Senparc.AI.Tests/RegisterTest.cs +++ b/src/Senparc.AI.Tests/RegisterTest.cs @@ -33,6 +33,9 @@ public void GlobalRegisterTest() Assert.IsNotNull(senparcAiSetting.OpenAIKeys); Assert.IsNotNull(senparcAiSetting.OpenAIKeys.ApiKey); + + Assert.AreEqual("", senparcAiSetting.OpenAIKeys.Endpoint); + } } } diff --git a/src/Senparc.AI.Tests/appsettings.json b/src/Senparc.AI.Tests/appsettings.json index 8922734..e46589e 100644 --- a/src/Senparc.AI.Tests/appsettings.json +++ b/src/Senparc.AI.Tests/appsettings.json @@ -25,6 +25,7 @@ }, "OpenAIKeys": { "ApiKey": "YourOpenAIKey", //TODO:加密 + "Endpoint": "", "OrgaizationId": "YourOpenAIOrgId" }, "HuggingFaceKeys": { diff --git a/src/Senparc.AI/Entities/Keys/OpenAIKeys.cs b/src/Senparc.AI/Entities/Keys/OpenAIKeys.cs index 5fedfe6..b9ce267 100644 --- a/src/Senparc.AI/Entities/Keys/OpenAIKeys.cs +++ b/src/Senparc.AI/Entities/Keys/OpenAIKeys.cs @@ -7,6 +7,7 @@ namespace Senparc.AI public class OpenAIKeys { public string ApiKey { get; set; } + public string Endpoint { get; set; } public string OrgaizationId { get; set; } } } diff --git a/src/Senparc.AI/Entities/SenparcAiSettingBase.cs b/src/Senparc.AI/Entities/SenparcAiSettingBase.cs index a6ec0f7..82fe175 100644 --- a/src/Senparc.AI/Entities/SenparcAiSettingBase.cs +++ b/src/Senparc.AI/Entities/SenparcAiSettingBase.cs @@ -66,6 +66,10 @@ public class SenparcAiSettingBase : ISenparcAiSetting #endregion + #region OpenAI + public virtual string OpenAIEndpoint => OpenAIKeys.Endpoint; + + #endregion #region NeuChar diff --git a/src/Senparc.AI/Interfaces/ISenparcAiSetting.cs b/src/Senparc.AI/Interfaces/ISenparcAiSetting.cs index ef1862a..9380c71 100644 --- a/src/Senparc.AI/Interfaces/ISenparcAiSetting.cs +++ b/src/Senparc.AI/Interfaces/ISenparcAiSetting.cs @@ -58,6 +58,12 @@ public interface ISenparcAiSetting #endregion + #region OpenAI + + string OpenAIEndpoint { get; } + + #endregion + #region NeuChar ///