Fix bug for regression and sanitize input label from user (dotnet#198)

* removed dummy command

* sanitize label and fix template

* fix tests

Author: srsaggam

src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.GeneratedProjectCodeTest.approved.txt

@@ -6,7 +6,7 @@
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Train.cs" />
+    <Compile Include="Program.cs" />
     <Compile Include="ConsoleHelper.cs" />
   </ItemGroup>
   <ItemGroup>

src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.cs

@@ -124,7 +124,8 @@ public void GeneratedHelperCodeTest()
 
                 this.columnInference = new ColumnInferenceResults()
                 {
-                    TextLoaderArgs = textLoaderArgs
+                    TextLoaderArgs = textLoaderArgs,
+                    ColumnInformation = new ColumnInformation() { LabelColumn = "Label" }
                 };
             }
             return (pipeline, columnInference);

src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

@@ -12,6 +12,7 @@
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.ML.Auto;
 using Microsoft.ML.CLI.Templates.Console;
+using Microsoft.ML.CLI.Utilities;
 using static Microsoft.ML.Data.TextLoader;
 
 namespace Microsoft.ML.CLI.CodeGenerator.CSharp
@@ -69,14 +70,13 @@ public void GenerateOutput()
 
         internal void WriteOutputToFiles(string trainScoreCode, string projectSourceCode, string consoleHelperCode)
         {
-            var outputFolder = Path.Combine(options.OutputBaseDir, options.OutputName);
-            if (!Directory.Exists(outputFolder))
+            if (!Directory.Exists(options.OutputBaseDir))
             {
-                Directory.CreateDirectory(outputFolder);
+                Directory.CreateDirectory(options.OutputBaseDir);
             }
-            File.WriteAllText($"{outputFolder}/Train.cs", trainScoreCode);
-            File.WriteAllText($"{outputFolder}/{options.OutputName}.csproj", projectSourceCode);
-            File.WriteAllText($"{outputFolder}/ConsoleHelper.cs", consoleHelperCode);
+            File.WriteAllText($"{options.OutputBaseDir}/Program.cs", trainScoreCode);
+            File.WriteAllText($"{options.OutputBaseDir}/{options.OutputName}.csproj", projectSourceCode);
+            File.WriteAllText($"{options.OutputBaseDir}/ConsoleHelper.cs", consoleHelperCode);
         }
 
         internal static string GenerateConsoleHelper(string namespaceValue)
@@ -165,6 +165,7 @@ internal string GenerateTrainCode(string usings, string trainer, List<string> tr
         internal IList<string> GenerateClassLabels()
         {
             IList<string> result = new List<string>();
+            var label_column = Utils.Sanitize(columnInferenceResult.ColumnInformation.LabelColumn);
             foreach (var column in columnInferenceResult.TextLoaderArgs.Column)
             {
                 StringBuilder sb = new StringBuilder();
@@ -213,7 +214,15 @@ internal IList<string> GenerateClassLabels()
                     result.Add($"[ColumnName(\"{column.Name}\"), LoadColumn({column.Source[0].Min})]");
                 }
                 sb.Append(" ");
-                sb.Append(Normalize(column.Name));
+                if (column.Name.Equals(label_column))
+                {
+                    sb.Append("Label");
+                }
+                else
+                {
+                    sb.Append(Normalize(column.Name));
+                }
+
                 sb.Append("{get; set;}");
                 result.Add(sb.ToString());
                 result.Add("\r\n");

src/mlnet/Commands/New/NewCommandHandler.cs

@@ -74,8 +74,7 @@ public void Execute()
 
             // Save the model
             logger.Log(LogLevel.Info, Strings.SavingBestModel);
-            var modelPath = Path.Combine(@options.OutputPath.FullName, options.Name);
-            Utils.SaveModel(model, modelPath, $"{options.Name}_model.zip", context);
+            Utils.SaveModel(model, options.OutputPath.FullName, $"{options.Name}_model.zip", context);
 
             // Generate the Project
             GenerateProject(columnInference, pipeline);
@@ -120,7 +119,13 @@ internal void GenerateProject(ColumnInferenceResults columnInference, Pipeline p
         internal (Pipeline, ITransformer) ExploreModels(MLContext context, IDataView trainData, IDataView validationData)
         {
             ITransformer model = null;
-            string label = options.LabelColumnName ?? "Label"; // It is guaranteed training dataview to have Label column
+            string label = "Label";
+
+            if (options.LabelColumnName != null)
+            {
+                label = Utils.Sanitize(options.LabelColumnName);
+            }
+
             Pipeline pipeline = null;
 
             if (taskKind == TaskKind.BinaryClassification)

src/mlnet/Templates/Console/MLProjectGen.cs

@@ -33,7 +33,7 @@ public virtual string TransformText()
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include=""Train.cs"" />
+    <Compile Include=""Program.cs"" />
     <Compile Include=""ConsoleHelper.cs"" />
   </ItemGroup>
   <ItemGroup>

src/mlnet/Templates/Console/MLProjectGen.tt

@@ -11,7 +11,7 @@
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Train.cs" />
+    <Compile Include="Program.cs" />
     <Compile Include="ConsoleHelper.cs" />
   </ItemGroup>
   <ItemGroup>