This is an automated email from the ASF dual-hosted git repository.
ifropc pushed a change to branch NLPCRAFT-91
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
discard 0f8024f Update minecraft.yaml
discard 045d8d4 NPCRAFT-91: Add more examples and small changes in the model
discard bf11d2b NLPCRAFT-91: Add basic test
discard fae84d6 NLPCRAFT-91: Uncomment macros
discard 67808d6 NLPCRAFT-91: Fixes for new syntax
discard 9ddba5e NLPCRAFT-91: Add examples to MinecraftModel
discard 5b729f6 NLPCRAFT-91: Finish fill command
discard de05f20 NLPCRAFT-91: Small fixes for model
discard d45d88a NLPCRAFT-91: Support basic /fill command (different shapes
and static position)
discard cbcfd4d Add copyright
discard 19173f3 NLPCRAFT-91: Replace usage of macros with stand-alone element
discard 96bbcc7 Fix regex
discard ca905a8 NLPCRAFT-91: fill command draft
discard 113f5c8 Update README
discard c590a61 NLPCRAFT-91: "Give" supports player target and quantity
discard b3bbc9b NLPCRAFT-91: Give intent support
discard 158253b Version bump
discard 5b738c4 NLPCRAFT-91: Add /time command support
discard 7d50239 NLPCRAFT-91: Settings support for mod and cleanup data files
discard 24cf30c NLPCRAFT-91: Improve credentials handling
discard b28cf43 NLPCRAFT-91: Add README
discard 5d903f0 NLPCRAFT-91: Add sign in to mod
discard dff94ee NLPCRAFT-91: Fix build after restructure
discard 7c896b9 NLPCRAFT-91: Add mod for Minecraft as example
discard 5440357 NLPCRAFT-91: Fix minecraft model
discard 8f66b0d NLPCRAFT-91: Organize model files
discard e210a73 NLPCRAFT-91: Initial model for weather command
discard 6b962c1 NLPCRAFT-91: Base stubs for Minecraft example
discard 66fade4 NLPCRAFT-91: Initial files
add 5a05217 WIP.
add 546d235 WIP.
add ff215ba Update NCModelView.java
add fc3dec4 Fix javadoc.
add 384fdc0 WIP.
add 207ca19 Update NCIntentDsl.g4
add f138c17 WIP.
add 7eb34b6 Update NCIntentDsl.g4
add 2150575 Merge branch 'NLPCRAFT-206' of
https://github.com/apache/incubator-nlpcraft into NLPCRAFT-206
add b8f522d WIP.
add 2646005 WIP.
add da35884 WIP.
add cb26d87 WIP.
add b6b88a0 WIP.
add 2bbf715 WIP.
add 8bdde3b WIP.
add 526e9db WIP.
add f7bd364 WIP.
add 9611729 WIP.
add eccbe77 WIP.
add 9ae2c0d WIP.
add 0876ae5 WIP.
add 7eea36f WIP.
add 13291d9 WIP.
add fc9fc0e WIP.
add 0b7734a Update NCIntentDslCompiler.scala
add 6dc2356 WIP.
add 51acce3 Update NCIntentDslCompiler.scala
add 96d0358 WIP.
add 33aa4de WIP.
add eaaa8b7 WIP.
add 9f7d973 WIP.
add 637698f WIP.
add e5d8ac1 WIP.
add 3e32103 Merge remote-tracking branch 'origin/master' into NLPCRAFT-206
add 3cb9bbe Merge branch 'master' into NLPCRAFT-206
add 90e855c Update NCIntentDslCompiler.scala
add 2a83b64 WIP.
add e812c8a Merge branch 'master' into NLPCRAFT-206
add 3676230 WIP.
add 1170470 WIP.
add 3893707 Update NCBaseDslCompiler.scala
add 727b69a Update NCBaseDslCompiler.scala
add bfa41e2 Update NCIntentDslCompiler.scala
add 8ed98be Merge branch 'master' into NLPCRAFT-206
add f94daf8 WIP.
add a08a8f2 Update NCDslCompilerSpec.scala
add 017b662 WIP.
add 9c681f6 WIP.
add 5feaf49 Test NC file.
add 33ee086 WIP.
add 203d3b4 WIP.
add f17a3a8 WIP on error handling.
add bdf6918 WIP.
add c164ab3 WIP.
add ace0a02 WIP.
add 343e36e Merge branch 'master' into NLPCRAFT-206
add 0f30285 Update NCIntentDslCompiler.scala
add 9fc897f WIP.
add d62eb17 WIP.
add 8cd0199 WIP.
add 5ac370a WIP.
add 8c10631 WIP.
add 27069ca WIP.
add f9c1cbe WIP.
add a61d003 WIP.
add e00d7ff WIP (does NOT compile).
add 4b39a1b Merge remote-tracking branch 'origin/master' into NLPCRAFT-206
add 739f11b WIP.
add f5bef38 WIP.
add 11d05e8 WIP.
add 721fbf0 WIP (compiles OK).
add cd92760 WIP.
add 8f9d7c5 WIP.
add 3f77b6f WIP.
add 67255ef WIP.
add 7ed48e1 WIP.
add 5fb372e WIP.
add bea5517 Merge branch 'master' into NLPCRAFT-206
add 230ff50 WIP.
add 1a7de94 WIP.
add a220020 WIP.
add 1347d84 WIP.
add 5f870b9 WIP.
add 260ce1b WIP.
add 3ac6a53 WIP.
add 1c4a310 WIP.
add d1bdbe4 WIP.
add 71126d8 WIP.
add 47bf665 WIP.
add 06e1054 WIP.
add 6e7c447 WIP.
add 36eee60 WIP.
add 9a6d6bd WIP.
add 824d72f WIP.
add 27bb4a3 WIP.
add 23690e6 WIP.
add 3684bd3 WIP.
add a64acac WIP.
add 7d489a8 WIP.
add 1ce0cb5 Update NCModelManager.scala
add 72382ca WIP.
add e70c31a Merge branch 'master' into NLPCRAFT-206
add 052f3c7 Merge branch 'master' into 206_tmp
add 15d2b0d Merge branch 'master' into NLPCRAFT-206
add 74d1115 Merge branch 'master' into NLPCRAFT-206
add 85461dc Merge branch 'NLPCRAFT-206' of
https://github.com/apache/incubator-nlpcraft into NLPCRAFT-206
add 14fb39a WIP.
add 5861102 WIP.
add 8ef24c7 Update NCDeployManager.scala
add 88f59b9 WIP.
add 3d64b4b WIP.
add 268ad3b WIP.
add 8bb8dfa WIP.
add 9aaa2ef WIP.
add dc66161 WIP.
add 1a8bc56 WIP.
add 5a96e72 WIP.
add ccde124 WIP.
add 7d7e6ac WIP.
add 8958779 WIP.
add b7bf65b WIP.
add 4a543e9 WIP.
add ffbc3de WIP.
add 62da871 Update sql_model.yaml
add 33eb2d1 Update NCDslCompilerBase.scala
add 8aec4a9 WIP.
add 92d25d1 WIP.
add 8fa9649 WIP.
add 8c602ad WIP.
add 6c40687 WIP.
add c1224e3 Update NCCli.scala
add 4ef5629 Update NCDslCompilerBase.scala
add 1760721 WIP.
add 7559b68 Update NCDslCompilerBase.scala
add db93929 WIP.
add 5cce2f0 WIP.
add baacd68 Merge branch 'master' into NLPCRAFT-206
add 101897f WIP.
add 424048a Temporary simple test on tokens DSL.
add 3cefa03 Update NCDslCompilerBase.scala
add 16917cd WIP.
add 905b201 Update test_ok.nc
add 3a7dede WIP.
add 252c86b WIP.
add 68727df WIP.
add 6231ed5 Merge branch 'NLPCRAFT-206' of
https://github.com/apache/incubator-nlpcraft into NLPCRAFT-206
add 954546d Update NCDslCompilerBase.scala
add 5ec9a27 WIP.
add 2133789 WIP.
add b54343c Update NCIntentSolverEngine.scala
add 429a852 WIP.
add 705db63 WIP.
add d947dac WIP.
add 544bcb4 Merge branch 'NLPCRAFT-206' into NLPCRAFT-257
add e8090b6 WIP.
add c073a74 WIP.
add 50af786 WIP.
add c9e4058 WIP.
add 4137042 WIP.
add c89e837 Update NCDslCompilerBase.scala
add 71f6894 WIP.
add e766582 WIP.
add 57c8c3a Renaming DSL -> IDL, etc.
add eb07ce0 DSL -> IDL.
add 457384e WIP.
add d61e45d Merge branch 'NLPCRAFT-206' of
https://github.com/apache/incubator-nlpcraft into NLPCRAFT-206
add 8d122e2 WIP.
add 7c78fc9 Update NCMacroCompilerSpec.scala
add 1a0d497 WIP.
add cddb5eb WIP.
add fa3c05b Update NCTestAutoModelValidatorImpl.scala
add b6b714c Merge branch 'NLPCRAFT-206' into NLPCRAFT-257
add 05ca0a8 Update NCEnricherNestedModelSpec5.scala
add d7d6297 WIP.
add 15e69fb Merge branch 'NLPCRAFT-206' into NLPCRAFT-257
add 5efd5b8 Update NCIdlCompilerBase.scala
add 04511b1 WIP.
add b0adec9 Improved meta_part() function.
add deff4ff Update NCIdlCompilerBase.scala
add b10ffcb WIP.
add 306752e Intents test added.
add 904b0de Update NCIdlCompilerBase.scala
add 4917351 has_any(), and has_all() IDL functions added.
add 1ddf32a Update test_ok.idl
add 35e1ed6 Update test_ok.idl
add e715697 Delete hs_err_pid19932.log
add 90812f1 Update pom.xml
add 05d19ce Update README.md
add be733d4 WIP.
add 818a309 Update test_ok.idl
add e1d24fb Fix Maven build failure (add custom 'testResources' location).
add 0bd7b03 Minor improvements.
add 04ea452 WIP.
add da438d4 WIP.
add b32a375 WIP.
add 4d38bd0 WIP.
add bb99559 WIP.
add 9754314 WIP.
add 8f2937c WIP.
add 38732c8 Update test_ok.idl
add 100dab4 Update NCIdlCompiler.scala
add dedcf82 WIP.
add 27b900f WIP.
add d5eb9da WIP.
add e9ec949 WIP.
add eba8e85 WIP.
add 61edff9 WIP.
add b7ddcfa WIP.
add d8ac64a WIP.
add e174c6b WIP.
add 892c47f WIP.
add 8d7d58f WIP.
add d67a801 WIP.
add f83bd1a WIP.
add a015c6b WIP.
add 54944bf Update NCIdlCompilerBase.scala
add 53658f8 WIP.
add 4e5d53f WIP.
add 97c9611 Merge branch 'NLPCRAFT-278' of
https://github.com/apache/incubator-nlpcraft into NLPCRAFT-278
add 1c5b907 Update NCIdlFunctionsUser.scala
add 19b885c WIP.
add b96ed58 WIP.
add a60bf49 Update NCIdlCompilerBase.scala
add 4baedfb WIP.
add 5fb9cc3 Update NCIdlFunctionsOther.scala
add d08e9db Update NCIdlCompilerBase.scala
add 8e2872c WIP.
add d33a6b0 WIP.
add bcb42c1 Update NCIdlFunctionsOther.scala
add aa4b131 WIP.
add 14c8ef1 Update NCToken.java
add 68efdd0 WIP.
add 4265ffc WIP.
add 9e46c69 Update SqlModel.scala
add 154a8c9 Update NCMetaSpec.scala
add c2e2fc0 WIP.
add a7ae2a7 WIP.
add 7182853 WIP.
add 3a868f9 WIP.
add a8db1cf WIP.
add cb74e43 WIP.
add ff78bbf WIP.
add d4f5e75 WIP.
add 08f17fc WIP.
add 10bae01 WIP.
add fe0d3b9 WIP.
add 4931d7a WIP.
add 5b06a9c WIP.
add cf25323 Update NCIdlCompilerBase.scala
add 3ce78a2 WIP.
add 8095292 Merge branch 'NLPCRAFT-278' of
https://github.com/apache/incubator-nlpcraft into NLPCRAFT-278
add 603d6d1 WIP.
add 5de3fe3 WIP.
add e83b473 WIP.
add 32dd0d0 WIP.
add 8ca78a5 Update NCIdlCompilerBase.scala
add 9cc4e48 WIP.
new 2200817 NLPCRAFT-91: Initial files
new a6ea56b NLPCRAFT-91: Base stubs for Minecraft example
new f0125cb NLPCRAFT-91: Initial model for weather command
new 6183eab NLPCRAFT-91: Organize model files
new 9729b68 NLPCRAFT-91: Fix minecraft model
new 5bda72e NLPCRAFT-91: Add mod for Minecraft as example
new d0e65bf NLPCRAFT-91: Fix build after restructure
new 55df42e NLPCRAFT-91: Add sign in to mod
new eb8e3c1 NLPCRAFT-91: Add README
new 08e8a9f NLPCRAFT-91: Improve credentials handling
new d14908e NLPCRAFT-91: Settings support for mod and cleanup data files
new 5dd2272 NLPCRAFT-91: Add /time command support
new 6d3e256 Version bump
new a8e64f5 NLPCRAFT-91: Give intent support
new 638356b NLPCRAFT-91: "Give" supports player target and quantity
new 5b2ffe4 Update README
new b61e046 NLPCRAFT-91: fill command draft
new c69dbd0 Fix regex
new 4681c47 NLPCRAFT-91: Replace usage of macros with stand-alone element
new a0c24cb Add copyright
new f91d531 NLPCRAFT-91: Support basic /fill command (different shapes
and static position)
new c06d95d NLPCRAFT-91: Small fixes for model
new 2bf8695 NLPCRAFT-91: Finish fill command
new 58f9600 NLPCRAFT-91: Add examples to MinecraftModel
new 3ea0b3b NLPCRAFT-91: Fixes for new syntax
new ca2a117 NLPCRAFT-91: Uncomment macros
new 63a8974 NLPCRAFT-91: Add basic test
new 844a37a NPCRAFT-91: Add more examples and small changes in the model
new f70b51e Update minecraft.yaml
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0f8024f)
\
N -- N -- N refs/heads/NLPCRAFT-91 (f70b51e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 29 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 42 +-
nlpcraft/pom.xml | 23 +
nlpcraft/src/main/resources/sql/create_schema.sql | 19 +-
nlpcraft/src/main/resources/sql/drop_schema.sql | 3 +-
.../org/apache/nlpcraft/common/ansi/NCAnsi.scala | 1 +
.../apache/nlpcraft/common/debug/NCLogHolder.scala | 28 +-
.../common/extcfg/NCExternalConfigManager.scala | 2 +-
.../nlpcraft/common/makro/NCMacroCompiler.scala | 25 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 10 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 2 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 2 +-
.../common/makro/antlr4/NCMacroDslLexer.interp | 6 +-
.../common/makro/antlr4/NCMacroDslLexer.java | 45 +-
.../common/makro/antlr4/NCMacroDslLexer.tokens | 2 +-
.../common/makro/antlr4/NCMacroDslParser.java | 12 +-
.../nlpcraft/common/nlp/NCNlpSentenceNote.scala | 9 +-
.../scala/org/apache/nlpcraft/common/package.scala | 44 +-
.../apache/nlpcraft/common/socket/NCSocket.scala | 6 +-
.../apache/nlpcraft/common/util/NCIdGenerator.java | 2 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 146 +-
.../scala/org/apache/nlpcraft/examples/README.md | 3 +-
.../apache/nlpcraft/examples/alarm/AlarmModel.java | 2 +-
.../nlpcraft/examples/alarm/alarm_model.json | 2 +-
.../alarm/intents.idl} | 21 +-
.../apache/nlpcraft/examples/echo/EchoModel.scala | 2 +-
.../lightswitch/LightSwitchGroovyModel.groovy | 2 +-
.../examples/lightswitch/lightswitch_model.yaml | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 5 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 32 +-
.../nlpcraft/examples/sql/db/SqlValueLoader.scala | 2 +-
.../apache/nlpcraft/examples/sql/sql_model.yaml | 18 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 7 +-
.../nlpcraft/examples/weather/WeatherModel.java | 20 +-
.../scala/org/apache/nlpcraft/model/NCCompany.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCContext.java | 13 +-
.../org/apache/nlpcraft/model/NCConversation.java | 25 +-
.../org/apache/nlpcraft/model/NCCustomParser.java | 2 +-
.../{NCIntentMatch.java => NCDialogFlowItem.java} | 102 +-
.../scala/org/apache/nlpcraft/model/NCElement.java | 4 +-
.../scala/org/apache/nlpcraft/model/NCIntent.java | 30 +-
.../org/apache/nlpcraft/model/NCIntentRef.java | 25 +-
.../org/apache/nlpcraft/model/NCIntentSample.java | 3 +-
.../org/apache/nlpcraft/model/NCIntentSkip.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentTerm.java | 7 +-
.../org/apache/nlpcraft/model/NCMetadata.java | 14 +-
.../apache/nlpcraft/model/NCModelFileAdapter.java | 44 +-
.../org/apache/nlpcraft/model/NCModelView.java | 19 +-
.../scala/org/apache/nlpcraft/model/NCRequest.java | 11 +-
.../scala/org/apache/nlpcraft/model/NCResult.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCToken.java | 167 +-
...{NCIntent.java => NCTokenPredicateContext.java} | 41 +-
...IntentTerm.java => NCTokenPredicateResult.java} | 56 +-
.../scala/org/apache/nlpcraft/model/NCUser.java | 9 +-
.../model/factories/basic/NCBasicModelFactory.java | 6 +-
.../factories/spring/NCSpringModelFactory.java | 8 +-
.../apache/nlpcraft/model/impl/NCCompanyImpl.java | 7 +-
.../apache/nlpcraft/model/impl/NCTokenImpl.scala | 14 +-
.../apache/nlpcraft/model/impl/NCTokenLogger.scala | 2 +-
.../org/apache/nlpcraft/model/impl/NCUserImpl.java | 12 +-
.../nlpcraft/model/impl/json/NCModelJson.java | 8 +-
.../intent/NCIdlContext.scala} | 38 +-
.../NCIdlFunction.scala} | 8 +-
.../apache/nlpcraft/model/intent/NCIdlIntent.scala | 60 +
.../NCDslTokenChecker.scala => NCIdlStack.scala} | 47 +-
.../intent/NCIdlSynonym.scala} | 19 +-
.../NCDslTokenChecker.scala => NCIdlTerm.scala} | 59 +-
.../model/intent/compiler/NCIdlCompiler.scala | 694 +++++
.../model/intent/compiler/NCIdlCompilerBase.scala | 1251 ++++++++
.../intent/compiler/NCIdlCompilerGlobal.scala | 87 +
.../compiler/NCIdlFragment.scala} | 19 +-
.../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 343 +++
.../model/intent/compiler/antlr4/NCIdl.interp | 152 +
.../model/intent/compiler/antlr4/NCIdl.tokens | 93 +
.../intent/compiler/antlr4/NCIdlBaseListener.java | 591 ++++
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 175 ++
.../model/intent/compiler/antlr4/NCIdlLexer.java | 671 +++++
.../model/intent/compiler/antlr4/NCIdlLexer.tokens | 93 +
.../intent/compiler/antlr4/NCIdlListener.java | 490 ++++
.../model/intent/compiler/antlr4/NCIdlParser.java | 3002 ++++++++++++++++++++
.../model/intent/impl/NCIntentDslCompiler.scala | 377 ---
.../model/intent/impl/antlr4/NCIntentDsl.g4 | 98 -
.../model/intent/impl/antlr4/NCIntentDsl.interp | 122 -
.../model/intent/impl/antlr4/NCIntentDsl.tokens | 82 -
.../impl/antlr4/NCIntentDslBaseListener.java | 291 --
.../intent/impl/antlr4/NCIntentDslLexer.interp | 152 -
.../model/intent/impl/antlr4/NCIntentDslLexer.java | 231 --
.../intent/impl/antlr4/NCIntentDslLexer.tokens | 82 -
.../intent/impl/antlr4/NCIntentDslListener.java | 220 --
.../intent/impl/antlr4/NCIntentDslParser.java | 1628 -----------
.../intent/{impl => solver}/NCIntentSolver.scala | 18 +-
.../{impl => solver}/NCIntentSolverEngine.scala | 430 +--
.../{impl => solver}/NCIntentSolverInput.scala | 2 +-
.../{impl => solver}/NCIntentSolverResult.scala | 4 +-
.../{impl => solver}/NCIntentSolverVariant.scala | 29 +-
.../nlpcraft/model/intent/utils/NCDslIntent.scala | 66 -
.../nlpcraft/model/intent/utils/NCDslTerm.java | 131 -
.../model/intent/utils/NCDslTokenPredicate.java | 473 ---
.../model/intent/utils/NCDslTokenQualifier.scala | 62 -
.../nlpcraft/model/tools/cmdline/NCCli.scala | 10 +-
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 6 +-
.../nlpcraft/model/tools/test/NCTestClient.java | 2 -
.../model/tools/test/NCTestClientBuilder.java | 8 +-
.../test/impl/NCTestAutoModelValidatorImpl.scala | 2 +-
.../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 8 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 23 +-
.../nlpcraft/probe/mgrs/NCProbeSynonymChunk.scala | 17 +-
.../probe/mgrs/NCProbeSynonymChunkKind.scala | 2 +-
.../nlpcraft/probe/mgrs/NCProbeVariants.scala | 9 +-
.../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 18 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 481 ++--
.../mgrs/dialogflow/NCDialogFlowManager.scala | 92 +-
.../nlpcraft/probe/mgrs/model/NCModelManager.scala | 26 +-
.../probe/mgrs/model/NCModelSynonymDsl.scala | 28 -
.../mgrs/model/NCModelSynonymDslCompiler.scala | 290 --
.../probe/mgrs/model/antlr4/NCSynonymDsl.g4 | 81 -
.../probe/mgrs/model/antlr4/NCSynonymDsl.interp | 83 -
.../probe/mgrs/model/antlr4/NCSynonymDsl.tokens | 53 -
.../model/antlr4/NCSynonymDslBaseListener.java | 183 --
.../mgrs/model/antlr4/NCSynonymDslLexer.interp | 107 -
.../probe/mgrs/model/antlr4/NCSynonymDslLexer.java | 196 --
.../mgrs/model/antlr4/NCSynonymDslLexer.tokens | 53 -
.../mgrs/model/antlr4/NCSynonymDslListener.java | 130 -
.../mgrs/model/antlr4/NCSynonymDslParser.java | 1135 --------
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 29 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 9 +-
.../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 2 +-
.../probe/mgrs/nlp/impl/NCRequestImpl.scala | 23 +-
.../probe/mgrs/sentence/NCSentenceHelper.java | 4 +-
.../probe/mgrs/sentence/NCSentenceManager.scala | 9 +-
.../org/apache/nlpcraft/server/NCServer.scala | 16 +-
.../nlpcraft/server/company/NCCompanyManager.scala | 52 +-
.../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 +-
...ropertyMdo.scala => NCCompanyPropertyMdo.scala} | 22 +-
.../nlpcraft/server/mdo/impl/NCMdoField.java | 2 +-
.../server/nlp/enrichers/date/NCDateEnricher.scala | 2 +-
.../enrichers/stopword/NCStopWordEnricher.scala | 6 +-
.../nlpcraft/server/probe/NCProbeManager.scala | 41 +-
.../nlpcraft/server/query/NCQueryManager.scala | 15 +-
.../nlpcraft/server/rest/NCBasicRestApi.scala | 36 +-
.../apache/nlpcraft/server/sql/NCSqlManager.scala | 82 +-
.../nlpcraft/server/user/NCUserManager.scala | 3 +-
.../common/makro/NCMacroCompilerSpec.scala | 1 -
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 10 +-
.../nlpcraft/examples/sql/NCSqlExampleSpec.scala | 2 +-
.../{NCIntentDslSpec.scala => NCIdlSpec.scala} | 22 +-
.../{NCIntentDslSpec2.scala => NCIdlSpec2.scala} | 22 +-
.../nlpcraft/model/NCIntentPrioritiesSpec.scala | 4 +-
.../abstract/NCAbstractTokensIntentsSpec.scala | 8 +-
.../model/abstract/NCAbstractTokensModel.scala | 8 +-
.../model/conversation/NCConversationSpec.scala | 2 +-
.../conversation/NCConversationTimeoutSpec.scala | 18 +-
.../nlpcraft/model/dialog/NCDialogSpec.scala | 8 +-
.../NCIdlTestModel.scala} | 8 +-
.../NCDslSpec.scala => idl/NCIdlTestSpec.scala} | 14 +-
.../intent/idl/compiler/NCIdlCompilerSpec.scala | 241 ++
.../idl/compiler/functions/NCIdlFunctions.scala | 189 ++
.../functions/NCIdlFunctionsCollections.scala | 72 +
.../compiler/functions/NCIdlFunctionsCompany.scala | 79 +
.../compiler/functions/NCIdlFunctionsDate.scala | 61 +
.../compiler/functions/NCIdlFunctionsMath.scala | 90 +
.../compiler/functions/NCIdlFunctionsMeta.scala | 122 +
.../compiler/functions/NCIdlFunctionsOther.scala} | 54 +-
.../compiler/functions/NCIdlFunctionsRequest.scala | 52 +
.../compiler/functions/NCIdlFunctionsStat.scala | 50 +
.../compiler/functions/NCIdlFunctionsStrings.scala | 77 +
.../compiler/functions/NCIdlFunctionsToken.scala | 112 +
.../compiler/functions/NCIdlFunctionsUser.scala | 78 +
.../nlpcraft/model/intent/idl/compiler/test_ok.idl | 58 +
.../idl_test_model.yaml} | 14 +-
.../apache/nlpcraft/model/meta/NCMetaSpec.scala | 149 +
.../model/properties/NCTokensPropertiesSpec.scala | 4 +-
.../properties/NCTokensRestrictionsSpec.scala | 8 +-
.../nlpcraft/model/synonyms/NCSynonymsSpec.scala | 10 +-
.../synonyms/NCSynonymsSpecTmp.scala} | 35 +-
.../nlpcraft/models/stm/NCStmTestModel.scala | 8 +-
.../mgrs/nlp/enrichers/NCEnricherBaseSpec.scala | 4 +-
.../model/NCEnricherNestedModelSpec.scala | 10 +-
.../model/NCEnricherNestedModelSpec2.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 4 +-
.../model/NCEnricherNestedModelSpec4.scala | 6 +-
...pec4.scala => NCEnricherNestedModelSpec5.scala} | 30 +-
.../nlpcraft/server/rest/NCRestAskSpec.scala | 2 +-
.../nlpcraft/server/rest/NCRestCompanySpec.scala | 67 +-
.../apache/nlpcraft/server/rest/NCRestSpec.scala | 4 +-
openapi/nlpcraft_swagger.yml | 15 +
pom.xml | 6 +-
sql/mysql/drop_schema.sql | 13 +-
sql/mysql/schema.sql | 14 +
sql/oracle/drop_schema.sql | 8 +
sql/oracle/schema.sql | 19 +-
sql/postgres/drop_schema.sql | 13 +-
sql/postgres/schema.sql | 15 +
196 files changed, 11249 insertions(+), 7657 deletions(-)
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/{common/extcfg/NCExternalConfigType.scala
=> examples/alarm/intents.idl} (65%)
copy nlpcraft/src/main/scala/org/apache/nlpcraft/model/{NCIntentMatch.java =>
NCDialogFlowItem.java} (63%)
copy nlpcraft/src/main/scala/org/apache/nlpcraft/model/{NCIntent.java =>
NCTokenPredicateContext.java} (62%)
copy nlpcraft/src/main/scala/org/apache/nlpcraft/model/{NCIntentTerm.java =>
NCTokenPredicateResult.java} (51%)
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/{server/geo/tools/unstats/NCUnsdStatsGeo.scala
=> model/intent/NCIdlContext.scala} (55%)
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/model/{opencensus/package-info.java
=> intent/NCIdlFunction.scala} (83%)
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/NCIdlIntent.scala
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{utils/NCDslTokenChecker.scala
=> NCIdlStack.scala} (56%)
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/{common/nlp/core/NCNlpTokenizerFactory.scala
=> model/intent/NCIdlSynonym.scala} (76%)
rename
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{utils/NCDslTokenChecker.scala
=> NCIdlTerm.scala} (50%)
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompiler.scala
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerGlobal.scala
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/model/{tools/sqlgen/impl/__javadoc_fix.java
=> intent/compiler/NCIdlFragment.scala} (69%)
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.g4
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.interp
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.tokens
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlBaseListener.java
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.interp
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.tokens
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlListener.java
create mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlParser.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentDslCompiler.scala
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDsl.g4
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDsl.interp
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDsl.tokens
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslBaseListener.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslLexer.interp
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslLexer.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslLexer.tokens
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslListener.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/NCIntentDslParser.java
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{impl =>
solver}/NCIntentSolver.scala (92%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{impl =>
solver}/NCIntentSolverEngine.scala (66%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{impl =>
solver}/NCIntentSolverInput.scala (95%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{impl =>
solver}/NCIntentSolverResult.scala (90%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{impl =>
solver}/NCIntentSolverVariant.scala (83%)
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslIntent.scala
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTerm.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTokenPredicate.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslTokenQualifier.scala
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDsl.scala
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.interp
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.tokens
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseListener.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.interp
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.tokens
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslListener.java
delete mode 100644
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslParser.java
copy
nlpcraft/src/main/scala/org/apache/nlpcraft/server/mdo/{NCUserPropertyMdo.scala
=> NCCompanyPropertyMdo.scala} (78%)
rename
nlpcraft/src/test/scala/org/apache/nlpcraft/model/{NCIntentDslSpec.scala =>
NCIdlSpec.scala} (74%)
rename
nlpcraft/src/test/scala/org/apache/nlpcraft/model/{NCIntentDslSpec2.scala =>
NCIdlSpec2.scala} (75%)
rename
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/{dsl/NCDslTestModel.scala
=> idl/NCIdlTestModel.scala} (77%)
rename
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/{dsl/NCDslSpec.scala
=> idl/NCIdlTestSpec.scala} (84%)
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/NCIdlCompilerSpec.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctions.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCollections.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsCompany.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsDate.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsMath.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsMeta.scala
copy
nlpcraft/src/test/scala/org/apache/nlpcraft/{common/blowfish/NCBlowfishHasherSpec.scala
=> model/intent/idl/compiler/functions/NCIdlFunctionsOther.scala} (51%)
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsRequest.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsStat.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsStrings.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsToken.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
rename
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/{dsl/dsl_test_model.yaml
=> idl/idl_test_model.yaml} (78%)
create mode 100644
nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
copy
nlpcraft/src/test/scala/org/apache/nlpcraft/{probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
=> model/synonyms/NCSynonymsSpecTmp.scala} (56%)
copy
nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/{NCEnricherNestedModelSpec4.scala
=> NCEnricherNestedModelSpec5.scala} (62%)
