This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-206 by this push:
new 9a6d6bd WIP.
9a6d6bd is described below
commit 9a6d6bda2b8ad9ca4db62e1647e3affad66c9965
Author: Aaron Radzinzski <[email protected]>
AuthorDate: Thu Mar 11 06:54:01 2021 -0800
WIP.
---
.../apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 8 ++++----
.../scala/org/apache/nlpcraft/server/probe/NCProbeManager.scala | 2 +-
.../scala/org/apache/nlpcraft/server/query/NCQueryManager.scala | 2 +-
3 files changed, 6 insertions(+), 6 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 21322de..34f3418 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
@@ -245,7 +245,7 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
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")}", rv(g(srvReqId)))
+ tbl += (s"${b("Server Request ID")}", m(srvReqId))
logger.info(s"New request received from server:\n$tbl")
@@ -343,7 +343,7 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
s"\n" +
s"${g("|")}\n" +
s"${g("|")} ${bo(g("SUCCESS"))} result sent back to server
[" +
- s"srvReqId=${rv(g(srvReqId))}, " +
+ s"srvReqId=${m(srvReqId)}, " +
s"type=${resType.getOrElse("")}, " +
s"dur=${durMs}ms" +
s"]\n" +
@@ -354,7 +354,7 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
s"\n" +
s"${r("|")}\n" +
s"${r("|")} ${bo(r("REJECT"))} result sent back to server
[" +
- s"srvReqId=${rv(g(srvReqId))}, " +
+ s"srvReqId=${m(srvReqId)}, " +
s"response=${errMsg.get}, " +
s"dur=${durMs}ms" +
s"]\n" +
@@ -681,7 +681,7 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
"errMsg" → e.getMessage
)
- U.prettyError(logger,s"Rejection for server request
ID: ${rv(g(srvReqId))}", e)
+ U.prettyError(logger,s"Rejection for server request
ID: ${m(srvReqId)}", e)
val res = mdl.model.onRejection(solverIn.intentMatch,
e)
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 88b85f5..20902a8 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
@@ -911,7 +911,7 @@ object NCProbeManager extends NCService {
s"txt='$txt', " +
s"mdlId=$mdlId, " +
s"probeId=${holder.probeKey.probeId}, " +
- s"srvReqId=${rv(g(srvReqId))}" +
+ s"srvReqId=${m(srvReqId)}" +
s"]")
addTags(
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 22d02a5..411651e 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
@@ -272,7 +272,7 @@ object NCQueryManager extends NCService with
NCIgniteInstance with NCOpenCensusS
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")}", rv(g(srvReqId)))
+ tbl += (s"${b("Server Request ID")}", m(srvReqId))
tbl += (s"${b("Data")}",
U.prettyJson(data.orNull).split("\n").toSeq)
logger.info(s"New request received:\n$tbl")
