prepare release

Author: ikwattro

README.md

@@ -65,6 +65,10 @@ MATCH (result)-[:CONTAINS_SENTENCE]->(s:Sentence)
 RETURN labels(s) as labels
 ```
 
+
+
+
+## BETA
 ### Customizing pipeline models
 To add new customized model (currenlty NER and Sentiment), one can do it via Cypher:
 ```

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.graphaware.neo4j</groupId>
   <artifactId>nlp-opennlp</artifactId>
-  <version>3.3.1.51.3-SNAPSHOT</version>
+  <version>3.3.2.51.5-SNAPSHOT</version>
 
   <licenses>
     <license>
@@ -14,6 +14,10 @@
     </license>
   </licenses>
 
+  <name>GraphAware OpenNLP Integration</name>
+  <description>OpenNLP integration into GraphAware NLP</description>
+  <url>https://graphaware.com</url>
+
   <scm>
     <connection>scm:git:git@github.com:graphaware/neo4j-nlp-opennlp.git</connection>
     <developerConnection>scm:git:git@github.com:graphaware/neo4j-nlp-opennlp.git</developerConnection>
@@ -60,16 +64,17 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <graphaware.version>3.3.1.51</graphaware.version>
-    <resttest.version>3.3.1.51.18</resttest.version>
-    <neo4j.version>3.3.1</neo4j.version>
+    <graphaware.version>3.3.2.51</graphaware.version>
+    <resttest.version>3.3.2.51.18</resttest.version>
+    <neo4j.version>3.3.2</neo4j.version>
+    <nlp.version>3.3.2.51.4</nlp.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.graphaware.neo4j</groupId>
       <artifactId>nlp</artifactId>
-      <version>3.3.1.51.3-SNAPSHOT</version>
+      <version>${nlp.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -135,7 +140,7 @@
     <dependency>
       <groupId>com.graphaware.neo4j</groupId>
       <artifactId>nlp</artifactId>
-      <version>3.3.1.51.3-SNAPSHOT</version>
+      <version>${nlp.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -221,7 +226,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.20</version>
         <configuration>
-          <argLine>-Xmx4g</argLine>
+          <argLine>-Xmx8g</argLine>
         </configuration>
       </plugin>
     </plugins>

src/test/java/com/graphaware/nlp/processor/opennlp/OpenNLPIntegrationTest.java

@@ -0,0 +1,22 @@
+package com.graphaware.nlp.processor.opennlp;
+
+import com.graphaware.nlp.NLPIntegrationTest;
+import com.graphaware.nlp.dsl.AbstractDSL;
+import org.neo4j.kernel.impl.proc.Procedures;
+import org.reflections.Reflections;
+
+import java.util.Set;
+
+public class OpenNLPIntegrationTest extends NLPIntegrationTest {
+
+    @Override
+    protected void registerProceduresAndFunctions(Procedures procedures) throws Exception {
+        super.registerProceduresAndFunctions(procedures);
+        Reflections reflections = new Reflections("com.graphaware.nlp.dsl");
+        Set<Class<? extends AbstractDSL>> cls = reflections.getSubTypesOf(AbstractDSL.class);
+        for (Class c : cls) {
+            procedures.registerProcedure(c);
+            procedures.registerFunction(c);
+        }
+    }
+}

src/test/java/com/graphaware/nlp/processor/opennlp/TextProcessorTest.java

@@ -26,6 +26,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.QueryExecutionException;
@@ -38,14 +40,19 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 
-public class TextProcessorTest extends EmbeddedDatabaseIntegrationTest {
+public class TextProcessorTest extends OpenNLPIntegrationTest {
 
+    private static TextProcessor textProcessor;
     private static final String TEXT_PROCESSOR = "com.graphaware.nlp.processor.opennlp.OpenNLPTextProcessor";
 
+    @BeforeClass
+    public static void init() {
+        textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
+        textProcessor.init();
+    }
+
     @Test
     public void testAnnotatedText() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-        textProcessor.init();
         AnnotatedText annotatedText = textProcessor.annotateText("On 8 May 2013, "
                 + "one week before the Pakistani election, the third author, "
                 + "in his keynote address at the Sentiment Analysis Symposium, "
@@ -72,8 +79,6 @@ public void testAnnotatedText() {
 
     @Test
     public void testLemmaLowerCasing() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-        textProcessor.init();
         AnnotatedText annotateText = textProcessor.annotateText("Collibra’s Data Governance Innovation: Enabling Data as a Strategic Asset", OpenNLPTextProcessor.TOKENIZER, "en", null);
 
         assertEquals(1, annotateText.getSentences().size());
@@ -112,43 +117,39 @@ private ResourceIterator<Object> getTagsIterator(String value) throws QueryExecu
 
     @Test
     public void testAnnotatedTag() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-        textProcessor.init();
         Tag annotateTag = textProcessor.annotateTag("winners", "en");
         assertEquals(annotateTag.getLemma(), "winner");
     }
 
-    @Test
-    public void testAnnotationAndConcept() {
-        // ConceptNet5Importer.Builder() - arguments need fixing
-        /*TextProcessor textProcessor = ServiceLoader.loadTextProcessor("com.graphaware.nlp.processor.stanford.StanfordTextProcessor");
-        ConceptNet5Importer conceptnet5Importer = new ConceptNet5Importer.Builder("http://conceptnet5.media.mit.edu/data/5.4", textProcessor)
-                .build();
-        String text = "Say hi to Christophe";
-        AnnotatedText annotateText = textProcessor.annotateText(text, 1, 0, "en", false);
-        List<Node> nodes = new ArrayList<>();
-        try (Transaction beginTx = getDatabase().beginTx()) {
-            Node annotatedNode = annotateText.storeOnGraph(getDatabase(), false);
-            Map<String, Object> params = new HashMap<>();
-            params.put("id", annotatedNode.getId());
-            Result queryRes = getDatabase().execute("MATCH (n:AnnotatedText)-[*..2]->(t:Tag) where id(n) = {id} return t", params);
-            ResourceIterator<Node> tags = queryRes.columnAs("t");
-            while (tags.hasNext()) {
-                Node tag = tags.next();
-                nodes.add(tag);
-                List<Tag> conceptTags = conceptnet5Importer.importHierarchy(Tag.createTag(tag), "en");
-                conceptTags.stream().forEach((newTag) -> {
-                    nodes.add(newTag.storeOnGraph(getDatabase(), false));
-                });
-            }
-            beginTx.success();
-        }*/
-    }
+//    @Test
+//    public void testAnnotationAndConcept() {
+//        // ConceptNet5Importer.Builder() - arguments need fixing
+//        /*TextProcessor textProcessor = ServiceLoader.loadTextProcessor("com.graphaware.nlp.processor.stanford.StanfordTextProcessor");
+//        ConceptNet5Importer conceptnet5Importer = new ConceptNet5Importer.Builder("http://conceptnet5.media.mit.edu/data/5.4", textProcessor)
+//                .build();
+//        String text = "Say hi to Christophe";
+//        AnnotatedText annotateText = textProcessor.annotateText(text, 1, 0, "en", false);
+//        List<Node> nodes = new ArrayList<>();
+//        try (Transaction beginTx = getDatabase().beginTx()) {
+//            Node annotatedNode = annotateText.storeOnGraph(getDatabase(), false);
+//            Map<String, Object> params = new HashMap<>();
+//            params.put("id", annotatedNode.getId());
+//            Result queryRes = getDatabase().execute("MATCH (n:AnnotatedText)-[*..2]->(t:Tag) where id(n) = {id} return t", params);
+//            ResourceIterator<Node> tags = queryRes.columnAs("t");
+//            while (tags.hasNext()) {
+//                Node tag = tags.next();
+//                nodes.add(tag);
+//                List<Tag> conceptTags = conceptnet5Importer.importHierarchy(Tag.createTag(tag), "en");
+//                conceptTags.stream().forEach((newTag) -> {
+//                    nodes.add(newTag.storeOnGraph(getDatabase(), false));
+//                });
+//            }
+//            beginTx.success();
+//        }*/
+//    }
 
     //@Test
     public void testSentiment() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-
         AnnotatedText annotateText = textProcessor.annotateText("I really hate to study at Stanford, it was a waste of time, I'll never be there again", OpenNLPTextProcessor.TOKENIZER, "en", null);
         assertEquals(1, annotateText.getSentences().size());
         assertEquals(0, annotateText.getSentences().get(0).getSentiment());
@@ -172,8 +173,6 @@ public void testSentiment() {
 
     @Test
     public void testAnnotatedTextWithPosition() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-        textProcessor.init();
         AnnotatedText annotateText = textProcessor.annotateText("On 8 May 2013, "
                 + "one week before the Pakistani election, the third author, "
                 + "in his keynote address at the Sentiment Analysis Symposium, "
@@ -217,8 +216,6 @@ public void testAnnotatedTextWithPosition() {
 
     @Test
     public void testAnnotatedShortText() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-        textProcessor.init();
         AnnotatedText annotateText = textProcessor.annotateText("Fixing Batch Endpoint Logging Problem", OpenNLPTextProcessor.TOKENIZER, "en", null);
 
         assertEquals(1, annotateText.getSentences().size());
@@ -230,8 +227,6 @@ public void testAnnotatedShortText() {
 
     @Test
     public void testAnnotatedShortText2() {
-        TextProcessor textProcessor = ServiceLoader.loadTextProcessor(TEXT_PROCESSOR);
-        textProcessor.init();
         AnnotatedText annotateText = textProcessor.annotateText("Importing CSV data does nothing", OpenNLPTextProcessor.TOKENIZER, "en", null);
         assertEquals(1, annotateText.getSentences().size());
 //        GraphPersistence peristence = new LocalGraphDatabase(getDatabase());

src/test/java/com/graphaware/nlp/processor/opennlp/model/CustomSentimentModelIntegrationTest.java

@@ -1,13 +1,13 @@
 package com.graphaware.nlp.processor.opennlp.model;
 
-import com.graphaware.nlp.NLPIntegrationTest;
+import com.graphaware.nlp.processor.opennlp.OpenNLPIntegrationTest;
 import org.junit.Test;
 
 import java.util.Map;
 
 import static org.junit.Assert.*;
 
-public class CustomSentimentModelIntegrationTest extends NLPIntegrationTest {
+public class CustomSentimentModelIntegrationTest extends OpenNLPIntegrationTest {
 
     @Test
     public void testTrainCustomModelWithProcedure() {

src/test/java/com/graphaware/nlp/processor/opennlp/procedure/ProcedureTest.java

@@ -17,6 +17,7 @@
 
 import com.graphaware.nlp.module.NLPConfiguration;
 import com.graphaware.nlp.module.NLPModule;
+import com.graphaware.nlp.processor.opennlp.OpenNLPIntegrationTest;
 import com.graphaware.runtime.GraphAwareRuntime;
 import com.graphaware.runtime.GraphAwareRuntimeFactory;
 import com.graphaware.test.integration.GraphAwareIntegrationTest;
@@ -32,7 +33,7 @@
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 
-public class ProcedureTest extends GraphAwareIntegrationTest {
+public class ProcedureTest extends OpenNLPIntegrationTest {
 
 
     private static final String TEXT = "On 8 May 2013, "