This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-70_NEW in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 45927340bf75c7f5ab436f95a78af9a13a086481 Merge: ca4f4c7 a667f12 Author: Sergey Kamov <[email protected]> AuthorDate: Mon Aug 2 09:26:03 2021 +0300 Merge branch 'master' into NLPCRAFT-70_NEW LICENSE | 5 + NOTICE | 8 - README.md | 106 +- hs_err_pid98656.log | 3856 -------------------- nlpcraft/pom.xml | 2 +- .../python/ctxword/bin/install_dependencies.sh | 7 +- .../src/main/python/ctxword/bin/py_requirements | 52 +- nlpcraft/src/main/python/spacy_proxy.py | 10 +- .../apache/nlpcraft/common/util/NCIdGenerator.java | 26 +- .../org/apache/nlpcraft/model/NCConversation.java | 24 +- .../org/apache/nlpcraft/model/NCCustomWord.java | 18 +- .../scala/org/apache/nlpcraft/model/NCElement.java | 6 +- .../org/apache/nlpcraft/model/NCIntentSkip.java | 2 +- .../scala/org/apache/nlpcraft/model/NCModel.java | 4 +- .../org/apache/nlpcraft/model/NCModelView.java | 48 +- .../scala/org/apache/nlpcraft/model/NCToken.java | 58 +- .../scala/org/apache/nlpcraft/model/NCUser.java | 4 +- .../nlpcraft/model/intent/NCIdlContext.scala | 16 +- .../model/intent/compiler/NCIdlCompilerBase.scala | 109 +- .../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 9 + .../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +- .../model/intent/compiler/antlr4/NCIdlLexer.java | 860 ++--- .../model/intent/solver/NCIntentSolverEngine.scala | 25 +- .../nlpcraft/model/tools/cmdline/NCCli.scala | 4 +- .../model/tools/cmdline/NCCliCommands.scala | 6 +- .../model/tools/embedded/NCEmbeddedProbe.java | 4 +- .../nlpcraft/model/tools/sqlgen/NCSqlColumn.java | 8 +- .../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 6 +- .../model/tools/test/NCTestClientBuilder.java | 2 +- .../nlpcraft/model/tools/test/NCTestResult.java | 4 +- .../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 1 + .../nlpcraft/server/mdo/impl/NCMdoEntity.java | 4 +- .../nlpcraft/server/mdo/impl/NCMdoField.java | 8 +- .../idl/compiler/functions/NCIdlFunctions.scala | 24 +- .../compiler/functions/NCIdlFunctionsCompany.scala | 2 +- .../compiler/functions/NCIdlFunctionsCustom.scala | 20 +- .../compiler/functions/NCIdlFunctionsMeta.scala | 20 +- .../compiler/functions/NCIdlFunctionsRequest.scala | 2 +- .../compiler/functions/NCIdlFunctionsToken.scala | 88 +- .../functions/NCIdlFunctionsTokensUsed.scala | 18 +- .../compiler/functions/NCIdlFunctionsUser.scala | 2 +- .../{models => model}/stm/NCStmTestModel.scala | 2 +- .../{models => model}/stm/NCStmTestModelSpec.scala | 2 +- .../stm/indexes/NCLimitSpec.scala | 4 +- .../stm/indexes/NCRelationSpec.scala | 4 +- .../{models => model}/stm/indexes/NCSortSpec.scala | 4 +- .../stm/indexes/NCSpecModelAdapter.scala | 2 +- 47 files changed, 945 insertions(+), 4553 deletions(-)
