Skip to content

Commit 9f74b04

Browse files
Oceania2018Oceania2018
committed
Separate KnoledgeBase as standalone plugin.
1 parent 05b8db8 commit 9f74b04

File tree

42 files changed

+234
-111
lines changed

Some content is hidden

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

42 files changed

+234
-111
lines changed

‎BotSharp.sln‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.PizzaBot",
5151
EndProject
5252
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{51AFE054-AE99-497D-A593-69BAEFB5106F}"
5353
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.RoutingSpeeder", "src\Plugins\BotSharp.Plugin.RoutingSpeeder\BotSharp.Plugin.RoutingSpeeder.csproj", "{631D9C12-86C4-44F0-99C3-D32C0754BF37}"
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Plugin.RoutingSpeeder", "src\Plugins\BotSharp.Plugin.RoutingSpeeder\BotSharp.Plugin.RoutingSpeeder.csproj", "{631D9C12-86C4-44F0-99C3-D32C0754BF37}"
55+
EndProject
56+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RAGs", "RAGs", "{4F346DCE-087F-4368-AF88-EE9C720D0E69}"
57+
EndProject
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BotSharp.Plugin.KnowledgeBase", "src\Plugins\BotSharp.Plugin.KnowledgeBase\BotSharp.Plugin.KnowledgeBase.csproj", "{298AC787-A104-414C-B114-82BE764FBD9C}"
5559
EndProject
5660
Global
5761
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -189,6 +193,14 @@ Global
189193
{631D9C12-86C4-44F0-99C3-D32C0754BF37}.Release|Any CPU.Build.0 = Release|Any CPU
190194
{631D9C12-86C4-44F0-99C3-D32C0754BF37}.Release|x64.ActiveCfg = Release|Any CPU
191195
{631D9C12-86C4-44F0-99C3-D32C0754BF37}.Release|x64.Build.0 = Release|Any CPU
196+
{298AC787-A104-414C-B114-82BE764FBD9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
197+
{298AC787-A104-414C-B114-82BE764FBD9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
198+
{298AC787-A104-414C-B114-82BE764FBD9C}.Debug|x64.ActiveCfg = Debug|Any CPU
199+
{298AC787-A104-414C-B114-82BE764FBD9C}.Debug|x64.Build.0 = Debug|Any CPU
200+
{298AC787-A104-414C-B114-82BE764FBD9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
201+
{298AC787-A104-414C-B114-82BE764FBD9C}.Release|Any CPU.Build.0 = Release|Any CPU
202+
{298AC787-A104-414C-B114-82BE764FBD9C}.Release|x64.ActiveCfg = Release|Any CPU
203+
{298AC787-A104-414C-B114-82BE764FBD9C}.Release|x64.Build.0 = Release|Any CPU
192204
EndGlobalSection
193205
GlobalSection(SolutionProperties) = preSolution
194206
HideSolutionNode = FALSE
@@ -215,6 +227,8 @@ Global
215227
{A1118A2C-C6D7-4E22-9462-964AEC7CC46E} = {32FAFFFE-A4CB-4FEE-BF7C-84518BBC6DCC}
216228
{51AFE054-AE99-497D-A593-69BAEFB5106F} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
217229
{631D9C12-86C4-44F0-99C3-D32C0754BF37} = {51AFE054-AE99-497D-A593-69BAEFB5106F}
230+
{4F346DCE-087F-4368-AF88-EE9C720D0E69} = {2635EC9B-2E5F-4313-AC21-0B847F31F36C}
231+
{298AC787-A104-414C-B114-82BE764FBD9C} = {4F346DCE-087F-4368-AF88-EE9C720D0E69}
218232
EndGlobalSection
219233
GlobalSection(ExtensibilityGlobals) = postSolution
220234
SolutionGuid = {A9969D89-C98B-40A5-A12B-FC87E55B3A19}

‎Directory.Build.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>10.0</LangVersion>
4+
<OutputPath>..\..\..\packages</OutputPath>
5+
<PackageVersion>0.11.0</PackageVersion>
6+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7+
</PropertyGroup>
8+
</Project>

‎src/Infrastructure/BotSharp.Core/Agents/Services/AgentHookBase.cs‎ renamed to ‎src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using BotSharp.Abstraction.Agents.Models;
1+
using BotSharp.Abstraction.Agents.Settings;
22

3-
namespace BotSharp.Core.Agents.Services;
3+
namespace BotSharp.Abstraction.Agents;
44

55
public abstract class AgentHookBase : IAgentHook
66
{
@@ -28,6 +28,9 @@ public virtual bool OnAgentLoading(ref string id)
2828

2929
public virtual bool OnInstructionLoaded(string template, Dictionary<string, object> dict)
3030
{
31+
dict["current_date"] = $"{DateTime.Now:MMM dd, yyyy}";
32+
dict["current_time"] = $"{DateTime.Now:hh:mm tt}";
33+
dict["current_weekday"] = $"{DateTime.Now:dddd}";
3134
return true;
3235
}
3336

‎src/Infrastructure/BotSharp.Abstraction/Agents/Settings/AgentSettings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ namespace BotSharp.Abstraction.Agents.Settings;
22

33
public class AgentSettings
44
{
5-
public string DataDir { get; set; }
6-
public string TemplateFormat { get; set; }
5+
public string DataDir { get; set; } = string.Empty;
6+
public string TemplateFormat { get; set; } = "liquid";
77
}

‎src/Infrastructure/BotSharp.Abstraction/BotSharp.Abstraction.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<Nullable>enable</Nullable>
6-
<LangVersion>10.0</LangVersion>
7-
<VersionPrefix>0.10.1</VersionPrefix>
6+
<LangVersion>$(LangVersion)</LangVersion>
7+
<VersionPrefix>$(PackageVersion)</VersionPrefix>
88
<PackageIcon>Icon.png</PackageIcon>
9+
<GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎src/Infrastructure/BotSharp.Abstraction/Plugins/PluginLoaderSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ namespace BotSharp.Abstraction.Plugins;
22

33
public class PluginLoaderSettings
44
{
5-
public string[] Assemblies { get; set; }
5+
public string[] Assemblies { get; set; } = new string[0];
66
}

‎src/Infrastructure/BotSharp.Abstraction/Routing/Settings/RoutingSettings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ public class RoutingSettings
55
/// <summary>
66
/// Router Agent Id
77
/// </summary>
8-
public string RouterId { get; set; }
8+
public string RouterId { get; set; } = string.Empty;
99

1010
/// <summary>
1111
/// Reasoner Agent Id
1212
/// </summary>
13-
public string ReasonerId { get; set; }
13+
public string ReasonerId { get; set; } = string.Empty;
1414
}

‎src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
5-
<LangVersion>10.0</LangVersion>
6-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
7-
<VersionPrefix>0.10.4</VersionPrefix>
5+
<LangVersion>$(LangVersion)</LangVersion>
6+
<VersionPrefix>$(PackageVersion)</VersionPrefix>
7+
<GeneratePackageOnBuild>$(GeneratePackageOnBuild)</GeneratePackageOnBuild>
88
</PropertyGroup>
99

1010
<PropertyGroup Label="Globals">
@@ -76,7 +76,6 @@
7676
<PackageReference Include="EntityFrameworkCore.BootKit" Version="6.2.1" />
7777
<PackageReference Include="Fluid.Core" Version="2.4.0" />
7878
<PackageReference Include="TensorFlow.Keras" Version="0.11.2" />
79-
<PackageReference Include="PdfPig" Version="0.1.9-alpha-20230806-4a480" />
8079
</ItemGroup>
8180

8281
<ItemGroup>

‎src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
using BotSharp.Abstraction.Agents.Models;
21
using BotSharp.Abstraction.Functions;
32
using BotSharp.Core.Functions;
43
using BotSharp.Core.Hooks;
54
using BotSharp.Core.Routing;
65
using BotSharp.Core.Templating;
7-
using BotSharp.Core.Plugins.Knowledges.Services;
86
using Microsoft.AspNetCore.Builder;
97
using Microsoft.Extensions.Configuration;
108
using BotSharp.Abstraction.Routing.Settings;
@@ -113,7 +111,5 @@ public static void RegisterPlugins(IServiceCollection services, IConfiguration c
113111
loader.Load();
114112

115113
services.AddSingleton(loader);
116-
117-
services.AddSingleton<IPdf2TextConverter, PigPdf2TextConverter>();
118114
}
119115
}

‎src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,6 @@ public async Task<bool> SendMessage(string agentId,
2828

2929
_storage.Append(_conversationId, agent.Id, lastDialog);
3030

31-
// Get relevant domain knowledge
32-
/*if (_settings.EnableKnowledgeBase)
33-
{
34-
var knowledge = _services.GetRequiredService<IKnowledgeService>();
35-
agent.Knowledges = await knowledge.GetKnowledges(new KnowledgeRetrievalModel
36-
{
37-
AgentId = agentId,
38-
Question = string.Join("\n", wholeDialogs.Select(x => x.Content))
39-
});
40-
}*/
41-
4231
var hooks = _services.GetServices<IConversationHook>().ToList();
4332

4433
// Before chat completion hook

0 commit comments

Comments
 (0)