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/09/16 06:10:07 UTC
[incubator-nlpcraft] branch NLPCRAFT-41 updated: Improving logging.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-41
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-41 by this push:
new c64b20c Improving logging.
c64b20c is described below
commit c64b20c8c68d4debf2a781dcb3270657b8280d17
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Tue Sep 15 23:07:32 2020 -0700
Improving logging.
---
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 16 ++++++-------
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
.../nlpcraft/server/query/NCQueryManager.scala | 26 ++++++++++++----------
.../mgrs/nlp/enrichers/NCEnricherBaseSpec.scala | 3 ++-
4 files changed, 25 insertions(+), 22 deletions(-)
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 6a2d6dd..15d1f83 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -362,14 +362,14 @@ private [probe] object NCProbeBoot extends LazyLogging with NCOpenCensusTrace {
val ver = NCVersion.getCurrent
- tbl += ("Probe ID", s"$ansiReversed${cfg.id}$ansiReset")
- tbl += ("Probe Token", cfg.token)
- tbl += ("API Version", ver.version + ", " + ver.date.toString)
- tbl += ("Down-Link", cfg.downLinkString)
- tbl += ("Up-Link", cfg.upLinkString)
- tbl += ("Lifecycle", cfg.lifecycle)
- tbl += (s"Models (${cfg.modelsSeq.size})" , cfg.modelsSeq)
- tbl += ("JARs Folder", cfg.jarsFolder.getOrElse(""))
+ tbl += (s"${ansiBlueFg}Probe ID$ansiReset", s"$ansiReversed${cfg.id}$ansiReset")
+ tbl += (s"${ansiBlueFg}Probe Token$ansiReset", cfg.token)
+ tbl += (s"${ansiBlueFg}API Version$ansiReset", ver.version + ", " + ver.date.toString)
+ tbl += (s"${ansiBlueFg}Down-Link$ansiReset", cfg.downLinkString)
+ tbl += (s"${ansiBlueFg}Up-Link$ansiReset", cfg.upLinkString)
+ tbl += (s"${ansiBlueFg}Lifecycle$ansiReset", cfg.lifecycle)
+ tbl += (s"${ansiBlueFg}Models (${cfg.modelsSeq.size})$ansiReset" , cfg.modelsSeq)
+ tbl += (s"${ansiBlueFg}JARs Folder$ansiReset", cfg.jarsFolder.getOrElse(""))
tbl.info(logger, Some("Probe Configuration:"))
}
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 24f98d5..4450542 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
@@ -225,7 +225,7 @@ object NCProbeEnrichmentManager extends NCService with NCOpenCensusModelStats {
srvReqId
)
- logger.info(s"New sentence received:\n$tbl")
+ logger.info(s"New request received:\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 8590861..dc04e7f 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
@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap
import io.opencensus.trace.Span
import org.apache.ignite.IgniteCache
import org.apache.ignite.events.{CacheEvent, EventType}
+import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.apache.nlpcraft.common.{NCService, _}
import org.apache.nlpcraft.server.opencensus._
import org.apache.nlpcraft.server.apicodes.NCApiStatusCode._
@@ -34,6 +35,7 @@ import org.apache.nlpcraft.server.probe.NCProbeManager
import org.apache.nlpcraft.server.proclog.NCProcessLogManager
import org.apache.nlpcraft.server.tx.NCTxManager
import org.apache.nlpcraft.server.user.NCUserManager
+import org.apache.nlpcraft.common.ansi.NCAnsiColor._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.{Future, Promise}
@@ -248,20 +250,20 @@ object NCQueryManager extends NCService with NCIgniteInstance with NCOpenCensusS
Future {
startScopedSpan("future", parent, "srvReqId" → srvReqId) { span ⇒
+ val tbl = NCAsciiTable()
+
+ tbl += (s"${ansiBlueFg}Text$ansiReset", txt0)
+ tbl += (s"${ansiBlueFg}User ID$ansiReset", usr.id)
+ tbl += (s"${ansiBlueFg}Model ID$ansiReset", mdlId)
+ tbl += (s"${ansiBlueFg}Agent$ansiReset", usrAgent.getOrElse("<n/a>"))
+ tbl += (s"${ansiBlueFg}Remote Address$ansiReset", rmtAddr.getOrElse("<n/a>"))
+ tbl += (s"${ansiBlueFg}Server Request ID$ansiReset", srvReqId)
+ tbl += (s"${ansiBlueFg}Data$ansiReset", data.getOrElse(""))
+
+ logger.info(s"New request received:\n$tbl")
+
val enabledBuiltInToks = NCProbeManager.getModel(mdlId, span).enabledBuiltInTokens
- val toksStr = enabledBuiltInToks.toSeq.
- sortBy(t ⇒ (if (t.startsWith("nlpcraft:")) 0
- else 1, t)).
- mkString(",")
-
- logger.info(s"New request received " +
- s"[txt='$txt0'" +
- s", usrId=${usr.id}" +
- s", mdlId=$mdlId" +
- s", enabledBuiltInTokens=$toksStr" +
- s"]")
-
// Enrich the user input and send it to the probe.
NCProbeManager.askProbe(
srvReqId,
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala
index 291b704..bb0548c 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnricherBaseSpec.scala
@@ -37,9 +37,10 @@ class NCEnricherBaseSpec {
getModelClass match {
case Some(claxx) ⇒
- println(s"Embedded probe is going to start with model [id=$mdlId, claxx=${claxx.getName}]")
+ println(s"Embedded probe is going to start with model [id=$mdlId, class=${claxx.getName}]")
NCEmbeddedProbe.start(claxx)
+
case None ⇒
println(s"Probe should be already started as external process: $mdlId")
}