This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-203
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-203 by this push:
new ce42c1a WIP + NLPCRAFT-210 fix.
ce42c1a is described below
commit ce42c1ac7996476b7cea25c6edc7132e0de68640
Author: Aaron Radzinski <[email protected]>
AuthorDate: Tue Dec 29 19:12:02 2020 -0800
WIP + NLPCRAFT-210 fix.
---
.../main/scala/org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala | 4 ++--
.../src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 --
.../apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala | 10 ++++------
.../nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 4 ++--
5 files changed, 9 insertions(+), 13 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 a4f614e..c6953b5 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
@@ -1409,7 +1409,7 @@ object NCUtils extends LazyLogging {
s"$exClsName$errMsg $ansiCyanFg->$ansiReset
($fileName:$lineNum)"
msg.split("\n").foreach(line ⇒ {
- val s = s"${" " * indent}${if (first) ansiBlue("+- ") else "
"}$line"
+ val s = s"${" " * indent}${if (first) ansiBlue("+-- ") else "
"}$line"
if (err) logger.error(s) else logger.warn(s)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index ff2589d..ce0ad91 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -2597,8 +2597,8 @@ object NCCli extends App {
val dashX = c("-" * idx) + r("^") + c("-" *
(line.length - idx - 1))
error(s"Uneven quotes or brackets:")
- error(s" ${r("+-")} $lineX")
- error(s" ${r("+-")} $dashX")
+ error(s" ${r("+--")} $lineX")
+ error(s" ${r("+--")} $dashX")
}
if (line == QUIT_CMD.name)
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 a54e22f..f47eb2c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -155,8 +155,6 @@ private [probe] object NCProbeBoot extends LazyLogging with
NCOpenCensusTrace {
val models: String = getString(s"$prefix.models")
val lifecycle: Seq[String] = getStringList(s"$prefix.lifecycle")
}
-
- println(s"Models -> ${Cfg.models}")
ProbeConfig(
Cfg.id,
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 787fb38..735f7b3 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
@@ -426,12 +426,10 @@ object NCDeployManager extends NCService with
DecorateAsScala {
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}")
-
- throw new NCE(s"Duplicated synonyms found and not allowed -
check warning messages [mdlId=$mdlId]")
- }
+ logger.warn(s" ${b("|--")} NOTE: ID of the model element is
its default built-in synonym - you don't need to add it explicitly to the list
of synonyms.")
+ logger.warn(s" ${b("+--")} Model '$mdlId' allows duplicate
synonyms but the large number may degrade the performance.")
+ } else
+ throw new NCE(s"Duplicated synonyms found and not allowed
[mdlId=$mdlId]")
}
mdl.getMetadata.put(MDL_META_ALL_ALIASES_KEY, allAliases.toSet)
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 3fbe801..207aad0 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
@@ -339,13 +339,13 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
s"srvReqId=${rv(g(srvReqId))}, " +
s"type=${resType.getOrElse("")}" +
s"]" +
- s"\n\n<<${U.fgRainbow("===========")} ${g("\uD83D\uDE00")}
${U.fgRainbow("===========")}>>\n")
+ s"\n\n<<${bo("===========")} ${g("OK")}
${bo("===========")}>>\n")
else
logger.info(s"REJECT response sent back to server [" +
s"srvReqId=${rv(g(srvReqId))}, " +
s"response=${errMsg.get}" +
s"]" +
- s"\n\n<<${U.fgRainbow("===========")} ${r("\uD83E\uDD7A")}
${U.fgRainbow("===========")}>>\n")
+ s"\n\n<<${bo("===========")} ${r("REJECT")}
${bo("===========")}>>\n")
}
val mdl = NCModelManager.getModel(mdlId, span)
