This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-91-FIX in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit be0334612e68fe9102bfa6177730ba9cae0cf90f Merge: 6d9617e 6f1f702 Author: Sergey Kamov <[email protected]> AuthorDate: Sun Apr 18 11:28:02 2021 +0300 Merge branch 'master' into NLPCRAFT-91-FIX external/badfilter/swear_words.txt | 1 - external/md5.txt | 2 +- nlpcraft/src/main/resources/cli/templates.zip | Bin 73619 -> 73527 bytes .../nlpcraft/common/config/NCConfigurableJava.java | 4 +- .../apache/nlpcraft/common/debug/NCLogHolder.scala | 17 +- .../common/extcfg/NCExternalConfigManager.scala | 6 +- .../nlpcraft/common/makro/NCMacroCompiler.scala | 4 +- .../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 2 +- .../common/makro/antlr4/NCMacroDslLexer.interp | 2 +- .../common/makro/antlr4/NCMacroDslLexer.java | 2 +- .../apache/nlpcraft/common/nlp/NCNlpSentence.scala | 7 +- .../nlpcraft/common/nlp/NCNlpSentenceNote.scala | 41 +- .../nlpcraft/common/pool/NCThreadPoolManager.scala | 2 +- .../org/apache/nlpcraft/common/util/NCUtils.scala | 146 +++- .../org/apache/nlpcraft/examples/alarm/intents.idl | 4 +- .../examples/lightswitch/lightswitch_model.yaml | 2 + .../apache/nlpcraft/examples/sql/sql_model.yaml | 4 +- .../nlpcraft/examples/sql/sql_model_init.yaml | 4 +- .../apache/nlpcraft/examples/time/TimeModel.java | 5 +- .../apache/nlpcraft/model/NCDialogFlowItem.java | 2 +- .../scala/org/apache/nlpcraft/model/NCElement.java | 19 +- .../apache/nlpcraft/model/NCModelFileAdapter.java | 8 +- .../org/apache/nlpcraft/model/NCModelView.java | 50 +- .../scala/org/apache/nlpcraft/model/NCToken.java | 33 +- .../nlpcraft/model/NCTokenPredicateContext.java | 3 +- .../nlpcraft/model/NCTokenPredicateResult.java | 10 +- .../apache/nlpcraft/model/impl/NCTokenImpl.scala | 8 +- .../apache/nlpcraft/model/impl/NCTokenLogger.scala | 10 +- .../apache/nlpcraft/model/impl/NCTokenPimp.scala | 1 + .../nlpcraft/model/impl/json/NCElementJson.java | 10 +- .../nlpcraft/model/impl/json/NCModelJson.java | 10 +- .../model/intent/compiler/NCIdlCompiler.scala | 52 +- .../model/intent/compiler/NCIdlCompilerBase.scala | 58 +- .../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 44 +- .../model/intent/compiler/antlr4/NCIdl.interp | 3 +- .../intent/compiler/antlr4/NCIdlBaseListener.java | 14 +- .../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +- .../model/intent/compiler/antlr4/NCIdlLexer.java | 946 +++++++++++---------- .../intent/compiler/antlr4/NCIdlListener.java | 12 +- .../model/intent/compiler/antlr4/NCIdlParser.java | 836 ++++++++++-------- .../model/intent/solver/NCIntentSolverEngine.scala | 84 +- .../model/tools/cmdline/NCCliRestSpec.scala | 2 +- .../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 20 +- .../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 227 +++-- .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 2 +- .../probe/mgrs/conn/NCConnectionManager.scala | 16 +- .../probe/mgrs/deploy/NCDeployManager.scala | 89 +- .../nlpcraft/probe/mgrs/model/NCModelManager.scala | 28 +- .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 20 +- .../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 766 ++++++++--------- .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 26 +- .../probe/mgrs/sentence/NCSentenceManager.scala | 37 +- .../server/geo/tools/NCGeoNamesGenerator.scala | 2 +- .../geo/tools/NCGeoStateNamesGenerator.scala | 2 +- .../geo/tools/metro/NCGeoMetroGenerator.scala | 2 +- .../geo/tools/unstats/NCUnsdStatsService.scala | 2 +- .../org/apache/nlpcraft/server/json/NCJson.scala | 4 +- .../nlpcraft/server/mdo/NCQueryStateMdo.scala | 2 +- .../nlpcraft/server/probe/NCProbeManager.scala | 12 +- .../nlpcraft/server/query/NCQueryManager.scala | 42 +- .../nlpcraft/server/rest/NCBasicRestApi.scala | 6 +- .../scala/org/apache/nlpcraft/NCTestContext.scala | 2 +- .../apache/nlpcraft/common/debug/NCLogSpec.scala | 159 ++++ .../nlpcraft/examples/sql/NCSqlModelSpec.scala | 7 - .../org/apache/nlpcraft/model/NCIdlSpec.scala | 4 +- .../org/apache/nlpcraft/model/NCIdlSpec2.scala | 2 +- .../nlpcraft/model/NCTrueIntentIdlSpec.scala} | 38 +- .../model/abstract/NCAbstractTokensModel.scala | 2 +- .../abstract/NCAbstractTokensVariantsSpec.scala | 2 +- .../nlpcraft/model/dialog/NCDialogSpec.scala | 71 +- .../nlpcraft/model/dialog/NCDialogSpec2.scala | 147 ++++ .../nlpcraft/model/intent/idl/NCIdlTestSpec.scala | 2 +- .../intent/idl/compiler/NCIdlCompilerSpec.scala | 8 +- .../idl/compiler/functions/NCIdlFunctions.scala | 84 +- .../functions/NCIdlFunctionsCollections.scala | 5 +- .../compiler/functions/NCIdlFunctionsCompany.scala | 1 - .../compiler/functions/NCIdlFunctionsCustom.scala | 86 ++ .../compiler/functions/NCIdlFunctionsMath.scala | 18 +- .../compiler/functions/NCIdlFunctionsMeta.scala | 7 +- .../compiler/functions/NCIdlFunctionsOther.scala | 41 +- .../compiler/functions/NCIdlFunctionsRequest.scala | 2 +- .../compiler/functions/NCIdlFunctionsStat.scala | 15 +- .../compiler/functions/NCIdlFunctionsStrings.scala | 29 +- .../compiler/functions/NCIdlFunctionsToken.scala | 7 +- ...nsStat.scala => NCIdlFunctionsTokensUsed.scala} | 48 +- .../nlpcraft/model/intent/idl/compiler/test_ok.idl | 26 + .../nlpcraft/model/intent/idl/idl_test_model.yaml | 4 +- .../apache/nlpcraft/model/meta/NCMetaSpec.scala | 83 +- .../{NCMetaSpec.scala => NCMetaSpecAdapter.scala} | 74 +- .../model/properties/NCTokensPropertiesSpec.scala | 167 ++-- .../NCSparseSpec.scala} | 29 +- ...onymsSpecTmp.scala => NCSuspSynonymsSpec.scala} | 25 +- .../nlpcraft/model/synonyms/NCSynonymsSpec.scala | 61 +- .../model/NCEnricherNestedModelSpec.scala | 56 +- .../model/NCEnricherNestedModelSpec2.scala | 9 +- ...ec4.scala => NCEnricherNestedModelSpec41.scala} | 26 +- .../nlp/enrichers/sort/NCEnricherSortSpec.scala | 199 ++++- .../apache/nlpcraft/server/rest/NCRestSpec.scala | 2 +- 98 files changed, 3202 insertions(+), 2123 deletions(-)
