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/08/29 21:23:16 UTC
[incubator-nlpcraft] branch NLPCRAFT-384 updated (5d2ad16 ->
f1a1b88)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-384
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 5d2ad16 WIP
add 10eaa09 Deploy manager quick fix.
add fb05340 WIP
add bb8c5d8 WIP
add 409e5f9 WIP
add eda7eb4 Fix for NLPCRAFT-426
add d259d2d WIP on NLPCRAFT-427
new f6112d5 Merge branch 'master' into NLPCRAFT-384
new f1a1b88 Renaming.
The 2 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 | 2 +-
.../alarm/src/main/resources/alarm_intents.idl | 4 +-
.../src/main/resources/lightswitch_model.yaml | 2 +-
.../minecraft/MinecraftFillMatchProcessor.kt | 4 +-
.../minecraft/MinecraftModel.kt | 4 +-
.../minecraft/MinecraftValueLoader.kt | 2 +-
.../minecraft/src/main/resources/minecraft.yaml | 34 +-
.../minecraft/NCMinecraftModelSpec.kt | 2 +-
.../minecraft/NCModelValidationSpec.scala | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 4 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 30 +-
.../sql/src/main/resources/sql_model.yaml | 18 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 6 +-
.../nlpcraft/examples/weather/WeatherModel.java | 8 +-
.../nlpcraft/common/makro/NCMacroCompiler.scala | 43 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 16 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 12 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 18 +-
.../makro/antlr4/NCMacroDslBaseListener.java | 24 +
.../common/makro/antlr4/NCMacroDslLexer.interp | 15 +-
.../common/makro/antlr4/NCMacroDslLexer.java | 71 +-
.../common/makro/antlr4/NCMacroDslLexer.tokens | 18 +-
.../common/makro/antlr4/NCMacroDslListener.java | 20 +
.../common/makro/antlr4/NCMacroDslParser.java | 204 +++-
.../scala/org/apache/nlpcraft/model/NCIntent.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentSample.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentTerm.java | 2 +-
.../model/intent/compiler/NCIdlCompiler.scala | 11 +-
.../model/intent/compiler/NCIdlCompilerBase.scala | 39 +-
.../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 10 +-
.../model/intent/compiler/antlr4/NCIdl.interp | 2 +-
.../intent/compiler/antlr4/NCIdlBaseListener.java | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.java | 1107 ++++++++++----------
.../intent/compiler/antlr4/NCIdlListener.java | 2 +-
.../model/intent/compiler/antlr4/NCIdlParser.java | 410 ++++----
.../probe/mgrs/deploy/NCDeployManager.scala | 7 +-
.../server/nlp/preproc/NCPreProcessManager.scala | 2 +-
.../apache/nlpcraft/common/debug/NCLogSpec.scala | 2 +-
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 12 +-
.../org/apache/nlpcraft/model/NCIdlSpec.scala | 6 +-
.../org/apache/nlpcraft/model/NCIdlSpec2.scala | 10 +-
.../nlpcraft/model/NCIntentPrioritiesSpec.scala | 4 +-
.../apache/nlpcraft/model/NCIntentSampleSpec.scala | 4 +-
.../abstract/NCAbstractTokensIntentsSpec.scala | 8 +-
.../model/abstract/NCAbstractTokensModel.scala | 8 +-
.../model/conversation/NCConversationSpec.scala | 2 +-
.../conversation/NCConversationTimeoutSpec.scala | 2 +-
.../nlpcraft/model/dialog/NCDialogSpec.scala | 22 +-
.../nlpcraft/model/dialog/NCDialogSpec2.scala | 10 +-
.../intent/idl/compiler/NCIdlCompilerSpec.scala | 18 +-
.../idl/compiler/functions/NCIdlFunctions.scala | 2 +
.../compiler/functions/NCIdlFunctionsCompany.scala | 18 +-
.../compiler/functions/NCIdlFunctionsRequest.scala | 10 +-
.../compiler/functions/NCIdlFunctionsStrings.scala | 2 +
.../compiler/functions/NCIdlFunctionsToken.scala | 74 +-
.../functions/NCIdlFunctionsTokensUsed.scala | 8 +-
.../compiler/functions/NCIdlFunctionsUser.scala | 16 +-
.../nlpcraft/model/intent/idl/compiler/test_ok.idl | 4 +-
.../nlpcraft/model/intent/idl/idl_test_model.yaml | 6 +-
.../model/intent/idl/options/NCFreeWordsSpec.scala | 8 +-
.../model/intent/idl/options/NCOrderedSpec.scala | 8 +-
.../model/intent/idl/options/NCStmOnlySpec.scala | 16 +-
.../model/intent/idl/options/NCSysTokensSpec.scala | 8 +-
.../intent/idl/options/NCUserTokensSpec.scala | 8 +-
.../nlpcraft/model/meta/NCMetaResultSpec.scala | 2 +-
.../apache/nlpcraft/model/meta/NCMetaSpec.scala | 2 +-
.../model/properties/NCTokensPropertiesSpec.scala | 4 +-
.../properties/NCTokensRestrictionsSpec.scala | 8 +-
.../apache/nlpcraft/model/stm/NCStmTestModel.scala | 8 +-
.../nlpcraft/model/stm/indexes/NCLimitSpec.scala | 14 +-
.../model/stm/indexes/NCRelationSpec.scala | 16 +-
.../nlpcraft/model/stm/indexes/NCSortSpec.scala | 24 +-
.../model/synonyms/NCSuspSynonymsSpec.scala | 2 +-
.../nlpcraft/model/synonyms/NCSynonymsSpec.scala | 10 +-
.../model/synonyms/NCSynonymsValuesSpec.scala | 2 +-
.../mgrs/deploy/NCModelNestedSamplesSpec.scala | 2 +-
.../probe/mgrs/deploy/javatest/NCNestedClass.java | 2 +-
.../probe/mgrs/deploy/javatest/NCNestedStatic.java | 2 +-
.../mgrs/deploy/scalatest/NCNestedClass.scala | 2 +-
.../mgrs/deploy/scalatest/NCNestedStatic.scala | 2 +-
.../model/NCEnricherNestedModelSpec.scala | 10 +-
.../model/NCEnricherNestedModelSpec2.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 4 +-
.../model/NCEnricherNestedModelSpec41.scala | 4 +-
.../model/NCEnricherNestedModelSpec5.scala | 4 +-
.../nlp/enrichers/sort/NCEnricherSortSpec.scala | 2 +-
.../nlpcraft/server/rest/RestTestModel.scala | 6 +-
88 files changed, 1474 insertions(+), 1123 deletions(-)
rename nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/MinecraftFillMatchProcessor.kt (96%)
rename nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/MinecraftModel.kt (96%)
rename nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/MinecraftValueLoader.kt (98%)
rename nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/NCMinecraftModelSpec.kt (96%)
rename nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/{example => examples}/minecraft/NCModelValidationSpec.scala (96%)
[incubator-nlpcraft] 02/02: Renaming.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-384
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit f1a1b885a5c7e00c359ac9334d8950ce8733ee18
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sun Aug 29 14:23:06 2021 -0700
Renaming.
---
.../{example => examples}/minecraft/MinecraftFillMatchProcessor.kt | 4 ++--
.../apache/nlpcraft/{example => examples}/minecraft/MinecraftModel.kt | 4 ++--
.../nlpcraft/{example => examples}/minecraft/MinecraftValueLoader.kt | 2 +-
.../nlpcraft/{example => examples}/minecraft/NCMinecraftModelSpec.kt | 2 +-
.../{example => examples}/minecraft/NCModelValidationSpec.scala | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftFillMatchProcessor.kt b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftFillMatchProcessor.kt
similarity index 96%
rename from nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftFillMatchProcessor.kt
rename to nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftFillMatchProcessor.kt
index 75790e1..779d7d2 100644
--- a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftFillMatchProcessor.kt
+++ b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftFillMatchProcessor.kt
@@ -16,9 +16,9 @@
*
*/
-package org.apache.nlpcraft.example.minecraft
+package org.apache.nlpcraft.examples.minecraft
-import org.apache.nlpcraft.example.minecraft.MinecraftValueLoader.Companion.dumps
+import org.apache.nlpcraft.examples.minecraft.MinecraftValueLoader.Companion.dumps
import org.apache.nlpcraft.model.*
import java.util.*
diff --git a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftModel.kt b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftModel.kt
similarity index 96%
rename from nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftModel.kt
rename to nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftModel.kt
index 954ab40..de96e25 100644
--- a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftModel.kt
+++ b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftModel.kt
@@ -16,10 +16,10 @@
*
*/
-package org.apache.nlpcraft.example.minecraft
+package org.apache.nlpcraft.examples.minecraft
import org.apache.nlpcraft.common.NCException
-import org.apache.nlpcraft.example.minecraft.MinecraftValueLoader.Companion.dumps
+import org.apache.nlpcraft.examples.minecraft.MinecraftValueLoader.Companion.dumps
import org.apache.nlpcraft.model.*
import java.util.*
diff --git a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftValueLoader.kt b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftValueLoader.kt
similarity index 98%
rename from nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftValueLoader.kt
rename to nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftValueLoader.kt
index 429adcf..2b658f4 100644
--- a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftValueLoader.kt
+++ b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/examples/minecraft/MinecraftValueLoader.kt
@@ -16,7 +16,7 @@
*
*/
-package org.apache.nlpcraft.example.minecraft
+package org.apache.nlpcraft.examples.minecraft
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
diff --git a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCMinecraftModelSpec.kt b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/examples/minecraft/NCMinecraftModelSpec.kt
similarity index 96%
rename from nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCMinecraftModelSpec.kt
rename to nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/examples/minecraft/NCMinecraftModelSpec.kt
index 811df6b..49f5e56 100644
--- a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCMinecraftModelSpec.kt
+++ b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/examples/minecraft/NCMinecraftModelSpec.kt
@@ -16,7 +16,7 @@
*
*/
-package org.apache.nlpcraft.example.minecraft
+package org.apache.nlpcraft.examples.minecraft
import org.apache.nlpcraft.NCTestContext
import org.apache.nlpcraft.NCTestEnvironment
diff --git a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCModelValidationSpec.scala b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/examples/minecraft/NCModelValidationSpec.scala
similarity index 96%
rename from nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCModelValidationSpec.scala
rename to nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/examples/minecraft/NCModelValidationSpec.scala
index f1b572e..ec9fd03 100644
--- a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCModelValidationSpec.scala
+++ b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/examples/minecraft/NCModelValidationSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.example.minecraft
+package org.apache.nlpcraft.examples.minecraft
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
[incubator-nlpcraft] 01/02: Merge branch 'master' into NLPCRAFT-384
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-384
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit f6112d579ec6fec153abe880c8e30dd4bd2c05b1
Merge: 5d2ad16 d259d2d
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sun Aug 29 14:16:19 2021 -0700
Merge branch 'master' into NLPCRAFT-384
README.md | 2 +-
.../alarm/src/main/resources/alarm_intents.idl | 4 +-
.../src/main/resources/lightswitch_model.yaml | 2 +-
.../minecraft/src/main/resources/minecraft.yaml | 34 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 4 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 30 +-
.../sql/src/main/resources/sql_model.yaml | 18 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 6 +-
.../nlpcraft/examples/weather/WeatherModel.java | 8 +-
.../nlpcraft/common/makro/NCMacroCompiler.scala | 43 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 16 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.interp | 12 +-
.../nlpcraft/common/makro/antlr4/NCMacroDsl.tokens | 18 +-
.../makro/antlr4/NCMacroDslBaseListener.java | 24 +
.../common/makro/antlr4/NCMacroDslLexer.interp | 15 +-
.../common/makro/antlr4/NCMacroDslLexer.java | 71 +-
.../common/makro/antlr4/NCMacroDslLexer.tokens | 18 +-
.../common/makro/antlr4/NCMacroDslListener.java | 20 +
.../common/makro/antlr4/NCMacroDslParser.java | 204 +++-
.../scala/org/apache/nlpcraft/model/NCIntent.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentSample.java | 2 +-
.../org/apache/nlpcraft/model/NCIntentTerm.java | 2 +-
.../model/intent/compiler/NCIdlCompiler.scala | 11 +-
.../model/intent/compiler/NCIdlCompilerBase.scala | 39 +-
.../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 10 +-
.../model/intent/compiler/antlr4/NCIdl.interp | 2 +-
.../intent/compiler/antlr4/NCIdlBaseListener.java | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.java | 1107 ++++++++++----------
.../intent/compiler/antlr4/NCIdlListener.java | 2 +-
.../model/intent/compiler/antlr4/NCIdlParser.java | 410 ++++----
.../probe/mgrs/deploy/NCDeployManager.scala | 7 +-
.../server/nlp/preproc/NCPreProcessManager.scala | 2 +-
.../apache/nlpcraft/common/debug/NCLogSpec.scala | 2 +-
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 12 +-
.../org/apache/nlpcraft/model/NCIdlSpec.scala | 6 +-
.../org/apache/nlpcraft/model/NCIdlSpec2.scala | 10 +-
.../nlpcraft/model/NCIntentPrioritiesSpec.scala | 4 +-
.../apache/nlpcraft/model/NCIntentSampleSpec.scala | 4 +-
.../abstract/NCAbstractTokensIntentsSpec.scala | 8 +-
.../model/abstract/NCAbstractTokensModel.scala | 8 +-
.../model/conversation/NCConversationSpec.scala | 2 +-
.../conversation/NCConversationTimeoutSpec.scala | 2 +-
.../nlpcraft/model/dialog/NCDialogSpec.scala | 22 +-
.../nlpcraft/model/dialog/NCDialogSpec2.scala | 10 +-
.../intent/idl/compiler/NCIdlCompilerSpec.scala | 18 +-
.../idl/compiler/functions/NCIdlFunctions.scala | 2 +
.../compiler/functions/NCIdlFunctionsCompany.scala | 18 +-
.../compiler/functions/NCIdlFunctionsRequest.scala | 10 +-
.../compiler/functions/NCIdlFunctionsStrings.scala | 2 +
.../compiler/functions/NCIdlFunctionsToken.scala | 74 +-
.../functions/NCIdlFunctionsTokensUsed.scala | 8 +-
.../compiler/functions/NCIdlFunctionsUser.scala | 16 +-
.../nlpcraft/model/intent/idl/compiler/test_ok.idl | 4 +-
.../nlpcraft/model/intent/idl/idl_test_model.yaml | 6 +-
.../model/intent/idl/options/NCFreeWordsSpec.scala | 8 +-
.../model/intent/idl/options/NCOrderedSpec.scala | 8 +-
.../model/intent/idl/options/NCStmOnlySpec.scala | 16 +-
.../model/intent/idl/options/NCSysTokensSpec.scala | 8 +-
.../intent/idl/options/NCUserTokensSpec.scala | 8 +-
.../nlpcraft/model/meta/NCMetaResultSpec.scala | 2 +-
.../apache/nlpcraft/model/meta/NCMetaSpec.scala | 2 +-
.../model/properties/NCTokensPropertiesSpec.scala | 4 +-
.../properties/NCTokensRestrictionsSpec.scala | 8 +-
.../apache/nlpcraft/model/stm/NCStmTestModel.scala | 8 +-
.../nlpcraft/model/stm/indexes/NCLimitSpec.scala | 14 +-
.../model/stm/indexes/NCRelationSpec.scala | 16 +-
.../nlpcraft/model/stm/indexes/NCSortSpec.scala | 24 +-
.../model/synonyms/NCSuspSynonymsSpec.scala | 2 +-
.../nlpcraft/model/synonyms/NCSynonymsSpec.scala | 10 +-
.../model/synonyms/NCSynonymsValuesSpec.scala | 2 +-
.../mgrs/deploy/NCModelNestedSamplesSpec.scala | 2 +-
.../probe/mgrs/deploy/javatest/NCNestedClass.java | 2 +-
.../probe/mgrs/deploy/javatest/NCNestedStatic.java | 2 +-
.../mgrs/deploy/scalatest/NCNestedClass.scala | 2 +-
.../mgrs/deploy/scalatest/NCNestedStatic.scala | 2 +-
.../model/NCEnricherNestedModelSpec.scala | 10 +-
.../model/NCEnricherNestedModelSpec2.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 4 +-
.../model/NCEnricherNestedModelSpec41.scala | 4 +-
.../model/NCEnricherNestedModelSpec5.scala | 4 +-
.../nlp/enrichers/sort/NCEnricherSortSpec.scala | 2 +-
.../nlpcraft/server/rest/RestTestModel.scala | 6 +-
83 files changed, 1467 insertions(+), 1116 deletions(-)
diff --cc nlpcraft-examples/alarm/src/main/resources/alarm_intents.idl
index 109f60c,3c3934d..b4fdd7b
--- a/nlpcraft-examples/alarm/src/main/resources/alarm_intents.idl
+++ b/nlpcraft-examples/alarm/src/main/resources/alarm_intents.idl
@@@ -15,19 -15,15 +15,19 @@@
* limitations under the License.
*/
+/*
+ * Read documentation: http://nlpcraft.apache.org/intent-matching.html
+ */
+
// Fragments (mostly for demo purposes here).
- fragment=buzz term~{tok_id() == 'x:alarm'}
+ fragment=buzz term~{# == 'x:alarm'}
fragment=when
term(nums)~{
// Demonstrating term variables.
@type = meta_tok('nlpcraft:num:unittype')
- @iseq = meta_tok('nlpcraft:num:isequalcondition') // Excludes conditional statements.
+ @isEq = meta_tok('nlpcraft:num:isequalcondition') // Excludes conditional statements.
- tok_id() == 'nlpcraft:num' && @type == 'datetime' && @isEq == true
+ # == 'nlpcraft:num' && @type == 'datetime' && @iseq == true
}[1,7]
// Intents (using fragments).