This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-113 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 335a90c01abcedce399d97326390f1188eb0113e Merge: 2556cfd 38b6311 Author: Sergey Kamov <[email protected]> AuthorDate: Sun Sep 13 18:13:10 2020 +0300 Merge branch 'NLPCRAFT-41' into NLPCRAFT-113 nlpcraft/src/main/python/ctxword/README.md | 11 +- nlpcraft/src/main/python/ctxword/WINDOWS_SETUP.md | 2 +- nlpcraft/src/main/resources/log4j2.xml | 22 +- nlpcraft/src/main/resources/nlpcraft.conf | 40 +- nlpcraft/src/main/resources/reference.conf | 6 +- .../org/apache/nlpcraft/common/NCService.scala | 11 +- .../nlpcraft/common/ascii/NCAsciiTable.scala | 4 +- .../nlpcraft/common/config/NCConfigurable.scala | 40 +- .../nlpcraft/common/makro/NCMacroParser.scala | 2 +- .../org/apache/nlpcraft/common/util/NCUtils.scala | 68 +- .../apache/nlpcraft/examples/time/TimeModel.java | 54 +- .../nlpcraft/examples/weather/WeatherModel.java | 3 +- .../apache/nlpcraft/model/NCModelFileAdapter.java | 40 +- .../org/apache/nlpcraft/model/NCModelView.java | 207 ++- .../apache/nlpcraft/model/impl/NCModelImpl.scala | 69 - .../apache/nlpcraft/model/impl/NCTokenImpl.scala | 4 +- .../model/intent/impl/NCIntentDslCompiler.scala | 10 +- .../model/intent/impl/NCIntentScanner.scala | 483 ------- .../model/intent/impl/NCIntentSolver.scala | 6 +- .../model/tools/cmdline/NCCommandLine.scala | 40 +- .../model/tools/embedded/NCEmbeddedProbe.java | 30 +- .../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 4 +- .../model/tools/test/NCTestClientBuilder.java | 5 +- .../test/impl/NCTestAutoModelValidatorImpl.scala | 11 +- .../scala/org/apache/nlpcraft/probe/NCProbe.scala | 13 +- .../org/apache/nlpcraft/probe/NCProbeBoot.scala | 141 +- .../nlpcraft/probe/mgrs/NCProbeMessage.scala | 2 +- .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 51 +- .../probe/mgrs/conn/NCConnectionManager.scala | 30 +- ...sationDescriptor.scala => NCConversation.scala} | 58 +- .../mgrs/conversation/NCConversationManager.scala | 65 +- .../probe/mgrs/deploy/NCDeployManager.scala | 1429 ++++++++++++++++++-- .../mgrs/dialogflow/NCDialogFlowManager.scala | 94 +- .../nlpcraft/probe/mgrs/model/NCModelManager.scala | 672 +-------- .../NCModelData.scala} | 67 +- .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala | 5 +- .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 80 +- .../dictionary/NCDictionaryEnricher.scala | 7 +- .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala | 7 +- .../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 40 +- .../enrichers/relation/NCRelationEnricher.scala | 7 +- .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala | 9 +- .../enrichers/stopword/NCStopWordEnricher.scala | 22 +- .../suspicious/NCSuspiciousNounsEnricher.scala | 9 +- .../mgrs/nlp/validate/NCValidateManager.scala | 46 +- .../org/apache/nlpcraft/server/NCServer.scala | 104 +- .../apache/nlpcraft/server/geo/NCGeoManager.scala | 2 +- .../server/geo/tools/NCGeoNamesGenerator.scala | 8 +- .../geo/tools/NCGeoStateNamesGenerator.scala | 2 +- .../geo/tools/unstats/NCUnsdStatsService.scala | 2 +- .../nlpcraft/server/ignite/NCIgniteHelpers.scala | 39 - .../lifecycle/NCServerLifecycleManager.scala | 9 +- .../nlpcraft/server/mdo/NCProbeModelMdo.scala | 5 +- .../nlpcraft/server/model/NCEnhanceManager.scala | 370 ----- .../server/model/NCEnhanceSuggestion.scala | 32 - .../server/nlp/core/NCNlpServerManager.scala | 5 +- .../opencensus/NCOpenCensusServerStats.scala | 7 +- .../nlpcraft/server/probe/NCProbeManager.scala | 179 ++- .../nlpcraft/server/query/NCQueryManager.scala | 2 +- .../nlpcraft/server/rest/NCBasicRestApi.scala | 1143 ++++++++-------- .../apache/nlpcraft/server/rest/NCRestApi.scala | 14 +- .../nlpcraft/server/rest/NCRestManager.scala | 19 +- .../org/apache/nlpcraft/server/sql/NCSql.scala | 11 +- .../server/sugsyn/NCSuggestSynonymManager.scala | 443 ++++++ .../sugsyn/NCSuggestSynonymResult.scala} | 30 +- .../nlpcraft/server/user/NCUserManager.scala | 20 +- nlpcraft/src/test/resources/log4j2.xml | 24 +- ...torSpec.scala => NCTestExampleModelsSpec.scala} | 19 +- .../nlpcraft/examples/sql/NCSqlExampleSpec.scala | 28 +- .../impl/NCSqlModelGeneratorImplSpec.scala} | 6 +- .../nlpcraft/models/stm/NCStmTestModelSpec.scala | 2 +- openapi/nlpcraft_swagger.yml | 37 +- 72 files changed, 3517 insertions(+), 3071 deletions(-)
