Fixed the case where no tuner is specified

src/main/scala/io/github/jsarni/CaraModel.scala

@@ -31,35 +31,46 @@ final class CaraModel(yamlPath: String, dataset: Dataset[_], savePath: String, o
   private def generateModel(caraPipeline: CaraPipeline) : Try[Pipeline] = Try {
     val pipeline = caraPipeline.pipeline
     val evaluator = caraPipeline.evaluator
-    val tuningStage = caraPipeline.tuner.tuningStage
-    val methodeName = "set" + caraPipeline.tuner.paramName
-    val model = tuningStage match  {
-      case "CrossValidator" => {
-        val paramValue = caraPipeline.tuner.paramValue.toInt
-        val crossValidatorModel = new CrossValidator()
-          .setEstimator(pipeline)
-          .setEvaluator(evaluator)
-          .setEstimatorParamMaps(new ParamGridBuilder().build())
-          .setParallelism(2)
-
-        crossValidatorModel.getClass.getMethod(methodeName, paramValue.getClass )
-          .invoke(crossValidatorModel,paramValue.asInstanceOf[java.lang.Integer])
-
-        new Pipeline().setStages(Array(crossValidatorModel))
-      }
-      case "TrainValidationSplit" => {
-        val paramValue = caraPipeline.tuner.paramValue.toDouble
-        val validationSplitModel = new TrainValidationSplit()
-          .setEstimator(pipeline)
-          .setEvaluator(evaluator)
-          .setEstimatorParamMaps(new ParamGridBuilder().build())
-          .setParallelism(2)
-
-        validationSplitModel.getClass.getMethod(methodeName, paramValue.getClass )
-          .invoke(validationSplitModel,paramValue.asInstanceOf[java.lang.Double])
-
-        new Pipeline().setStages(Array(validationSplitModel))
-      }
+    val model = caraPipeline.tuner match {
+      case Some(tuner) =>
+        val methodeName = "set" + tuner.paramName
+        tuner.tuningStage match  {
+          case "CrossValidator" => {
+            val paramValue = tuner.paramValue.toInt
+            val crossValidatorModel = new CrossValidator()
+
+              .setEstimator(pipeline)
+
+              .setEvaluator(evaluator)
+
+              .setEstimatorParamMaps(new ParamGridBuilder().build())
+
+              .setParallelism(2)
+            crossValidatorModel.getClass.getMethod(methodeName, paramValue.getClass )
+
+              .invoke(crossValidatorModel,paramValue.asInstanceOf[java.lang.Integer])
+            new Pipeline().setStages(Array(crossValidatorModel))
+          }
+          case "TrainValidationSplit" => {
+            val paramValue = tuner.paramValue.toDouble
+            val validationSplitModel = new TrainValidationSplit()
+
+              .setEstimator(pipeline)
+
+              .setEvaluator(evaluator)
+
+              .setEstimatorParamMaps(new ParamGridBuilder().build())
+
+              .setParallelism(2)
+            validationSplitModel.getClass.getMethod(methodeName, paramValue.getClass )
+
+              .invoke(validationSplitModel,paramValue.asInstanceOf[java.lang.Double])
+            new Pipeline().setStages(Array(validationSplitModel))
+          }
+
+        }
+      case None =>
+        pipeline
     }
     model
   }

src/main/scala/io/github/jsarni/PipelineParser/CaraParser.scala

@@ -18,8 +18,9 @@ class CaraParser(caraYaml: CaraYamlReader) extends ParserUtils with CaraStageMap
     for {
       pipeline <- parsePipeline()
       evaluator <- parseEvaluator()
-      tunerDesc <- parseTuner()
-    } yield CaraPipeline(pipeline, evaluator, tunerDesc)
+      hasTuner <- hasTuner()
+      tunerDescOpt = if (!hasTuner) None else Some(parseTuner().get)
+    } yield CaraPipeline(pipeline, evaluator, tunerDescOpt)
   }
 
   private[PipelineParser] def parsePipeline(): Try[Pipeline] = {
@@ -92,12 +93,18 @@ class CaraParser(caraYaml: CaraYamlReader) extends ParserUtils with CaraStageMap
     }
   }
 
+  private[PipelineParser] def hasTuner(): Try[Boolean] =
+    for {
+      content <- contentTry
+      hasTuner = content.at(s"/CaraPipeline").iterator().asScala.toList.filter(_.has("tuner")).nonEmpty
+    } yield hasTuner
+
   private[PipelineParser] def extractTuner(fileContent: JsonNode): Try[TuningStageDescription] = {
 
     val tunersList = fileContent.at(s"/CaraPipeline").iterator().asScala.toList.filter(_.has("tuner"))
 
     tunersList.length match {
-      case l if l <= 1 =>
+      case l if l == 1 =>
         val tunerJson = tunersList.head
         val tunerName = tunerJson.at("/tuner").textValue()
 

src/main/scala/io/github/jsarni/PipelineParser/CaraPipeline.scala

@@ -4,4 +4,4 @@ import io.github.jsarni.CaraStage.TuningStage.TuningStageDescription
 import org.apache.spark.ml.Pipeline
 import org.apache.spark.ml.evaluation.Evaluator
 
-case class CaraPipeline(pipeline: Pipeline, evaluator: Evaluator, tuner: TuningStageDescription)
+case class CaraPipeline(pipeline: Pipeline, evaluator: Evaluator, tuner: Option[TuningStageDescription])

src/test/scala/io/github/jsarni/CaraModelTest.scala

@@ -29,8 +29,8 @@ class CaraModelTest extends TestBase {
     val caraModel = new CaraModel("YamlPath", spark.emptyDataFrame,  "savePath")(spark)
     val pipeline = new Pipeline()
       .setStages(Array(lr))
-    val crossCaraPipeline = CaraPipeline(pipeline, crossEvaluator, crossTuner)
-    val splitCaraPipeline = CaraPipeline(pipeline, splitEvaluator, splitTuner)
+    val crossCaraPipeline = CaraPipeline(pipeline, crossEvaluator, Some(crossTuner))
+    val splitCaraPipeline = CaraPipeline(pipeline, splitEvaluator, Some(splitTuner))
     val method = PrivateMethod[Try[Pipeline]]('generateModel)
 
     val crossModel = caraModel.invokePrivate(method(crossCaraPipeline))

src/test/scala/io/github/jsarni/PipelineParser/CaraParserTest.scala

@@ -237,6 +237,6 @@ class CaraParserTest extends TestBase {
     res.get.evaluator.isInstanceOf[RegressionEvaluator] shouldBe true
     res.get.pipeline.getStages.map(_.extractParamMap().toSeq.map(_.value)).head should contain theSameElementsAs
       exprectedRes.getStages.map(_.extractParamMap().toSeq.map(_.value)).head
-    res.get.tuner shouldBe TuningStageDescription("CrossValidator", "NumFolds", "3")
+    res.get.tuner shouldBe Some(TuningStageDescription("CrossValidator", "NumFolds", "3"))
   }
 }