First step of allowing uniq for a ProcessSemgrexRequest - need to decode all sentences from the request first, then turn that into a response

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/ProcessSemgrexRequest.java

@@ -10,16 +10,22 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import edu.stanford.nlp.ling.CoreAnnotations;
 import edu.stanford.nlp.ling.CoreLabel;
 import edu.stanford.nlp.pipeline.ProtobufAnnotationSerializer;
 import edu.stanford.nlp.pipeline.CoreNLPProtos;
 import edu.stanford.nlp.semgraph.SemanticGraph;
+import edu.stanford.nlp.semgraph.SemanticGraphCoreAnnotations;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
 import edu.stanford.nlp.semgraph.semgrex.SemgrexMatcher;
 import edu.stanford.nlp.semgraph.semgrex.SemgrexPattern;
+import edu.stanford.nlp.util.ArrayCoreMap;
+import edu.stanford.nlp.util.CoreMap;
+import edu.stanford.nlp.util.Pair;
 import edu.stanford.nlp.util.ProcessProtobufRequest;
 
 public class ProcessSemgrexRequest extends ProcessProtobufRequest {
@@ -83,19 +89,28 @@ public static CoreNLPProtos.SemgrexResponse processRequest(CoreNLPProtos.Semgrex
     ProtobufAnnotationSerializer serializer = new ProtobufAnnotationSerializer();
     CoreNLPProtos.SemgrexResponse.Builder responseBuilder = CoreNLPProtos.SemgrexResponse.newBuilder();
 
-    List<SemgrexPattern> patterns = request.getSemgrexList().stream().map(SemgrexPattern::compile).collect(Collectors.toList());
-    int graphIdx = 0;
+    List<CoreMap> sentences = new ArrayList<>();
     for (CoreNLPProtos.SemgrexRequest.Dependencies sentence : request.getQueryList()) {
-      CoreNLPProtos.SemgrexResponse.GraphResult.Builder graphResultBuilder = CoreNLPProtos.SemgrexResponse.GraphResult.newBuilder();
-
       final List<CoreLabel> tokens;
       if (sentence.getGraph().getTokenList().size() > 0) {
         tokens = sentence.getGraph().getTokenList().stream().map(serializer::fromProto).collect(Collectors.toList());
       } else {
         tokens = sentence.getTokenList().stream().map(serializer::fromProto).collect(Collectors.toList());
       }
       SemanticGraph graph = ProtobufAnnotationSerializer.fromProto(sentence.getGraph(), tokens, "semgrex");
+      CoreMap coremap = new ArrayCoreMap();
+      coremap.set(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class, graph);
+      coremap.set(CoreAnnotations.TokensAnnotation.class, tokens);
+      sentences.add(coremap);
+    }
+
+    List<SemgrexPattern> patterns = request.getSemgrexList().stream().map(SemgrexPattern::compile).collect(Collectors.toList());
+    int graphIdx = 0;
+    for (CoreMap sentence : sentences) {
+      CoreNLPProtos.SemgrexResponse.GraphResult.Builder graphResultBuilder = CoreNLPProtos.SemgrexResponse.GraphResult.newBuilder();
+
       int patternIdx = 0;
+      SemanticGraph graph = sentence.get(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class);
       for (SemgrexPattern pattern : patterns) {
         graphResultBuilder.addResult(matchSentence(pattern, graph, patternIdx, graphIdx));
         ++patternIdx;