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/18 08:40:52 UTC
[incubator-nlpcraft] branch master updated: Improving logging.
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 6ec63eb Improving logging.
6ec63eb is described below
commit 6ec63eba31f4630ef4da945ffe0cc08db2dc4a1b
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Fri Sep 18 01:40:39 2020 -0700
Improving logging.
---
.../org/apache/nlpcraft/common/util/NCUtils.scala | 24 ++++++++++------------
.../probe/mgrs/deploy/NCDeployManager.scala | 12 +++++++----
.../nlpcraft/probe/mgrs/model/NCModelManager.scala | 4 +++-
3 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index 1aa87a1..db9082f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@ -1423,24 +1423,22 @@ object NCUtils extends LazyLogging {
val buf = mutable.Buffer.empty[String]
var inQuotes = false
- var isValue = false
for (ch ← json) {
ch match {
- case ':' ⇒ buf += s"$ansiGreenFg:$ansiReset"; isValue = true
- case '[' | ']' | '{' | '}' | ',' ⇒ buf += s"$ansiBold$ansiYellowFg$ch$ansiReset"
- case '"' ⇒ inQuotes = !inQuotes; buf += s"$ansiBlueFg$ch$ansiReset"
- case _ ⇒
- if (inQuotes && isValue)
- buf += s"$ansiGreenFg$ch$ansiReset"
- else if (inQuotes && !isValue)
- buf += s"$ansiCyanFg$ch$ansiReset"
+ case ':' if !inQuotes ⇒ buf += s"$ansiBold$ansiRedFg:$ansiReset"
+ case '[' | ']' | '{' | '}' if !inQuotes ⇒ buf += s"$ansiBold$ansiYellowFg$ch$ansiReset"
+ case ',' if !inQuotes ⇒ buf += s"$ansiBold$ansiGreenFg$ch$ansiReset"
+ case '"' ⇒
+ if (inQuotes)
+ buf += s"$ansiReset$ansiBlueFg$ch$ansiReset"
else
- buf += s"$ch"
- }
+ buf += s"$ansiBlueFg$ch$ansiCyanFg"
+
+ inQuotes = !inQuotes
- if (ch == ',' && !inQuotes)
- isValue = false
+ case _ ⇒ buf += s"$ch"
+ }
}
buf.mkString
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index aa6356c..72b343f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -424,12 +424,16 @@ object NCDeployManager extends NCService with DecorateAsScala {
row._2
))
- logger.warn(s"Dup synonyms in '$mdlId' model:\n${tbl.toString}")
+ if (mdl.isDupSynonymsAllowed) {
+ logger.trace(s"Duplicate synonyms found in '$mdlId' model:\n${tbl.toString}")
+
+ logger.warn(s"Duplicate synonyms found in '$mdlId' model - turn on TRACE logging to see them.")
+ logger.warn(s"Model '$mdlId' allows duplicate synonyms but the large number may degrade the performance.")
+ } else {
+ logger.warn(s"Duplicate synonyms found in '$mdlId' model:\n${tbl.toString}")
- if (mdl.isDupSynonymsAllowed)
- logger.warn(s"NOTE: '$mdlId' model allows dup synonyms but the large number may degrade the performance.")
- else
throw new NCE(s"Duplicated synonyms found and not allowed - check warning messages [mdlId=$mdlId]")
+ }
}
mdl.getMetadata.put(MDL_META_ALL_ALIASES_KEY, allAliases.toSet)
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 a23ccc3..313e175 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
@@ -65,7 +65,9 @@ object NCModelManager extends NCService with DecorateAsScala {
mdl.getVersion,
w.elements.keySet.size,
synCnt,
- w.intents.map(_.toDslString)
+ w.intents
+ .map(_.toDslString)
+ .flatMap(s ⇒ s.replaceAll(" term", "\n term").split("\n"))
)
})
}