This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-491 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 6523187afcb804400c650d66df4f3f439006e5b7 Merge: c453277c e7c92f42 Author: Sergey Kamov <[email protected]> AuthorDate: Thu Jul 7 09:50:42 2022 +0300 Merge branch 'NLPCRAFT-504' into NLPCRAFT-491 # Conflicts: # nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.scala .../examples/lightswitch/LightSwitchFrModel.scala | 14 +- .../entity/parser/NCFrSemanticEntityParser.scala | 2 +- .../token/enricher/NCFrLemmaPosTokenEnricher.scala | 5 +- .../enricher/NCFrStopWordsTokenEnricher.scala | 8 +- .../nlp/token/parser/NCFrTokenParser.scala | 7 +- .../lightswitch/NCModelValidationSpec.scala | 0 .../examples/lightswitch/LightSwitchRuModel.scala | 12 +- .../entity/parser/NCRuSemanticEntityParser.scala | 4 +- .../token/enricher/NCRuLemmaPosTokenEnricher.scala | 5 +- .../enricher/NCRuStopWordsTokenEnricher.scala | 11 +- .../nlp/token/parser/NCRuTokenParser.scala | 7 +- .../lightswitch/NCModelValidationSpec.scala | 0 .../lightswitch/LightSwitchGroovyModel.groovy | 88 -- .../examples/lightswitch/LightSwitchJavaModel.java | 93 -- .../examples/lightswitch/LightSwitchKotlinModel.kt | 91 -- .../lightswitch/LightSwitchScalaModel.scala | 12 +- .../lightswitch/NCModelValidationSpec.scala | 11 +- .../apache/nlpcraft/examples/time/TimeModel.java | 189 --- .../time/utils/cities/CitiesDataProvider.java | 80 -- .../nlpcraft/examples/time/utils/cities/City.java | 81 -- .../examples/time/utils/cities/CityData.java | 67 - .../examples/time/utils/keycdn/GeoData.java | 122 -- .../examples/time/utils/keycdn/GeoManager.java | 150 --- .../examples/time/utils/keycdn/Response.java | 81 -- .../examples/time/utils/keycdn/ResponseData.java | 43 - .../apache/nlpcraft/examples/time/TimeModel.scala | 123 ++ .../time/utils/cities/CitiesDataProvider.scala} | 33 +- .../examples/time/utils/keycdn/GeoManager.scala | 108 ++ .../examples/time/NCModelValidationSpec.scala | 0 .../parser/stanford/NCStanfordNLPEntityParser.java | 88 -- .../parser/stanford/NCStanfordNLPTokenParser.java | 56 - .../stanford/NCStanfordNLPEntityParser.scala} | 18 +- .../stanford/NCStanfordNLPTokenParser.scala} | 18 +- .../stanford/NCStanfordNLPEntityParserSpec.scala | 14 +- .../stanford/NCStanfordNLPTokenParserSpec.scala | 2 +- nlpcraft/pom.xml | 24 + .../{NCVariantFilter.java => NCCallbackData.scala} | 33 +- .../main/scala/org/apache/nlpcraft/NCContext.java | 71 -- .../main/scala/org/apache/nlpcraft/NCContext.scala | 67 + .../scala/org/apache/nlpcraft/NCConversation.java | 112 -- .../scala/org/apache/nlpcraft/NCConversation.scala | 102 ++ .../main/scala/org/apache/nlpcraft/NCCuration.java | 47 - .../intent/NCIDLEntity.scala => NCCuration.scala} | 18 +- ...CDialogFlowItem.java => NCDialogFlowItem.scala} | 47 +- .../main/scala/org/apache/nlpcraft/NCEntity.java | 87 -- .../main/scala/org/apache/nlpcraft/NCEntity.scala | 74 ++ .../org/apache/nlpcraft/NCEntityEnricher.java | 49 - .../org/apache/nlpcraft/NCEntityEnricher.scala | 45 + .../scala/org/apache/nlpcraft/NCEntityMapper.java | 49 - .../scala/org/apache/nlpcraft/NCEntityMapper.scala | 47 + .../scala/org/apache/nlpcraft/NCEntityParser.java | 49 - .../scala/org/apache/nlpcraft/NCEntityParser.scala | 45 + .../org/apache/nlpcraft/NCEntityValidator.java | 47 - .../org/apache/nlpcraft/NCEntityValidator.scala | 43 + .../scala/org/apache/nlpcraft/NCException.java | 42 - .../package-info.java => NCException.scala} | 9 +- .../scala/org/apache/nlpcraft/NCIntentMatch.java | 89 -- .../scala/org/apache/nlpcraft/NCIntentMatch.scala | 73 ++ .../scala/org/apache/nlpcraft/NCIntentSkip.java | 55 - .../scala/org/apache/nlpcraft/NCIntentSkip.scala | 38 + .../scala/org/apache/nlpcraft/NCLifecycle.java | 48 - .../{NCModelAdapter.java => NCLifecycle.scala} | 49 +- .../main/scala/org/apache/nlpcraft/NCModel.java | 209 ---- .../main/scala/org/apache/nlpcraft/NCModel.scala | 195 +++ .../NCIDLEntity.scala => NCModelAdapter.scala} | 15 +- .../scala/org/apache/nlpcraft/NCModelClient.java | 126 -- ...NCModelClientImpl.scala => NCModelClient.scala} | 79 +- .../scala/org/apache/nlpcraft/NCModelConfig.java | 141 --- .../scala/org/apache/nlpcraft/NCModelConfig.scala | 53 + .../main/scala/org/apache/nlpcraft/NCPipeline.java | 121 -- .../scala/org/apache/nlpcraft/NCPipeline.scala | 101 ++ .../org/apache/nlpcraft/NCPipelineBuilder.java | 368 ------ .../org/apache/nlpcraft/NCPipelineBuilder.scala | 241 ++++ .../scala/org/apache/nlpcraft/NCPropertyMap.java | 110 -- .../scala/org/apache/nlpcraft/NCPropertyMap.scala | 96 ++ .../org/apache/nlpcraft/NCPropertyMapAdapter.java | 76 -- .../org/apache/nlpcraft/NCPropertyMapAdapter.scala | 49 + .../scala/org/apache/nlpcraft/NCRejection.java | 47 - .../{NCCallbackData.java => NCRejection.scala} | 33 +- .../main/scala/org/apache/nlpcraft/NCRequest.java | 69 -- .../main/scala/org/apache/nlpcraft/NCRequest.scala | 59 + .../main/scala/org/apache/nlpcraft/NCResult.java | 109 -- .../{NCTokenValidator.java => NCResult.scala} | 37 +- .../{NCResultType.java => NCResultType.scala} | 18 +- .../main/scala/org/apache/nlpcraft/NCToken.java | 71 -- .../main/scala/org/apache/nlpcraft/NCToken.scala | 65 + .../{NCCallbackData.java => NCTokenEnricher.scala} | 42 +- .../scala/org/apache/nlpcraft/NCTokenParser.java | 46 - .../{NCTokenEnricher.java => NCTokenParser.scala} | 44 +- ...{NCCallbackData.java => NCTokenValidator.scala} | 40 +- .../main/scala/org/apache/nlpcraft/NCVariant.java | 36 - .../{NCCallbackData.java => NCVariant.scala} | 36 +- .../NCIDLEntity.scala => NCVariantFilter.scala} | 19 +- .../nlpcraft/{ => annotations}/NCIntent.java | 6 +- .../nlpcraft/{ => annotations}/NCIntentObject.java | 2 +- .../nlpcraft/{ => annotations}/NCIntentRef.java | 6 +- .../nlpcraft/{ => annotations}/NCIntentSample.java | 6 +- .../{ => annotations}/NCIntentSampleRef.java | 6 +- .../nlpcraft/{ => annotations}/NCIntentTerm.java | 6 +- .../nlpcraft/internal/ascii/NCAsciiTable.scala | 14 +- .../internal/conversation/NCConversationData.scala | 18 +- .../conversation/NCConversationManager.scala | 7 +- .../internal/dialogflow/NCDialogFlowManager.scala | 26 +- .../internal/impl/NCModelPipelineManager.scala | 64 +- .../nlpcraft/internal/impl/NCModelScanner.scala | 128 +- .../nlpcraft/internal/intent/NCIDLEntity.scala | 4 +- .../intent/compiler/NCIDLCodeGenerator.scala | 26 +- .../internal/intent/compiler/NCIDLCompiler.scala | 14 +- .../internal/intent/compiler/antlr4/NCIDL.interp | 2 +- .../intent/compiler/antlr4/NCIDLBaseListener.java | 2 +- .../intent/compiler/antlr4/NCIDLLexer.interp | 2 +- .../intent/compiler/antlr4/NCIDLLexer.java | 1276 +++++++++++++------- .../intent/compiler/antlr4/NCIDLListener.java | 2 +- .../intent/compiler/antlr4/NCIDLParser.java | 350 ++++-- .../intent/matcher/NCIntentSolverManager.scala | 210 ++-- .../nlpcraft/internal/makro/NCMacroCompiler.scala | 8 +- .../nlpcraft/internal/makro/NCMacroJavaParser.java | 77 -- .../internal/makro/NCMacroJavaParserTrait.java | 59 - .../nlpcraft/internal/makro/NCMacroParser.scala | 10 +- .../internal/makro/antlr4/NCMacroDsl.interp | 2 +- .../makro/antlr4/NCMacroDslBaseListener.java | 2 +- .../internal/makro/antlr4/NCMacroDslLexer.interp | 2 +- .../internal/makro/antlr4/NCMacroDslLexer.java | 98 +- .../internal/makro/antlr4/NCMacroDslListener.java | 2 +- .../internal/makro/antlr4/NCMacroDslParser.java | 60 +- .../nlpcraft/internal/util/NCResourceReader.scala | 2 +- .../apache/nlpcraft/internal/util/NCUtils.scala | 4 +- .../nlp/entity/parser/NCNLPEntityParser.java | 51 - ...ityParserImpl.scala => NCNLPEntityParser.scala} | 19 +- .../nlp/entity/parser/NCOpenNLPEntityParser.java | 79 -- ...arserImpl.scala => NCOpenNLPEntityParser.scala} | 28 +- .../nlpcraft/nlp/entity/parser/package-info.java | 21 - .../entity/parser/semantic/NCSemanticElement.java | 65 - .../parser/semantic/NCSemanticElement.scala} | 47 +- .../parser/semantic/NCSemanticEntityParser.java | 98 -- .../NCSemanticEntityParser.scala} | 117 +- ...emanticStemmer.java => NCSemanticStemmer.scala} | 20 +- .../impl}/NCSemanticSourceReader.scala | 32 +- .../impl}/NCSemanticSynonym.scala | 12 +- .../impl}/NCSemanticSynonymsProcessor.scala | 42 +- .../token/enricher/NCEnBracketsTokenEnricher.java | 49 - ...rImpl.scala => NCEnBracketsTokenEnricher.scala} | 12 +- .../enricher/NCEnDictionaryTokenEnricher.java | 49 - ...mpl.scala => NCEnDictionaryTokenEnricher.scala} | 14 +- .../token/enricher/NCEnQuotesTokenEnricher.java | 49 - ...herImpl.scala => NCEnQuotesTokenEnricher.scala} | 14 +- .../token/enricher/NCEnStopWordsTokenEnricher.java | 61 - ...Impl.scala => NCEnStopWordsTokenEnricher.scala} | 40 +- .../enricher/NCEnSwearWordsTokenEnricher.java | 61 - ...mpl.scala => NCEnSwearWordsTokenEnricher.scala} | 16 +- .../enricher/NCOpenNLPLemmaPosTokenEnricher.java | 60 - ....scala => NCOpenNLPLemmaPosTokenEnricher.scala} | 45 +- .../nlpcraft/nlp/token/enricher/package-info.java | 21 - .../{impl => tools}/NCEnStopWordGenerator.scala | 6 +- .../nlp/token/parser/NCOpenNLPTokenParser.java | 54 - ...ParserImpl.scala => NCOpenNLPTokenParser.scala} | 15 +- .../nlpcraft/nlp/token/parser/package-info.java | 21 - .../scala/org/apache/nlpcraft/package-info.java | 21 - .../conversation/NCConversationManagerSpec.scala | 16 +- .../internal/conversation/NCConversationSpec.scala | 27 +- .../conversation/NCConversationTimeoutSpec.scala | 18 +- .../dialogflow/NCDialogFlowManagerSpec.scala | 19 +- .../internal/impl/NCModelCallbacksSpec.scala | 29 +- .../nlpcraft/internal/impl/NCModelClientSpec.scala | 20 +- .../internal/impl/NCModelClientSpec2.scala | 31 +- .../internal/impl/NCModelClientSpec3.scala | 11 +- .../internal/impl/NCModelPingPongSpec.scala | 23 +- .../internal/impl/NCPipelineManagerSpec.scala | 6 +- .../impl/scan/NCModelIntentsInvalidArgsSpec.scala | 64 +- .../scan/NCModelIntentsInvalidIntentsSpec.scala | 13 +- .../impl/scan/NCModelIntentsNestedSpec.scala | 22 +- .../internal/impl/scan/NCModelIntentsSpec.scala | 1 - .../internal/impl/scan/NCTestModelJava.java | 67 - .../internal/impl/scan/NCTestModelScala.scala | 26 +- .../intent/compiler/functions/NCIDLFunctions.scala | 6 +- .../compiler/functions/NCIDLFunctionsModel.scala | 8 +- .../apache/nlpcraft/nlp/NCEntityEnricherSpec.scala | 10 +- .../apache/nlpcraft/nlp/NCEntityMapperSpec.scala | 37 +- .../nlpcraft/nlp/NCEntityValidatorSpec.scala | 11 +- .../apache/nlpcraft/nlp/NCTokenEnricherSpec.scala | 10 +- .../apache/nlpcraft/nlp/NCTokenValidatorSpec.scala | 11 +- .../apache/nlpcraft/nlp/NCVariantFilterSpec.scala | 10 +- .../nlp/benchmark/client/NCClientBenchmark.java | 150 +-- .../nlp/entity/parser/NCNLPEntityParserSpec.scala | 8 +- .../entity/parser/NCOpenNLPEntityParserSpec.scala | 8 +- .../semantic/NCSemanticEntityParserJsonSpec.scala | 2 +- .../semantic/NCSemanticEntityParserLemmaSpec.scala | 29 +- .../semantic/NCSemanticEntityParserSpec.scala | 25 +- .../semantic/NCSemanticEntityParserYamlSpec.scala | 2 +- .../parser/semantic/NCSemanticTestElement.scala | 9 +- .../enricher/NCBracketsTokenEnricherSpec.scala | 9 +- .../enricher/NCDictionaryTokenEnricherSpec.scala | 6 +- .../token/enricher/NCQuotesTokenEnricherSpec.scala | 5 +- .../token/enricher/NCStopWordsEnricherSpec.scala | 11 +- .../enricher/NCSwearWordsTokenEnricherSpec.scala | 4 +- .../token/enricher/impl/NCStopWordsImplSpec.scala | 9 +- .../token/parser/NCOpenNLPTokenParserSpec.scala | 7 +- .../apache/nlpcraft/nlp/util/NCTestConfig.scala | 13 +- .../apache/nlpcraft/nlp/util/NCTestConfigJava.java | 39 - .../apache/nlpcraft/nlp/util/NCTestEntity.scala | 7 +- .../nlpcraft/nlp/util/NCTestModelAdapter.scala | 4 +- .../apache/nlpcraft/nlp/util/NCTestPipeline.scala | 28 +- .../apache/nlpcraft/nlp/util/NCTestRequest.scala | 4 +- ...NCTestModelAdapter.scala => NCTestResult.scala} | 14 +- .../org/apache/nlpcraft/nlp/util/NCTestToken.scala | 7 +- .../org/apache/nlpcraft/nlp/util/NCTestUtils.scala | 31 +- pom.xml | 5 +- 207 files changed, 4058 insertions(+), 6469 deletions(-) diff --cc nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.scala index 395fa2e0,bbd1ff34..0e75ec0b --- a/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.scala +++ b/nlpcraft-stanford/src/main/scala/org/apache/nlpcraft/nlp/entity/parser/stanford/NCStanfordNLPEntityParser.scala @@@ -32,14 -30,11 +32,13 @@@ import scala.jdk.CollectionConverters. * @param stanford * @param supported */ - class NCStanfordNLPEntityParserImpl(stanford: StanfordCoreNLP, supported: JSet[String]) extends NCEntityParser: - require(stanford != null) - require(supported != null) -class NCStanfordNLPEntityParser(stanford: StanfordCoreNLP, supported: Set[String]) extends NCEntityParser: - require(stanford != null, "Stanford instance cannot be null."); - require(supported != null, "Supported elements set cannot be null."); ++class NCStanfordNLPEntityParserImpl(stanford: StanfordCoreNLP, supported: Set[String]) extends NCEntityParser: ++ require(stanford != null, "Stanford instance cannot be null.") ++ require(supported != null, "Supported elements set cannot be null.") + + private val supportedLc = supported.asScala.map(_.toLowerCase) - override def parse(req: NCRequest, cfg: NCModelConfig, toksList: JList[NCToken]): JList[NCEntity] = - val toks = toksList.asScala.toSeq + override def parse(req: NCRequest, cfg: NCModelConfig, toks: List[NCToken]): List[NCEntity] = val doc = new CoreDocument(req.getText) stanford.annotate(doc)
