👌 Clean up/add exit code returns

aiidateam · Jun 3, 2023 · c0c42ea · c0c42ea
1 parent 52e02f8
commit c0c42ea
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/src/aiida_quantumespresso/parsers/cp.py b/src/aiida_quantumespresso/parsers/cp.py
@@ -262,6 +262,10 @@ def parse(self, **kwargs):
         output_params = Dict(out_dict)
         self.out('output_parameters', output_params)
 
+        for exit_code in list(self.get_error_map().values()) + ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
+            if exit_code in logs.error:
+                return self.exit(self.exit_codes.get(exit_code), logs)
+
         return self.exit(logs=logs)
 
     def get_linkname_trajectory(self):

diff --git a/src/aiida_quantumespresso/parsers/matdyn.py b/src/aiida_quantumespresso/parsers/matdyn.py
@@ -23,9 +23,8 @@ def parse(self, **kwargs):
 
         self.out('output_parameters', orm.Dict(parsed_data))
 
-        for exit_code in ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
-            if exit_code in logs.error:
-                return self.exit(self.exit_codes.get(exit_code), logs)
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
 
         filename_frequencies = MatdynCalculation._PHONON_FREQUENCIES_NAME
 

diff --git a/src/aiida_quantumespresso/parsers/neb.py b/src/aiida_quantumespresso/parsers/neb.py
@@ -192,4 +192,7 @@ def parse(self, **kwargs):
         mep_arraydata.set_array('interpolated_mep', interp_mep)
         self.out('output_mep', mep_arraydata)
 
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
+
         return self.exit(logs=logs)
diff --git a/src/aiida_quantumespresso/parsers/pp.py b/src/aiida_quantumespresso/parsers/pp.py
@@ -61,9 +61,8 @@ def parse(self, **kwargs):
 
         self.out('output_parameters', orm.Dict(parsed_data))
 
-        for exit_code in ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
-            if exit_code in logs.error:
-                return self.exit(self.exit_codes.get(exit_code), logs)
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
 
         retrieve_temporary_list = self.node.base.attributes.get('retrieve_temporary_list', None)
 

diff --git a/src/aiida_quantumespresso/parsers/projwfc.py b/src/aiida_quantumespresso/parsers/projwfc.py
@@ -291,9 +291,8 @@ def parse(self, **kwargs):
 
         self.out('output_parameters', Dict(parsed_data))
 
-        for exit_code in ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
-            if exit_code in logs.error:
-                return self.exit(self.exit_codes.get(exit_code), logs)
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
 
         try:
             retrieved_temporary_folder = kwargs['retrieved_temporary_folder']

diff --git a/src/aiida_quantumespresso/parsers/pw2gw.py b/src/aiida_quantumespresso/parsers/pw2gw.py
@@ -30,9 +30,8 @@ def parse(self, **kwargs):
 
         self.out('output_parameters', Dict(dict=parsed_data))
 
-        for exit_code in ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
-            if exit_code in logs.error:
-                return self.exit(self.exit_codes.get(exit_code), logs)
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
 
         self.exit_code_eps = None
         eps = self.parse_eps_files()

diff --git a/src/aiida_quantumespresso/parsers/pw2wannier90.py b/src/aiida_quantumespresso/parsers/pw2wannier90.py
@@ -25,8 +25,7 @@ def parse(self, **kwargs):
 
         self.out('output_parameters', Dict(parsed_data))
 
-        for exit_code in ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
-            if exit_code in logs.error:
-                return self.exit(self.exit_codes.get(exit_code), logs)
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
 
         return self.exit(logs=logs)
diff --git a/src/aiida_quantumespresso/parsers/q2r.py b/src/aiida_quantumespresso/parsers/q2r.py
@@ -22,9 +22,8 @@ def parse(self, **kwargs):
 
         self.out('output_parameters', Dict(parsed_data))
 
-        for exit_code in ['ERROR_OUTPUT_STDOUT_INCOMPLETE']:
-            if exit_code in logs.error:
-                return self.exit(self.exit_codes.get(exit_code), logs)
+        if 'ERROR_OUTPUT_STDOUT_INCOMPLETE'in logs.error:
+            return self.exit(self.exit_codes.ERROR_OUTPUT_STDOUT_INCOMPLETE, logs)
 
         filename_force_constants = self.node.process_class._FORCE_CONSTANTS_NAME