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 2021/03/19 02:43:30 UTC
[incubator-nlpcraft] branch NLPCRAFT-257 updated (e8090b6 ->
b6b714c)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-257
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from e8090b6 WIP.
add c073a74 WIP.
add 50af786 WIP.
add c9e4058 WIP.
add 4137042 WIP.
add c89e837 Update NCDslCompilerBase.scala
add 71f6894 WIP.
add e766582 WIP.
add 57c8c3a Renaming DSL -> IDL, etc.
add eb07ce0 DSL -> IDL.
add 457384e WIP.
add d61e45d Merge branch 'NLPCRAFT-206' of https://github.com/apache/incubator-nlpcraft into NLPCRAFT-206
add 8d122e2 WIP.
add 7c78fc9 Update NCMacroCompilerSpec.scala
add 1a0d497 WIP.
add cddb5eb WIP.
add fa3c05b Update NCTestAutoModelValidatorImpl.scala
new b6b714c Merge branch 'NLPCRAFT-206' into NLPCRAFT-257
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 4 +-
nlpcraft/pom.xml | 1 +
.../nlpcraft/common/makro/NCMacroCompiler.scala | 2 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 4 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 2 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 2 +-
.../common/makro/antlr4/NCMacroDslLexer.interp | 6 +-
.../common/makro/antlr4/NCMacroDslLexer.java | 45 +-
.../common/makro/antlr4/NCMacroDslLexer.tokens | 2 +-
.../common/makro/antlr4/NCMacroDslParser.java | 12 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../nlpcraft/examples/alarm/alarm_model.json | 2 +-
.../examples/alarm/{intents.nc => intents.idl} | 0
.../apache/nlpcraft/examples/phone/PhoneModel.java | 1 -
.../apache/nlpcraft/examples/sql/sql_model.yaml | 6 +-
.../nlpcraft/examples/weather/WeatherModel.java | 3 -
.../scala/org/apache/nlpcraft/model/NCIntent.java | 6 +-
.../org/apache/nlpcraft/model/NCIntentSkip.java | 2 +-
.../org/apache/nlpcraft/model/NCModelView.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCToken.java | 4 +-
.../nlpcraft/model/NCTokenPredicateContext.java | 2 +-
.../nlpcraft/model/NCTokenPredicateResult.java | 2 +-
.../{NCDslContext.scala => NCIdlContext.scala} | 2 +-
.../{NCDslIntent.scala => NCIdlIntent.scala} | 12 +-
.../{NCDslSynonym.scala => NCIdlSynonym.scala} | 4 +-
.../intent/{NCDslTerm.scala => NCIdlTerm.scala} | 20 +-
...enPredicate.scala => NCIdlTokenPredicate.scala} | 2 +-
.../{NCDslCompiler.scala => NCIdlCompiler.scala} | 180 +++----
...lCompilerBase.scala => NCIdlCompilerBase.scala} | 374 ++++++++------
...pilerGlobal.scala => NCIdlCompilerGlobal.scala} | 14 +-
.../{NCDslFragment.scala => NCIdlFragment.scala} | 8 +-
.../{NCDslStack.scala => NCIdlStack.scala} | 16 +-
.../compiler/antlr4/{NCIntentDsl.g4 => NCIdl.g4} | 22 +-
.../antlr4/{NCIntentDsl.interp => NCIdl.interp} | 6 +-
.../{NCIntentDslLexer.tokens => NCIdl.tokens} | 0
...DslBaseListener.java => NCIdlBaseListener.java} | 178 +++----
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 172 +++++++
.../model/intent/compiler/antlr4/NCIdlLexer.java | 571 +++++++++++++++++++++
.../{NCIntentDsl.tokens => NCIdlLexer.tokens} | 0
.../intent/compiler/antlr4/NCIdlListener.java | 458 +++++++++++++++++
.../{NCIntentDslParser.java => NCIdlParser.java} | 416 +++++++--------
.../compiler/antlr4/NCIntentDslBaseVisitor.java | 315 ------------
.../intent/compiler/antlr4/NCIntentDslLexer.interp | 172 -------
.../intent/compiler/antlr4/NCIntentDslLexer.java | 568 --------------------
.../compiler/antlr4/NCIntentDslListener.java | 458 -----------------
.../intent/compiler/antlr4/NCIntentDslVisitor.java | 280 ----------
.../model/intent/solver/NCIntentSolver.scala | 4 +-
.../model/intent/solver/NCIntentSolverEngine.scala | 38 +-
.../intent/solver/NCIntentSolverVariant.scala | 2 +-
.../test/impl/NCTestAutoModelValidatorImpl.scala | 2 +-
.../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 4 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 14 +-
.../nlpcraft/probe/mgrs/NCProbeSynonymChunk.scala | 10 +-
.../probe/mgrs/NCProbeSynonymChunkKind.scala | 2 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 46 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 4 +-
.../common/makro/NCMacroCompilerSpec.scala | 1 -
.../nlpcraft/examples/sql/NCSqlModelSpec.scala | 226 ++++----
.../apache/nlpcraft/model/NCIntentDslSpec.scala | 6 +-
.../apache/nlpcraft/model/NCIntentDslSpec2.scala | 6 +-
.../model/intent/dsl/NCIntentDslTestModel.scala | 2 +-
.../model/intent/dsl/NCIntentDslTestSpec.scala | 2 +-
...lCompilerSpec.scala => NCIdlCompilerSpec.scala} | 14 +-
.../dsl/compiler/{test_ok.nc => test_ok.idl} | 2 +-
.../nlpcraft/model/intent/dsl/dsl_test_model.yaml | 4 +-
.../model/NCEnricherNestedModelSpec4.scala | 2 +-
...pec4.scala => NCEnricherNestedModelSpec5.scala} | 30 +-
.../nlpcraft/server/rest/NCRestAskSpec.scala | 2 +-
.../nlpcraft/server/rest/NCRestModelSpec.scala | 2 +-
70 files changed, 2122 insertions(+), 2665 deletions(-)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/{intents.nc => intents.idl} (100%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{NCDslContext.scala => NCIdlContext.scala} (98%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{NCDslIntent.scala => NCIdlIntent.scala} (90%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{NCDslSynonym.scala => NCIdlSynonym.scala} (94%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{NCDslTerm.scala => NCIdlTerm.scala} (82%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/{NCDslTokenPredicate.scala => NCIdlTokenPredicate.scala} (93%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/{NCDslCompiler.scala => NCIdlCompiler.scala} (83%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/{NCDslCompilerBase.scala => NCIdlCompilerBase.scala} (62%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/{NCDslCompilerGlobal.scala => NCIdlCompilerGlobal.scala} (85%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/{NCDslFragment.scala => NCIdlFragment.scala} (89%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/{NCDslStack.scala => NCIdlStack.scala} (72%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/{NCIntentDsl.g4 => NCIdl.g4} (95%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/{NCIntentDsl.interp => NCIdl.interp} (99%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/{NCIntentDslLexer.tokens => NCIdl.tokens} (100%)
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/{NCIntentDslBaseListener.java => NCIdlBaseListener.java} (55%)
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.interp
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/{NCIntentDsl.tokens => NCIdlLexer.tokens} (100%)
create mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlListener.java
rename nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/{NCIntentDslParser.java => NCIdlParser.java} (80%)
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIntentDslBaseVisitor.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIntentDslLexer.interp
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIntentDslLexer.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIntentDslListener.java
delete mode 100644 nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIntentDslVisitor.java
rename nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/compiler/{NCDslCompilerSpec.scala => NCIdlCompilerSpec.scala} (94%)
rename nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/dsl/compiler/{test_ok.nc => test_ok.idl} (96%)
copy nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/{NCEnricherNestedModelSpec4.scala => NCEnricherNestedModelSpec5.scala} (62%)
[incubator-nlpcraft] 01/01: Merge branch 'NLPCRAFT-206' into
NLPCRAFT-257
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-257
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit b6b714c51cde7c376f09c11dc4f3b6ecaef2a014
Merge: e8090b6 fa3c05b
Author: Aaron Radzinski <ar...@apache.org>
AuthorDate: Thu Mar 18 19:43:17 2021 -0700
Merge branch 'NLPCRAFT-206' into NLPCRAFT-257
README.md | 4 +-
nlpcraft/pom.xml | 1 +
.../nlpcraft/common/makro/NCMacroCompiler.scala | 2 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 4 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 2 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 2 +-
.../common/makro/antlr4/NCMacroDslLexer.interp | 6 +-
.../common/makro/antlr4/NCMacroDslLexer.java | 45 +-
.../common/makro/antlr4/NCMacroDslLexer.tokens | 2 +-
.../common/makro/antlr4/NCMacroDslParser.java | 12 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../nlpcraft/examples/alarm/alarm_model.json | 2 +-
.../examples/alarm/{intents.nc => intents.idl} | 0
.../apache/nlpcraft/examples/phone/PhoneModel.java | 1 -
.../apache/nlpcraft/examples/sql/sql_model.yaml | 6 +-
.../nlpcraft/examples/weather/WeatherModel.java | 3 -
.../scala/org/apache/nlpcraft/model/NCIntent.java | 6 +-
.../org/apache/nlpcraft/model/NCIntentSkip.java | 2 +-
.../org/apache/nlpcraft/model/NCModelView.java | 2 +-
.../scala/org/apache/nlpcraft/model/NCToken.java | 4 +-
.../nlpcraft/model/NCTokenPredicateContext.java | 2 +-
.../nlpcraft/model/NCTokenPredicateResult.java | 2 +-
.../{NCDslContext.scala => NCIdlContext.scala} | 2 +-
.../{NCDslIntent.scala => NCIdlIntent.scala} | 12 +-
.../{NCDslSynonym.scala => NCIdlSynonym.scala} | 4 +-
.../intent/{NCDslTerm.scala => NCIdlTerm.scala} | 20 +-
...enPredicate.scala => NCIdlTokenPredicate.scala} | 2 +-
.../{NCDslCompiler.scala => NCIdlCompiler.scala} | 180 +++----
...lCompilerBase.scala => NCIdlCompilerBase.scala} | 374 ++++++++------
...pilerGlobal.scala => NCIdlCompilerGlobal.scala} | 14 +-
.../{NCDslFragment.scala => NCIdlFragment.scala} | 8 +-
.../{NCDslStack.scala => NCIdlStack.scala} | 16 +-
.../compiler/antlr4/{NCIntentDsl.g4 => NCIdl.g4} | 22 +-
.../antlr4/{NCIntentDsl.interp => NCIdl.interp} | 6 +-
.../{NCIntentDslLexer.tokens => NCIdl.tokens} | 0
...DslBaseListener.java => NCIdlBaseListener.java} | 178 +++----
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 172 +++++++
.../model/intent/compiler/antlr4/NCIdlLexer.java | 571 +++++++++++++++++++++
.../{NCIntentDsl.tokens => NCIdlLexer.tokens} | 0
.../intent/compiler/antlr4/NCIdlListener.java | 458 +++++++++++++++++
.../{NCIntentDslParser.java => NCIdlParser.java} | 416 +++++++--------
.../compiler/antlr4/NCIntentDslBaseVisitor.java | 315 ------------
.../intent/compiler/antlr4/NCIntentDslLexer.interp | 172 -------
.../intent/compiler/antlr4/NCIntentDslLexer.java | 568 --------------------
.../compiler/antlr4/NCIntentDslListener.java | 458 -----------------
.../intent/compiler/antlr4/NCIntentDslVisitor.java | 280 ----------
.../model/intent/solver/NCIntentSolver.scala | 4 +-
.../model/intent/solver/NCIntentSolverEngine.scala | 38 +-
.../intent/solver/NCIntentSolverVariant.scala | 2 +-
.../test/impl/NCTestAutoModelValidatorImpl.scala | 2 +-
.../apache/nlpcraft/probe/mgrs/NCProbeModel.scala | 4 +-
.../nlpcraft/probe/mgrs/NCProbeSynonym.scala | 14 +-
.../nlpcraft/probe/mgrs/NCProbeSynonymChunk.scala | 10 +-
.../probe/mgrs/NCProbeSynonymChunkKind.scala | 2 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 46 +-
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 2 +-
.../mgrs/nlp/enrichers/model/NCModelEnricher.scala | 4 +-
.../common/makro/NCMacroCompilerSpec.scala | 1 -
.../nlpcraft/examples/sql/NCSqlModelSpec.scala | 226 ++++----
.../apache/nlpcraft/model/NCIntentDslSpec.scala | 6 +-
.../apache/nlpcraft/model/NCIntentDslSpec2.scala | 6 +-
.../model/intent/dsl/NCIntentDslTestModel.scala | 2 +-
.../model/intent/dsl/NCIntentDslTestSpec.scala | 2 +-
...lCompilerSpec.scala => NCIdlCompilerSpec.scala} | 14 +-
.../dsl/compiler/{test_ok.nc => test_ok.idl} | 2 +-
.../nlpcraft/model/intent/dsl/dsl_test_model.yaml | 4 +-
.../model/NCEnricherNestedModelSpec4.scala | 2 +-
...pec4.scala => NCEnricherNestedModelSpec5.scala} | 30 +-
.../nlpcraft/server/rest/NCRestAskSpec.scala | 2 +-
.../nlpcraft/server/rest/NCRestModelSpec.scala | 2 +-
70 files changed, 2122 insertions(+), 2665 deletions(-)