Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Generic service parameters returned in validation #1507

Merged
merged 1 commit into from
Apr 7, 2021
Merged

[FIX] Generic service parameters returned in validation #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions .../interpreter/src/main/scala/pl/touk/nussknacker/engine/compile/PartSubGraphCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import cats.instances.option._
import pl.touk.nussknacker.engine.api.MetaData
import pl.touk.nussknacker.engine.api.context.ProcessCompilationError._
import pl.touk.nussknacker.engine.api.context.{OutputVar, ProcessCompilationError, ValidationContext}
import pl.touk.nussknacker.engine.api.definition.Parameter
import pl.touk.nussknacker.engine.api.expression.{ExpressionParser, ExpressionTypingInfo}
import pl.touk.nussknacker.engine.api.typed.typing.{Typed, Unknown}
import pl.touk.nussknacker.engine.compile.nodecompilation.NodeCompiler.NodeCompilationResult
Expand Down Expand Up @@ -138,41 +139,42 @@ class PartSubGraphCompiler(expressionCompiler: ExpressionCompiler,
}

private def compileSubsequent(ctx: ValidationContext, data: OneOutputSubsequentNodeData, next: Next)(implicit nodeId: NodeId, metaData: MetaData): CompilationResult[Node] = {
def toCompilationResult[T](validated: ValidatedNel[ProcessCompilationError, T], expressionsTypingInfo: Map[String, ExpressionTypingInfo]) =
CompilationResult(Map(data.id -> NodeTypingInfo(ctx, expressionsTypingInfo, None)), validated)
def toCompilationResult[T](validated: ValidatedNel[ProcessCompilationError, T],
expressionsTypingInfo: Map[String, ExpressionTypingInfo], parameters: Option[List[Parameter]]) =
CompilationResult(Map(data.id -> NodeTypingInfo(ctx, expressionsTypingInfo, parameters)), validated)

data match {
case graph.node.Variable(id, varName, expression, _) =>
val NodeCompilationResult(typingInfo, _, newCtx, compiledExpression, t) =
val NodeCompilationResult(typingInfo, parameters, newCtx, compiledExpression, t) =
nodeCompiler.compileExpression(expression, ctx, expectedType = Unknown, outputVar = Some(OutputVar.variable(varName)))
CompilationResult.map3(
f0 = CompilationResult(newCtx),
f1 = toCompilationResult(compiledExpression, typingInfo),
f1 = toCompilationResult(compiledExpression, typingInfo, parameters),
f2 = compile(next, newCtx.getOrElse(ctx))) {
(_, compiled, compiledNext) =>
compiledgraph.node.VariableBuilder(id, varName, Left(compiled), compiledNext)
}
case graph.node.VariableBuilder(id, varName, fields, _) =>
val NodeCompilationResult(typingInfo, _, newCtxV, compiledFields, _) =
val NodeCompilationResult(typingInfo, parameters, newCtxV, compiledFields, _) =
nodeCompiler.compileFields(fields, ctx, outputVar = Some(OutputVar.variable(varName)))
CompilationResult.map3(
f0 = CompilationResult(newCtxV),
f1 = toCompilationResult(compiledFields, typingInfo),
f1 = toCompilationResult(compiledFields, typingInfo, parameters),
f2 = compile(next, newCtxV.getOrElse(ctx))) {
(_, compiledFields, compiledNext) =>
compiledgraph.node.VariableBuilder(id, varName, Right(compiledFields), compiledNext)
}

case processor@graph.node.Processor(id, _, isDisabled, _) =>
val NodeCompilationResult(typingInfo, _, _, validatedServiceRef, _) = nodeCompiler.compileProcessor(processor, ctx)
CompilationResult.map2(toCompilationResult(validatedServiceRef, typingInfo), compile(next, ctx))((ref, next) =>
val NodeCompilationResult(typingInfo, parameters, _, validatedServiceRef, _) = nodeCompiler.compileProcessor(processor, ctx)
CompilationResult.map2(toCompilationResult(validatedServiceRef, typingInfo, parameters), compile(next, ctx))((ref, next) =>
compiledgraph.node.Processor(id, ref, next, isDisabled.contains(true)))

case enricher@graph.node.Enricher(id, _, output, _) =>
val NodeCompilationResult(typingInfo, _, newCtx, validatedServiceRef, _) = nodeCompiler.compileEnricher(enricher, ctx, outputVar = Some(OutputVar.enricher(output)))
val NodeCompilationResult(typingInfo, parameters, newCtx, validatedServiceRef, _) = nodeCompiler.compileEnricher(enricher, ctx, outputVar = Some(OutputVar.enricher(output)))

CompilationResult.map3(
toCompilationResult(validatedServiceRef, typingInfo),
toCompilationResult(validatedServiceRef, typingInfo, parameters),
CompilationResult(newCtx),
compile(next, newCtx.getOrElse(ctx)))((ref, _, next) => compiledgraph.node.Enricher(id, ref, output, next))

Expand All @@ -183,25 +185,25 @@ class PartSubGraphCompiler(expressionCompiler: ExpressionCompiler,
f = compiledNext => compiledgraph.node.CustomNode(id, compiledNext))

case subprocessInput:SubprocessInput =>
val NodeCompilationResult(typingInfo, _, newCtx, combinedValidParams, _) = nodeCompiler.compileSubprocessInput(subprocessInput, ctx)
CompilationResult.map2(toCompilationResult(combinedValidParams, typingInfo), compile(next, newCtx.getOrElse(ctx)))((params, next) =>
val NodeCompilationResult(typingInfo, parameters, newCtx, combinedValidParams, _) = nodeCompiler.compileSubprocessInput(subprocessInput, ctx)
CompilationResult.map2(toCompilationResult(combinedValidParams, typingInfo, parameters), compile(next, newCtx.getOrElse(ctx)))((params, next) =>
compiledgraph.node.SubprocessStart(subprocessInput.id, params, next))

case SubprocessOutput(id, outPutName, List(), _) =>
//this popContext *really* has to work to be able to extract variable types :|
ctx.popContext
.map(popContext => compile(next, popContext).andThen(next => toCompilationResult(Valid(SubprocessEnd(id, outPutName, List(), next)), Map.empty)))
.map(popContext => compile(next, popContext).andThen(next => toCompilationResult(Valid(SubprocessEnd(id, outPutName, List(), next)), Map.empty, None)))
.valueOr(error => CompilationResult(Invalid(error)))
case SubprocessOutput(id, outputName, fields, _) =>
ctx.popContext.map { parentCtx =>
val NodeCompilationResult(typingInfo, _, ctxWithSubOutV, compiledFields, typingResult) =
val NodeCompilationResult(typingInfo, parameters, ctxWithSubOutV, compiledFields, typingResult) =
nodeCompiler.compileFields(fields, ctx, outputVar = Some(OutputVar.subprocess(outputName)))
val parentCtxWithSubOut = parentCtx
.withVariable(OutputVar.subprocess(outputName), typingResult.getOrElse(Unknown))
.getOrElse(parentCtx)
CompilationResult.map3(
f0 = CompilationResult(ctxWithSubOutV),
f1 = toCompilationResult(compiledFields, typingInfo),
f1 = toCompilationResult(compiledFields, typingInfo, parameters),
f2 = compile(next, parentCtxWithSubOut)) {
(_, compiledFields, compiledNext) =>
compiledgraph.node.SubprocessEnd(id, outputName, compiledFields, compiledNext)
Expand Down
65 changes: 41 additions & 24 deletions ...c/test/scala/pl/touk/nussknacker/engine/compile/GenericTransformationValidationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import pl.touk.nussknacker.engine.api.definition.{DualParameterEditor, Parameter
import pl.touk.nussknacker.engine.api.editor.DualEditorMode
import pl.touk.nussknacker.engine.api.process._
import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, TypingResult, Unknown}
import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MetaData, StreamMetaData, process}
import pl.touk.nussknacker.engine.api.{CustomStreamTransformer, MetaData, Service, StreamMetaData, process}
import pl.touk.nussknacker.engine.build.{EspProcessBuilder, GraphBuilder}
import pl.touk.nussknacker.engine.compile.validationHelpers._
import pl.touk.nussknacker.engine.definition.ProcessDefinitionExtractor
Expand Down Expand Up @@ -42,13 +42,25 @@ class GenericTransformationValidationSpec extends FunSuite with Matchers with Op
"genericParametersSink" -> WithCategories(GenericParametersSink)
)

override def services(processObjectDependencies: ProcessObjectDependencies): Map[String, WithCategories[Service]] = Map(
"genericParametersProcessor" -> WithCategories(GenericParametersProcessor),
"genericParametersEnricher" -> WithCategories(GenericParametersEnricher)
)
}

private val processBase = EspProcessBuilder.id("proc1").exceptionHandler().source("sourceId", "mySource")
private val objectWithMethodDef = ProcessDefinitionExtractor.extractObjectWithMethods(MyProcessConfigCreator,
process.ProcessObjectDependencies(ConfigFactory.empty, ObjectNamingProvider(getClass.getClassLoader)))
private val validator = ProcessValidator.default(objectWithMethodDef, new SimpleDictRegistry(Map.empty))

private val expectedGenericParameters = List(
Parameter[String]("par1").copy(editor = Some(DualParameterEditor(StringParameterEditor, DualEditorMode.RAW))),
Parameter[Long]("lazyPar1").copy(isLazyParameter = true),
Parameter("val1", Unknown),
Parameter("val2", Unknown),
Parameter("val3", Unknown)
)


test("should validate happy path") {

Expand All @@ -73,14 +85,8 @@ class GenericTransformationValidationSpec extends FunSuite with Matchers with Op
"val3" -> Typed.fromDetailedType[java.util.List[Boolean]]
))

val parameters = result.parametersInNodes("generic")
parameters shouldBe List(
Parameter[String]("par1").copy(editor = Some(DualParameterEditor(StringParameterEditor, DualEditorMode.RAW))),
Parameter[Long]("lazyPar1").copy(isLazyParameter = true),
Parameter("val1", Unknown),
Parameter("val2", Unknown),
Parameter("val3", Unknown)
)
result.parametersInNodes("generic") shouldBe expectedGenericParameters


}

Expand All @@ -104,14 +110,8 @@ class GenericTransformationValidationSpec extends FunSuite with Matchers with Op
"val3" -> Typed.fromDetailedType[java.util.List[Boolean]]
))

val parameters = result.parametersInNodes("sourceId")
parameters shouldBe List(
Parameter[String]("par1").copy(editor = Some(DualParameterEditor(StringParameterEditor, DualEditorMode.RAW))),
Parameter[Long]("lazyPar1").copy(isLazyParameter = true),
Parameter("val1", Unknown),
Parameter("val2", Unknown),
Parameter("val3", Unknown)
)
result.parametersInNodes("sourceId") shouldBe expectedGenericParameters

}

test("should validate sinks") {
Expand All @@ -126,14 +126,31 @@ class GenericTransformationValidationSpec extends FunSuite with Matchers with Op
)
result.result shouldBe 'valid

val parameters = result.parametersInNodes("end")
parameters shouldBe List(
Parameter[String]("par1").copy(editor = Some(DualParameterEditor(StringParameterEditor, DualEditorMode.RAW))),
Parameter[Long]("lazyPar1").copy(isLazyParameter = true),
Parameter("val1", Unknown),
Parameter("val2", Unknown),
Parameter("val3", Unknown)
result.parametersInNodes("end") shouldBe expectedGenericParameters

}

test("should validate services") {
val result = validator.validate(
processBase.processor("genericProcessor", "genericParametersProcessor",
"par1" -> "'val1,val2,val3'",
"lazyPar1" -> "#input == null ? 1 : 5",
"val1" -> "'aa'",
"val2" -> "11",
"val3" -> "{false}"
).enricher("genericEnricher", "out", "genericParametersProcessor",
"par1" -> "'val1,val2,val3'",
"lazyPar1" -> "#input == null ? 1 : 5",
"val1" -> "'aa'",
"val2" -> "11",
"val3" -> "{false}"
)
.emptySink("end", "dummySink")
)
result.result shouldBe 'valid

result.parametersInNodes("genericProcessor") shouldBe expectedGenericParameters
result.parametersInNodes("genericProcessor") shouldBe expectedGenericParameters
}

test("should dependent parameter in sink") {
Expand Down
27 changes: 26 additions & 1 deletion engine/interpreter/src/test/scala/pl/touk/nussknacker/engine/compile/validationHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ package pl.touk.nussknacker.engine.compile

import cats.data.Validated.{Invalid, Valid}
import pl.touk.nussknacker.engine.api
import pl.touk.nussknacker.engine.api.{AdditionalVariable, AdditionalVariables, BranchParamName, CustomStreamTransformer, LazyParameter, MetaData, MethodToInvoke, OutputVariableName, ParamName, Service}
import pl.touk.nussknacker.engine.api.{AdditionalVariable, AdditionalVariables, BranchParamName, CustomStreamTransformer, EagerService, LazyParameter, MetaData, MethodToInvoke, OutputVariableName, ParamName, Service, ServiceInvoker}
import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.{CustomNodeError, FatalUnknownError, NodeId}
import pl.touk.nussknacker.engine.api.context.transformation.{BaseDefinedParameter, DefinedEagerBranchParameter, DefinedEagerParameter, DefinedSingleParameter, FailedToDefineParameter, JoinGenericNodeTransformation, NodeDependencyValue, OutputVariableNameValue, SingleInputGenericNodeTransformation}
import pl.touk.nussknacker.engine.api.context.{ContextTransformation, JoinContextTransformation, ValidationContext}
import pl.touk.nussknacker.engine.api.definition.{NodeDependency, OutputVariableNameDependency, Parameter, TypedNodeDependency}
import pl.touk.nussknacker.engine.api.process.{Sink, SinkFactory, Source, SourceFactory, TestDataGenerator, TestDataParserProvider}
import pl.touk.nussknacker.engine.api.test.{NewLineSplittedTestDataParser, TestDataParser}
import pl.touk.nussknacker.engine.api.typed.typing.{Typed, TypedObjectTypingResult, Unknown}
import pl.touk.nussknacker.engine.compile.validationHelpers.GenericParametersSource.finalResult
import pl.touk.nussknacker.engine.compile.validationHelpers.GenericParametersTransformer.finalResult
import pl.touk.nussknacker.engine.definition.TestInfoProvider

import scala.concurrent.Future
Expand Down Expand Up @@ -223,6 +225,29 @@ object validationHelpers {

}

object GenericParametersProcessor extends EagerService with GenericParameters[ServiceInvoker] {
protected def outputParameters(context: ValidationContext, dependencies: List[NodeDependencyValue], rest: List[(String, BaseDefinedParameter)])(implicit nodeId: NodeId): this.FinalResults = {
FinalResults(context)
}
override def nodeDependencies: List[NodeDependency] = List(TypedNodeDependency(classOf[MetaData]))

}

object GenericParametersEnricher extends EagerService with GenericParameters[ServiceInvoker] {

protected def outputParameters(context: ValidationContext, dependencies: List[NodeDependencyValue], rest: List[(String, BaseDefinedParameter)])(implicit nodeId: NodeId): this.FinalResults = {
dependencies.collectFirst { case OutputVariableNameValue(name) => name } match {
case Some(name) =>
finalResult(context, rest, name)
case None =>
FinalResults(context, errors = List(CustomNodeError("Output not defined", None)))
}
}
override def nodeDependencies: List[NodeDependency] = List(OutputVariableNameDependency, TypedNodeDependency(classOf[MetaData]))
}



trait GenericParameters[T] extends SingleInputGenericNodeTransformation[T] {

override type State = List[String]
Expand Down