This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-383 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 6bb97f7f24c7d42d4acbdf7deb39d4a6576e2ed1 Merge: 113797b 766bc3b Author: Sergey Kamov <[email protected]> AuthorDate: Mon Sep 27 16:45:35 2021 +0300 Merge branch 'master' into NLPCRAFT-383 # Conflicts: # nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala nlpcraft-examples/alarm/pom.xml | 3 +- .../apache/nlpcraft/examples/alarm/AlarmModel.java | 2 +- .../resources/{intents.idl => alarm_intents.idl} | 8 +- .../alarm/src/main/resources/alarm_model.json | 2 +- nlpcraft-examples/cargps/README.md | 45 ++ nlpcraft-examples/{alarm => cargps}/pom.xml | 4 +- .../nlpcraft/examples/cargps/CarGpsModel.scala | 65 +++ .../src/main/resources/cargps_intents.idl} | 29 +- .../cargps/src/main/resources/cargps_model.yaml | 100 +++++ .../src/main/resources/probe.conf | 4 +- .../samples/cargps_add_waypoint_samples.txt | 21 + .../resources/samples/cargps_cancel_samples.txt | 28 ++ .../resources/samples/cargps_navigate_samples.txt | 21 + .../samples/cargps_remove_waypoint_samples.txt | 21 + .../examples/cargps/NCCarGpsModelSpec.scala} | 23 +- .../examples/cargps}/NCModelValidationSpec.scala | 4 +- nlpcraft-examples/minecraft-mod/build.gradle | 4 +- nlpcraft-examples/minecraft/pom.xml | 2 +- .../minecraft/MinecraftFillMatchProcessor.kt | 4 +- .../minecraft/MinecraftModel.kt | 9 +- .../minecraft/MinecraftValueLoader.kt | 2 +- .../minecraft/src/main/resources/minecraft.yaml | 12 +- .../minecraft/src/main/resources/probe.conf | 2 +- .../minecraft/NCMinecraftModelSpec.kt | 2 +- .../minecraft/NCModelValidationSpec.scala | 4 +- nlpcraft-examples/time/pom.xml | 2 +- .../nlp/core/stanford/NCStanfordTokenizer.scala | 21 + .../src/main/resources/stopwords/stop_words.txt | 5 +- .../org/apache/nlpcraft/common/NCService.scala | 2 +- .../apache/nlpcraft/common/nlp/NCNlpSentence.scala | 25 +- .../nlpcraft/common/nlp/NCNlpSentenceNote.scala | 141 ++++--- .../nlpcraft/common/nlp/NCNlpSentenceToken.scala | 36 +- .../common/nlp/NCNlpSentenceTokenBuffer.scala | 9 +- .../org/apache/nlpcraft/common/util/NCUtils.scala | 12 +- .../org/apache/nlpcraft/model/NCAddElement.java | 42 +- .../apache/nlpcraft/model/NCAddElementClass.java | 51 +++ .../org/apache/nlpcraft/model/NCCustomParser.java | 2 +- .../scala/org/apache/nlpcraft/model/NCElement.java | 2 +- .../apache/nlpcraft/model/NCModelFileAdapter.java | 5 + .../org/apache/nlpcraft/model/NCModelView.java | 11 + .../apache/nlpcraft/model/impl/NCTokenImpl.scala | 31 +- .../apache/nlpcraft/model/impl/NCTokenLogger.scala | 17 +- .../nlpcraft/model/impl/json/NCModelJson.java | 7 + .../model/intent/compiler/NCIdlCompiler.scala | 10 +- .../model/intent/solver/NCIntentSolver.scala | 3 +- .../model/intent/solver/NCIntentSolverEngine.scala | 23 +- .../nlpcraft/model/tools/cmdline/NCCli.scala | 15 +- .../nlpcraft/model/tools/cmdline/NCCliBase.scala | 2 +- .../org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 + .../nlpcraft/probe/mgrs/NCProbeIdlToken.scala | 65 +++ .../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 8 +- .../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 229 +--------- .../nlpcraft/probe/mgrs/NCProbeVariants.scala | 3 + .../probe/mgrs/deploy/NCDeployManager.scala | 454 +++++++++++++++----- .../mgrs/dialogflow/NCDialogFlowManager.scala | 2 +- .../nlpcraft/probe/mgrs/model/NCModelManager.scala | 7 + .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 47 +-- .../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 461 ++++++++++++--------- .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 187 ++++----- .../enrichers/stopword/NCStopWordEnricher.scala | 23 +- .../probe/mgrs/sentence/NCSentenceManager.scala | 120 ++++-- .../probe/mgrs/synonyms/NCSynonymsManager.scala | 436 +++++++++++++++++++ .../nlp/enrichers/NCServerEnrichmentManager.scala | 21 +- .../nlp/enrichers/numeric/NCNumericEnricher.scala | 158 ++++--- .../nlpcraft/server/probe/NCProbeManager.scala | 6 +- .../nlpcraft/server/query/NCQueryManager.scala | 2 +- .../scala/org/apache/nlpcraft/NCTestElement.scala | 2 + .../model/stm/indexes/NCSpecModelAdapter.scala | 25 +- .../model/stop/NCStopWordsAllowedSpec.scala | 72 ++++ .../nlpcraft/model/stop/NCStopWordsBaseSpec.scala | 73 ++++ .../model/stop/NCStopWordsInsideSpec.scala | 72 ++++ .../apache/nlpcraft/probe/mgrs/deploy/readme.txt | 18 + .../mgrs/deploy1/NCElementAnnotationsSpec.scala | 122 ++++++ .../mgrs/deploy1/pack/NCElementAnnotations2.scala | 30 +- .../apache/nlpcraft/probe/mgrs/deploy1/readme.txt | 18 + .../nlp/enrichers/limit/NCEnricherLimitSpec.scala | 6 - .../model/NCEnricherNestedModelSpec.scala | 3 +- .../model/NCEnricherNestedModelSpec4.scala | 79 +++- .../nlp/enrichers/sort/NCEnricherSortSpec.scala | 3 +- pom.xml | 3 +- 80 files changed, 2605 insertions(+), 1047 deletions(-) diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala index c01801e,332dd26..827846f --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala @@@ -1691,10 -1896,10 +1896,10 @@@ object NCDeployManager extends NCServic if (unusedIntents.nonEmpty) logger.warn(s"Intents are unused (have no callback): [" + s"mdlId=$mdlId, " + - s"origin=${mdl.getOrigin}, " + + s"origin=${wrappedMdl.getOrigin}, " + s"intentIds=${unusedIntents.map(_.id).mkString("(", ", ", ")")}]" ) -- ++ intents.toSet }
