Merge pull request #98 from AIDotNet/feature_nuget

Feature nuget
update
2026-02-24 19:19:34 +08:00 · 2024-08-05 11:31:09 +08:00 · 2024-08-05 11:30:52 +08:00 · 2024-08-05 11:16:32 +08:00 · 2024-08-05 11:03:51 +08:00 · 2024-08-05 10:52:51 +08:00
14 changed files with 163 additions and 61 deletions
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ AntSK is suitable for various business scenarios, such as:
 ### Online Demo
 [document](http://antsk.cn/)

-[demo](https://antsk.ai-dotnet.com/)
+[demo](https://demo.antsk.cn/)

 ```
 Default account: test
--- a/README.zh.md
+++ b/README.zh.md
@@ -45,7 +45,7 @@ AntSK 适用于多种业务场景，例如：

 [文档地址](http://antsk.cn/)

-[体验地址](https://antsk.ai-dotnet.com/)
+[体验地址](https://demo.antsk.cn/)

 ```
 默认账号：test
--- a/src/AntSK.Domain/AntSK.Domain.csproj
+++ b/src/AntSK.Domain/AntSK.Domain.csproj
@@ -8,23 +8,23 @@
    <NoWarn>CA1050,CA1707,CA2007,VSTHRD111,CS1591,RCS1110,CA5394,SKEXP0001,SKEXP0002,SKEXP0003,SKEXP0004,SKEXP0010,SKEXP0011,,SKEXP0012,SKEXP0020,SKEXP0021,SKEXP0022,SKEXP0023,SKEXP0024,SKEXP0025,SKEXP0026,SKEXP0027,SKEXP0028,SKEXP0029,SKEXP0030,SKEXP0031,SKEXP0032,SKEXP0040,SKEXP0041,SKEXP0042,SKEXP0050,SKEXP0051,SKEXP0052,SKEXP0053,SKEXP0054,SKEXP0055,SKEXP0060,SKEXP0061,SKEXP0101,SKEXP0102,KMEXP00</NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="AntDesign.Charts" Version="0.5.2" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.19.2" />
+    <PackageReference Include="AntDesign.Charts" Version="0.5.5" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.7" />
    <PackageReference Include="BlazorComponents.Terminal" Version="0.6.0" />
    <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
  
    <PackageReference Include="pythonnet" Version="3.0.3" />
   
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
    
    <PackageReference Include="AutoMapper" Version="8.1.0" />
    <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
    <PackageReference Include="Markdig" Version="0.37.0" />
    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.160" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
    <PackageReference Include="RestSharp" Version="$(RestSharpVersion)" />
-    <PackageReference Include="NPOI" Version="2.7.0" />
+    <PackageReference Include="NPOI" Version="2.7.1" />

    <PackageReference Include="Microsoft.SemanticKernel" Version="$(SKVersion)" />
    <PackageReference Include="Microsoft.SemanticKernel.Core" Version="$(SKVersion)" />
@@ -41,13 +41,13 @@
    <PackageReference Include="LLamaSharp.kernel-memory" Version="$(LLamaSharpVersion)" />
    <PackageReference Include="LLamaSharp.semantic-kernel" Version="$(LLamaSharpVersion)" />

-    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10391" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
    <PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0" />
+    <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\AntSK.LLamaFactory\AntSK.LLamaFactory.csproj" />
--- a/src/AntSK.Domain/Common/Embedding/HuggingfaceTextEmbeddingGenerator.cs
+++ b/src/AntSK.Domain/Common/Embedding/HuggingfaceTextEmbeddingGenerator.cs
@@ -52,5 +52,10 @@ namespace AntSK.Domain.Common.Embedding
        {
            return BgeEmbeddingConfig.TokenCount(text);
        }
+
+        public IReadOnlyList<string> GetTokens(string text)
+        {
+            return new List<string>();
+        }
    }
 }
--- a/src/AntSK.Domain/Domain/Other/Bge/BegRerankConfig.cs
+++ b/src/AntSK.Domain/Domain/Other/Bge/BegRerankConfig.cs
@@ -26,12 +26,7 @@ namespace AntSK.Domain.Domain.Other.Bge
            {
                if (model == null)
                {
-                    if (string.IsNullOrEmpty(Runtime.PythonDLL))
-                    {
-                        Runtime.PythonDLL = pythondllPath;
-                    }
-                    PythonEngine.Initialize();
-                    PythonEngine.BeginAllowThreads();
+                    PyRunTime.InitRunTime(pythondllPath);
                    try
                    {
                        using (GIL())// 初始化Python环境的Global Interpreter Lock)
@@ -40,7 +35,7 @@ namespace AntSK.Domain.Domain.Other.Bge
                            dynamic flagEmbedding = Py.Import("FlagEmbedding");

                            dynamic model_dir = modelscope.snapshot_download(modelName, revision: "master");
-                            dynamic flagReranker = flagEmbedding.FlagReranker(model_dir, use_fp16: true);
+                            dynamic flagReranker = flagEmbedding.FlagReranker(model_dir, use_fp16: false);
                            model = flagReranker;
                            return model;
                        }
--- a/src/AntSK.Domain/Domain/Other/Bge/BgeEmbeddingConfig.cs
+++ b/src/AntSK.Domain/Domain/Other/Bge/BgeEmbeddingConfig.cs
@@ -1,5 +1,4 @@
 using Microsoft.KernelMemory.AI.OpenAI;
-using Microsoft.KernelMemory.AI.OpenAI.GPT3;
 using Python.Runtime;
 using Serilog;
 using System;
@@ -28,13 +27,7 @@ namespace AntSK.Domain.Domain.Other.Bge
            {
                if (model == null)
                {
-                    //Runtime.PythonDLL = @"D:\Programs\Python\Python311\python311.dll";
-                    if (string.IsNullOrEmpty(Runtime.PythonDLL))
-                    {
-                        Runtime.PythonDLL = pythondllPath;
-                    }
-                    PythonEngine.Initialize();
-                    PythonEngine.BeginAllowThreads();
+                    PyRunTime.InitRunTime(pythondllPath);
                    try
                    {
                        using (GIL())// 初始化Python环境的Global Interpreter Lock)
--- a/src/AntSK.Domain/Domain/Other/Bge/PyRunTime.cs
+++ b/src/AntSK.Domain/Domain/Other/Bge/PyRunTime.cs
@@ -0,0 +1,28 @@
+using Python.Runtime;
+
+namespace AntSK.Domain.Domain.Other.Bge
+{
+    public static class PyRunTime
+    {
+        static object lockobj = new object();
+
+        static bool isInit = false;
+
+        public static void InitRunTime(string pythonPath)
+        {
+            lock (lockobj)
+            {
+                if (!isInit)
+                {
+                    if (string.IsNullOrEmpty(Runtime.PythonDLL))
+                    {
+                        Runtime.PythonDLL = pythonPath;
+                    }
+                    PythonEngine.Initialize();
+                    PythonEngine.BeginAllowThreads();
+                    isInit = true;
+                }
+            }
+        }
+    }
+}
--- a/src/AntSK.OCR/AntSK.OCR.csproj
+++ b/src/AntSK.OCR/AntSK.OCR.csproj
@@ -9,11 +9,11 @@
    <PackageReference Include="Microsoft.KernelMemory.Core" Version="$(KMVersion)" />
    <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
    <PackageReference Include="Sdcb.OpenCvSharp4.mini.runtime.debian.12-x64" Version="4.8.0.20231125" />
-    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.5" />
+    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.6" />
    <PackageReference Include="Sdcb.OpenVINO.PaddleOCR.Models.Online" Version="0.6.2" />
    <PackageReference Include="Sdcb.OpenVINO.PaddleOCR" Version="0.6.3" />
-    <PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2024.0.0" />
-    <PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2024.1.0" />
+    <PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2024.2.0" />
+    <PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2024.2.0" />
    
  </ItemGroup>
 </Project>
--- a/src/AntSK.sln
+++ b/src/AntSK.sln
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MiddleWare", "MiddleWare",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.BackgroundTask", "MiddleWare\AntSK.BackgroundTask\AntSK.BackgroundTask.csproj", "{DF87E829-99C5-44A7-9718-B3E67DC801F6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.LLM", "AntSk.LLM\AntSK.LLM.csproj", "{19529BFA-152F-4A8C-8254-F2D4896AB739}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.LLM", "AntSK.LLM\AntSK.LLM.csproj", "{19529BFA-152F-4A8C-8254-F2D4896AB739}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntSK.Test", "AntSK.Test\AntSK.Test.csproj", "{6AD71410-127F-4C83-95A8-F699C39B44FF}"
 EndProject
--- a/src/AntSK/Pages/_Host.cshtml
+++ b/src/AntSK/Pages/_Host.cshtml
@@ -31,7 +31,7 @@
        <component type="typeof(App)" render-mode="Server" />
    </app>

-    <script type="text/javascript" src="@("https://unpkg.com/@antv/g2plot@2.4.17/dist/g2plot.min.js")"></script>
+    <script src="./js/g2plot.min.js"></script>
    <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
    <script src="_content/AntDesign.Charts/ant-design-charts-blazor.js"></script>
    <script src="_framework/blazor.server.js"></script>
--- a/src/AntSK/wwwroot/js/g2plot.min.js
+++ b/src/AntSK/wwwroot/js/g2plot.min.js
--- a/src/AntSk.LLM/AntSK.LLM.csproj
+++ b/src/AntSk.LLM/AntSK.LLM.csproj
@@ -10,7 +10,7 @@
    <PackageReference Include="Microsoft.SemanticKernel" Version="$(SKVersion)" />
    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" />
    <PackageReference Include="RestSharp" Version="$(RestSharpVersion)" />
-    <PackageReference Include="Cnblogs.KernelMemory.AI.DashScope" Version="0.1.0" />
+    <PackageReference Include="Cnblogs.KernelMemory.AI.DashScope" Version="0.3.0" />
    <PackageReference Include="Cnblogs.SemanticKernel.Connectors.DashScope" Version="0.3.2" />
    <PackageReference Include="Sdcb.SparkDesk" Version="3.0.0" />
    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
--- a/src/AntSk.LLM/OllamaModelList.txt
+++ b/src/AntSk.LLM/OllamaModelList.txt
@@ -4,16 +4,6 @@ gemma:2b
 gemma:7b
 llama3
 llama3:70b
-llama2:7b
-llama2:13b
-llama2:70b
-llama2-chinese:7b
-llama2-chinese:13b
-llama2-uncensored
-codellama:7b
-codellama:13b
-codellama:34b
-codellama:70b
 yi:6b
 yi:9B
 yi:34B
@@ -29,28 +19,87 @@ qwen:14b
 qwen:32b
 qwen:72b
 qwen:110b
+deepseek-coder:1.3b
+deepseek-coder:6.7b
+deepseek-coder:33b
+deepseek-coder-v2:16b
+deepseek-coder-v2:236b
+phi:2.7b
 phi3:mini
 phi3:medium
 phi3:medium-128k
 aya:8b
 aya:35b
+mistral:7b
 mixtral:8x22b
 mixtral:8x7b
-llava
-tinyllama
-openchat
-deepseek-coder-v2
-deepseek-coder-v2:236b
-mistral
-codegemma:7b
 codegemma:2b
+codegemma:7b
 command-r:35b
-command-r-plus:104b
-deepseek-coder:1.3b
-deepseek-coder:6.7b
-deepseek-coder:33b
-moondream
-neural-chat
-starling-lm
-solar
-
+llava
+gemma:2b
+gemma:7b
+llama2:7b
+llama2:13b
+llama2:70b
+llama2-chinese:7b
+llama2-chinese:13b
+llama3.1:8b
+llama3.1:70b
+llama3.1:405b
+codellama:7b
+codellama:13b
+codellama:34b
+codellama:70b
+dolphin-mistral:7b
+dolphin-mixtral:8x22b
+dolphin-mixtral:8x7b
+llama2-uncensored:7b
+llama2-uncensored:70b
+tinyllama:1.1b
+openchat:7b
+orca-mini:3b
+orca-mini:7b
+orca-mini:13b
+orca-mini:70b
+mistral-openorca:7b
+dolphin-llama3:8b
+dolphin-llama3:70b
+starcoder:1b
+starcoder:3b
+starcoder:7b
+starcoder:15b
+starcoder2:3b
+starcoder2:7b
+starcoder2:15b
+zephyr:7b
+zephyr:141b
+nous-hermes2:10.7b
+nous-hermes2:34b
+vicuna:7b
+vicuna:13b
+vicuna:33b
+wizard-vicuna-uncensored:7b
+wizard-vicuna-uncensored:13b
+wizard-vicuna-uncensored:30b
+wizardlm2:7b
+codestral:22b
+tinydolphin:1.1b
+openhermes:v2.5
+neural-chat:7b
+codeqwen:7b
+phind-codellama:34b
+nous-hermes:7b
+nous-hermes:13b
+nous-hermes:13b
+starling-lm:7b
+llama3-gradient:8b
+llama3-gradient:70b
+yarn-llama2:7b
+yarn-llama2:13b
+llava-llama3:8b
+llama-pro:instruct
+everythinglm:13b
+llava-phi3:3.8b
+mistrallite:7b
+notus:7b
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,10 +1,10 @@
 <Project>
  <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
  <PropertyGroup>
-    <KMVersion>0.62.240605.1</KMVersion>
-    <LLamaSharpVersion>0.13.0</LLamaSharpVersion>
+    <KMVersion>0.70.240803.1</KMVersion>
+    <LLamaSharpVersion>0.15.0</LLamaSharpVersion>
    <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
-    <RestSharpVersion>111.2.0</RestSharpVersion>
-    <SKVersion>1.14.1</SKVersion>
+    <RestSharpVersion>111.4.1</RestSharpVersion>
+    <SKVersion>1.16.2</SKVersion>
  </PropertyGroup>
 </Project>
Author	SHA1	Message	Date
zyxucp	531b4473e8	Merge pull request #98 from AIDotNet/feature_nuget Feature nuget	2024-08-05 11:31:09 +08:00
zyxucp	aefd0d2775	update	2024-08-05 11:30:52 +08:00
zyxucp	960468edf0	update nuget	2024-08-05 11:16:32 +08:00
zyxucp	07ad1f58b5	update sk nuget	2024-08-05 11:03:51 +08:00
zyxucp	095428be50	add llama3	2024-08-05 10:52:51 +08:00
zyxucp	87fc8911fa	Merge pull request #97 from AIDotNet/feature_css fix 处理本地js问题	2024-08-05 10:50:02 +08:00
zyxucp	58272e1ce8	fix 处理本地js问题	2024-08-05 10:49:39 +08:00
zyxucp	700bbcb63f	update nuget	2024-07-20 18:14:42 +08:00
zyxucp	dde1d68876	Merge branch 'main' of github.com:AIDotNet/AntSK	2024-07-20 18:13:04 +08:00
zyxucp	71553a6153	fix 修改bge 默认cpu	2024-07-20 18:12:52 +08:00
zyxucp	d4f8de3e21	Merge pull request #96 from AIDotNet/feature_pyruntime fix pyruntime	2024-07-20 18:11:25 +08:00
zyxucp	6cf5dea10d	fix pyruntime	2024-07-20 18:11:03 +08:00
zyxucp	05379dfee6	Update README.zh.md	2024-07-13 14:18:57 +08:00
zyxucp	5a6d49ff64	Update README.md	2024-07-13 14:18:35 +08:00
zyxucp	64ab940a26	Merge branch 'main' of github.com:AIDotNet/AntSK	2024-07-03 21:22:18 +08:00
zyxucp	55982ea36d	add ollama model list	2024-07-03 21:22:08 +08:00