[incubator-nlpcraft] branch NLPCRAFT-41 updated: Update NCProbeEnrichmentManager.scala

[ar...@apache.org]

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 b9d1d08  Update NCProbeEnrichmentManager.scala
b9d1d08 is described below

commit b9d1d08d230715611ed413f2848b3f568298c761
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Tue Sep 15 23:31:18 2020 -0700

    Update NCProbeEnrichmentManager.scala
---
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 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 4450542..54735a1 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
@@ -18,11 +18,13 @@
 package org.apache.nlpcraft.probe.mgrs.nlp
 
 import java.io.Serializable
+import java.time.LocalDateTime
 import java.util
-import java.util.Objects
+import java.util.{Date, Objects}
 import java.util.concurrent.{ExecutorService, Executors}
 import java.util.function.Predicate
 
+import akka.http.scaladsl.model.DateTime
 import io.opencensus.trace.{Span, Status}
 import org.apache.nlpcraft.common.NCErrorCodes._
 import org.apache.nlpcraft.common._
@@ -49,6 +51,7 @@ import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.stopword.NCStopWordEnricher
 import org.apache.nlpcraft.probe.mgrs.nlp.enrichers.suspicious.NCSuspiciousNounsEnricher
 import org.apache.nlpcraft.probe.mgrs.nlp.impl._
 import org.apache.nlpcraft.probe.mgrs.nlp.validate._
+import org.apache.nlpcraft.common.ansi.NCAnsiColor._
 
 import scala.collection.JavaConverters._
 import scala.collection.{Seq, _}
@@ -216,16 +219,23 @@ object NCProbeEnrichmentManager extends NCService with NCOpenCensusModelStats {
 
         var start = System.currentTimeMillis()
 
-        val tbl = NCAsciiTable("Text", "Model ID", "User ID", "Server Request ID")
-
-        tbl += (
-            nlpSens.map(_.text),
-            mdlId,
-            usrId,
-            srvReqId
-        )
-
-        logger.info(s"New request received:\n$tbl")
+        val tbl = NCAsciiTable()
+
+        tbl += (s"${ansiBlueFg}Text$ansiReset", nlpSens.map(_.text))
+        tbl += (s"${ansiBlueFg}Model ID$ansiReset", mdlId)
+        tbl += (s"${ansiBlueFg}User ID$ansiReset", usrId)
+        tbl += (s"${ansiBlueFg}  First Name$ansiReset", senMeta.getOrElse("FIRST_NAME", ""))
+        tbl += (s"${ansiBlueFg}  Last Name$ansiReset", senMeta.getOrElse("LAST_NAME", ""))
+        tbl += (s"${ansiBlueFg}  Email$ansiReset", senMeta.getOrElse("EMAIL", ""))
+        tbl += (s"${ansiBlueFg}  Company Name$ansiReset", senMeta.getOrElse("COMPANY_NAME", ""))
+        tbl += (s"${ansiBlueFg}  Is Admin$ansiReset", senMeta.getOrElse("IS_ADMIN", ""))
+        tbl += (s"${ansiBlueFg}  Signup Date$ansiReset", new Date(java.lang.Long.parseLong(senMeta("SIGNUP_TSTAMP").toString)))
+        tbl += (s"${ansiBlueFg}User Agent$ansiReset", senMeta.getOrElse("USER_AGENT", ""))
+        tbl += (s"${ansiBlueFg}Remote Address$ansiReset", senMeta.getOrElse("REMOTE_ADDR", ""))
+        tbl += (s"${ansiBlueFg}Server Timestamp$ansiReset", new Date(java.lang.Long.parseLong(senMeta("RECEIVE_TSTAMP").toString)))
+        tbl += (s"${ansiBlueFg}Server Request ID$ansiReset", srvReqId)
+
+        logger.info(s"New request received from server:\n$tbl")
         
         /**
           *
@@ -523,7 +533,7 @@ object NCProbeEnrichmentManager extends NCService with NCOpenCensusModelStats {
                 NCTokenLogger.prepareTable(sen.asScala).
                     info(
                         logger,
-                        Some(s"Parsing variant #${i + 1} for: $txt")
+                        Some(s"Parsing variant #${i + 1} for: '$txt")
                     )
             }
         }