Merge pull request #3 from Senparc/Develop

JeffreySu · web-flow · commit 870c1fa733d7 · 2023-05-30T22:36:03.000+08:00
Develop
diff --git a/.gitignore b/.gitignore
@@ -55,17 +55,15 @@ bin/
 obj/
 .user
 /BuildOutPut
-/src/Senparc.AI.Kernel.Tests/appsettings.test.json
 .DS_Store
 /src/Senparc.Weixin.AI.Tests/appsettings.test.json
 /Samples/Senparc.Weixin.AI.MPSample/appsettings.test.json
 /Samples/Senparc.Weixin.AI.MPSample/appsettings.json
 /Samples/Senparc.Weixin.AI.MPSample/App_Data/SenparcTraceLog
-/Samples/Senparc.Weixin.AI.MPSample/App_Data/WeChat_OfficialAccount/2023-04-09
 /Samples/Senparc.Weixin.AI.MPSample/Properties/PublishProfiles
 /Samples/Senparc.Weixin.AI.MPSample/Properties/ServiceDependencies/SenparcWeixinAIMPSample20230409175131 - Web Deploy
 *.user
 /Samples/Senparc.AI.Samples.Consoles/appsettings.test.json
-/Samples/Senparc.Weixin.AI.MPSample/App_Data/WeChat_OfficialAccount/2023-05-07
-/Samples/Senparc.Weixin.AI.MPSample/App_Data/WeChat_OfficialAccount/2023-05-13
 /Samples/Senparc.Weixin.AI.MPSample/App_Data/OpenAiImageTemp
+/Samples/Senparc.Weixin.AI.MPSample/App_Data/NeuChar
+/Samples/Senparc.Weixin.AI.MPSample/App_Data/WeChat_OfficialAccount/
diff --git a/Samples/Senparc.Weixin.AI.MPSample/App_Data/skills/ResponseChooseSkill/ResponseMessageChoose/config.json b/Samples/Senparc.Weixin.AI.MPSample/App_Data/skills/ResponseChooseSkill/ResponseMessageChoose/config.json
@@ -9,7 +9,7 @@
     "presence_penalty": 0.6,
     "frequency_penalty": 0.0,
     "stop_sequences": [
-      "# done"
+      "[done]"
     ]
   }
 }
diff --git a/Samples/Senparc.Weixin.AI.MPSample/App_Data/skills/ResponseChooseSkill/ResponseMessageChoose/skprompt.txt b/Samples/Senparc.Weixin.AI.MPSample/App_Data/skills/ResponseChooseSkill/ResponseMessageChoose/skprompt.txt
@@ -9,10 +9,16 @@ Example:
 Input: What's the mean of animal?
 Output: {"MessageType":"Text", "Result":"The word \"animal\" is a broad term that refers to living organisms that are not plants or fungi, and it encompasses a wide range of species with diverse characteristics. Therefore, it is not possible to calculate a mean for the term "animal" as it is not a numerical value or a quantitative measure."}
 
+Input: Can you tell me what's in the image?
+Output: [{""MessageType"":""Text"", ""Result"":""It's an image of a panda driving a car in the sky, with the car flying high and the panda looking happy and excited.""}]
+
+Input: Create me a picture with sky and birds.
+Output: [{""MessageType"":""Image"", ""Result"":""The sky is filled with colorful birds.""}]
+
 Input: Give me an image shows the spring of China.
 Output: {"MessageType":"Image", "Result":"Generate a high-quality and visually stunning image that depicts the beauty of spring in China, with a focus on blooming flowers, lush green landscapes, and perhaps a cultural or historical element such as a traditional Chinese garden or temple."}
 
-# done
+[done]
 
 Now tell me the follow message's output:
 {{$input}}
diff --git a/Samples/Senparc.Weixin.AI.MPSample/CustomMessageHandler.cs b/Samples/Senparc.Weixin.AI.MPSample/CustomMessageHandler.cs
@@ -31,7 +31,9 @@ public class CustomMessageHandler : MessageHandler<DefaultMpMessageContext>
 
 ===开源地址===
 Senparc.AI模块：https://github.com/Senparc/Senparc.AI
-微信SDK：https://github.com/JeffreySu/WeiXinMPSDK";
+Senparc.Weixin.AI：https://github.com/Senparc/Senparc.Weixin.AI
+微信SDK：https://github.com/JeffreySu/WeiXinMPSDK
+";
 
         private readonly IBaseObjectCacheStrategy _cache;
         private string GetCacheKey(string openId) => $"SenparcAI-Chat-{openId}";
@@ -70,7 +72,7 @@ public override async Task<IResponseMessageBase> OnTextRequestAsync(RequestMessa
                         await _cache.SetAsync(cacheKey, messages, TimeSpan.FromHours(1));
                         responseMessage.Content = "Chat 准备就绪，请开始对话！";
 
-                        //TODO：清空 Senparc.AI 层面的对话
+                        //清空 Senparc.AI 层面的对话
                         ReponseMessageFactory.iWantToRunCollection.TryRemove(OpenId, out _);
                         return responseMessage;
                     });
diff --git a/Samples/Senparc.Weixin.AI.MPSample/appsettings.-remove-here-.json b/Samples/Senparc.Weixin.AI.MPSample/appsettings.-remove-here-.json
@@ -17,7 +17,7 @@
     //微信全局
     "IsDebug": true,
     //公众号
-    "Token": "YourToken",
+    "Token": "weixin",
     "EncodingAESKey": "YourEncodingAESKey",
     "WeixinAppId": "YourWeixinAppId",
     "WeixinAppSecret": "YourWeixinAppSecret"
@@ -27,7 +27,7 @@
     "IsDebug": true,
     "AiPlatform": "NeuCharOpenAI",
     "NeuCharOpenAIKeys": {
-      "ApiKey": "", //在 https://www.neuchar.com/Developer/AiApp 申请
+      "ApiKey": "YourNeuCharApiKey", //在 https://www.neuchar.com/Developer/AiApp 申请
       "NeuCharEndpoint": "https://www.neuchar.com/<DeveloperId>/" //查看 ApiKey 时可看到 DeveloperId
     },
     "AzureOpenAIKeys": {
diff --git a/src/Senparc.Weixin.AI/Register.cs b/src/Senparc.Weixin.AI/Register.cs
@@ -33,7 +33,7 @@ public static IServiceCollection AddSenparcWeixinAI(this IServiceCollection serv
                 Senparc.AI.Register.UseSenparcAI(null, senparcAiSetting);
             }
             catch (Exception ex)
-            {
+            {
                 Console.WriteLine(ex);
             }
 
diff --git a/src/Senparc.Weixin.AI/ReponseMessageFactory.cs b/src/Senparc.Weixin.AI/ReponseMessageFactory.cs
@@ -36,8 +36,6 @@ public class ReponseMessageFactory
 
         IServiceProvider ServiceProvider { get; set; }
 
-
-
         public ReponseMessageFactory(IServiceProvider serviceProvider)
         {
             ServiceProvider = serviceProvider;
@@ -68,7 +66,7 @@ public async Task<string> GetResponseMessageByPlanAsync(IAiHandler aiHandler, st
             var skillsDirectory = Senparc.CO2NET.Utilities.ServerUtility.ContentRootMapPath("~/App_Data/skills");/* Path.Combine(dir, "..", "..", "..", "skills");*/
             await Console.Out.WriteLineAsync("skillsDirectory:" + skillsDirectory);
             //var skillList = iWantToRun.ImportSkillFromDirectory(skillsDirectory, "ResponseChooseSkill").skillList;
-            iWantToRun.ImportSkill(new SenparcWeixinSkills(iWantToRun.Kernel), "BuildResponseMessage");
+            //iWantToRun.ImportSkill(new SenparcWeixinSkills(iWantToRun.Kernel), "BuildResponseMessage");
 
             //var ask = "I want to know which program language is the best one?";
 
diff --git a/src/Senparc.Weixin.AI/WeixinSkills/SenparcWeixinSkills.cs b/src/Senparc.Weixin.AI/WeixinSkills/SenparcWeixinSkills.cs
@@ -21,34 +21,23 @@ public class SenparcWeixinSkills
 
         private const string BUILD_RESPONSE_MESSAGE_DEFINITION = @"Determine the type of message and result that should be returned based on the input information.
 
-The context of the request may contains several history messages, only the last message can determine the type of the message, which always using the key of ""input"" in context.
-
 There are two types of message:
 - Text: just need return text, without image required. The Result parameter will be returned as a ChatBot's reply.
 - Image: need to generate image. The Result parameter will give a better prompt to generate a image by general image generate engine.
 
-Examples:
+Example:
 
 Input: What's the mean of animal?
-Output: [{""MessageType"":""Text"", ""Result"":""The word \""animal\"" is a broad term that refers to living organisms that are not plants or fungi, and it encompasses a wide range of species with diverse characteristics. Therefore, it is not possible to calculate a mean for the term ""animal"" as it is not a numerical value or a quantitative measure.""}]
-
-Input: Can you tell me what's in the image?
-Output: [{""MessageType"":""Text"", ""Result"":""It's an image of a panda driving a car in the sky, with the car flying high and the panda looking happy and excited.""}]
-
-Input: Give me a picture with sky and bird.
-Output: [{""MessageType"":""Image"", ""Result"":""The sky is filled with colorful birds.""}]
+Output: {""MessageType"":""Text"", ""Result"":""The word \""animal\"" is a broad term that refers to living organisms that are not plants or fungi, and it encompasses a wide range of species with diverse characteristics. Therefore, it is not possible to calculate a mean for the term ""animal"" as it is not a numerical value or a quantitative measure.""}
 
 Input: Give me an image shows the spring of China.
-Output: [{""MessageType"":""Image"", ""Result"":""Generate a high-quality and visually stunning image that depicts the beauty of spring in China, with a focus on blooming flowers, lush green landscapes, and perhaps a cultural or historical element such as a traditional Chinese garden or temple.""}]
+Output: {""MessageType"":""Image"", ""Result"":""Generate a high-quality and visually stunning image that depicts the beauty of spring in China, with a focus on blooming flowers, lush green landscapes, and perhaps a cultural or historical element such as a traditional Chinese garden or temple.""}
 
 [done]
 
-
-The original Output is JSON format, I want to get an XML format result, do the parse first. Just left JSON information without any other 'appendToResult' information.
-
 Now tell me the follow message's output:
-Input: {{$input}}
-Output: ";
+{{$input}}
+The Output is JSON format.";
 
         public SenparcWeixinSkills(IKernel kernel)
         {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"presence_penalty": 0.6,`
`10`	`10`	`"frequency_penalty": 0.0,`
`11`	`11`	`"stop_sequences": [`
`12`		`- "# done"`
	`12`	`+ "[done]"`
`13`	`13`	`]`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static IServiceCollection AddSenparcWeixinAI(this IServiceCollection serv`
`33`	`33`	`Senparc.AI.Register.UseSenparcAI(null, senparcAiSetting);`
`34`	`34`	`}`
`35`	`35`	`catch (Exception ex)`
`36`		`- {`
	`36`	`+ {`
`37`	`37`	`Console.WriteLine(ex);`
`38`	`38`	`}`
`39`	`39`