[Nu-7573] Relax validation of absent variables in fragment input vali…

…dation (#7574) * [Nu-7573] relax missing variables validation Co-authored-by: DeamonDev <[email protected]> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DeamonDev <[email protected]>
TouK · Feb 24, 2025 · 16eaf0d · 16eaf0d
1 parent 5f4ba7e
commit 16eaf0d
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 16 deletions.
diff --git a/defaultModel/src/main/scala/pl/touk/nussknacker/defaultmodel/DefaultConfigCreator.scala b/defaultModel/src/main/scala/pl/touk/nussknacker/defaultmodel/DefaultConfigCreator.scala
@@ -10,7 +10,7 @@ class DefaultConfigCreator extends EmptyProcessConfigCreator {
 
   override def expressionConfig(modelDependencies: ProcessObjectDependencies): ExpressionConfig = {
     ExpressionConfig(
-      Map(
+      globalProcessVariables = Map(
         "GEO"         -> anyCategory(geo),
         "NUMERIC"     -> anyCategory(numeric),
         "CONV"        -> anyCategory(conversion),
@@ -21,7 +21,7 @@ class DefaultConfigCreator extends EmptyProcessConfigCreator {
         "RANDOM"      -> anyCategory(random),
         "BASE64"      -> anyCategory(base64)
       ),
-      List()
+      globalImports = List()
     )
   }
 

diff --git a/...d allow adding input parameters and display used fragment graph in modal #2.png b/...d allow adding input parameters and display used fragment graph in modal #2.png
diff --git a/...gner/server/src/test/scala/pl/touk/nussknacker/ui/validation/UIProcessValidatorSpec.scala b/...gner/server/src/test/scala/pl/touk/nussknacker/ui/validation/UIProcessValidatorSpec.scala
@@ -57,6 +57,7 @@ import pl.touk.nussknacker.engine.testing.{LocalModelData, ModelDefinitionBuilde
 import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap
 import pl.touk.nussknacker.engine.util.service.EagerServiceWithStaticParametersAndReturnType
 import pl.touk.nussknacker.engine.CustomProcessValidator
+import pl.touk.nussknacker.engine.graph.expression.Expression.Language.Spel
 import pl.touk.nussknacker.engine.util.functions.collection
 import pl.touk.nussknacker.restmodel.validation.ValidationResults.NodeValidationErrorType.{
   RenderNotAllowed,
@@ -797,6 +798,49 @@ class UIProcessValidatorSpec extends AnyFunSuite with Matchers with TableDrivenP
     }
   }
 
+  test("validates fragment input definition while validating fragment - accepting absent variables") {
+    val fragmentWithValidParam =
+      CanonicalProcess(
+        MetaData("fragment1", FragmentSpecificData()),
+        List(
+          FlatNode(
+            FragmentInputDefinition(
+              "in",
+              List(
+                FragmentParameter(
+                  ParameterName("param1"),
+                  FragmentClazzRef[String],
+                  initialValue = Some(FixedExpressionValue("#input", "inputValue")),
+                  hintText = None,
+                  valueEditor = None,
+                  valueCompileTimeValidation = None
+                ),
+                FragmentParameter(
+                  ParameterName("param2"),
+                  FragmentClazzRef[java.util.List[Boolean]],
+                  initialValue = Some(FixedExpressionValue("{1, 2}.![#this > 1]", "mappedValue")),
+                  hintText = None,
+                  valueEditor = None,
+                  valueCompileTimeValidation = None
+                ),
+              )
+            )
+          ),
+          FlatNode(
+            FragmentOutputDefinition("out", "out1", List.empty)
+          )
+        ),
+        List.empty
+      )
+
+    val fragmentGraph =
+      CanonicalProcessConverter.toScenarioGraph(fragmentWithValidParam)
+
+    val validationResult = validateWithConfiguredProperties(fragmentGraph)
+
+    validationResult.errors.invalidNodes shouldBe empty
+  }
+
   test("validates fragment input definition while validating fragment - ValueInputWithDictEditor") {
     val fragmentWithInvalidParam =
       CanonicalProcess(

diff --git a/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/node.scala b/scenario-api/src/main/scala/pl/touk/nussknacker/engine/graph/node.scala
@@ -325,7 +325,7 @@ object node {
         initialValue: Option[FixedExpressionValue],
         hintText: Option[String],
         valueEditor: Option[ParameterValueInput],
-        valueCompileTimeValidation: Option[ParameterValueCompileTimeValidation],
+        valueCompileTimeValidation: Option[ParameterValueCompileTimeValidation]
     )
 
     object FragmentParameter {

diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ExpressionCompiler.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/ExpressionCompiler.scala
@@ -416,4 +416,10 @@ class ExpressionCompiler(
     }
   }
 
+  def withExpressionParsers(
+      modify: Map[Language, ExpressionParser] => Map[Language, ExpressionParser]
+  ): ExpressionCompiler = {
+    new ExpressionCompiler(modify(expressionParsers), dictRegistry, expressionEvaluator)
+  }
+
 }
diff --git a/...iler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeCompiler.scala b/...iler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/NodeCompiler.scala
@@ -38,6 +38,7 @@ import pl.touk.nussknacker.engine.graph.expression._
 import pl.touk.nussknacker.engine.graph.node._
 import pl.touk.nussknacker.engine.graph.service.ServiceRef
 import pl.touk.nussknacker.engine.resultcollector.ResultCollector
+import pl.touk.nussknacker.engine.spel.SpelExpressionParser
 import pl.touk.nussknacker.engine.variables.GlobalVariablesPreparer
 import pl.touk.nussknacker.engine.{api, compiledgraph}
 import shapeless.Typeable
@@ -199,7 +200,13 @@ class NodeCompiler(
         fragmentParameterValidator.validateFixedExpressionValues(
           param,
           validationContext,
-          expressionCompiler
+          expressionCompiler.withExpressionParsers(expressionParsers =>
+            expressionParsers.map {
+              case (language, parser: SpelExpressionParser) =>
+                language -> parser.withValidator(v => v.withTyper(t => t.withAbsentVariableReferenceAllowed(true)))
+              case other => other
+            }
+          )
         )
       }
       .sequence

diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpression.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpression.scala
@@ -243,6 +243,17 @@ class SpelExpressionParser(
       prepareEvaluationContext
     )
 
+  def withValidator(modify: SpelExpressionValidator => SpelExpressionValidator): SpelExpressionParser = {
+    new SpelExpressionParser(
+      parser,
+      modify(validator),
+      dictRegistry,
+      enableSpelForceCompile,
+      flavour,
+      prepareEvaluationContext
+    )
+  }
+
 }
 
 object SpelExpressionParser extends LazyLogging {
@@ -286,7 +297,7 @@ object SpelExpressionParser extends LazyLogging {
       dictRegistry: DictRegistry,
       enableSpelForceCompile: Boolean,
       flavour: Flavour,
-      classDefinitionSet: ClassDefinitionSet
+      classDefinitionSet: ClassDefinitionSet,
   ): SpelExpressionParser = {
 
     val parser = new org.springframework.expression.spel.standard.SpelExpressionParser(
@@ -295,7 +306,7 @@ object SpelExpressionParser extends LazyLogging {
     )
     val evaluationContextPreparer = EvaluationContextPreparer.default(classLoader, expressionConfig, classDefinitionSet)
     val validator = new SpelExpressionValidator(
-      Typer.default(classLoader, expressionConfig, new KeysDictTyper(dictRegistry), classDefinitionSet)
+      Typer.default(classLoader, expressionConfig, new KeysDictTyper(dictRegistry), classDefinitionSet, false)
     )
     new SpelExpressionParser(
       parser,

diff --git a/...rio-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSuggester.scala b/...rio-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/SpelExpressionSuggester.scala
@@ -36,8 +36,16 @@ class SpelExpressionSuggester(
     classLoader: ClassLoader
 ) {
   private val successfulNil = Future.successful[List[ExpressionSuggestion]](Nil)
+
   private val typer =
-    Typer.default(classLoader, expressionConfig, new LabelsDictTyper(uiDictServices.dictRegistry), clssDefinitions)
+    Typer.default(
+      classLoader,
+      expressionConfig,
+      new LabelsDictTyper(uiDictServices.dictRegistry),
+      clssDefinitions,
+      false
+    )
+
   private val nuSpelNodeParser = new NuSpelNodeParser(typer)
   private val dictQueryService = uiDictServices.dictQueryService
 

diff --git a/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala b/scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/spel/Typer.scala
@@ -66,7 +66,8 @@ private[spel] class Typer(
     classDefinitionSet: ClassDefinitionSet,
     evaluationContextPreparer: EvaluationContextPreparer,
     anyMethodExecutionForUnknownAllowed: Boolean,
-    dynamicPropertyAccessAllowed: Boolean
+    dynamicPropertyAccessAllowed: Boolean,
+    absentVariableReferenceAllowed: Boolean
 ) extends LazyLogging {
 
   import ast.SpelAst._
@@ -499,7 +500,7 @@ private[spel] class Typer(
           .get(name)
           .orElse(current.stackHead.filter(_ => name == "this"))
           .map(valid)
-          .getOrElse(invalid(UnresolvedReferenceError(name)))
+          .getOrElse(if (absentVariableReferenceAllowed) valid(Unknown) else invalid(UnresolvedReferenceError(name)))
           .map(toNodeResult)
     })
   }
@@ -786,7 +787,20 @@ private[spel] class Typer(
       classDefinitionSet,
       evaluationContextPreparer,
       anyMethodExecutionForUnknownAllowed,
-      dynamicPropertyAccessAllowed
+      dynamicPropertyAccessAllowed,
+      absentVariableReferenceAllowed
+    )
+
+  def withAbsentVariableReferenceAllowed(value: Boolean): Typer =
+    new Typer(
+      dictTyper,
+      strictMethodsChecking,
+      staticMethodInvocationsChecking,
+      classDefinitionSet,
+      evaluationContextPreparer,
+      anyMethodExecutionForUnknownAllowed,
+      dynamicPropertyAccessAllowed,
+      absentVariableReferenceAllowed = value
     )
 
 }
@@ -797,7 +811,8 @@ object Typer {
       classLoader: ClassLoader,
       expressionConfig: ExpressionConfigDefinition,
       spelDictTyper: SpelDictTyper,
-      classDefinitionSet: ClassDefinitionSet
+      classDefinitionSet: ClassDefinitionSet,
+      absentVariableReferenceAllowed: Boolean
   ): Typer = {
     val evaluationContextPreparer = EvaluationContextPreparer.default(classLoader, expressionConfig, classDefinitionSet)
 
@@ -808,7 +823,8 @@ object Typer {
       classDefinitionSet,
       evaluationContextPreparer,
       expressionConfig.methodExecutionForUnknownAllowed,
-      expressionConfig.dynamicPropertyAccessAllowed
+      expressionConfig.dynamicPropertyAccessAllowed,
+      absentVariableReferenceAllowed
     )
   }
 

diff --git a/...io-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala b/...io-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala
@@ -1070,7 +1070,7 @@ class NodeDataValidatorSpec extends AnyFunSuite with Matchers with Inside with T
     }
   }
 
-  test("shouldn't allow expressions that reference unknown variables in FragmentInputDefinition") {
+  test("should allow expressions that reference unknown variables in FragmentInputDefinition") {
     val nodeId: String               = "in"
     val invalidReferencingExpression = "#unknownVar"
 
@@ -1094,8 +1094,8 @@ class NodeDataValidatorSpec extends AnyFunSuite with Matchers with Inside with T
         Map.empty,
         outgoingEdges = List(OutgoingEdge("any", Some(FragmentOutput("out1"))))
       )
-    ) { case ValidationPerformed((error: ExpressionParserCompilationErrorInFragmentDefinition) :: Nil, None, None) =>
-      error.message should include("Unresolved reference 'unknownVar'")
+    ) { case ValidationPerformed(errors, None, None) =>
+      errors shouldBe empty
     }
   }
 

diff --git a/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/TyperSpec.scala b/scenario-compiler/src/test/scala/pl/touk/nussknacker/engine/spel/TyperSpec.scala
@@ -201,7 +201,8 @@ class TyperSpec extends AnyFunSuite with Matchers with ValidatedValuesDetailedMe
     classDefinitionSet = ClassDefinitionTestUtils.createDefinitionWithDefaultsAndExtensions,
     evaluationContextPreparer = null,
     anyMethodExecutionForUnknownAllowed = false,
-    dynamicPropertyAccessAllowed = dynamicPropertyAccessAllowed
+    dynamicPropertyAccessAllowed = dynamicPropertyAccessAllowed,
+    absentVariableReferenceAllowed = false
   )
 
   private def typeExpression(