fix 字典修改

Merge branch 'main' of https://github.com/xuzeyu91/AntSK
fix 修改StreamingTextContent
2026-02-25 11:59:18 +08:00 · 2024-03-09 12:15:32 +08:00 · 2024-03-09 12:10:05 +08:00 · 2024-03-09 12:09:53 +08:00 · 2024-03-09 12:02:47 +08:00 · 2024-03-09 11:59:36 +08:00
7 changed files with 18 additions and 28 deletions
--- a/README.md
+++ b/README.md
@@ -118,12 +118,6 @@ model/xxx.gguf
    "DbType": "Sqlite", 
    "ConnectionStrings": "Data Source=AntSK.db;"
  },
-  "OpenAIOption": {
-    "EndPoint": "http://localhost:5000/llama/",
-    "Key": "NotNull",
-    "Model": "gpt4-turbo",
-    "EmbeddingModel": "text-embedding-ada-002"
-  },
  "KernelMemory": {
    "VectorDb": "Disk", 
    "ConnectionString": "Host=;Port=;Database=antsk;Username=;Password=",
--- a/docker-compose.simple.yml
+++ b/docker-compose.simple.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
  antsk:
    container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.1.6
    ports:
      - 5000:5000
    networks:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
      - ./pg/data:/var/lib/postgresql/data
  antsk:
    container_name: antsk
-    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.1.5
+    image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk:v0.1.6
    ports:
      - 5000:5000
    networks:
--- a/src/AntSK/Pages/ChatPage/Chat.razor.cs
+++ b/src/AntSK/Pages/ChatPage/Chat.razor.cs
@@ -94,6 +94,7 @@ namespace AntSK.Pages.ChatPage
            catch (System.Exception ex)
            {
                Sendding = false;
+                Console.WriteLine("异常:" + ex.Message);
                _ = Message.Error("异常:"+ex.Message, 2);
            }
        }
@@ -246,7 +247,7 @@ namespace AntSK.Pages.ChatPage
            }
            
            var func = _kernel.CreateFunctionFromPrompt(app.Prompt, settings);
-            var chatResult = _kernel.InvokeStreamingAsync<StreamingChatMessageContent>(function: func, arguments: new KernelArguments() { ["input"] = msg });
+            var chatResult = _kernel.InvokeStreamingAsync<StreamingTextContent>(function: func, arguments: new KernelArguments() { ["input"] = msg });
            MessageInfo info = null;
            var markdown = new Markdown();
            await foreach (var content in chatResult)
@@ -255,15 +256,15 @@ namespace AntSK.Pages.ChatPage
                {
                    info = new MessageInfo();
                    info.ID = Guid.NewGuid().ToString();
-                    info.Context = content?.Content?.ConvertToString();
-                    info.HtmlAnswers = content?.Content?.ConvertToString();
+                    info.Context = content?.Text?.ConvertToString();
+                    info.HtmlAnswers = content?.Text?.ConvertToString();
                    info.CreateTime = DateTime.Now;

                    MessageList.Add(info);
                }
                else
                {
-                    info.HtmlAnswers += content.Content;
+                    info.HtmlAnswers += content.Text;
                    await Task.Delay(50); 
                }
                await InvokeAsync(StateHasChanged);
--- a/src/AntSK/Pages/ChatPage/OpenChat.razor.cs
+++ b/src/AntSK/Pages/ChatPage/OpenChat.razor.cs
@@ -100,6 +100,7 @@ namespace AntSK.Pages.ChatPage
            catch (System.Exception ex)
            {
                Sendding = false;
+                Console.WriteLine("异常:" + ex.Message);
                _ = Message.Error("异常:"+ex.Message, 2);
            }

@@ -177,7 +178,7 @@ namespace AntSK.Pages.ChatPage
                    }
                }
                KernelFunction jsonFun = _kernel.Plugins.GetFunction("KMSPlugin", "Ask");
-                var chatResult = _kernel.InvokeStreamingAsync<StreamingChatMessageContent>(function: jsonFun,
+                var chatResult = _kernel.InvokeStreamingAsync<StreamingTextContent>(function: jsonFun,
                    arguments: new KernelArguments() { ["doc"] = dataMsg, ["history"] = msg, ["questions"] = questions });

                MessageInfo info = null;
@@ -188,15 +189,15 @@ namespace AntSK.Pages.ChatPage
                    {
                        info = new MessageInfo();
                        info.ID = Guid.NewGuid().ToString();
-                        info.Context = content?.Content?.ConvertToString();
-                        info.HtmlAnswers = content?.Content?.ConvertToString();
+                        info.Context = content?.Text?.ConvertToString();
+                        info.HtmlAnswers = content?.Text?.ConvertToString();
                        info.CreateTime = DateTime.Now;

                        MessageList.Add(info);
                    }
                    else
                    {
-                        info.HtmlAnswers += content.Content;
+                        info.HtmlAnswers += content.Text;
                        await Task.Delay(50);
                    }
                    await InvokeAsync(StateHasChanged);
@@ -236,7 +237,7 @@ namespace AntSK.Pages.ChatPage
            }

            var func = _kernel.CreateFunctionFromPrompt(app.Prompt, settings);
-            var chatResult = _kernel.InvokeStreamingAsync<StreamingChatMessageContent>(function: func, arguments: new KernelArguments() { ["input"] = msg });
+            var chatResult = _kernel.InvokeStreamingAsync<StreamingTextContent>(function: func, arguments: new KernelArguments() { ["input"] = msg });
            MessageInfo info = null;
            var markdown = new Markdown();
            await foreach (var content in chatResult)
@@ -245,15 +246,15 @@ namespace AntSK.Pages.ChatPage
                {
                    info = new MessageInfo();
                    info.ID = Guid.NewGuid().ToString();
-                    info.Context = content?.Content?.ConvertToString(); 
-                    info.HtmlAnswers = content?.Content?.ConvertToString();
+                    info.Context = content?.Text?.ConvertToString(); 
+                    info.HtmlAnswers = content?.Text?.ConvertToString();
                    info.CreateTime = DateTime.Now;

                    MessageList.Add(info);
                }
                else
                {
-                    info.HtmlAnswers += content.Content;
+                    info.HtmlAnswers += content.Text;
                    await Task.Delay(50); 
                }
                await InvokeAsync(StateHasChanged);
--- a/src/AntSK/Services/OpenApi/OpenApiService.cs
+++ b/src/AntSK/Services/OpenApi/OpenApiService.cs
@@ -112,12 +112,12 @@ namespace AntSK.Services.OpenApi
            //Console.WriteLine(renderedPrompt);

            var func = _kernel.CreateFunctionFromPrompt(app.Prompt, settings);
-            var chatResult = _kernel.InvokeStreamingAsync<StreamingChatMessageContent>(function: func, arguments: new KernelArguments() { ["input"] = msg });
+            var chatResult = _kernel.InvokeStreamingAsync<StreamingTextContent>(function: func, arguments: new KernelArguments() { ["input"] = msg });
            int i = 0;

            await foreach (var content in chatResult)
            {
-                result.choices[0].delta.content = content.Content.ConvertToString();
+                result.choices[0].delta.content = content.Text.ConvertToString();
                string message = $"data: {JsonConvert.SerializeObject(result)}\n\n";
                await HttpContext.Response.WriteAsync(message, Encoding.UTF8);
                await HttpContext.Response.Body.FlushAsync();
--- a/src/AntSK/appsettings.json
+++ b/src/AntSK/appsettings.json
@@ -27,12 +27,6 @@
    "DbType": "Sqlite", 
    "ConnectionStrings": "Data Source=AntSK.db;"
  },
-  "OpenAIOption": {
-    "EndPoint": "http://localhost:5000/llama/",
-    "Key": "NotNull",
-    "Model": "gpt4-turbo",
-    "EmbeddingModel": "text-embedding-ada-002"
-  },
  "KernelMemory": {
    "VectorDb": "Disk", 
    "ConnectionString": "Host=;Port=;Database=antsk;Username=;Password=",
Author	SHA1	Message	Date
zyxucp	6852b458fa	fix 字典修改	2024-03-09 12:15:32 +08:00
zyxucp	cdb41023d4	Merge branch 'main' of https://github.com/xuzeyu91/AntSK	2024-03-09 12:10:05 +08:00
zyxucp	8e00e681f0	fix 修改StreamingTextContent	2024-03-09 12:09:53 +08:00
zyxucp	577d6dd3a6	add 增加异常日志	2024-03-09 12:02:47 +08:00
zyxucp	eeecd15d9e	fix 修改StreamingTextContent	2024-03-09 11:59:36 +08:00
zyxucp	e39b26bcc3	更新 README.md	2024-03-09 00:05:20 +08:00
zyxucp	6b5a77f8c1	Update appsettings.json	2024-03-08 23:38:36 +08:00
zyxucp	0dc9736c35	Update docker-compose.simple.yml	2024-03-08 23:18:15 +08:00
zyxucp	bbe2471815	Update docker-compose.yml	2024-03-08 23:17:49 +08:00