From 293dececc6e447da318cc98d57dffcec7a6bd0c6 Mon Sep 17 00:00:00 2001
From: Oceania2018 <haiping008@gmail.com>
Date: Thu, 20 Sep 2018 16:18:34 -0500
Subject: [PATCH] add publish profile

---
 .gitignore                                    |  3 ---
 BotSharp.Algorithm/BotSharp.Algorithm.csproj  |  4 +++
 BotSharp.WebHost/BotSharp.WebHost.csproj      | 20 +++++++++++++-
 BotSharp.WebHost/BotSharp.WebHost.csproj.user | 10 +++++++
 .../Properties/PublishProfiles/RASA.pubxml    | 22 +++++++++++++++
 .../PublishProfiles/RASA.pubxml.user          | 11 ++++++++
 .../Properties/launchSettings.json            | 27 +++++++++++++++++++
 Dockerfile                                    | 12 +++++----
 Settings/bot.json                             |  4 +--
 9 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 BotSharp.WebHost/BotSharp.WebHost.csproj.user
 create mode 100644 BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml
 create mode 100644 BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml.user
 create mode 100644 BotSharp.WebHost/Properties/launchSettings.json

diff --git a/.gitignore b/.gitignore
index d61438e2..b79b8e34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 
 # User-specific files
 *.suo
-*.user
 *.userosscache
 *.sln.docstates
 
@@ -46,7 +45,6 @@ dlldata.c
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
 
 *_i.c
 *_p.c
@@ -150,7 +148,6 @@ publish/
 *.azurePubxml
 # TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
diff --git a/BotSharp.Algorithm/BotSharp.Algorithm.csproj b/BotSharp.Algorithm/BotSharp.Algorithm.csproj
index a5c5191c..246b0a3f 100644
--- a/BotSharp.Algorithm/BotSharp.Algorithm.csproj
+++ b/BotSharp.Algorithm/BotSharp.Algorithm.csproj
@@ -14,4 +14,8 @@
     <Copyright>MIT</Copyright>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RASA|AnyCPU'">
+    <OutputPath>bin\RASA</OutputPath>
+  </PropertyGroup>
+
 </Project>
diff --git a/BotSharp.WebHost/BotSharp.WebHost.csproj b/BotSharp.WebHost/BotSharp.WebHost.csproj
index 41879116..a46d91fe 100644
--- a/BotSharp.WebHost/BotSharp.WebHost.csproj
+++ b/BotSharp.WebHost/BotSharp.WebHost.csproj
@@ -11,6 +11,10 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RASA|AnyCPU'">
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="App_Data\AgentArchive\**" />
     <Compile Remove="App_Data\Corpus\**" />
@@ -38,7 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="App_Data\Corpus\CoNLL\conll2000_chunking_train.txt" />
+    <Content Include="App_Data\Corpus\CoNLL\conll2000_chunking_train.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
@@ -60,4 +66,16 @@
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="3.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="App_Data\CRFLite\template.en">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="App_Data\Resources\dict.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="App_Data\userdict.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/BotSharp.WebHost/BotSharp.WebHost.csproj.user b/BotSharp.WebHost/BotSharp.WebHost.csproj.user
new file mode 100644
index 00000000..8e15de60
--- /dev/null
+++ b/BotSharp.WebHost/BotSharp.WebHost.csproj.user
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ActiveDebugProfile>BotSharp.WebHost</ActiveDebugProfile>
+    <NameOfLastUsedPublishProfile>RASA</NameOfLastUsedPublishProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RASA|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml b/BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml
new file mode 100644
index 00000000..543b973e
--- /dev/null
+++ b/BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>RASA</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <ProjectGuid>03dca427-327a-4fc9-9a2f-57d17f16708c</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <_IsPortable>true</_IsPortable>
+    <publishUrl>PublishOutput</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml.user b/BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml.user
new file mode 100644
index 00000000..86910c09
--- /dev/null
+++ b/BotSharp.WebHost/Properties/PublishProfiles/RASA.pubxml.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <_PublishTargetUrl>D:\Projects\BotSharp\BotSharp.WebHost\PublishOutput</_PublishTargetUrl>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/BotSharp.WebHost/Properties/launchSettings.json b/BotSharp.WebHost/Properties/launchSettings.json
new file mode 100644
index 00000000..ecb75fb4
--- /dev/null
+++ b/BotSharp.WebHost/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:3112/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "BotSharp.WebHost": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:3112/"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9da2a29c..8cb96e19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,16 @@ WORKDIR /source
 # copies the rest of your code
 COPY . .
 RUN dotnet build
-RUN dotnet publish --output /app --configuration RASA
+RUN dotnet publish /p:PublishProfile=RASA /p:Configuration=RASA --output /app
 
 # copy Settings folder
-COPY Settings /app/Settings
+WORKDIR /app
+COPY Settings Settings
+RUN mkdir App_Data/Projects
 
-# App_Data
-COPY BotSharp.WebHost/App_Data /app/App_Data
+# move data for jieba.NetCore
+# RUN mv App_Data/Resources Resources
+# RUN mv App_Data/userdict.txt userdict.txt
 
 # stage 2: run
-WORKDIR /app
 ENTRYPOINT [ "dotnet", "BotSharp.WebHost.dll" ]
diff --git a/Settings/bot.json b/Settings/bot.json
index c073be48..b3119328 100644
--- a/Settings/bot.json
+++ b/Settings/bot.json
@@ -12,7 +12,7 @@
     },
 	
 	"BotSharpTokenizer": {
-		"tokenizer": "JiebaTokenizer"
+		"tokenizer": "TreebankTokenizer"
 	},
 	
 	"BotSharpNBayesClassifier": {
@@ -23,7 +23,7 @@
     },
 
     "BotSharpTagger": {
-		"tagger": "JiebaTagger"
+		"tagger": "NGramTagger"
     },
 	
 	"BotSharpCRFNer": {