This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-512 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit c63ced7285e558d82b50b19ea1cab8675e38dca9 Merge: 30996df2 8441c263 Author: Aaron Radzinski <[email protected]> AuthorDate: Thu Aug 25 10:23:34 2022 -0700 Merge branch 'master' into NLPCRAFT-512 .../examples/lightswitch/LightSwitchFrModel.scala | 5 +- .../examples/lightswitch/LightSwitchRuModel.scala | 5 +- .../lightswitch/LightSwitchScalaModel.scala | 5 +- .../examples/pizzeria/PizzeriaModelSpec.scala | 0 .../pizzeria/cli/PizzeriaModelClientCli.scala | 0 .../pizzeria/cli/PizzeriaModelServer.scala | 0 .../apache/nlpcraft/examples/time/TimeModel.scala | 2 +- .../main/scala/org/apache/nlpcraft/NCEntity.scala | 43 ++++--- .../org/apache/nlpcraft/NCEntityEnricher.scala | 27 +++-- .../scala/org/apache/nlpcraft/NCEntityMapper.scala | 24 ++-- .../scala/org/apache/nlpcraft/NCEntityParser.scala | 26 ++-- .../org/apache/nlpcraft/NCEntityValidator.scala | 26 ++-- .../scala/org/apache/nlpcraft/NCException.scala | 6 +- .../scala/org/apache/nlpcraft/NCIntentMatch.scala | 6 +- .../scala/org/apache/nlpcraft/NCIntentSkip.scala | 10 +- .../scala/org/apache/nlpcraft/NCLifecycle.scala | 19 +-- .../scala/org/apache/nlpcraft/NCPropertyMap.scala | 6 +- .../main/scala/org/apache/nlpcraft/NCResult.scala | 27 +++++ .../main/scala/org/apache/nlpcraft/NCToken.scala | 18 +-- .../org/apache/nlpcraft/NCTokenEnricher.scala | 18 +-- .../scala/org/apache/nlpcraft/NCTokenParser.scala | 18 +-- .../org/apache/nlpcraft/NCTokenValidator.scala | 18 +-- .../main/scala/org/apache/nlpcraft/NCVariant.scala | 2 +- .../nlpcraft/internal/impl/NCModelScanner.scala | 61 ++++++++-- .../internal/intent/compiler/NCIDLCompiler.scala | 132 ++++++++++++--------- .../internal/intent/compiler/NCIDLGlobal.scala | 83 ------------- .../internal/conversation/NCConversationSpec.scala | 10 +- .../conversation/NCConversationTimeoutSpec.scala | 7 +- .../internal/impl/NCModelCallbacksSpec.scala | 10 +- .../nlpcraft/internal/impl/NCModelClientSpec.scala | 4 +- .../internal/impl/NCModelClientSpec2.scala | 3 +- .../internal/impl/NCModelClientSpec3.scala | 7 +- .../impl/scan/NCModelIntentsInvalidArgsSpec.scala | 2 +- .../intent/compiler/NCIDLCompilerSpec.scala | 14 +-- .../compiler/NCIDLFragmentsOverridingSpec.scala | 49 ++++++++ .../compiler/NCIDLFragmentsOverridingSpec2.scala | 52 ++++++++ .../intent/compiler/NCIDLFragmentsSpec.scala | 99 ++++++++++++++++ .../intent/compiler/functions/NCIDLFunctions.scala | 5 +- .../internal/intent/compiler/impl_level1.idl} | 21 ++-- .../internal/intent/compiler/impl_level2.idl} | 14 ++- .../apache/nlpcraft/nlp/NCEntityEnricherSpec.scala | 2 +- .../apache/nlpcraft/nlp/NCEntityMapperSpec.scala | 2 +- .../nlpcraft/nlp/NCEntityValidatorSpec.scala | 2 +- .../apache/nlpcraft/nlp/NCTokenEnricherSpec.scala | 2 +- .../apache/nlpcraft/nlp/NCTokenValidatorSpec.scala | 2 +- .../apache/nlpcraft/nlp/NCVariantFilterSpec.scala | 2 +- .../apache/nlpcraft/nlp/util/NCTestConfig.scala | 10 +- .../apache/nlpcraft/nlp/util/NCTestResult.scala | 7 +- 48 files changed, 552 insertions(+), 361 deletions(-)
