fix plugin dir bug

Author: xuzeyu91

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
   <PropertyGroup>
-    <Version>0.1.16</Version>
+    <Version>0.1.17</Version>
     <SKVersion>1.17.1</SKVersion>  
   </PropertyGroup>
 </Project>

src/GraphRag.Net.Web/.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "8.0.8",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}

src/GraphRag.Net.Web/GraphRag.Net.Web.csproj.user

@@ -2,5 +2,6 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ActiveDebugProfile>https</ActiveDebugProfile>
+    <NameOfLastUsedPublishProfile>D:\AI\AntBlazor\GraphRag.Net\src\GraphRag.Net.Web\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

src/GraphRag.Net/Domain/Service/GraphService.cs

@@ -180,6 +180,7 @@ public async Task InsertGraphDataAsync(string index, string input)
                         var node1 = _nodes_Repositories.GetFirst(p => p.Id == memory.Metadata.Id);
                         string text1 = $"Name:{node1.Name};Type:{node1.Type};Desc:{node1.Desc}";
                         var relationShipJson = await _semanticService.GetRelationship(text1, text2);
+
                         var relationShip = JsonConvert.DeserializeObject<RelationShipModel>(relationShipJson);
                         if (relationShip.IsRelationship)
                         {
@@ -199,10 +200,6 @@ public async Task InsertGraphDataAsync(string index, string input)
                                 relationShip.Edge.Index = index;
                                 _edges_Repositories.Insert(relationShip.Edge);
                             }
-                            else
-                            {
-                                //相同的边进行合并
-                            }
                         }
                     }
 
@@ -271,7 +268,7 @@ public async Task InsertGraphDataAsync(string index, string input)
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.ToString());
+                Console.WriteLine($"插入数据失败：{ex.ToString()}");
             }
         }
 

src/GraphRag.Net/Utils/RepoUtils/RepoFiles.cs

@@ -12,25 +12,33 @@ internal static class RepoFiles
     /// <returns>The full path to samples/plugins</returns>
     public static string SamplePluginsPath()
     {
-        string Parent = System.IO.Directory.GetCurrentDirectory();
-        string Folder = "graphPlugins";
+        string baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
+        string folderName = "graphPlugins";
 
-        bool SearchPath(string pathToFind, out string result, int maxAttempts = 10)
+        string FindPluginsDirectory(string startDir, string targetFolder)
         {
-            var currDir = Path.GetFullPath(Assembly.GetExecutingAssembly().Location);
-            bool found;
-            do
+            string currDir = Path.GetFullPath(startDir);
+            const int maxAttempts = 10;
+
+            for (int i = 0; i < maxAttempts; i++)
             {
-                result = Path.Join(currDir, pathToFind);
-                found = Directory.Exists(result);
+                string potentialPath = Path.Combine(currDir, targetFolder);
+                if (Directory.Exists(potentialPath))
+                {
+                    return potentialPath;
+                }
+
                 currDir = Path.GetFullPath(Path.Combine(currDir, ".."));
-            } while (maxAttempts-- > 0 && !found);
+            }
 
-            return found;
+            return null; // Not found after max attempts.
         }
 
-        if (!SearchPath(Parent + Path.DirectorySeparatorChar + Folder, out string path)
-            && !SearchPath(Folder, out path))
+        // Check in the BaseDirectory and its parent directories
+        string path = FindPluginsDirectory(baseDirectory, folderName)
+                    ?? FindPluginsDirectory(baseDirectory + Path.DirectorySeparatorChar + folderName, folderName);
+
+        if (string.IsNullOrEmpty(path))
         {
             throw new AppException("Plugins directory not found. The app needs the plugins from the repo to work.");
         }

src/GraphRag.Net/graphPlugins/graph/create/skprompt.txt

@@ -1,5 +1,6 @@
-你是一个AI知识图谱生成助手，我需要生成一些节点和边的数据来构成一个图。
+你是一个AI知识图谱生成助手，功能是根据我输入的内容生成知识图谱数据。
 
+### 背景知识:知识图谱包含一些节点和边,其中
 节点的数据结构包含以下字段：
 - Id: 唯一标识符，例如 "node1"
 - Name: 节点名称
@@ -13,10 +14,10 @@
 
 输入的文本将描述节点和它们之间的关系。生成的数据应包括节点和边，并且每个节点和边的数据应以JSON格式表示。
 
-### 示例输入
+### 示例输入：
 大雄有5个苹果，碰到哆啦A梦给了2个，碰到静香，静香又给大雄一个，最后碰到了胖虎
 
-### 示例输出，只返回JSON，不要包含markdown
+### 示例输出，只返回JSON，不要包含markdown：
 
 {
   "Nodes": [

src/GraphRag.Net/graphPlugins/graph/relationship/skprompt.txt

@@ -1,4 +1,4 @@
-你是一个AI知识图谱生成助手，给定2个节点的描述，你需要确定他们是否相关
+你是一个AI知识图谱生成助手，给定2个节点的描述，你需要确定他们是否相关,输出json格式，不需要markdown格式。
 
 ### 示例输入
 node1:Name:苹果;Type:Fruit;Desc:一种水果