Fix: allow to use lazy parameter at PrinzEnricher (#209)

Co-authored-by: Łukasz Ciołecki <[email protected]>
prinz-nussknacker · Dec 21, 2021 · 0524a42 · 0524a42
1 parent 4f46e4a
commit 0524a42
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -25,11 +25,11 @@ If you are already signed to GitHub in your project, just add any of these lines
 to add Prinz dependencies to your `.sbt` project
 
 ```sbt
-"pl.touk.nussknacker.prinz" %% "prinz" % "1.2.0-preview-staging"
-"pl.touk.nussknacker.prinz" %% "prinz-mlflow" % "1.2.0-preview-staging"
-"pl.touk.nussknacker.prinz" %% "prinz-pmml" % "1.2.0-preview-staging"
-"pl.touk.nussknacker.prinz" %% "prinz-h2o" % "1.2.0-preview-staging"
-"pl.touk.nussknacker.prinz" %% "prinz-proxy" % "1.2.0-preview-staging"
+"pl.touk.nussknacker.prinz" %% "prinz" % "1.2.0-preview-staging-2021-12-21"
+"pl.touk.nussknacker.prinz" %% "prinz-mlflow" % "1.2.0-preview-staging-2021-12-21"
+"pl.touk.nussknacker.prinz" %% "prinz-pmml" % "1.2.0-preview-staging-2021-12-21"
+"pl.touk.nussknacker.prinz" %% "prinz-h2o" % "1.2.0-preview-staging-2021-12-21"
+"pl.touk.nussknacker.prinz" %% "prinz-proxy" % "1.2.0-preview-staging-2021-12-21"
 ```
 
 ## Authors

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 import sbtassembly.MergeStrategy
 
-val prinzV = "1.2.0-preview-staging"
+val prinzV = "1.2.0-preview-staging-2021-12-21"
 val prinzOrg = "pl.touk.nussknacker.prinz"
 val repositoryOwner = "prinz-nussknacker"
 val repositoryName = "prinz"

diff --git a/dev-environment/create_environment.sh b/dev-environment/create_environment.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 scalaV="2.12"
-prinzV="1.2.0-preview-staging"
+prinzV="1.2.0-preview-staging-2021-12-21"
 
 COMP_FILES=""
 ENV_FILE="-f docker-compose-env.yaml"

diff --git a/dev-environment/docker-compose-env.yaml b/dev-environment/docker-compose-env.yaml
@@ -22,7 +22,7 @@ services:
       # this is needed to be able to verify savepoints during deployments
       - storage_flink:/opt/flink/data
       - ./nussknacker/opt/prinz-sample/prinz.conf:/opt/nussknacker/conf/prinz.conf
-      - ./nussknacker/opt/prinz-sample/prinz-sample-assembly-1.2.0-preview-staging.jar:/opt/prinz-sample/prinz-sample.jar
+      - ./nussknacker/opt/prinz-sample/prinz-sample-assembly-1.2.0-preview-staging-2021-12-21.jar:/opt/prinz-sample/prinz-sample.jar
     networks:
       - dev-bridge-net
 

diff --git a/prinz/src/main/scala/pl/touk/nussknacker/prinz/engine/PrinzEnricher.scala b/prinz/src/main/scala/pl/touk/nussknacker/prinz/engine/PrinzEnricher.scala
@@ -35,7 +35,7 @@ final case class PrinzEnricher(private val model: Model)
     model
       .getMetadata
       .signature
-      .toInputParameterDefinition
+      .toInputLazyParameterDefinition
 
   override def returnType: typing.TypingResult =
     model

diff --git a/prinz/src/main/scala/pl/touk/nussknacker/prinz/model/ModelSignature.scala b/prinz/src/main/scala/pl/touk/nussknacker/prinz/model/ModelSignature.scala
@@ -11,8 +11,8 @@ case class ModelSignature private(private val signatureInputs: List[SignatureFie
 
   private val signatureOutputMap = signatureOutputs.groupBy(_.signatureName).mapValues(_.head.signatureType)
 
-  def toInputParameterDefinition: List[Parameter] =
-    signatureInputs.map(field => field.toNussknackerParameter)
+  def toInputLazyParameterDefinition: List[Parameter] =
+    signatureInputs.map(field => field.toLazyNotBlankParameter)
 
   def toOutputTypedObjectTypingResult: TypedObjectTypingResult =
     TypedObjectTypingResult(signatureOutputMap.map(kv => (kv._1.name, kv._2.typingResult)).toList)
@@ -34,8 +34,8 @@ case class SignatureType(typingResult: TypingResult)
 
 case class SignatureField(signatureName: SignatureName, signatureType: SignatureType) {
 
-  def toNussknackerParameter: Parameter =
-    NotBlankParameter(signatureName.name, signatureType.typingResult)
+  def toLazyNotBlankParameter: Parameter =
+    NotBlankParameter(signatureName.name, signatureType.typingResult).copy(isLazyParameter = true)
 
   override def toString: String =
     s"${signatureName.name}: ${signatureType.typingResult.display}"