This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-70_NEW in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit dc626d4b28d85a080d5480da2fca53c6d3d7cdc9 Merge: 63fc114 5dd87be Author: Sergey Kamov <[email protected]> AuthorDate: Tue Aug 10 23:05:22 2021 +0300 Merge branch 'master' into NLPCRAFT-70_NEW .../lightswitch/LightSwitchGroovyModel.groovy | 36 +- .../examples/lightswitch/LightSwitchJavaModel.java | 8 + .../examples/lightswitch/LightSwitchKotlinModel.kt | 36 +- .../lightswitch/LightSwitchScalaModel.scala | 7 + .../src/main/resources/lightswitch_model.yaml | 9 +- nlpcraft/src/main/resources/date/full.txt.gz | Bin 6098772 -> 6985934 bytes nlpcraft/src/main/resources/date/parts.txt.gz | Bin 8104071 -> 8146091 bytes nlpcraft/src/main/resources/date/parts_dmy.txt.gz | Bin 4949759 -> 4986446 bytes nlpcraft/src/main/resources/date/parts_mdy.txt.gz | Bin 4923267 -> 4955873 bytes nlpcraft/src/main/resources/date/parts_ymd.txt.gz | Bin 5298790 -> 5326821 bytes nlpcraft/src/main/resources/nlpcraft.conf | 2 +- .../main/scala/org/apache/nlpcraft/NCStart.scala | 2 +- .../org/apache/nlpcraft/common/NCService.scala | 2 +- .../org/apache/nlpcraft/common/ansi/NCAnsi.scala | 1321 +++++++++++++++++++- .../nlpcraft/common/ascii/NCAsciiTable.scala | 55 +- .../scala/org/apache/nlpcraft/common/package.scala | 22 +- .../org/apache/nlpcraft/common/util/NCUtils.scala | 125 +- .../scala/org/apache/nlpcraft/model/NCElement.java | 8 +- .../org/apache/nlpcraft/model/NCModelView.java | 58 +- .../scala/org/apache/nlpcraft/model/NCResult.java | 5 +- .../model/intent/solver/NCIntentSolver.scala | 2 +- .../model/intent/solver/NCIntentSolverEngine.scala | 10 +- .../nlpcraft/model/tools/cmdline/NCCli.scala | 38 +- .../model/tools/cmdline/NCCliCommands.scala | 33 +- .../model/tools/embedded/NCEmbeddedResult.java | 4 +- .../model/tools/test/NCTestAutoModelValidator.java | 70 +- .../test/impl/NCTestAutoModelValidatorImpl.scala | 31 +- .../org/apache/nlpcraft/probe/NCProbeBoot.scala | 4 +- .../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 8 + .../nlpcraft/probe/mgrs/cmd/NCCommandManager.scala | 105 +- .../probe/mgrs/deploy/NCDeployManager.scala | 58 +- .../nlpcraft/probe/mgrs/model/NCModelManager.scala | 37 +- .../org/apache/nlpcraft/server/NCServer.scala | 2 +- .../nlp/enrichers/NCServerEnrichmentManager.scala | 2 +- .../nlp/enrichers/date/tools/NCDateGenerator.scala | 30 +- .../nlpcraft/server/probe/NCProbeManager.scala | 9 +- .../nlpcraft/server/rest/NCBasicRestApi.scala | 2 +- .../model/synonyms/NCSynonymsValuesSpec.scala | 114 ++ .../nlp/enrichers/date/NCEnricherDateSpec.scala | 47 + .../nlpcraft/server/rest/NCRestModelSpec.scala | 1 - pom.xml | 8 +- 41 files changed, 2046 insertions(+), 265 deletions(-) diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala index 55285de,f6ee6eb..0514f70 --- 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 @@@ -1643,12 -1598,12 +1651,12 @@@ object NCDeployManager extends NCServic val unusedIntents = intentDecls.filter(i => !intents.exists(_._1.id == i.id)) if (unusedIntents.nonEmpty) - logger.warn(s"Declared but unused intents: [" + + logger.warn(s"Intents are unused (have no callback): [" + s"mdlId=$mdlId, " + - s"mdlOrigin=${mdl.getOrigin}, " + + s"origin=${mdl.getOrigin}, " + s"intentIds=${unusedIntents.map(_.id).mkString("(", ", ", ")")}]" ) - + intents.toSet } diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/NCServerEnrichmentManager.scala index dc15caf,636b263..32e8909 --- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/NCServerEnrichmentManager.scala +++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/enrichers/NCServerEnrichmentManager.scala @@@ -126,11 -121,9 +126,11 @@@ object NCServerEnrichmentManager extend NCCoordinatesEnricher.enrich(s, span) } + NCContextWordCategoriesEnricher.enrich(s, span) + ner(s, enabledBuiltInToks) - prepareAsciiTable(s).info(logger, Some(s"Sentence enriched: '$normTxt'")) + prepareAsciiTable(s).info(logger, Some(s"Server-side enrichment (built-in tokens only) for: '$normTxt'")) cache += normTxt -> Holder(s, enabledBuiltInToks)
