From f6c14f1c81d75a006ca1ffa5fb3c7f64788382f2 Mon Sep 17 00:00:00 2001
From: "WQY\\qiong" <qiongyu.wang@outlook.com>
Date: Sat, 10 Dec 2022 19:26:43 +0800
Subject: [PATCH] Add simulation result and report to output json

---
 epanet/epanet.py | 49 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/epanet/epanet.py b/epanet/epanet.py
index 77314fa..86d216f 100644
--- a/epanet/epanet.py
+++ b/epanet/epanet.py
@@ -7,7 +7,7 @@ from typing import Any
 sys.path.append("..") 
 from api import project
 from api import parser
-
+from .error_code import *
 
 def _verify_platform():
     _platform = platform.system()
@@ -196,7 +196,7 @@ class Output:
         return ds
 
 
-    def dump(self, cache: bool = True) -> str:
+    def dump(self) -> dict[str, Any]:
         data = {}
         data |= { 'version' : self.version() }
         data |= { 'net_size' : self.net_size() }
@@ -207,15 +207,24 @@ class Output:
         data |= { 'reactions' : self.reactions() }
         data |= { 'node_results' : self.node_results() }
         data |= { 'link_results' : self.link_results() }
-        if cache:
-            with open(self._path + '.json', 'w') as f:
-                json.dump(data, f)
-        return json.dumps(data)
+        return data
+
+
+def dump_report(path: str) -> str:
+    return open(path, mode='r').read()
+
+
+def _dump_output(path: str) -> dict[str, Any]:
+    opt = Output(path)
+    data = opt.dump()
+    with open(path + '.json', 'w') as f:
+        json.dump(data, f)
+    return data
 
 
 def dump_output(path: str) -> str:
-    opt = Output(path)
-    return opt.dump()
+    data = _dump_output(path)
+    return json.dumps(data)
 
 
 def run_project(name: str) -> str:
@@ -234,12 +243,18 @@ def run_project(name: str) -> str:
     opt = os.path.join(os.path.join(dir, 'temp'), input + '.opt')
     command = f'{exe} {inp} {rpt} {opt}'
 
+    data = {}
+
     result = os.system(command)
     if result != 0:
-        msg = f'Failed to run simulation for project [{name}]'
-        raise Exception(msg)
+        data['simulation_result'] = 'failed'
+    else:
+        data['simulation_result'] = 'successful'
+        data |= _dump_output(opt)
 
-    return dump_output(opt)
+    data['report'] = dump_report(rpt)
+
+    return json.dumps(data)
 
 
 def run_inp(name: str) -> str:
@@ -251,12 +266,18 @@ def run_inp(name: str) -> str:
     opt = os.path.join(os.path.join(dir, 'temp'), name + '.opt')
     command = f'{exe} {inp} {rpt} {opt}'
 
+    data = {}
+
     result = os.system(command)
     if result != 0:
-        msg = f'Failed to run simulation for project [{name}]'
-        raise Exception(msg)
+        data['simulation_result'] = 'failed'
+    else:
+        data['simulation_result'] = 'successful'
+        data |= _dump_output(opt)
 
-    return dump_output(opt)
+    data['report'] = dump_report(rpt)
+
+    return json.dumps(data)
 
 
 if __name__ == '__main__':