Skip to content

Commit 7e57ba4

Browse files
authored
Merge pull request #415 from simvue-io/hotfix/wrong-error-types
Fix wrong types on Run error returns
2 parents 8602d3d + 75938e0 commit 7e57ba4

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

simvue/run.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,13 +1182,11 @@ def save_object(
11821182

11831183
# Register file
11841184
try:
1185-
file_save = self._simvue.save_file(data)
1185+
return self._simvue is not None and self._simvue.save_file(data) is not None
11861186
except RuntimeError as e:
11871187
self._error(f"{e.args[0]}")
11881188
return False
11891189

1190-
return self._simvue is not None and file_save is not None
1191-
11921190
@skip_if_failed("_aborted", "_suppress_errors", False)
11931191
@check_run_initialised
11941192
@pydantic.validate_call
@@ -1409,14 +1407,12 @@ def set_status(
14091407
self._status = status
14101408

14111409
try:
1412-
updated = self._simvue.update(data)
1410+
if self._simvue and self._simvue.update(data):
1411+
return True
14131412
except RuntimeError as e:
14141413
self._error(f"{e.args[0]}")
14151414
return False
14161415

1417-
if self._simvue and updated:
1418-
return True
1419-
14201416
return False
14211417

14221418
@skip_if_failed("_aborted", "_suppress_errors", False)
@@ -1733,7 +1729,7 @@ def create_alert(
17331729
alerts = self._simvue.list_alerts()
17341730
except RuntimeError as e:
17351731
self._error(f"{e.args[0]}")
1736-
return alerts
1732+
return None
17371733

17381734
if alerts:
17391735
for existing_alert in alerts:
@@ -1748,7 +1744,7 @@ def create_alert(
17481744
response = self._simvue.add_alert(alert)
17491745
except RuntimeError as e:
17501746
self._error(f"{e.args[0]}")
1751-
return False
1747+
return None
17521748
if response:
17531749
if "id" in response:
17541750
alert_id = response["id"]
@@ -1764,7 +1760,7 @@ def create_alert(
17641760
self._simvue.update(data)
17651761
except RuntimeError as e:
17661762
self._error(f"{e.args[0]}")
1767-
return False
1763+
return None
17681764

17691765
return alert_id
17701766

0 commit comments

Comments
 (0)