You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/09/13 15:13:27 UTC

[incubator-nlpcraft] branch NLPCRAFT-113 updated (2556cfd -> 335a90c)

This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a change to branch NLPCRAFT-113
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.


    from 2556cfd  WIP.
     add ec52019  WIP.
     add 5401f57  WIP.
     add 8296a9c  WIP.
     add fb0f5c7  WIP.
     add 0edaea8  WIP.
     add 707bfa7  WIP.
     add 49de5c6  WIP.
     add 0d94a1e  WIP.
     add 33e5eba  WIP.
     add 11f0c98  WIP.
     add 3c1b0f7  WIP.
     add b3bd2cb  WIP.
     add 61c72e8  WIP.
     add c8ad9a7  Merge branch 'master' into NLPCRAFT-41
     add b401869  WIP.
     add 3779be9  Merge branch 'master' into NLPCRAFT-41
     add 6c64680  Inspection design proposal.
     add f3895f0  WIP.
     add cca3eeb  WIP.
     add 7c71200  WIP.
     add ca40a33  WIP.
     add 26d57f1  WIP.
     add 9403b9b  Merge branch 'master' into NLPCRAFT-41
     add aef586f  WIP.
     add a488e43  WIP.
     add 9b58e6b  Update NCBasicRestApi.scala
     add 499b254  Fixed most warnings.
     add 6371b76  Update NCBasicRestApi.scala
     add eae496a  WIP.
     add 8621fa4  WIP.
     add 09beffb  WIP.
     add f4484ac  Update NCSuggestionInspection.scala
     add 4108c65  WIP.
     add c673bb9  Update NCProbeEnrichmentManager.scala
     add 6393f3f  WIP.
     add 8e7022b  Merge branch 'NLPCRAFT-41' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-41
     add a978ac7  Update NCModelFileAdapter.java
     add 1110d0b  WIP.
     add c574058  WIP.
     add d1974fe  Merge branch 'NLPCRAFT-41' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-41
     add fd70576  WIP.
     add fce8033  WIP.
     add fabb725  WIP.
     add 0a43b55  Refactoring WIP.
     add 45848a9  WIP.
     add 10431d8  WIP.
     add d5149aa  Update NCSuggestSynonymManager.scala
     add d87440e  WIP.
     add f8f600b  WIP.
     add aa6399d  WIP.
     add 14b8ad8  Update nlpcraft.conf
     add 02bab36  Merge branch 'NLPCRAFT-41' into NLPCRAFT-41-1
     add bdc8a1b  WIP.
     add 4ed0e3f  WIP.
     add c3ad67d  WIP.
     add 5fbdd3b  WIP.
     add 2af9dad  WIP.
     add 123e5cc  WIP.
     add f82235e  WIP.
     add 867a3e0  WIP.
     add 1b5e967  WIP.
     add 123e19a  Merge branch 'NLPCRAFT-41-2' into NLPCRAFT-41
     add 6ef5588  WIP.
     add 2297c9c  WIP.
     add 59588ba  Merge branch 'NLPCRAFT-41' into NLPCRAFT-41-config
     add f6e071c  WIP.
     add e5f470f  Merge branch 'NLPCRAFT-41' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-41
     add 4379c7c  Merge branch 'NLPCRAFT-41' into NLPCRAFT-41-config
     add f96ed1a  WIP.
     add 2a2eb05  WIP.
     add 833479e  WIP.
     add 0b2b3c4  Update NCDeployManager.scala
     add fae2ab4  WIP.
     add b8be015  Update NCDeployManager.scala
     add c6fa57e  Update NCConversationManager.scala
     add 5e8bd67  WIP.
     add 4ab4d49  WIP.
     add 59e8f71  WIP.
     add 5a84b1e  Merge branch 'NLPCRAFT-41' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-41
     add bf46b0e  WIP.
     add 649d4b4  Fixing refactoring.
     add 93512f9  Update NCTestExampleModelsSpec.scala
     add 53b0da8  Update TimeModel.java
     add 2e74f63  WIP.
     add 5edb8b5  WIP.
     add 43f7a0f  Fix.
     add 38b6311  Update NCServer.scala
     new 335a90c  Merge branch 'NLPCRAFT-41' into NLPCRAFT-113

The 1 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:
 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 ++++++++++++++++++--
 .../nlpcraft/probe/mgrs/deploy/NCModelHolder.scala |   31 -
 .../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}           |   41 +-
 .../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 +-
 73 files changed, 3516 insertions(+), 3114 deletions(-)
 delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/impl/NCModelImpl.scala
 delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentScanner.scala
 rename nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/conversation/{NCConversationDescriptor.scala => NCConversation.scala} (84%)
 delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCModelHolder.scala
 rename nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/{NCModelDecorator.scala => nlp/NCModelData.scala} (56%)
 delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceManager.scala
 delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceSuggestion.scala
 create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/server/sugsyn/NCSuggestSynonymManager.scala
 copy nlpcraft/src/main/scala/org/apache/nlpcraft/{model/tools/sqlgen/NCSqlDateRange.java => server/sugsyn/NCSuggestSynonymResult.scala} (55%)
 rename nlpcraft/src/test/scala/org/apache/nlpcraft/{NCTestAutoModelValidatorSpec.scala => NCTestExampleModelsSpec.scala} (58%)
 rename nlpcraft/src/test/scala/org/apache/nlpcraft/model/tools/{NCSqlModelEngineSpec.scala => sqlgen/impl/NCSqlModelGeneratorImplSpec.scala} (96%)


[incubator-nlpcraft] 01/01: Merge branch 'NLPCRAFT-41' into NLPCRAFT-113

Posted by se...@apache.org.
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 <se...@apache.org>
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(-)