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 2021/09/25 04:38:06 UTC
[incubator-nlpcraft] branch master updated: Fix for NLPCRAFT-455
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master by this push:
new 0789526 Fix for NLPCRAFT-455
0789526 is described below
commit 0789526e90f1a36fbcdc9f5bcb8ab99d5f75a6c1
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Fri Sep 24 21:37:58 2021 -0700
Fix for NLPCRAFT-455
---
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 41 ++++++++++------------
.../nlpcraft/server/probe/NCProbeManager.scala | 6 ++--
.../nlpcraft/server/query/NCQueryManager.scala | 2 +-
3 files changed, 22 insertions(+), 27 deletions(-)
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 4b6c697..26359e2 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
@@ -232,7 +232,7 @@ object NCProbeEnrichmentManager extends NCService with NCOpenCensusModelStats {
val tbl = NCAsciiTable()
- tbl += (s"${b("Text")}", nlpSens.map(s => rv(s.text)))
+ tbl += (s"${b("Text")}", nlpSens.map(s => rv(" " + s.text + " ")))
tbl += (s"${b("Model ID")}", mdlId)
tbl += (s"${b("User:")}", "")
tbl += (s"${b(" ID")}", usrId)
@@ -346,28 +346,23 @@ object NCProbeEnrichmentManager extends NCService with NCOpenCensusModelStats {
val durMs = U.now() - startMs.get
- if (errMsg.isEmpty)
- logger.info(s"" +
- s"\n" +
- s"${g("|>")}\n" +
- s"${g("|>")} ${bo(g("SUCCESS"))} result sent back to server [" +
- s"srvReqId=${m(srvReqId)}, " +
- s"type=${resType.getOrElse("")}, " +
- s"dur=${durMs}ms" +
- s"]\n" +
- s"${g("|>")}"
- )
- else
- logger.info(s"" +
- s"\n" +
- s"${r("|X")}\n" +
- s"${r("|X")} ${bo(r("REJECT"))} result sent back to server [" +
- s"srvReqId=${m(srvReqId)}, " +
- s"response=${errMsg.get}, " +
- s"dur=${durMs}ms" +
- s"]\n" +
- s"${r("|X")}"
- )
+ val tbl = NCAsciiTable()
+
+ if (errMsg.isEmpty) {
+ tbl += (s"${gb(w(" SUCCESS "))}", "")
+ tbl += (s"${g("---------")}", "")
+ tbl += (s"${b("Result type")}", resType.getOrElse(""))
+ }
+ else {
+ tbl += (s"${rb(w(" REJECT "))}", "")
+ tbl += (s"${r("--------")}", "")
+ tbl += (s"${r("Error")}", s"${r(errMsg.get)}")
+ }
+
+ tbl += (s"${b("Probe duration")}", s"${durMs}ms")
+ tbl += (s"${b("Server Request ID")}", m(srvReqId))
+
+ logger.info(s"\n$tbl")
}
val mdl = NCModelManager.getModel(mdlId, span)
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 d5b3ba9..e8265e1 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
@@ -762,10 +762,10 @@ object NCProbeManager extends NCService {
errCode
)
- logger.trace(s"Error result processed [srvReqId=${m(srvReqId)}, error=$err, code=$errCode]")
+ logger.info(s"${rb(w(" REJECT "))} result processed [srvReqId=${m(srvReqId)}, error=$err, code=$errCode]")
}
else { // OK result.
- require(resTypeOpt.isDefined && resBodyOpt.isDefined, "Result defined")
+ require(resTypeOpt.isDefined && resBodyOpt.isDefined)
NCQueryManager.setResult(
srvReqId,
@@ -776,7 +776,7 @@ object NCProbeManager extends NCService {
intentId
)
- logger.trace(s"OK result processed [srvReqId=${m(srvReqId)}]")
+ logger.info(s"${gb(w(" SUCCESS "))} result processed [srvReqId=${m(srvReqId)}]")
}
}
catch {
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
index a12a4e8..877cf60 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/query/NCQueryManager.scala
@@ -262,7 +262,7 @@ object NCQueryManager extends NCService with NCIgniteInstance with NCOpenCensusS
startScopedSpan("future", parent, "srvReqId" -> srvReqId) { span =>
val tbl = NCAsciiTable()
- tbl += (s"${b("Text")}", rv(txt0))
+ tbl += (s"${b("Text")}", rv(" " + txt0 + " "))
tbl += (s"${b("User ID")}", usr.id)
tbl += (s"${b("Model ID")}", mdlId)
tbl += (s"${b("Agent")}", usrAgent.getOrElse("<n/a>"))