Skip to content

Commit e026b70

Browse files
committed
feat(openai): 重命名 "WechatOpenAI" → "WechatChatbot"
1 parent 7909b86 commit e026b70

File tree

82 files changed

+140
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+140
-191
lines changed

docs/WechatOpenAI/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
using SKIT.FlurlHttpClient.Wechat;
3636
using SKIT.FlurlHttpClient.Wechat.OpenAI;
3737

38-
var options = new WechatOpenAIClientOptions()
38+
var options = new WechatChatbotClientOptions()
3939
{
4040
AppId = "微信智能对话 AppId",
4141
Token = "微信智能对话 Token",
4242
EncodingAESKey = "微信智能对话 EncodingAESKey"
4343
};
44-
var client = WechatOpenAIClientBuilder.Create(options).Build();
44+
var client = WechatChatbotClientBuilder.Create(options).Build();
4545
```
4646

4747
### 请求 & 响应:
@@ -66,6 +66,7 @@ if (response.IsSuccessful())
6666
else
6767
{
6868
Console.WriteLine("错误代码:" + response.ErrorCode);
69+
Console.WriteLine("错误描述:" + response.ErrorMessage);
6970
Console.WriteLine("返回代码:" + response.ReturnCode);
7071
Console.WriteLine("返回错误:" + response.ReturnError);
7172
}

src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/ThirdKf/UserEnterEvent.cs renamed to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Events/Chatbot/ThirdKf/UserEnterEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace SKIT.FlurlHttpClient.Wechat.OpenAI.Events
77
/// <![CDATA[ https://developers.weixin.qq.com/doc/aispeech/confapi/thirdkefu/recivemsg.html ]]>
88
/// </para>
99
/// </summary>
10-
public class UserEnterEvent : WechatOpenAIEvent
10+
public class UserEnterEvent : WechatChatbotEvent
1111
{
1212
public static class Types
1313
{

src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientEventExtensions.cs renamed to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientEventExtensions.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,43 @@
33
namespace SKIT.FlurlHttpClient.Wechat.OpenAI
44
{
55
/// <summary>
6-
/// 为 <see cref="WechatOpenAIClient"/> 提供回调通知事件的扩展方法。
6+
/// 为 <see cref="WechatChatbotClient"/> 提供回调通知事件的扩展方法。
77
/// </summary>
8-
public static partial class WechatOpenAIClientEventExtensions
8+
public static partial class WechatChatbotClientEventExtensions
99
{
1010
/// <summary>
11-
/// <para>从 XML 反序列化得到 <see cref="WechatOpenAIEvent"/> 对象。</para>
11+
/// <para>从 XML 反序列化得到 <see cref="WechatChatbotEvent"/> 对象。</para>
1212
/// </summary>
1313
/// <typeparam name="TEvent"></typeparam>
1414
/// <param name="client"></param>
1515
/// <param name="webhookXml"></param>
1616
/// <returns></returns>
17-
public static TEvent DeserializeEventFromXml<TEvent>(this WechatOpenAIClient client, string webhookXml)
18-
where TEvent : WechatOpenAIEvent, new()
17+
public static TEvent DeserializeEventFromXml<TEvent>(this WechatChatbotClient client, string webhookXml)
18+
where TEvent : WechatChatbotEvent, new()
1919
{
2020
return InnerDeserializeEventFromXml<TEvent>(client, webhookXml);
2121
}
2222

2323
/// <summary>
24-
/// <para>从 XML 反序列化得到 <see cref="WechatOpenAIEvent"/> 对象。</para>
24+
/// <para>从 XML 反序列化得到 <see cref="WechatChatbotEvent"/> 对象。</para>
2525
/// </summary>
2626
/// <param name="client"></param>
2727
/// <param name="webhookXml"></param>
2828
/// <returns></returns>
29-
public static WechatOpenAIEvent DeserializeEventFromXml(this WechatOpenAIClient client, string webhookXml)
29+
public static WechatChatbotEvent DeserializeEventFromXml(this WechatChatbotClient client, string webhookXml)
3030
{
31-
return InnerDeserializeEventFromXml<WechatOpenAIEvent>(client, webhookXml);
31+
return InnerDeserializeEventFromXml<WechatChatbotEvent>(client, webhookXml);
3232
}
3333

3434
/// <summary>
35-
/// 将 <see cref="WechatOpenAIEvent"/> 对象序列化成 XML。
35+
/// 将 <see cref="WechatChatbotEvent"/> 对象序列化成 XML。
3636
/// </summary>
3737
/// <typeparam name="TEvent"></typeparam>
3838
/// <param name="client"></param>
3939
/// <param name="webhookEvent"></param>
4040
/// <returns></returns>
41-
public static string SerializeEventToXml<TEvent>(this WechatOpenAIClient client, TEvent webhookEvent)
42-
where TEvent : WechatOpenAIEvent, new()
41+
public static string SerializeEventToXml<TEvent>(this WechatChatbotClient client, TEvent webhookEvent)
42+
where TEvent : WechatChatbotEvent, new()
4343
{
4444
string xml;
4545

@@ -49,13 +49,13 @@ public static string SerializeEventToXml<TEvent>(this WechatOpenAIClient client,
4949
}
5050
catch (Exception ex)
5151
{
52-
throw new WechatOpenAIException("Failed to serialize event data. Please see the inner exception for more details.", ex);
52+
throw new WechatChatbotException("Failed to serialize event data. Please see the inner exception for more details.", ex);
5353
}
5454

5555
if (string.IsNullOrEmpty(client.Credentials.EncodingAESKey))
56-
throw new WechatOpenAIException("Failed to encrypt event data, because the push encoding AES key is not set.");
56+
throw new WechatChatbotException("Failed to encrypt event data, because the push encoding AES key is not set.");
5757
if (string.IsNullOrEmpty(client.Credentials.Token))
58-
throw new WechatOpenAIException("Failed to encrypt event data, because the push token is not set.");
58+
throw new WechatChatbotException("Failed to encrypt event data, because the push token is not set.");
5959

6060
try
6161
{
@@ -69,36 +69,36 @@ public static string SerializeEventToXml<TEvent>(this WechatOpenAIClient client,
6969
}
7070
catch (Exception ex)
7171
{
72-
throw new WechatOpenAIException("Failed to encrypt event data. Please see the inner exception for more details.", ex);
72+
throw new WechatChatbotException("Failed to encrypt event data. Please see the inner exception for more details.", ex);
7373
}
7474

7575
return xml;
7676
}
7777
}
7878

79-
partial class WechatOpenAIClientEventExtensions
79+
partial class WechatChatbotClientEventExtensions
8080
{
81-
private static TEvent InnerDeserializeEventFromXml<TEvent>(this WechatOpenAIClient client, string webhookXml)
82-
where TEvent : WechatOpenAIEvent
81+
private static TEvent InnerDeserializeEventFromXml<TEvent>(this WechatChatbotClient client, string webhookXml)
82+
where TEvent : WechatChatbotEvent
8383
{
8484
if (client is null) throw new ArgumentNullException(nameof(client));
8585
if (webhookXml is null) throw new ArgumentNullException(webhookXml);
8686

8787
try
8888
{
8989
if (!Utilities.WxMsgCryptor.TryParseXml(webhookXml, out string? encryptedXml))
90-
throw new WechatOpenAIException("Failed to decrypt event data, because of the encrypted data is empty.");
90+
throw new WechatChatbotException("Failed to decrypt event data, because of the encrypted data is empty.");
9191

9292
webhookXml = Utilities.WxMsgCryptor.AESDecrypt(cipherText: encryptedXml!, encodingAESKey: client.Credentials.EncodingAESKey!, out _);
9393
return Utilities.XmlHelper.Deserialize<TEvent>(webhookXml);
9494
}
95-
catch (WechatOpenAIException)
95+
catch (WechatChatbotException)
9696
{
9797
throw;
9898
}
9999
catch (Exception ex)
100100
{
101-
throw new WechatOpenAIException("Failed to deserialize event data. Please see the inner exception for more details.", ex);
101+
throw new WechatChatbotException("Failed to deserialize event data. Please see the inner exception for more details.", ex);
102102
}
103103
}
104104
}

src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteBotExtensions.cs renamed to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteBotExtensions.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace SKIT.FlurlHttpClient.Wechat.OpenAI
88
{
9-
public static class WechatOpenAIClientExecuteBotExtensions
9+
public static class WechatChatbotClientExecuteBotExtensions
1010
{
1111
/// <summary>
1212
/// <para>异步调用 [POST] /batchimportskill/{TOKEN} 接口。</para>
@@ -19,8 +19,7 @@ public static class WechatOpenAIClientExecuteBotExtensions
1919
/// <param name="request"></param>
2020
/// <param name="cancellationToken"></param>
2121
/// <returns></returns>
22-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
23-
public static async Task<Models.BatchImportSkillResponse> ExecuteBatchImportSkillAsync(this WechatOpenAIClient client, Models.BatchImportSkillRequest request, CancellationToken cancellationToken = default)
22+
public static async Task<Models.BatchImportSkillResponse> ExecuteBatchImportSkillAsync(this WechatChatbotClient client, Models.BatchImportSkillRequest request, CancellationToken cancellationToken = default)
2423
{
2524
if (client is null) throw new ArgumentNullException(nameof(client));
2625
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -42,8 +41,7 @@ public static class WechatOpenAIClientExecuteBotExtensions
4241
/// <param name="request"></param>
4342
/// <param name="cancellationToken"></param>
4443
/// <returns></returns>
45-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
46-
public static async Task<Models.PublishResponse> ExecutePublishAsync(this WechatOpenAIClient client, Models.PublishRequest request, CancellationToken cancellationToken = default)
44+
public static async Task<Models.PublishResponse> ExecutePublishAsync(this WechatChatbotClient client, Models.PublishRequest request, CancellationToken cancellationToken = default)
4745
{
4846
if (client is null) throw new ArgumentNullException(nameof(client));
4947
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -65,8 +63,7 @@ public static class WechatOpenAIClientExecuteBotExtensions
6563
/// <param name="request"></param>
6664
/// <param name="cancellationToken"></param>
6765
/// <returns></returns>
68-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
69-
public static async Task<Models.PublishProgressResponse> ExecutePublishProgressAsync(this WechatOpenAIClient client, Models.PublishProgressRequest request, CancellationToken cancellationToken = default)
66+
public static async Task<Models.PublishProgressResponse> ExecutePublishProgressAsync(this WechatChatbotClient client, Models.PublishProgressRequest request, CancellationToken cancellationToken = default)
7067
{
7168
if (client is null) throw new ArgumentNullException(nameof(client));
7269
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -88,8 +85,7 @@ public static class WechatOpenAIClientExecuteBotExtensions
8885
/// <param name="request"></param>
8986
/// <param name="cancellationToken"></param>
9087
/// <returns></returns>
91-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
92-
public static async Task<Models.SetAutoReplyResponse> ExecuteSetAutoReplyAsync(this WechatOpenAIClient client, Models.SetAutoReplyRequest request, CancellationToken cancellationToken = default)
88+
public static async Task<Models.SetAutoReplyResponse> ExecuteSetAutoReplyAsync(this WechatChatbotClient client, Models.SetAutoReplyRequest request, CancellationToken cancellationToken = default)
9389
{
9490
if (client is null) throw new ArgumentNullException(nameof(client));
9591
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -111,8 +107,7 @@ public static class WechatOpenAIClientExecuteBotExtensions
111107
/// <param name="request"></param>
112108
/// <param name="cancellationToken"></param>
113109
/// <returns></returns>
114-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
115-
public static async Task<Models.LabelBatchSetResponse> ExecuteLabelBatchSetAsync(this WechatOpenAIClient client, Models.LabelBatchSetRequest request, CancellationToken cancellationToken = default)
110+
public static async Task<Models.LabelBatchSetResponse> ExecuteLabelBatchSetAsync(this WechatChatbotClient client, Models.LabelBatchSetRequest request, CancellationToken cancellationToken = default)
116111
{
117112
if (client is null) throw new ArgumentNullException(nameof(client));
118113
if (request is null) throw new ArgumentNullException(nameof(request));

src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatOpenAIClientExecuteDialogExtensions.cs renamed to src/SKIT.FlurlHttpClient.Wechat.OpenAI/Extensions/WechatChatbotClientExecuteDialogExtensions.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace SKIT.FlurlHttpClient.Wechat.OpenAI
88
{
9-
public static class WechatOpenAIClientExecuteDialogExtensions
9+
public static class WechatChatbotClientExecuteDialogExtensions
1010
{
1111
/// <summary>
1212
/// <para>异步调用 [POST] /sign/{TOKEN} 接口。</para>
@@ -19,8 +19,7 @@ public static class WechatOpenAIClientExecuteDialogExtensions
1919
/// <param name="request"></param>
2020
/// <param name="cancellationToken"></param>
2121
/// <returns></returns>
22-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
23-
public static async Task<Models.SignResponse> ExecuteSignAsync(this WechatOpenAIClient client, Models.SignRequest request, CancellationToken cancellationToken = default)
22+
public static async Task<Models.SignResponse> ExecuteSignAsync(this WechatChatbotClient client, Models.SignRequest request, CancellationToken cancellationToken = default)
2423
{
2524
if (client is null) throw new ArgumentNullException(nameof(client));
2625
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -42,8 +41,7 @@ public static class WechatOpenAIClientExecuteDialogExtensions
4241
/// <param name="request"></param>
4342
/// <param name="cancellationToken"></param>
4443
/// <returns></returns>
45-
[Obsolete("相关接口或字段于 2023-04-10 下线。")]
46-
public static async Task<Models.AIBotResponse> ExecuteAIBotAsync(this WechatOpenAIClient client, Models.AIBotRequest request, CancellationToken cancellationToken = default)
44+
public static async Task<Models.AIBotResponse> ExecuteAIBotAsync(this WechatChatbotClient client, Models.AIBotRequest request, CancellationToken cancellationToken = default)
4745
{
4846
if (client is null) throw new ArgumentNullException(nameof(client));
4947
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -66,7 +64,7 @@ public static class WechatOpenAIClientExecuteDialogExtensions
6664
/// <param name="cancellationToken"></param>
6765
/// <returns></returns>
6866
[Obsolete("相关接口或字段于 2023-04-07 下线。")]
69-
public static async Task<Models.FeedbackResponse> ExecuteFeedbackAsync(this WechatOpenAIClient client, Models.FeedbackRequest request, CancellationToken cancellationToken = default)
67+
public static async Task<Models.FeedbackResponse> ExecuteFeedbackAsync(this WechatChatbotClient client, Models.FeedbackRequest request, CancellationToken cancellationToken = default)
7068
{
7169
if (client is null) throw new ArgumentNullException(nameof(client));
7270
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -89,7 +87,7 @@ public static class WechatOpenAIClientExecuteDialogExtensions
8987
/// <param name="cancellationToken"></param>
9088
/// <returns></returns>
9189
[Obsolete("相关接口或字段于 2023-04-07 下线。")]
92-
public static async Task<Models.GetHotQueryListResponse> ExecuteGetHotQueryListAsync(this WechatOpenAIClient client, Models.GetHotQueryListRequest request, CancellationToken cancellationToken = default)
90+
public static async Task<Models.GetHotQueryListResponse> ExecuteGetHotQueryListAsync(this WechatChatbotClient client, Models.GetHotQueryListRequest request, CancellationToken cancellationToken = default)
9391
{
9492
if (client is null) throw new ArgumentNullException(nameof(client));
9593
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -112,7 +110,7 @@ public static class WechatOpenAIClientExecuteDialogExtensions
112110
/// <param name="cancellationToken"></param>
113111
/// <returns></returns>
114112
[Obsolete("相关接口或字段于 2023-04-07 下线。")]
115-
public static async Task<Models.GetHotQueryDetailResponse> ExecuteGetHotQueryDetailAsync(this WechatOpenAIClient client, Models.GetHotQueryDetailRequest request, CancellationToken cancellationToken = default)
113+
public static async Task<Models.GetHotQueryDetailResponse> ExecuteGetHotQueryDetailAsync(this WechatChatbotClient client, Models.GetHotQueryDetailRequest request, CancellationToken cancellationToken = default)
116114
{
117115
if (client is null) throw new ArgumentNullException(nameof(client));
118116
if (request is null) throw new ArgumentNullException(nameof(request));

0 commit comments

Comments
 (0)