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 2021/07/26 07:59:51 UTC
[incubator-nlpcraft] branch NLPCRAFT-376 updated (3268c58 ->
4b98215)
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a change to branch NLPCRAFT-376
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 3268c58 WIP.
new aea0733 WIP.
add 4564f42 WIP.
add 6921b14 Merge branch 'master' into NLPCRAFT-371
add 60f2786 WIP.
add f5d938a WIP.
add d4a7dbc WIP.
add 86cfff4 WIP.
add 57f2469 WIP on NLPCRAFT-371
add 69ee467 WIP.
add c57db77 WIP on code review & fixes for NLPCRAFT-371.
add 019ac6f WIP on NLPCRAFT-371.
add e8fe512 WIP on NLPCRAFT-371.
add 616deb4 Update NCCliCommands.scala
add 7af50af WIP.
add e6af296 WIP on NLPCRAFT-379.
add e66facf WIP on NLPCRAFT-379
add 25e2e36 WIP on NLPCRAFT-379
new 4b98215 Merge branch 'master' into NLPCRAFT-376
The 2 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:
.../apache/nlpcraft/examples/sql/SqlModel.scala | 2 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 4 +
.../org/apache/nlpcraft/model/NCModelView.java | 5 +
.../nlpcraft/model/tools/cmdline/NCCli.scala | 114 +++++++++-
.../nlpcraft/model/tools/cmdline/NCCliBase.scala | 9 +-
.../model/tools/cmdline/NCCliCommands.scala | 150 ++++++++++----
.../model/tools/cmdline/NCCliRestSpec.scala | 19 ++
.../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 230 ++++++++++++++++++---
.../probe/mgrs/conn/NCConnectionManager.scala | 4 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 8 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 18 +-
.../nlpcraft/server/mdo/NCProbeModelMdo.scala | 3 +-
.../opencensus/NCOpenCensusServerStats.scala | 7 +-
.../nlpcraft/server/probe/NCProbeManager.scala | 162 +++++++++++++--
.../nlpcraft/server/rest/NCBasicRestApi.scala | 229 +++++++++++++++-----
.../server/sugsyn/NCSuggestSynonymManager.scala | 38 ++--
.../scala/org/apache/nlpcraft/NCTestElement.scala | 20 +-
.../models/stm/NCStmIndexesTestModelSpec.scala | 4 +-
.../nlpcraft/server/rest/NCRestModelSpec.scala | 75 ++++++-
.../apache/nlpcraft/server/rest/NCRestSpec.scala | 1 -
.../nlpcraft/server/rest/RestTestModel.scala | 5 +-
openapi/nlpcraft_swagger.yml | 128 +++++++++++-
22 files changed, 1023 insertions(+), 212 deletions(-)
[incubator-nlpcraft] 02/02: Merge branch 'master' into NLPCRAFT-376
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-376
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 4b98215ee23bb7736fc25a24a19d6e818a7cd059
Merge: aea0733 25e2e36
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Mon Jul 26 10:59:32 2021 +0300
Merge branch 'master' into NLPCRAFT-376
.../org/apache/nlpcraft/common/util/NCUtils.scala | 4 +
.../org/apache/nlpcraft/model/NCModelView.java | 5 +
.../nlpcraft/model/tools/cmdline/NCCli.scala | 114 +++++++++-
.../nlpcraft/model/tools/cmdline/NCCliBase.scala | 9 +-
.../model/tools/cmdline/NCCliCommands.scala | 150 ++++++++++----
.../model/tools/cmdline/NCCliRestSpec.scala | 19 ++
.../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 230 ++++++++++++++++++---
.../probe/mgrs/conn/NCConnectionManager.scala | 4 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 8 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 18 +-
.../nlpcraft/server/mdo/NCProbeModelMdo.scala | 3 +-
.../opencensus/NCOpenCensusServerStats.scala | 7 +-
.../nlpcraft/server/probe/NCProbeManager.scala | 162 +++++++++++++--
.../nlpcraft/server/rest/NCBasicRestApi.scala | 229 +++++++++++++++-----
.../server/sugsyn/NCSuggestSynonymManager.scala | 38 ++--
.../scala/org/apache/nlpcraft/NCTestElement.scala | 20 +-
.../nlpcraft/server/rest/NCRestModelSpec.scala | 75 ++++++-
.../apache/nlpcraft/server/rest/NCRestSpec.scala | 1 -
.../nlpcraft/server/rest/RestTestModel.scala | 5 +-
openapi/nlpcraft_swagger.yml | 128 +++++++++++-
20 files changed, 1020 insertions(+), 209 deletions(-)
[incubator-nlpcraft] 01/02: WIP.
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-376
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit aea073381791d8e3f471f6e0dfea8d7d321ab567
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Fri Jul 23 11:46:11 2021 +0300
WIP.
---
.../sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala | 2 +-
.../org/apache/nlpcraft/models/stm/NCStmIndexesTestModelSpec.scala | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
index 181ae8b..6e5753f 100644
--- a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -421,7 +421,7 @@ class SqlModel extends NCModelFileAdapter("sql_model.yaml") with LazyLogging {
def isColumn(t: NCToken): Boolean = findAnyColumnTokenOpt(t).isDefined
def isDate(t: NCToken): Boolean = t.getId == "nlpcraft:date"
- val ok = toks.forall(isValue) || toks.forall(isColumn) || toks.size == 1 && isDate(toks.head)
+ val ok = toks.forall(isValue) || toks.size == 1 && isDate(toks.head)
if (!ok) {
m.getContext.getConversation.clearStm(_ => true)
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmIndexesTestModelSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmIndexesTestModelSpec.scala
index 801103d..9965597 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmIndexesTestModelSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmIndexesTestModelSpec.scala
@@ -51,12 +51,12 @@ class NCStmIndexesTestModel extends NCModelAdapter("nlpcraft.stm.idxs.test", "ST
def str(t: NCToken): String = s"${t.origText}(${t.index})"
println(s"variant: ${ctx.getVariant.asScala.map(str).mkString("|")}")
+ println(s"variant sort bynotes: $bynotes")
+ println(s"variant sort byindexes: $byindexes")
println(s"variant freeTokens: ${ctx.getVariant.getFreeTokens.asScala.map(str).mkString("|")}")
println(s"variant matchedTokens: ${ctx.getVariant.getMatchedTokens.asScala.map(str).mkString("|")}")
println(s"variant userDefinedTokens: ${ctx.getVariant.getUserDefinedTokens.asScala.map(str).mkString("|")}")
println(s"variant conversation: ${ctx.getContext.getConversation.getTokens.asScala.map(str).mkString("|")}")
- println(s"bynotes: $bynotes")
- println(s"byindexes: $byindexes")
NCResult.text("OK")
}