Skip to content

Commit fdd0cb6

Browse files
Oceania2018Oceania2018
committed
remove articulate emulator
1 parent ea4b401 commit fdd0cb6

33 files changed

Lines changed: 31 additions & 1160 deletions

‎BotSharp.WebHost/BotSharp.WebHost.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,8 @@
6363
</ItemGroup>
6464

6565
<ItemGroup>
66-
<ProjectReference Include="..\BotSharp.Core\BotSharp.Core.csproj" />
67-
<ProjectReference Include="..\BotSharp.Platform.Abstraction\BotSharp.Platform.Abstraction.csproj" />
68-
<ProjectReference Include="..\BotSharp.RestApi\BotSharp.RestApi.csproj" />
69-
</ItemGroup>
70-
71-
<ItemGroup>
66+
<PackageReference Include="Colorful.Console" Version="1.2.9" />
67+
<PackageReference Include="DotNetToolkit" Version="1.6.0" />
7268
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
7369
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
7470
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
@@ -78,6 +74,10 @@
7874
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="3.0.0" />
7975
</ItemGroup>
8076

77+
<ItemGroup>
78+
<ProjectReference Include="..\..\botsharp-articulate\BotSharp.Platform.Articulate\BotSharp.Platform.Articulate.csproj" />
79+
</ItemGroup>
80+
8181
<ItemGroup>
8282
<Content Update="Settings\app.json">
8383
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎BotSharp.WebHost/InitializationLoader.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using BotSharp.Core.Abstractions;
2-
using DotNetToolkit;
3-
using Microsoft.AspNetCore.Hosting;
1+
using Microsoft.AspNetCore.Hosting;
42
using Microsoft.Extensions.Configuration;
53
using System;
64
using System.Linq;
@@ -13,12 +11,12 @@ public class InitializationLoader
1311
public IConfiguration Config { get; set; }
1412
public void Load()
1513
{
16-
var assemblies = (string[])AppDomain.CurrentDomain.GetData("Assemblies");
14+
/*var assemblies = (string[])AppDomain.CurrentDomain.GetData("Assemblies");
1715
var appsLoaders1 = TypeHelper.GetInstanceWithInterface<IInitializationLoader>(assemblies);
1816
appsLoaders1.ForEach(loader =>
1917
{
2018
loader.Initialize(Config, Env);
21-
});
19+
});*/
2220
}
2321
}
2422
}

‎BotSharp.WebHost/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static IWebHost BuildWebHost(string[] args) =>
4444
config.AddJsonFile(setting, optional: false, reloadOnChange: true);
4545
});
4646
})
47-
.UseUrls("http://0.0.0.0:3112")
47+
.UseUrls("http://0.0.0.0:7500")
4848
.UseStartup<Startup>()
4949
.Build();
5050
}

‎BotSharp.WebHost/Settings/BotSharpNLU.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515

1616
"botSharpIntentClassifier": {
17-
"classifer": "SVMClassifier",
17+
"classifer": "NaiveBayesClassifier",
1818
"wordvecModel": "|App_Data|wordvec_enu.bin"
1919
},
2020

‎BotSharp.WebHost/Startup.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.Drawing;
1313
using System.IO;
1414
using System.Linq;
15+
using System.Reflection;
1516
using Console = Colorful.Console;
1617

1718
namespace BotSharp.WebHost
@@ -56,8 +57,9 @@ public void ConfigureServices(IServiceCollection services)
5657
var info = Configuration.GetSection("Swagger").Get<Info>();
5758
c.SwaggerDoc(info.Version, info);
5859

59-
var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "BotSharp.RestApi.xml");
60-
c.IncludeXmlComments(filePath);
60+
//var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "BotSharp.RestApi.xml");
61+
//c.IncludeXmlComments(filePath);
62+
6163
c.OperationFilter<SwaggerFileUploadOperation>();
6264
});
6365

@@ -124,6 +126,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
124126
loader.Config = Configuration;
125127
loader.Load();*/
126128

129+
// load dll dynamic
130+
/*Assembly library = Assembly.LoadFile(Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "BotSharp.Platform.Articulate.dll"));
131+
Type myClass = (from type in library.GetExportedTypes()
132+
where typeof(IMyInterface).IsAssignableFrom(type)
133+
select type)
134+
.Single();*/
135+
127136
var platform = Configuration.GetValue<string>("Platform");
128137
var engine = Configuration.GetValue<string>($"{platform}:BotEngine");
129138
Formatter[] settings = new Formatter[]

‎BotSharp.sln‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.27130.2010
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Core", "BotSharp.Core\BotSharp.Core.csproj", "{95780673-2A1A-4953-962F-C46CBFDD07FF}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.RestApi", "BotSharp.RestApi\BotSharp.RestApi.csproj", "{80DDAA05-69BC-49DD-96A4-37345E7A2E20}"
9-
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.WebHost", "BotSharp.WebHost\BotSharp.WebHost.csproj", "{03DCA427-327A-4FC9-9A2F-57D17F16708C}"
119
ProjectSection(ProjectDependencies) = postProject
1210
{C2FDC855-BD88-4041-B0FF-3AA8A1C11A22} = {C2FDC855-BD88-4041-B0FF-3AA8A1C11A22}
@@ -26,7 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Platform.Models",
2624
EndProject
2725
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Platform.Dialogflow", "..\botsharp-dialogflow\BotSharp.Platform.Dialogflow\BotSharp.Platform.Dialogflow.csproj", "{B865F070-9693-47C6-B901-40121F659C6F}"
2826
EndProject
29-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Platform.Articulate", "Platform.Articulate\Platform.Articulate.csproj", "{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}"
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotSharp.Platform.Articulate", "..\botsharp-articulate\BotSharp.Platform.Articulate\BotSharp.Platform.Articulate.csproj", "{17BAE152-DDCF-4605-8DCB-9F14D403002F}"
3028
EndProject
3129
Global
3230
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -44,14 +42,6 @@ Global
4442
{95780673-2A1A-4953-962F-C46CBFDD07FF}.Release|Any CPU.Build.0 = Release|Any CPU
4543
{95780673-2A1A-4953-962F-C46CBFDD07FF}.Release|x64.ActiveCfg = Release|x64
4644
{95780673-2A1A-4953-962F-C46CBFDD07FF}.Release|x64.Build.0 = Release|x64
47-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Debug|x64.ActiveCfg = Debug|x64
50-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Debug|x64.Build.0 = Debug|x64
51-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Release|x64.ActiveCfg = Release|x64
54-
{80DDAA05-69BC-49DD-96A4-37345E7A2E20}.Release|x64.Build.0 = Release|x64
5545
{03DCA427-327A-4FC9-9A2F-57D17F16708C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5646
{03DCA427-327A-4FC9-9A2F-57D17F16708C}.Debug|Any CPU.Build.0 = Debug|Any CPU
5747
{03DCA427-327A-4FC9-9A2F-57D17F16708C}.Debug|x64.ActiveCfg = Debug|x64
@@ -108,14 +98,14 @@ Global
10898
{B865F070-9693-47C6-B901-40121F659C6F}.Release|Any CPU.Build.0 = Release|Any CPU
10999
{B865F070-9693-47C6-B901-40121F659C6F}.Release|x64.ActiveCfg = Release|Any CPU
110100
{B865F070-9693-47C6-B901-40121F659C6F}.Release|x64.Build.0 = Release|Any CPU
111-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
113-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Debug|x64.ActiveCfg = Debug|Any CPU
114-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Debug|x64.Build.0 = Debug|Any CPU
115-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
116-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Release|Any CPU.Build.0 = Release|Any CPU
117-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Release|x64.ActiveCfg = Release|Any CPU
118-
{9B7D2034-55A0-4539-A7A5-FAA7117E16A6}.Release|x64.Build.0 = Release|Any CPU
101+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Debug|Any CPU.Build.0 = Debug|Any CPU
103+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Debug|x64.ActiveCfg = Debug|Any CPU
104+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Debug|x64.Build.0 = Debug|Any CPU
105+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Release|x64.ActiveCfg = Release|Any CPU
108+
{17BAE152-DDCF-4605-8DCB-9F14D403002F}.Release|x64.Build.0 = Release|Any CPU
119109
EndGlobalSection
120110
GlobalSection(SolutionProperties) = preSolution
121111
HideSolutionNode = FALSE

‎Platform.Articulate/ArticulateAi.cs‎

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)