[incubator-nlpcraft] branch master-model updated: WIP.

[sergeykamov]

This is an automated email from the ASF dual-hosted git repository.

sergeykamov pushed a commit to branch master-model
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/master-model by this push:
     new 9d79c7c  WIP.
9d79c7c is described below

commit 9d79c7c119ae130daf37e1c2c6e330c74af9dc6c
Author: Sergey Kamov <skhdlem...@gmail.com>
AuthorDate: Fri Oct 8 09:30:36 2021 +0300

    WIP.
---
 .../src/main/scala/org/apache/nlpcraft/model/NCModel.java     |  7 ++++---
 .../src/main/scala/org/apache/nlpcraft/model/NCRequest.java   |  1 +
 .../org/apache/nlpcraft/model/builders/NCModelBuilder.java    | 11 +++++------
 .../model/nlp/{NCNlpNerParser.java => NCNlpTokensParser.java} |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
index deb194f..a2bc4a4 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java
@@ -17,7 +17,7 @@
 
 package org.apache.nlpcraft.model;
 
-import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
+import org.apache.nlpcraft.model.nlp.NCNlpTokensParser;
 import org.apache.nlpcraft.model.nlp.NCNlpWordsParser;
 import org.apache.nlpcraft.model.nlp.NCNlpWord;
 
@@ -167,11 +167,12 @@ public interface NCModel {
     List<NCElement> getElements();
 
     // Nlp.
-    NCNlpWordsParser getNlpParser();
+    NCNlpWordsParser getNlpWordsParser();
+    List<NCNlpTokensParser> getNlpTokensParsers();
     Function<List<NCNlpWord>, List<NCNlpWord>> getStopWordsFilter();
     Function<List<NCNlpWord>, List<NCNlpWord>> getSwearWordsFilter();
     Function<List<NCNlpWord>, List<NCNlpWord>> getSuspiciousWordsFilter();
-    List<NCNlpNerParser> getNerParsers();
+
 
     // Intents data.
     // model class by default + for methods of given instances.
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCRequest.java 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCRequest.java
index 3f26ad0..50c159f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCRequest.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCRequest.java
@@ -20,6 +20,7 @@ package org.apache.nlpcraft.model;
 import java.util.*;
 
 public interface NCRequest extends NCMetadata {
+    // TODO: optional?
     String getUserId();
     String getServerRequestId();
     String getNormalizedText();
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelBuilder.java
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelBuilder.java
index bd35272..774747e 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelBuilder.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/builders/NCModelBuilder.java
@@ -1,7 +1,7 @@
 package org.apache.nlpcraft.model.builders;
 
 import org.apache.nlpcraft.model.NCContext;
-import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
+import org.apache.nlpcraft.model.nlp.NCNlpTokensParser;
 import org.apache.nlpcraft.model.NCElement;
 import org.apache.nlpcraft.model.NCIntentMatch;
 import org.apache.nlpcraft.model.NCModel;
@@ -96,10 +96,6 @@ public class NCModelBuilder {
         return null;
     }
 
-    public NCModelBuilder withParsers(List<NCNlpNerParser> parsers) {
-        return null;
-    }
-
     public NCModelBuilder withMaxElementSynonyms(int maxElementSynonyms) { 
return null; }
 
     public NCModelBuilder withMaxSynonymsThresholdError(boolean 
maxSynonymsThresholdError) { return null; }
@@ -116,7 +112,10 @@ public class NCModelBuilder {
         return null;
     }
 
-    public NCModelBuilder withNlpParser(NCNlpWordsParser parser) {
+    public NCModelBuilder withNlpWordsParser(NCNlpWordsParser parser) {
+        return null;
+    }
+    public NCModelBuilder withNlpTokensParsers(List<NCNlpTokensParser> 
parsers) {
         return null;
     }
     public NCModelBuilder withStopWordsFilter(Function<List<NCNlpWord>, 
List<NCNlpWord>> filter) {
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpNerParser.java 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpTokensParser.java
similarity index 96%
rename from 
nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpNerParser.java
rename to 
nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpTokensParser.java
index 7d892f9..334ccd2 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpNerParser.java
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpTokensParser.java
@@ -22,6 +22,6 @@ import org.apache.nlpcraft.model.NCRequest;
 
 import java.util.*;
 
-public interface NCNlpNerParser {
+public interface NCNlpTokensParser {
     List<NCNlpToken> parse(NCRequest req, NCModel mdl, List<NCNlpRichWord> 
words, List<NCNlpToken> elements);
 }