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 06de595 WIP.
06de595 is described below
commit 06de595a9fdd0e395f6cb345698268de83f247e6
Author: Sergey Kamov <[email protected]>
AuthorDate: Fri Oct 8 08:46:13 2021 +0300
WIP.
---
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModel.java | 10 ++++------
.../src/main/scala/org/apache/nlpcraft/model/NCRequest.java | 5 -----
.../org/apache/nlpcraft/model/builders/NCModelBuilder.java | 8 ++++----
.../model/{NCCustomParser.java => nlp/NCNlpNerParser.java} | 9 ++++++---
.../main/scala/org/apache/nlpcraft/model/nlp/NCNlpParser.java | 7 -------
.../model/{NCCustomWord.java => nlp/NCNlpRichWord.java} | 4 ++--
.../model/{NCCustomElement.java => nlp/NCNlpToken.java} | 8 +++++---
.../scala/org/apache/nlpcraft/model/nlp/NCNlpWordsParser.java | 9 +++++++++
8 files changed, 30 insertions(+), 30 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 603ad6b..deb194f 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,8 @@
package org.apache.nlpcraft.model;
-import org.apache.nlpcraft.model.nlp.NCNlpParser;
+import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
+import org.apache.nlpcraft.model.nlp.NCNlpWordsParser;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
import java.time.Duration;
@@ -150,10 +151,6 @@ public interface NCModel {
return Collections.emptySet();
}
- default List<NCCustomParser> getParsers() {
- return Collections.emptyList();
- }
-
default int getMaxElementSynonyms() { return DFLT_MAX_ELEMENT_SYNONYMS; }
default boolean isMaxSynonymsThresholdError() { return
DFLT_MAX_SYNONYMS_THRESHOLD_ERROR; }
@@ -170,10 +167,11 @@ public interface NCModel {
List<NCElement> getElements();
// Nlp.
- NCNlpParser getNlpParser();
+ NCNlpWordsParser getNlpParser();
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 54819c6..3f26ad0 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCRequest.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCRequest.java
@@ -20,14 +20,9 @@ package org.apache.nlpcraft.model;
import java.util.*;
public interface NCRequest extends NCMetadata {
- // TODO:?
String getUserId();
String getServerRequestId();
String getNormalizedText();
long getReceiveTimestamp();
Map<String, Object> getRequestData();
-
- // NCCompany getCompany();
- // Optional<String> getRemoteAddress();
- // Optional<String> getClientAgent();
}
\ No newline at end of file
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 0dcbed2..bd35272 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,14 +1,14 @@
package org.apache.nlpcraft.model.builders;
import org.apache.nlpcraft.model.NCContext;
-import org.apache.nlpcraft.model.NCCustomParser;
+import org.apache.nlpcraft.model.nlp.NCNlpNerParser;
import org.apache.nlpcraft.model.NCElement;
import org.apache.nlpcraft.model.NCIntentMatch;
import org.apache.nlpcraft.model.NCModel;
import org.apache.nlpcraft.model.NCRejection;
import org.apache.nlpcraft.model.NCResult;
import org.apache.nlpcraft.model.NCVariant;
-import org.apache.nlpcraft.model.nlp.NCNlpParser;
+import org.apache.nlpcraft.model.nlp.NCNlpWordsParser;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
import java.io.File;
@@ -96,7 +96,7 @@ public class NCModelBuilder {
return null;
}
- public NCModelBuilder withParsers(List<NCCustomParser> parsers) {
+ public NCModelBuilder withParsers(List<NCNlpNerParser> parsers) {
return null;
}
@@ -116,7 +116,7 @@ public class NCModelBuilder {
return null;
}
- public NCModelBuilder withNlpParser(NCNlpParser parser) {
+ public NCModelBuilder withNlpParser(NCNlpWordsParser parser) {
return null;
}
public NCModelBuilder withStopWordsFilter(Function<List<NCNlpWord>,
List<NCNlpWord>> filter) {
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpNerParser.java
similarity index 75%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomParser.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpNerParser.java
index 91601f5..7d892f9 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomParser.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpNerParser.java
@@ -15,10 +15,13 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model;
+package org.apache.nlpcraft.model.nlp;
+
+import org.apache.nlpcraft.model.NCModel;
+import org.apache.nlpcraft.model.NCRequest;
import java.util.*;
-public interface NCCustomParser {
- List<NCCustomElement> parse(NCRequest req, NCModel mdl, List<NCCustomWord>
words, List<NCCustomElement> elements);
+public interface NCNlpNerParser {
+ List<NCNlpToken> parse(NCRequest req, NCModel mdl, List<NCNlpRichWord>
words, List<NCNlpToken> elements);
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpParser.java
deleted file mode 100644
index 11400b8..0000000
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpParser.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.nlpcraft.model.nlp;
-
-import java.util.List;
-
-public interface NCNlpParser {
- List<NCNlpWord> parse(String normTxt);
-}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomWord.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpRichWord.java
similarity index 91%
rename from nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomWord.java
rename to
nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpRichWord.java
index 51b2e0f..fa4c0c6 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomWord.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpRichWord.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model;
+package org.apache.nlpcraft.model.nlp;
import org.apache.nlpcraft.model.nlp.NCNlpWord;
-public interface NCCustomWord extends NCNlpWord {
+public interface NCNlpRichWord extends NCNlpWord {
boolean isStopWord();
boolean isBracketed();
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomElement.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
similarity index 84%
rename from
nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomElement.java
rename to nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
index 102d889..bb02494 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCCustomElement.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpToken.java
@@ -15,14 +15,16 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.model;
+package org.apache.nlpcraft.model.nlp;
+
+import org.apache.nlpcraft.model.NCMetadata;
import java.util.*;
-public interface NCCustomElement extends NCMetadata {
+public interface NCNlpToken extends NCMetadata {
String getElementId();
- List<NCCustomWord> getWords();
+ List<NCNlpRichWord> getWords();
Map<String, Object> getMetadata();
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpWordsParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpWordsParser.java
new file mode 100644
index 0000000..fc283c0
--- /dev/null
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/nlp/NCNlpWordsParser.java
@@ -0,0 +1,9 @@
+package org.apache.nlpcraft.model.nlp;
+
+import org.apache.nlpcraft.model.NCRequest;
+
+import java.util.List;
+
+public interface NCNlpWordsParser {
+ List<NCNlpWord> parse(NCRequest req);
+}
