You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/08/25 09:40:50 UTC
[incubator-nlpcraft] 01/02: WIP.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-41
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit fb0f5c7cc6a3748f550b0aa901de12d4de23b650
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Tue Aug 25 10:43:02 2020 +0300
WIP.
---
.../nlpcraft/server/model/NCEnhanceManager.scala | 36 +++++++++++++++++++---
.../nlpcraft/server/model/NCEnhanceType.scala | 2 +-
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceManager.scala
index 9aad487..be74437 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceManager.scala
@@ -81,6 +81,12 @@ object NCEnhanceManager extends NCService {
)
}
+ case class Response(
+ errors: Option[Seq[String]] = None,
+ warnings: Option[Seq[String]] = None,
+ suggestions: Option[AnyRef] = None
+ )
+
private final val GSON = new Gson
private final val TYPE_RESP = new TypeToken[JList[JList[Suggestion]]]() {}.getType
private final val SEPARATORS = Seq('?', ',', '.', '-', '!')
@@ -125,11 +131,19 @@ object NCEnhanceManager extends NCService {
}
/**
+ *
+ * @param typ
+ * @param resp
+ */
+ private def convert(typ: NCEnhanceType, resp: Response): NCEnhanceResponse =
+ NCEnhanceResponse(typ, resp.errors, resp.warnings, resp.suggestions)
+
+ /**
* @param mdlId Model ID.
* @param parent Parent.
*/
@throws[NCE]
- private def suggest(mdlId: String, parent: Span = null): NCEnhanceResponse =
+ private def suggest(mdlId: String, parent: Span = null): Response =
startScopedSpan("suggest", parent, "modelId" → mdlId) { _ ⇒
val url = s"${Config.urlOpt.getOrElse(throw new NCE("Context word server is not configured"))}/suggestions"
@@ -360,21 +374,33 @@ object NCEnhanceManager extends NCService {
}
})
- NCEnhanceResponse(
- ELEMENTS_SYNONYMS,
+ Response(
warnings = if (warns.isEmpty) None else Some(warns),
suggestions = Some(res.map(p ⇒ p._1 → p._2.asJava).asJava)
)
}
+ private def checkMacros(mdlId: String, parent: Span = null): Response =
+ startScopedSpan("suggest", parent, "modelId" → mdlId) { _ ⇒
+ val mdl = NCProbeManager.getModel(mdlId)
+ val syns = mdl.elementsSynonyms.values.flatten
+
+ // TODO: is it valid?
+ val warns = mdl.macros.keys.
+ flatMap(m ⇒ if (syns.exists(_.contains(m))) None else Some(s"Macro is not used: $m")).
+ toSeq
+
+ Response(warnings = if (warns.isEmpty) None else Some(warns))
+ }
+
@throws[NCE]
def enhance(mdlId: String, types: Seq[NCEnhanceType], parent: Span = null): Seq[NCEnhanceResponse] =
startScopedSpan("enhance", parent, "modelId" → mdlId) { _ ⇒
// Note that NCEnhanceResponse#suggestions should be simple types or java collections.
// Scala collections cannot be simple converted into JSON (REST calls)
types.map {
- case typ@ELEMENTS_SYNONYMS ⇒ suggest(mdlId, parent)
- case typ@VALIDATION_ELEMENTS ⇒ NCEnhanceResponse(typ, null)
+ case t@ELEMENTS_SYNONYMS ⇒ convert(t, suggest(mdlId, parent))
+ case t@VALIDATION_MACROS ⇒ convert(t, checkMacros(mdlId, parent))
}
}
}
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceType.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceType.scala
index 0aba13d..4bacc20 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceType.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/model/NCEnhanceType.scala
@@ -21,5 +21,5 @@ object NCEnhanceType extends Enumeration {
type NCEnhanceType = Value
val ELEMENTS_SYNONYMS = Value
- val VALIDATION_ELEMENTS = Value
+ val VALIDATION_MACROS = Value
}