This is an automated email from the ASF dual-hosted git repository. aradzinski pushed a commit to branch NLPCRAFT-206 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 3cb9bbe1c1e28210b477cb9b4fbcb0abc93ba1f2 Merge: 3e32103 a163982 Author: Aaron Radzinski <[email protected]> AuthorDate: Thu Feb 18 18:04:07 2021 -0800 Merge branch 'master' into NLPCRAFT-206 .../nlpcraft/common/ascii/NCAsciiTable.scala | 1 - .../org/apache/nlpcraft/common/util/NCUtils.scala | 12 +- .../scala/org/apache/nlpcraft/model/NCElement.java | 64 ++++- .../apache/nlpcraft/model/NCModelFileAdapter.java | 47 +++- .../org/apache/nlpcraft/model/NCModelView.java | 173 +++++++++++- .../scala/org/apache/nlpcraft/model/NCVariant.java | 2 +- .../model/factories/basic/NCBasicModelFactory.java | 3 +- .../apache/nlpcraft/model/impl/NCTokenImpl.scala | 10 +- .../apache/nlpcraft/model/impl/NCTokenLogger.scala | 3 - .../nlpcraft/model/impl/json/NCElementJson.java | 19 +- .../nlpcraft/model/impl/json/NCModelJson.java | 7 + .../nlpcraft/model/tools/cmdline/NCCli.scala | 7 +- .../tools/sqlgen/impl/NCSqlSchemaBuilderImpl.scala | 2 - .../probe/mgrs/deploy/NCDeployManager.scala | 115 +++++--- .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala | 12 +- .../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 35 ++- .../enrichers/relation/NCRelationEnricher.scala | 6 +- .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 10 +- .../nlpcraft/server/query/NCQueryManager.scala | 4 +- .../nlpcraft/server/rest/NCBasicRestApi.scala | 5 +- .../scala/org/apache/nlpcraft/NCTestContext.scala | 15 + .../scala/org/apache/nlpcraft/NCTestElement.scala | 40 +++ .../nlpcraft/common/ascii/NCAsciiTableSpec.scala | 2 +- .../nlpcraft/common/crypto/NCCipherSpec.scala | 4 +- .../apache/nlpcraft/model/NCIntentDslSpec.scala | 12 +- .../apache/nlpcraft/model/NCIntentDslSpec2.scala | 18 +- .../nlpcraft/model/NCIntentPrioritiesSpec.scala | 6 +- .../apache/nlpcraft/model/NCIntentSampleSpec.scala | 12 +- .../model/abstract/NCAbstractTokensModel.scala | 30 +- .../model/conversation/NCConversationSpec.scala | 14 +- .../conversation/NCConversationTimeoutSpec.scala | 19 +- .../nlpcraft/model/dialog/NCDialogSpec.scala | 5 +- .../nlpcraft/model/intent/dsl/NCDslSpec.scala | 2 +- .../model/properties/NCTokensPropertiesSpec.scala | 306 +++++++++++++++++++++ .../properties/NCTokensRestrictionsSpec.scala | 75 +++++ .../nlpcraft/models/stm/NCStmTestModel.scala | 13 +- .../mgrs/nlp/enrichers/NCDefaultTestModel.scala | 27 +- .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala | 7 +- .../nlp/enrichers/limit/NCEnricherLimitSpec.scala | 2 +- .../model/NCEnricherNestedModelSpec.scala | 27 +- .../enrichers/date/tools/NCDateGeneratorSpec.scala | 5 +- .../nlpcraft/server/rest/NCRestModelSpec.scala | 4 +- .../apache/nlpcraft/server/rest/NCRestSpec.scala | 7 +- 43 files changed, 958 insertions(+), 231 deletions(-)
