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/12/28 08:01:24 UTC
[incubator-nlpcraft] branch NLPCRAFT-203 updated (714e357 ->
ab87f50)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-203
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 714e357 WIP.
new 5c7d10f Update NCIntentSolver.scala
add aef336a Dialog test added.
add cfe1da1 Merge branch 'master' into NLPCRAFT-178
add 057a27b WIP.
add 9c9950f SQL example schema builder fix.
add 5e67367 Merge branch 'master' into NLPCRAFT-178
add f84f793 WIP on refactoring flow matching imp (compiles BUT does not work yet).
add 810182b WIP.
add 75f2ff6 WIP.
add 7b27f9c WIP.
add f88c5d1 WIP.
add 7dbe239 WIP.
new ab87f50 Merge branch 'NLPCRAFT-178' into NLPCRAFT-203
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:
.../nlpcraft/examples/sql/db/SqlBuilder.scala | 4 +-
.../model/intent/impl/NCIntentDslCompiler.scala | 58 +-
.../model/intent/impl/NCIntentSolver.scala | 19 +-
.../model/intent/impl/NCIntentSolverEngine.scala | 68 +-
.../model/intent/impl/antlr4/NCIntentDsl.g4 | 18 +-
.../model/intent/impl/antlr4/NCIntentDsl.interp | 10 +-
.../model/intent/impl/antlr4/NCIntentDsl.tokens | 16 +-
.../impl/antlr4/NCIntentDslBaseListener.java | 50 +-
.../intent/impl/antlr4/NCIntentDslLexer.interp | 8 +-
.../model/intent/impl/antlr4/NCIntentDslLexer.java | 193 ++---
.../intent/impl/antlr4/NCIntentDslLexer.tokens | 16 +-
.../intent/impl/antlr4/NCIntentDslListener.java | 42 +-
.../intent/impl/antlr4/NCIntentDslParser.java | 819 +++++++--------------
.../model/intent/utils/NCDslFlowItem.scala | 43 --
.../nlpcraft/model/intent/utils/NCDslIntent.scala | 32 +-
.../nlpcraft/model/tools/test/NCTestClient.java | 8 +
.../model/tools/test/NCTestClientBuilder.java | 26 +
.../mgrs/model/NCModelSynonymDslCompiler.scala | 4 +-
.../model/antlr4/NCSynonymDslBaseListener.java | 2 +-
.../probe/mgrs/model/antlr4/NCSynonymDslLexer.java | 4 +-
.../mgrs/model/antlr4/NCSynonymDslListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslParser.java | 4 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
.../nlpcraft/server/ignite/NCIgniteHelpers.scala | 2 +-
.../nlpcraft/server/query/NCQueryManager.scala | 2 +-
.../nlpcraft/server/user/NCUserManager.scala | 2 +-
.../model/conversation/NCConversationSpec.scala | 1 +
.../nlpcraft/model/dialog/NCDialogSpec.scala | 124 ++++
.../intent/impl/NCIntentSolverEngineSpec.scala | 60 +-
pom.xml | 2 +-
30 files changed, 619 insertions(+), 1022 deletions(-)
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/utils/NCDslFlowItem.scala
create mode 100644 nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
[incubator-nlpcraft] 02/02: Merge branch 'NLPCRAFT-178' into
NLPCRAFT-203
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-203
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit ab87f50d4d8715655fdbc6678f7d88797dce6bbe
Merge: 5c7d10f 7dbe239
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Mon Dec 28 00:01:09 2020 -0800
Merge branch 'NLPCRAFT-178' into NLPCRAFT-203
.../nlpcraft/examples/sql/db/SqlBuilder.scala | 4 +-
.../model/intent/impl/NCIntentDslCompiler.scala | 58 +-
.../model/intent/impl/NCIntentSolver.scala | 17 +-
.../model/intent/impl/NCIntentSolverEngine.scala | 68 +-
.../model/intent/impl/antlr4/NCIntentDsl.g4 | 18 +-
.../model/intent/impl/antlr4/NCIntentDsl.interp | 10 +-
.../model/intent/impl/antlr4/NCIntentDsl.tokens | 16 +-
.../impl/antlr4/NCIntentDslBaseListener.java | 50 +-
.../intent/impl/antlr4/NCIntentDslLexer.interp | 8 +-
.../model/intent/impl/antlr4/NCIntentDslLexer.java | 193 ++---
.../intent/impl/antlr4/NCIntentDslLexer.tokens | 16 +-
.../intent/impl/antlr4/NCIntentDslListener.java | 42 +-
.../intent/impl/antlr4/NCIntentDslParser.java | 819 +++++++--------------
.../model/intent/utils/NCDslFlowItem.scala | 43 --
.../nlpcraft/model/intent/utils/NCDslIntent.scala | 32 +-
.../nlpcraft/model/tools/test/NCTestClient.java | 8 +
.../model/tools/test/NCTestClientBuilder.java | 26 +
.../mgrs/model/NCModelSynonymDslCompiler.scala | 4 +-
.../model/antlr4/NCSynonymDslBaseListener.java | 2 +-
.../probe/mgrs/model/antlr4/NCSynonymDslLexer.java | 4 +-
.../mgrs/model/antlr4/NCSynonymDslListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslParser.java | 4 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
.../nlpcraft/server/ignite/NCIgniteHelpers.scala | 2 +-
.../nlpcraft/server/query/NCQueryManager.scala | 2 +-
.../nlpcraft/server/user/NCUserManager.scala | 2 +-
.../model/conversation/NCConversationSpec.scala | 1 +
.../nlpcraft/model/dialog/NCDialogSpec.scala | 124 ++++
.../intent/impl/NCIntentSolverEngineSpec.scala | 60 +-
pom.xml | 2 +-
30 files changed, 618 insertions(+), 1021 deletions(-)
[incubator-nlpcraft] 01/02: Update NCIntentSolver.scala
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-203
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 5c7d10f7168909b489d894b9026ab42df6a79cf1
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sun Dec 27 23:58:29 2020 -0800
Update NCIntentSolver.scala
---
.../scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
index 835f4c6..8d684bb 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolver.scala
@@ -150,7 +150,7 @@ class NCIntentSolver(intents: List[(NCDslIntent/*Intent*/, NCIntentMatch ⇒ NCR
if (cbRes.getIntentId == null)
cbRes.setIntentId(res.intentId)
- logger.info(s"Intent '${res.intentId}' for variant #${res.variantIdx + 1} selected as the ${r("'best match'")}")
+ logger.info(s"Intent '${res.intentId}' for variant #${res.variantIdx + 1} selected as the ${r("'best match'")}.")
NCDialogFlowManager.addMatchedIntent(res.intentId, req.getUser.getId, ctx.getModel.getId, span)