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

[incubator-nlpcraft] branch NLPCRAFT-127 updated (1ffe0c4 -> 1245cb1)

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

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


    from 1ffe0c4  WIP.
     add 892f811  WIP.
     add 74b573e  WIP.
     new 1245cb1  Merge branch 'master' into NLPCRAFT-127

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:
 .../nlp/core/stanford/NCStanfordCoreManager.scala  |  14 +-
 .../nlp/core/stanford/NCStanfordNerEnricher.scala  |  19 ++-
 .../nlp/core/stanford/NCStanfordParser.scala       |  13 +-
 .../org/apache/nlpcraft/common/NCService.scala     |  53 ++++---
 .../common/extcfg/NCExternalConfigManager.scala    |  15 +-
 .../common/nlp/core/NCNlpCoreManager.scala         |  21 ++-
 .../nlp/core/opennlp/NCOpenNlpTokenizer.scala      |  25 +++-
 .../common/nlp/dict/NCDictionaryManager.scala      |  12 +-
 .../common/nlp/numeric/NCNumericManager.scala      |  10 +-
 .../org/apache/nlpcraft/common/util/NCUtils.scala  |  19 +--
 .../model/intent/impl/NCIntentSolver.scala         |   4 +-
 .../test/impl/NCTestAutoModelValidatorImpl.scala   |   5 +-
 .../nlpcraft/probe/mgrs/NCProbeSynonym.scala       |   5 +-
 .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala |  18 +++
 .../probe/mgrs/conn/NCConnectionManager.scala      |   4 +-
 .../mgrs/conversation/NCConversationManager.scala  |  13 +-
 .../probe/mgrs/deploy/NCDeployManager.scala        | 159 ++++++++++-----------
 .../mgrs/dialogflow/NCDialogFlowManager.scala      |  13 +-
 .../probe/mgrs/lifecycle/NCLifecycleManager.scala  |  22 ++-
 .../nlpcraft/probe/mgrs/model/NCModelManager.scala |  32 +++--
 .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala  |   3 +-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |  35 +++--
 .../dictionary/NCDictionaryEnricher.scala          |  23 +--
 .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala |  16 ++-
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |  13 +-
 .../enrichers/relation/NCRelationEnricher.scala    |  14 +-
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |  19 ++-
 .../enrichers/stopword/NCStopWordEnricher.scala    |  37 +++--
 .../suspicious/NCSuspiciousNounsEnricher.scala     |  13 +-
 .../mgrs/nlp/validate/NCValidateManager.scala      |  17 ++-
 .../nlpcraft/server/company/NCCompanyManager.scala |  17 ++-
 .../server/feedback/NCFeedbackManager.scala        |  15 +-
 .../apache/nlpcraft/server/geo/NCGeoManager.scala  |  26 ++--
 .../geo/tools/NCGeoSyntheticNamesGenerator.scala   |   3 +-
 .../lifecycle/NCServerLifecycleManager.scala       |  21 ++-
 .../server/nlp/core/NCNlpNerEnricher.scala         |   4 +-
 .../server/nlp/core/NCNlpServerManager.scala       |  13 +-
 .../nlp/core/google/NCGoogleNerEnricher.scala      |  23 ++-
 .../nlp/core/opennlp/NCOpenNlpNerEnricher.scala    |  25 +++-
 .../server/nlp/core/opennlp/NCOpenNlpParser.scala  |  19 ++-
 .../server/nlp/core/spacy/NCSpaCyNerEnricher.scala |  21 ++-
 .../nlp/enrichers/NCServerEnrichmentManager.scala  |  14 +-
 .../nlp/enrichers/basenlp/NCBaseNlpEnricher.scala  |  26 +++-
 .../coordinate/NCCoordinatesEnricher.scala         |  19 ++-
 .../server/nlp/enrichers/date/NCDateEnricher.scala | 131 +++++++++--------
 .../server/nlp/enrichers/geo/NCGeoEnricher.scala   |  21 ++-
 .../nlp/enrichers/numeric/NCNumericEnricher.scala  |  23 ++-
 .../nlp/enrichers/quote/NCQuoteEnricher.scala      |  23 ++-
 .../enrichers/stopword/NCStopWordEnricher.scala    |  16 ++-
 .../server/nlp/preproc/NCPreProcessManager.scala   |  17 ++-
 .../server/nlp/spell/NCSpellCheckManager.scala     |  19 ++-
 .../server/nlp/wordnet/NCWordNetManager.scala      |  16 ++-
 .../nlpcraft/server/probe/NCProbeManager.scala     |  18 +--
 .../server/proclog/NCProcessLogManager.scala       |  13 +-
 .../nlpcraft/server/query/NCQueryManager.scala     |  21 ++-
 .../nlpcraft/server/rest/NCBasicRestApi.scala      |  16 +--
 .../nlpcraft/server/rest/NCRestManager.scala       |  15 +-
 .../apache/nlpcraft/server/sql/NCSqlManager.scala  |  16 ++-
 .../server/sugsyn/NCSuggestSynonymManager.scala    |  15 +-
 .../apache/nlpcraft/server/tx/NCTxManager.scala    |  29 ++--
 .../nlpcraft/server/user/NCUserManager.scala       |  13 +-
 61 files changed, 895 insertions(+), 439 deletions(-)


[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-127

Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-127
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git

commit 1245cb18d33041537a360353b3c2f26937ae6395
Merge: 1ffe0c4 74b573e
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Thu Sep 17 10:54:40 2020 -0700

    Merge branch 'master' into NLPCRAFT-127

 .../nlp/core/stanford/NCStanfordCoreManager.scala  |  14 +-
 .../nlp/core/stanford/NCStanfordNerEnricher.scala  |  19 ++-
 .../nlp/core/stanford/NCStanfordParser.scala       |  13 +-
 .../org/apache/nlpcraft/common/NCService.scala     |  53 ++++---
 .../common/extcfg/NCExternalConfigManager.scala    |  15 +-
 .../common/nlp/core/NCNlpCoreManager.scala         |  21 ++-
 .../nlp/core/opennlp/NCOpenNlpTokenizer.scala      |  25 +++-
 .../common/nlp/dict/NCDictionaryManager.scala      |  12 +-
 .../common/nlp/numeric/NCNumericManager.scala      |  10 +-
 .../org/apache/nlpcraft/common/util/NCUtils.scala  |  19 +--
 .../model/intent/impl/NCIntentSolver.scala         |   4 +-
 .../test/impl/NCTestAutoModelValidatorImpl.scala   |   5 +-
 .../nlpcraft/probe/mgrs/NCProbeSynonym.scala       |   5 +-
 .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala |  18 +++
 .../probe/mgrs/conn/NCConnectionManager.scala      |   4 +-
 .../mgrs/conversation/NCConversationManager.scala  |  13 +-
 .../probe/mgrs/deploy/NCDeployManager.scala        | 159 ++++++++++-----------
 .../mgrs/dialogflow/NCDialogFlowManager.scala      |  13 +-
 .../probe/mgrs/lifecycle/NCLifecycleManager.scala  |  22 ++-
 .../nlpcraft/probe/mgrs/model/NCModelManager.scala |  32 +++--
 .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala  |   3 +-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |  35 +++--
 .../dictionary/NCDictionaryEnricher.scala          |  23 +--
 .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala |  16 ++-
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |  13 +-
 .../enrichers/relation/NCRelationEnricher.scala    |  14 +-
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |  19 ++-
 .../enrichers/stopword/NCStopWordEnricher.scala    |  37 +++--
 .../suspicious/NCSuspiciousNounsEnricher.scala     |  13 +-
 .../mgrs/nlp/validate/NCValidateManager.scala      |  17 ++-
 .../nlpcraft/server/company/NCCompanyManager.scala |  17 ++-
 .../server/feedback/NCFeedbackManager.scala        |  15 +-
 .../apache/nlpcraft/server/geo/NCGeoManager.scala  |  26 ++--
 .../geo/tools/NCGeoSyntheticNamesGenerator.scala   |   3 +-
 .../lifecycle/NCServerLifecycleManager.scala       |  21 ++-
 .../server/nlp/core/NCNlpNerEnricher.scala         |   4 +-
 .../server/nlp/core/NCNlpServerManager.scala       |  13 +-
 .../nlp/core/google/NCGoogleNerEnricher.scala      |  23 ++-
 .../nlp/core/opennlp/NCOpenNlpNerEnricher.scala    |  25 +++-
 .../server/nlp/core/opennlp/NCOpenNlpParser.scala  |  19 ++-
 .../server/nlp/core/spacy/NCSpaCyNerEnricher.scala |  21 ++-
 .../nlp/enrichers/NCServerEnrichmentManager.scala  |  14 +-
 .../nlp/enrichers/basenlp/NCBaseNlpEnricher.scala  |  26 +++-
 .../coordinate/NCCoordinatesEnricher.scala         |  19 ++-
 .../server/nlp/enrichers/date/NCDateEnricher.scala | 131 +++++++++--------
 .../server/nlp/enrichers/geo/NCGeoEnricher.scala   |  21 ++-
 .../nlp/enrichers/numeric/NCNumericEnricher.scala  |  23 ++-
 .../nlp/enrichers/quote/NCQuoteEnricher.scala      |  23 ++-
 .../enrichers/stopword/NCStopWordEnricher.scala    |  16 ++-
 .../server/nlp/preproc/NCPreProcessManager.scala   |  17 ++-
 .../server/nlp/spell/NCSpellCheckManager.scala     |  19 ++-
 .../server/nlp/wordnet/NCWordNetManager.scala      |  16 ++-
 .../nlpcraft/server/probe/NCProbeManager.scala     |  18 +--
 .../server/proclog/NCProcessLogManager.scala       |  13 +-
 .../nlpcraft/server/query/NCQueryManager.scala     |  21 ++-
 .../nlpcraft/server/rest/NCBasicRestApi.scala      |  16 +--
 .../nlpcraft/server/rest/NCRestManager.scala       |  15 +-
 .../apache/nlpcraft/server/sql/NCSqlManager.scala  |  16 ++-
 .../server/sugsyn/NCSuggestSynonymManager.scala    |  15 +-
 .../apache/nlpcraft/server/tx/NCTxManager.scala    |  29 ++--
 .../nlpcraft/server/user/NCUserManager.scala       |  13 +-
 61 files changed, 895 insertions(+), 439 deletions(-)

diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
index d40a6f8,0c4f07d..2b2e11d
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/sort/NCSortEnricher.scala
@@@ -507,15 -480,19 +507,18 @@@ object NCSortEnricher extends NCProbeEn
              }
          }
  
+     /**
+      *
+      * @param parent Optional parent span.
+      * @return
+      */
      override def start(parent: Span = null): NCService = startScopedSpan("start", parent) { _ ⇒
          // Single words.
-         sort =
-             SORT_WORDS.map(NCNlpCoreManager.stem)
 -        sort = Seq("sort", "rank", "classify", "order", "arrange", "organize", "segment", "shuffle")
 -            .map(NCNlpCoreManager.stem)
++        sort = SORT_WORDS.map(NCNlpCoreManager.stem)
  
          // Single words.
          // Cannot be same as in SORT.
- 
 -        by = Seq("by", "on", "with").map(NCNlpCoreManager.stem)
 +        by = BY_WORDS.map(NCNlpCoreManager.stem)
  
          // Multiple words.
          // Cannot be same as in SORT and BY.