Changes for backend

Edan Toledo · Edan Toledo · commit c961e60a055f · 2021-03-03T21:18:07.000+02:00
diff --git a/requirements.txt b/requirements.txt
diff --git a/src/main/java/com/RepGraph/AMRGraph.java b/src/main/java/com/RepGraph/AMRGraph.java
@@ -47,7 +47,7 @@ public AMRGraph(@JsonProperty("id") String id, @JsonProperty("source") String so
     }
 
 
-    public void alignUtil(String NodeID, HashMap<String, Node> nodes, HashMap<String, Boolean> visited, int layer, FileWriter writer) throws IOException {
+    public void alignUtil(String NodeID, HashMap<String, Node> nodes, HashMap<String, Boolean> visited, int layer, StringWriter writer) throws IOException {
         // Mark the current node as visited and print it
         visited.put(NodeID, true);
 
@@ -82,35 +82,33 @@ public void alignNodes() throws IOException, InterruptedException {
         for (String i : nodes.keySet()) {
             visited.put(i, false);
         }
-        File tempDir = new File("supportScripts/temp");
-        if (!tempDir.exists()){
-            tempDir.mkdir();
-        }
-        File tempFile = new File("supportScripts/temp/AMR_TEMP.txt");
-        if (!tempFile.exists()){
-            tempFile.createNewFile();
-        }
 
-        FileWriter myWriter = new FileWriter(tempFile);
+        StringWriter myWriter = new StringWriter();
+
+
         myWriter.write("#::snt " + this.input + "\n");
         myWriter.write("(v" + this.top + " / " + nodes.get(this.top).getLabel() + " ");
 
         alignUtil(this.top, this.nodes, visited, 0, myWriter);
 
-        myWriter.close();
+        String amr_graph = myWriter.toString();
+
 
 
-        Process proc = Runtime.getRuntime().exec(new String[]{"python3", "supportScripts/align_AMR.py"});
+        Process proc = Runtime.getRuntime().exec(new String[]{"python3", "supportScripts/align_AMR.py",""+amr_graph+""});
         proc.waitFor();
         BufferedReader input =
                 new BufferedReader(new InputStreamReader(proc.getInputStream()));
 
+
         String line = null;
         String[] tokens = null;
         String[] ner_tags = null;
         String[] ner_iob_tags = null;
         String[] pos_tags = null;
         String[] lemmas = null;
+
+
         while ((line = input.readLine()) != null) {
 
             if (line.startsWith("v")) {
@@ -145,17 +143,19 @@ public void alignNodes() throws IOException, InterruptedException {
             }
         }
         ArrayList<Token> tokenlist = new ArrayList<>();
-        for (int i = 0; i < tokens.length; i++) {
+        if (tokens!=null) {
+            for (int i = 0; i < tokens.length; i++) {
 
-            tokenlist.add(new Token(i, tokens[i], lemmas[i], null));
-            tokenlist.get(i).getExtraInformation().put("NER", ner_tags[i]);
-            tokenlist.get(i).getExtraInformation().put("NER_IOB", ner_iob_tags[i]);
-            tokenlist.get(i).getExtraInformation().put("POS", pos_tags[i]);
+                tokenlist.add(new Token(i, tokens[i], lemmas[i], null));
+                tokenlist.get(i).getExtraInformation().put("NER", ner_tags[i]);
+                tokenlist.get(i).getExtraInformation().put("NER_IOB", ner_iob_tags[i]);
+                tokenlist.get(i).getExtraInformation().put("POS", pos_tags[i]);
 
+            }
+            setTokens(tokenlist);
         }
-        setTokens(tokenlist);
         beenProcessed = true;
-        tempFile.delete();
+
     }
 
     public void fillInSpans(HashMap<String, Node> nodes) {
diff --git a/supportScripts/align_AMR.py b/supportScripts/align_AMR.py
@@ -4,12 +4,11 @@
 import penman
 from penman.surface import Alignment
 import os
+import sys
 
 if __name__ == '__main__':
-    dirname = os.path.dirname(__file__)
-    filename = os.path.join(dirname, os.path.join('temp',"AMR_TEMP.txt"))
-    f = open(filename, "r")
-    graph_string = f.read()
+
+    graph_string = sys.argv[1]
 
     penman_graph = annotate_graph(graph_string)
     tokens = eval(penman_graph.metadata["tokens"])
