This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-108
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-108 by this push:
new 538161e WIP.
538161e is described below
commit 538161ea704c56d2b83701af2d8cc11b9399bf1c
Author: Aaron Radzinski <[email protected]>
AuthorDate: Sat Oct 3 12:51:25 2020 -0700
WIP.
---
.../nlpcraft/common/ascii/NCAsciiTable.scala | 4 +++-
.../model/intent/impl/NCIntentSolver.scala | 2 +-
.../model/intent/impl/NCIntentSolverEngine.scala | 4 ++--
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +-
.../nlpcraft/probe/mgrs/model/NCModelManager.scala | 2 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 24 +++++++++++-----------
.../nlpcraft/server/query/NCQueryManager.scala | 12 +++++------
7 files changed, 26 insertions(+), 24 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
index 62a96bd..3b9796a 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
@@ -609,7 +609,9 @@ class NCAsciiTable {
for (_ ← 1 to margin.bottom)
tbl ++= s" \n"
- tbl.toString()
+ val res = tbl.toString
+
+ res.substring(0, res.length - 1)
}
/**
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 dde3624..835f4c6 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)
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 5168d12..3ff1e3c 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
@@ -249,11 +249,11 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
tbl += (
Seq(
s"#${m.variantIdx + 1}",
- r("<<best match")
+ r("'best match'")
),
Seq(
im.intent.id,
- r("<<best match")
+ r("'best match'")
),
mkPickTokens(im)
)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
index 0509216..0ff93a8 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -383,7 +383,7 @@ private [probe] object NCProbeBoot extends LazyLogging with
NCOpenCensusTrace {
val tbl = NCAsciiTable()
- tbl.margin(top = 1)
+ tbl.margin(bottom = 1, top = 1)
tbl += s"Probe started $ansiBlueFg$dur$ansiReset"
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
index eebe3d9..844df70 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelManager.scala
@@ -83,7 +83,7 @@ object NCModelManager extends NCService with DecorateAsScala {
})
}
- tbl.info(logger, Some(s"Models deployed: ${data.size}\n"))
+ tbl.info(logger, Some(s"Models deployed: ${data.size}"))
addTags(
span,
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 54bc85a..b8d27a9 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,18 +232,18 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
val tbl = NCAsciiTable()
tbl += (s"${b("Text")}", nlpSens.map(s ⇒ g(s.text)))
- tbl += (s"${b("Model ID$ansiReset")}", mdlId)
- tbl += (s"${b("User ID$ansiReset")}", usrId)
- tbl += (s"${b(" First Name$ansiReset")}",
senMeta.getOrElse("FIRST_NAME", ""))
- tbl += (s"${b(" Last Name$ansiReset")}",
senMeta.getOrElse("LAST_NAME", ""))
- tbl += (s"${b(" Email$ansiReset")}", senMeta.getOrElse("EMAIL", ""))
- tbl += (s"${b(" Company Name$ansiReset")}",
senMeta.getOrElse("COMPANY_NAME", ""))
- tbl += (s"${b(" Is Admin$ansiReset")}", senMeta.getOrElse("IS_ADMIN",
""))
- tbl += (s"${b(" Signup Date$ansiReset")}", new
Date(java.lang.Long.parseLong(senMeta("SIGNUP_TSTAMP").toString)))
- tbl += (s"${b("User Agent$ansiReset")}",
senMeta.getOrElse("USER_AGENT", ""))
- tbl += (s"${b("Remote Address$ansiReset")}",
senMeta.getOrElse("REMOTE_ADDR", ""))
- tbl += (s"${b("Server Timestamp$ansiReset")}", new
Date(java.lang.Long.parseLong(senMeta("RECEIVE_TSTAMP").toString)))
- tbl += (s"${b("Server Request ID$ansiReset")}", srvReqId)
+ tbl += (s"${b("Model ID")}", mdlId)
+ tbl += (s"${b("User ID")}", usrId)
+ tbl += (s"${b(" First Name")}", senMeta.getOrElse("FIRST_NAME", ""))
+ tbl += (s"${b(" Last Name")}", senMeta.getOrElse("LAST_NAME", ""))
+ tbl += (s"${b(" Email")}", senMeta.getOrElse("EMAIL", ""))
+ tbl += (s"${b(" Company Name")}", senMeta.getOrElse("COMPANY_NAME",
""))
+ tbl += (s"${b(" Is Admin")}", senMeta.getOrElse("IS_ADMIN", ""))
+ tbl += (s"${b(" Signup Date")}", new
Date(java.lang.Long.parseLong(senMeta("SIGNUP_TSTAMP").toString)))
+ tbl += (s"${b("User Agent")}", senMeta.getOrElse("USER_AGENT", ""))
+ tbl += (s"${b("Remote Address")}", senMeta.getOrElse("REMOTE_ADDR",
""))
+ tbl += (s"${b("Server Timestamp")}", new
Date(java.lang.Long.parseLong(senMeta("RECEIVE_TSTAMP").toString)))
+ tbl += (s"${b("Server Request ID")}", srvReqId)
logger.info(s"New request received from server:\n$tbl")
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 9b98da6..9ffbce5 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
@@ -264,12 +264,12 @@ object NCQueryManager extends NCService with
NCIgniteInstance with NCOpenCensusS
startScopedSpan("future", parent, "srvReqId" → srvReqId) { span ⇒
val tbl = NCAsciiTable()
- tbl += (s"${b("Text$ansiReset")}", g(txt0))
- tbl += (s"${b("User ID$ansiReset")}", usr.id)
- tbl += (s"${b("Model ID$ansiReset")}", mdlId)
- tbl += (s"${b("Agent$ansiReset")}",
usrAgent.getOrElse("<n/a>"))
- tbl += (s"${b("Remote Address$ansiReset")}",
rmtAddr.getOrElse("<n/a>"))
- tbl += (s"${b("Server Request ID$ansiReset")}", srvReqId)
+ 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>"))
+ tbl += (s"${b("Remote Address")}", rmtAddr.getOrElse("<n/a>"))
+ tbl += (s"${b("Server Request ID")}", srvReqId)
// TODO: need to pretty print data JSON
// tbl += (s"${ansiBlueFg}Data$ansiReset", data.getOrElse(""))
