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
The following commit(s) were added to refs/heads/NLPCRAFT-203 by this push:
new 44f40d6 WIP.
44f40d6 is described below
commit 44f40d6401770e829c2de8a407baaecf96f98d6e
Author: Aaron Radzinski <[email protected]>
AuthorDate: Tue Dec 29 13:47:11 2020 -0800
WIP.
---
.../model/intent/impl/NCIntentSolverEngine.scala | 23 +++++++++++++++++++++-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 6 +++---
.../nlpcraft/server/probe/NCProbeManager.scala | 2 +-
pom.xml | 2 +-
4 files changed, 27 insertions(+), 6 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
index 2ad5380..5897fd1 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/impl/NCIntentSolverEngine.scala
@@ -194,6 +194,7 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
variant: NCIntentSolverVariant, // Variant used for the match.
variantIdx: Int // Variant index.
)
+
val req = ctx.getRequest
startScopedSpan("solve",
@@ -416,11 +417,31 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
intentW += termMatch.weight
intentGrps += TermTokensGroup(termMatch.termId,
termMatch.usedTokens)
lastTermMatch = termMatch
+
+ logger.whenInfoEnabled {
+ val tbl = NCAsciiTable()
+
+ val w = termMatch.weight.toSeq
+
+ tbl += (s"${B}Intent ID$RST",
s"$BO${intent.id}$RST")
+ tbl += (s"${B}Term$RST", term.toString)
+ tbl += (s"${B}Match tokens$RST",
termMatch.usedTokens.map(t ⇒ {
+ val txt = t.token.getOriginalText
+ val idx = t.token.getIndex
+
+ s"$txt${c("[" + idx + "]")}"
+ }).mkString("|"))
+ tbl += (s"${B}Match weight$RST",
+ s"${y("STK:")}${w.head},
${y("CDW:")}${w(1)}, ${y("MIN:")}${w(2)}, ${y("MAX:")}${w(3)}"
+ )
+
+ tbl.info(logger, Some("Term match found:"))
+ }
}
case None ⇒
// Term is missing. Stop further processing for this
intent. This intent cannot be matched.
- logger.info(s"Intent '$intentId' ${r("did not")} match
because of unmatched term '$term' $varStr.")
+ logger.info(s"Intent '$intentId' ${r("did not")} match
because of unmatched term '$Y$term$RST' $varStr.")
abort = true
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index a5cab2e..fcdbb09 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@ -335,9 +335,9 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
NCConnectionManager.send(msg, span)
if (errMsg.isEmpty)
- logger.info(s"OK result sent back to server
[srvReqId=$srvReqId, type=${resType.getOrElse("")}]")
+ logger.info(s"OK result sent back to server
[srvReqId=${rv(g(srvReqId))}, type=${resType.getOrElse("")}]")
else
- logger.info(s"REJECT response sent back to server
[srvReqId=$srvReqId, response=${errMsg.get}]")
+ logger.info(s"REJECT response sent back to server
[srvReqId=${rv(g(srvReqId))}, response=${errMsg.get}]")
}
val mdl = NCModelManager.getModel(mdlId, span)
@@ -653,7 +653,7 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
"errMsg" → e.getMessage
)
- logger.info(s"Rejection [srvReqId=$srvReqId,
msg=${e.getMessage}]")
+ logger.info(s"Rejection [srvReqId=${rv(g(srvReqId))},
msg=${e.getMessage}]")
if (e.getCause != null)
logger.info(s"Rejection cause:", e.getCause)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
index 51e4110..8e210ac 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala
@@ -907,7 +907,7 @@ object NCProbeManager extends NCService {
s"txt='$txt', " +
s"mdlId=$mdlId, " +
s"probeId=${holder.probeKey.probeId}, " +
- s"srvReqId=$srvReqId" +
+ s"srvReqId=${rv(g(srvReqId))}" +
s"]")
addTags(
diff --git a/pom.xml b/pom.xml
index e68c0ef..1c59570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<scala.base>2.12</scala.base>
<!-- Versions. -->
- <ignite.ver>2.9.0</ignite.ver>
+ <ignite.ver>2.9.1</ignite.ver>
<gridgain.agent.ver>2.8.1.2</gridgain.agent.ver>
<scala.plugin.ver>4.3.1</scala.plugin.ver>
<log4j.ver>2.12.0</log4j.ver>
