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 cddb5eb WIP.
cddb5eb is described below
commit cddb5eb79106c8f11efff367be98cbd588488d27
Author: Aaron Radzinski <[email protected]>
AuthorDate: Thu Mar 18 15:17:11 2021 -0700
WIP.
---
nlpcraft/pom.xml | 1 +
.../apache/nlpcraft/examples/alarm/alarm_model.json | 2 +-
.../examples/alarm/{intents.nc => intents.idl} | 0
.../org/apache/nlpcraft/model/intent/NCIdlTerm.scala | 4 +++-
.../model/intent/solver/NCIntentSolverEngine.scala | 18 +++++++++---------
.../model/intent/solver/NCIntentSolverVariant.scala | 2 +-
.../intent/dsl/compiler/{test_ok.nc => test_ok.idl} | 0
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/nlpcraft/pom.xml b/nlpcraft/pom.xml
index a9ee222..46a332a 100644
--- a/nlpcraft/pom.xml
+++ b/nlpcraft/pom.xml
@@ -264,6 +264,7 @@
<include>**/*.txt</include>
<include>**/*.json</include>
<include>**/*.nc</include>
+ <include>**/*.idl</include>
<include>**/*.yaml</include>
<include>**/*.sql</include>
<include>**/*.properties</include>
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/alarm_model.json
b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/alarm_model.json
index e441ff2..d438fc1 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/alarm_model.json
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/alarm_model.json
@@ -34,6 +34,6 @@
}
],
"intents": [
- "import('org/apache/nlpcraft/examples/alarm/intents.nc')" // Import
intents from external file.
+ "import('org/apache/nlpcraft/examples/alarm/intents.idl')" // Import
intents from external file.
]
}
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.nc
b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.idl
similarity index 100%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.nc
rename to nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.idl
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/NCIdlTerm.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/NCIdlTerm.scala
index 6805d17..5e24e8c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/NCIdlTerm.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/NCIdlTerm.scala
@@ -58,5 +58,7 @@ case class NCIdlTerm(
meta
)
- override def toString: String = g(idl)
+ override def toString: String = idl
+
+ def toAnsiString: String = g(idl)
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
index 95af661..99f8576 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverEngine.scala
@@ -125,7 +125,7 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
*/
def toSeq: Seq[Int] = buf
- override def toString: String = buf.mkString(y("<"), " ,", y(">"))
+ def toAnsiString: String = buf.mkString(y(bo("[")), ", ", y(bo("]")))
}
/**
@@ -273,14 +273,14 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
tbl += (
s"${c("Intent Match Weight")}",
- mw1,
- mw2
+ mw1.toAnsiString,
+ mw2.toAnsiString
)
tbl += (
s"${c("Variant Weight")}",
- v1,
- v2
+ v1.toAnsiString,
+ v2.toAnsiString
)
logger.warn(
@@ -332,14 +332,14 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
g(bo("best match"))
),
mkPickTokens(im),
- w
+ w.toAnsiString
)
else
tbl += (
s"#${m.variantIdx + 1}",
im.intent.id,
mkPickTokens(im),
- w
+ w.toAnsiString
)
if (logHldr != null)
@@ -386,7 +386,7 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
var grpIdx = 0
for (grp ← im.tokenGroups) {
- buf += s" ${grp.term}"
+ buf += s" ${grp.term.toAnsiString}"
grpIdx += 1
@@ -520,7 +520,7 @@ object NCIntentSolverEngine extends LazyLogging with
NCOpenCensusTrace {
val w = termMatch.weight.toSeq
tbl += (s"${B}Intent ID$RST",
s"$BO${intent.id}$RST")
- tbl += (s"${B}Matched Term$RST", term.toString)
+ tbl += (s"${B}Matched Term$RST", term.toAnsiString)
tbl += (s"${B}Matched Tokens$RST",
termMatch.usedTokens.map(t ⇒ {
val txt = t.token.getOriginalText
val idx = t.token.getIndex
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
index 5594161..50de4a7 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/solver/NCIntentSolverVariant.scala
@@ -80,5 +80,5 @@ case class NCIntentSolverVariant(tokens: util.List[NCToken])
extends Ordered[NCI
else 0
}
- override def toString: String = s"${y("<")}$userToks, $wordCnt,
$totalUserDirect, $avgWordsPerTokPct, $totalSparsity${y(">")}"
+ def toAnsiString: String = s"${y(bo("["))}$userToks, $wordCnt,
$totalUserDirect, $avgWordsPerTokPct, $totalSparsity${y(bo("]"))}"
}
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/compiler/test_ok.nc
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/compiler/test_ok.idl
similarity index 100%
rename from
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/compiler/test_ok.nc
rename to
nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/compiler/test_ok.idl
