Update service.py

service.py

@@ -1,4 +1,5 @@
 import http.server
+import select
 import socketserver
 import subprocess
 import threading
@@ -19,20 +20,22 @@ def run_command(command):
         text=True
     )
     while True:
-        output = process.stdout.readline()
-        if output == '' and process.poll() is not None:
-            command_output.put("Leaving")
+        reads = [process.stdout.fileno(), process.stderr.fileno()]
+        ret = select.select(reads, [], [])
+        for fd in ret[0]:
+            if fd == process.stdout.fileno():
+                output = process.stdout.readline()
+                if output:
+                    command_output.put(output)
+                error = process.stderr.readline()
+                if error:
+                    command_output.put(error)
+        if process.poll() is not None:
             break
-        if output:
-            command_output.put(output)
-
-        stderr_output = process.stderr.read()
-        if stderr_output:
-            command_output.put(stderr_output)
     process.stdout.close()
     process.stderr.close()
     process.wait()
-
+    command_output.put("Leaving")
 
 def command_worker():
     while True:
@@ -45,10 +48,15 @@ def command_worker():
 
 def start_commands():
     commands = [
-        ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/PMC_sample_1943', '-Prun=1', '-PfileRatio=1'],
-        ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/PLOS_1000', '-Prun=1', '-PfileRatio=1'],
-        ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/biorxiv-10k-test-2000', '-Prun=1', '-PfileRatio=1'],
-        ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/eLife_984', '-Prun=1', '-PfileRatio=1']
+        ['/Users/lfoppiano/development/projects/grobid/./gradlew', '-p', '/Users/lfoppiano/development/projects/grobid',
+         'jatsEval', '-Pp2t=/Volumes/ExtremePro/sciencialab/science-miner/grobid/grobid-evaluation/PMC_sample_1943',
+         '-Prun=1', '-PfileRatio=1'],
+        ['/Users/lfoppiano/development/projects/grobid/./gradlew', '-p', '/Users/lfoppiano/development/projects/grobid',
+         'jatsEval', '-Pp2t=/Volumes/ExtremePro/sciencialab/science-miner/grobid/grobid-evaluation/PLOS_1000',
+         '-Prun=1', '-PfileRatio=1'],
+        # ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/PLOS_1000', '-Prun=1', '-PfileRatio=1'],
+        # ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/biorxiv-10k-test-2000', '-Prun=1', '-PfileRatio=1'],
+        # ['./gradlew', 'jatsEval', '-Pp2t=/opt/grobid/evaluation/eLife_984', '-Prun=1', '-PfileRatio=1']
     ]
     for command in commands:
         command_queue.put(command)