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/05/22 06:42:54 UTC

[incubator-nlpcraft] branch NLPCRAFT-41 updated (21b6a09 -> 139b06e)

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

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


    from 21b6a09  Data holder fixes.
     add b9b63fc  NLPCRAFT-49: Probe hangs on stop.
     add 6feb86f  Merge pull request #2 from apache/NLPCRAFT-49
     add a91cfbb  Fixed h1/h2/h3 usage throughout the website for better SEO optimization.
     add 84cd731  WIP on sqlgen documentation.
     add e9f3b61  WIP.
     add 7e861a9  WIP.
     add 31c35d1  WIP.
     add 8124404  WIP.
     add 16226f5  Fix for NLPCRAFT-23.
     add 43f6613  WIP.
     add 85d47aa  WIP.
     add 947dbb5  WIP.
     add 2a064c1  Merge remote-tracking branch 'origin/master' into NLPCRAFT-13
     add 319e7d6  WIP.
     add dff470a  Merge remote-tracking branch 'origin/master' into sql-example-archive.
     add 218e651  Merge branch 'master' into NLPCRAFT-30
     add 6866a7b  WIP.
     add fa19dcf  WIP.
     add a37b24a  WIP.
     add 5ee71a2  SortEnricher bugfix.
     add 0ab1873  SortEnricher bugfix.
     add cf6c023  Fixes
     add fb807ae  WIP.
     add 41bca56  Merge branch 'master' into NLPCRAFT-30
     add 86b65df  WIP.
     add 3b7de5d  WIP.
     add efa4550  WIP.
     add 137c730  Merge branch 'master' into NLPCRAFT-30
     add f247805  WIP.
     add 7024e92  WIP.
     add 0b4c477  WIP.
     add 2515206  WIP.
     add a8351e9  WIP.
     add 6f05508  WIP.
     add d3b23c5  WIP.
     add 0fdbc79  WIP.
     add 5dd06c3  WIP.
     add 2057621  Licenses list updated.
     add e0a8542  Merge branch 'master' into NLPCRAFT-30
     add 3ced7bd  Licenses list updated.
     add ff54bb2  WIP.
     add 896811b  WIP.
     add 16b6351  WIP.
     add 1d47f2f  WIP.
     add a7a4305  WIP.
     add b6c7124  Merge branch 'master' into NLPCRAFT-30
     add b235d2d  Merge branch 'master' into NLPCRAFT-30
     add 06403d3  WIP.
     add b9621eb  WIP.
     add 8dd7d21  WIP.
     add f1cbe77  WIP.
     add c3aaa72  WIP.
     add fcd204e  WIP.
     add 45e32b8  WIP.
     add b8ab1b6  WIP.
     add eb1bc2d  WIP.
     add 8dcf60a  WIP.
     add 0e82186  WIP.
     add 6ba61ab  WIP.
     add b244b57  WIP.
     add 79985c5  WIP.
     add 6f5976a  WIP.
     add a3d2861  Merge branch 'master' into NLPCRAFT-30
     add c0e41e9  Licenses list updated.
     add 0698f9f  Licenses list updated.
     add dc1157a  SQL test model refactoring. SQL developer tests added, initial version.
     add bbe7876  Some comments added.
     add adf171a  Limit enricher fixed.
     add bb678a5  Limit enricher fixed.
     add 137ecd7  Some comments.
     add 9ec8fe9  Merge remote-tracking branch 'origin/master' into NLPCRAFT-30
     add c6c1719  CR,
     add 7019644  Refactoring & CR.
     add 736d55c  Refactoring & CR.
     add 6ee3d1e  Refactoring & CR.
     add afbe804  SQL model example javadoc and code comment added.
     add ee52c84  Initial generated SQL model added. It can be compared with extended.
     add ad958d1  Renaming.
     add a61c6c9  Utilities methods refactoring.
     add a8f3625  Utilities methods refactoring.
     add 364d05d  Utilities methods refactoring. Last iteration.
     add 0fc25c1  Merge branch 'NLPCRAFT-30-tmp' into NLPCRAFT-30
     add 0b0c2ad  Utilities methods refactoring. Last iteration.
     add aef1c56  CR.
     add 77e938b  CR.
     add f2664ce  Readme added. SQL server runner recovered.
     add ef16bc2  CR.
     add 4878ca4  CR.
     add 30e3fc0  Merge branch 'NLPCRAFT-30'
     new 139b06e  Merge branch 'master' into NLPCRAFT-41

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:
 bindist/LICENSE                                    |    6 +
 pom.xml                                            |    7 +
 src/main/resources/nlpcraft.conf                   |   19 +-
 .../apache/nlpcraft/common/nlp/NCNlpSentence.scala |  633 +++-
 .../nlpcraft/common/nlp/NCNlpSentenceNote.scala    |   43 +-
 .../org/apache/nlpcraft/common/util/NCUtils.scala  |    4 +-
 .../scala/org/apache/nlpcraft/examples/README.md   |    4 +-
 .../org/apache/nlpcraft/examples/alarm/README.md   |    8 +-
 .../org/apache/nlpcraft/examples/echo/README.md    |    8 +-
 .../apache/nlpcraft/examples/helloworld/README.md  |    8 +-
 .../examples/lightswitch/LightSwitchTest.java      |    2 +-
 .../apache/nlpcraft/examples/lightswitch/README.md |    8 +-
 .../org/apache/nlpcraft/examples/phone/README.md   |   12 +-
 .../nlpcraft/examples/{time => sql}/README.md      |   22 +-
 .../apache/nlpcraft/examples/sql/SqlModel.scala    |  427 +++
 .../org/apache/nlpcraft/examples/sql/SqlTest.scala |  688 ++++
 .../nlpcraft/examples/sql/db/SqlAccess.scala       |  141 +
 .../apache/nlpcraft/examples/sql/db/SqlBeans.scala |   63 +
 .../nlpcraft/examples/sql/db/SqlBuilder.scala      |  473 +++
 .../nlpcraft/examples/sql/db/SqlServer.scala       |  103 +
 .../nlpcraft/examples/sql/db/SqlValueLoader.scala  |   53 +
 .../org/apache/nlpcraft/examples/sql/db/model.png  |  Bin 0 -> 203011 bytes
 .../apache/nlpcraft/examples/sql/db/northwind.sql  | 3464 ++++++++++++++++++++
 .../apache/nlpcraft/examples/sql/sql_model.yaml    | 1500 +++++++++
 .../nlpcraft/examples/sql/sql_model_init.yaml      | 1409 ++++++++
 .../org/apache/nlpcraft/examples/time/README.md    |    8 +-
 .../org/apache/nlpcraft/examples/weather/README.md |    8 +-
 .../apache/nlpcraft/model/impl/NCTokenLogger.scala |   64 +-
 .../apache/nlpcraft/model/impl/NCValueImpl.java    |   50 -
 .../impl/antlr4/NCIntentDslBaseListener.java       |    2 +-
 .../intent/impl/antlr4/NCIntentDslBaseVisitor.java |    2 +-
 .../model/intent/impl/antlr4/NCIntentDslLexer.java |    2 +-
 .../intent/impl/antlr4/NCIntentDslListener.java    |    2 +-
 .../intent/impl/antlr4/NCIntentDslParser.java      |    2 +-
 .../intent/impl/antlr4/NCIntentDslVisitor.java     |    2 +-
 .../model/tools/sqlgen/NCSqlExtractor.java         |    4 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlLimit.java    |    5 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlSort.java     |    7 +-
 .../model/tools/sqlgen/impl/NCSqlBeans.scala       |   43 +-
 .../tools/sqlgen/impl/NCSqlExtractorImpl.scala     |  201 +-
 .../tools/sqlgen/impl/NCSqlSchemaBuilderImpl.scala |  146 +-
 .../model/tools/test/NCTestClientBuilder.java      |   19 +-
 .../org/apache/nlpcraft/probe/NCProbeBoot.scala    |    3 -
 .../nlpcraft/probe/mgrs/NCModelDecorator.scala     |   71 +-
 .../org/apache/nlpcraft/probe/mgrs/NCSynonym.scala |   40 +-
 .../conversation/NCConversationDescriptor.scala    |    8 +-
 .../model/antlr4/NCSynonymDslBaseListener.java     |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java |    2 +-
 .../probe/mgrs/model/antlr4/NCSynonymDslLexer.java |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslListener.java    |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslParser.java      |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslVisitor.java     |    2 +-
 .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala  |   49 +-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |   67 +-
 .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala |  134 +-
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |   17 +-
 .../nlp/enrichers/post/NCPostEnrichProcessor.scala |  805 -----
 .../enrichers/relation/NCRelationEnricher.scala    |   49 +-
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |  460 ++-
 .../apache/nlpcraft/server/geo/NCGeoManager.scala  |    2 +
 .../nlpcraft/examples/sql/NCSqlModelSpec.scala     |  181 +
 .../mgrs/nlp/enrichers/NCDefaultTestModel.scala    |    2 +
 .../mgrs/nlp/enrichers/NCEnricherBaseSpec.scala    |   54 +-
 .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala  |  121 +-
 .../nlp/enrichers/sort/NCEnricherSortSpec.scala    |   89 +-
 65 files changed, 10336 insertions(+), 1500 deletions(-)
 copy src/main/scala/org/apache/nlpcraft/examples/{time => sql}/README.md (76%)
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/SqlTest.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlBeans.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlBuilder.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlServer.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/SqlValueLoader.scala
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/model.png
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/db/northwind.sql
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
 create mode 100644 src/main/scala/org/apache/nlpcraft/examples/sql/sql_model_init.yaml
 delete mode 100644 src/main/scala/org/apache/nlpcraft/model/impl/NCValueImpl.java
 delete mode 100644 src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/post/NCPostEnrichProcessor.scala
 create mode 100644 src/test/scala/org/apache/nlpcraft/examples/sql/NCSqlModelSpec.scala


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

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

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

commit 139b06ed7c12eaf3fb530578f4a5e4a89020e7dc
Merge: 21b6a09 30e3fc0
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Fri May 22 09:42:33 2020 +0300

    Merge branch 'master' into NLPCRAFT-41

 bindist/LICENSE                                    |    6 +
 pom.xml                                            |    7 +
 src/main/resources/nlpcraft.conf                   |   19 +-
 .../apache/nlpcraft/common/nlp/NCNlpSentence.scala |  633 +++-
 .../nlpcraft/common/nlp/NCNlpSentenceNote.scala    |   43 +-
 .../org/apache/nlpcraft/common/util/NCUtils.scala  |    4 +-
 .../scala/org/apache/nlpcraft/examples/README.md   |    4 +-
 .../org/apache/nlpcraft/examples/alarm/README.md   |    8 +-
 .../org/apache/nlpcraft/examples/echo/README.md    |    8 +-
 .../apache/nlpcraft/examples/helloworld/README.md  |    8 +-
 .../examples/lightswitch/LightSwitchTest.java      |    2 +-
 .../apache/nlpcraft/examples/lightswitch/README.md |    8 +-
 .../org/apache/nlpcraft/examples/phone/README.md   |   12 +-
 .../nlpcraft/examples/{time => sql}/README.md      |   22 +-
 .../apache/nlpcraft/examples/sql/SqlModel.scala    |  427 +++
 .../org/apache/nlpcraft/examples/sql/SqlTest.scala |  688 ++++
 .../nlpcraft/examples/sql/db/SqlAccess.scala       |  141 +
 .../apache/nlpcraft/examples/sql/db/SqlBeans.scala |   63 +
 .../nlpcraft/examples/sql/db/SqlBuilder.scala      |  473 +++
 .../nlpcraft/examples/sql/db/SqlServer.scala       |  103 +
 .../nlpcraft/examples/sql/db/SqlValueLoader.scala  |   53 +
 .../org/apache/nlpcraft/examples/sql/db/model.png  |  Bin 0 -> 203011 bytes
 .../apache/nlpcraft/examples/sql/db/northwind.sql  | 3464 ++++++++++++++++++++
 .../apache/nlpcraft/examples/sql/sql_model.yaml    | 1500 +++++++++
 .../nlpcraft/examples/sql/sql_model_init.yaml      | 1409 ++++++++
 .../org/apache/nlpcraft/examples/time/README.md    |    8 +-
 .../org/apache/nlpcraft/examples/weather/README.md |    8 +-
 .../apache/nlpcraft/model/impl/NCTokenLogger.scala |   64 +-
 .../apache/nlpcraft/model/impl/NCValueImpl.java    |   50 -
 .../impl/antlr4/NCIntentDslBaseListener.java       |    2 +-
 .../intent/impl/antlr4/NCIntentDslBaseVisitor.java |    2 +-
 .../model/intent/impl/antlr4/NCIntentDslLexer.java |    2 +-
 .../intent/impl/antlr4/NCIntentDslListener.java    |    2 +-
 .../intent/impl/antlr4/NCIntentDslParser.java      |    2 +-
 .../intent/impl/antlr4/NCIntentDslVisitor.java     |    2 +-
 .../model/tools/sqlgen/NCSqlExtractor.java         |    4 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlLimit.java    |    5 +-
 .../nlpcraft/model/tools/sqlgen/NCSqlSort.java     |    7 +-
 .../model/tools/sqlgen/impl/NCSqlBeans.scala       |   43 +-
 .../tools/sqlgen/impl/NCSqlExtractorImpl.scala     |  201 +-
 .../tools/sqlgen/impl/NCSqlSchemaBuilderImpl.scala |  146 +-
 .../model/tools/test/NCTestClientBuilder.java      |   19 +-
 .../org/apache/nlpcraft/probe/NCProbeBoot.scala    |    3 -
 .../nlpcraft/probe/mgrs/NCModelDecorator.scala     |   71 +-
 .../org/apache/nlpcraft/probe/mgrs/NCSynonym.scala |   40 +-
 .../conversation/NCConversationDescriptor.scala    |    8 +-
 .../model/antlr4/NCSynonymDslBaseListener.java     |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java |    2 +-
 .../probe/mgrs/model/antlr4/NCSynonymDslLexer.java |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslListener.java    |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslParser.java      |    2 +-
 .../mgrs/model/antlr4/NCSynonymDslVisitor.java     |    2 +-
 .../nlpcraft/probe/mgrs/nlp/NCProbeEnricher.scala  |   49 +-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  |   67 +-
 .../mgrs/nlp/enrichers/limit/NCLimitEnricher.scala |  134 +-
 .../mgrs/nlp/enrichers/model/NCModelEnricher.scala |   17 +-
 .../nlp/enrichers/post/NCPostEnrichProcessor.scala |  805 -----
 .../enrichers/relation/NCRelationEnricher.scala    |   49 +-
 .../mgrs/nlp/enrichers/sort/NCSortEnricher.scala   |  460 ++-
 .../apache/nlpcraft/server/geo/NCGeoManager.scala  |    2 +
 .../nlpcraft/examples/sql/NCSqlModelSpec.scala     |  181 +
 .../mgrs/nlp/enrichers/NCDefaultTestModel.scala    |    2 +
 .../mgrs/nlp/enrichers/NCEnricherBaseSpec.scala    |   54 +-
 .../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala  |  121 +-
 .../nlp/enrichers/sort/NCEnricherSortSpec.scala    |   89 +-
 65 files changed, 10336 insertions(+), 1500 deletions(-)