From 7d1d61d27cec9a69ab6ec9f470abf91f6bd7ecba Mon Sep 17 00:00:00 2001
From: nhertz <nhertz@nrao.edu>
Date: Wed, 2 Sep 2020 13:35:07 -0600
Subject: [PATCH] Added __str__ and __repr__ methods to WorkflowMonitor; small
updates to same methods in WorkflowEvent
---
apps/cli/utilities/wf_monitor/src/wf_monitor/monitor.py | 6 ++++++
apps/cli/utilities/wf_monitor/src/wf_monitor/wf_event.py | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/apps/cli/utilities/wf_monitor/src/wf_monitor/monitor.py b/apps/cli/utilities/wf_monitor/src/wf_monitor/monitor.py
index d84aace07..011bb34e6 100644
--- a/apps/cli/utilities/wf_monitor/src/wf_monitor/monitor.py
+++ b/apps/cli/utilities/wf_monitor/src/wf_monitor/monitor.py
@@ -190,6 +190,12 @@ class WorkflowMonitor:
return events
+ def __str__(self):
+ return f'WorkflowMonitor, monitoring {self.logfile_path} that has events {self.events}'
+
+ def __repr__(self):
+ return f'{self.__class__.__name__} ({self.logfile_path}, {self.events})'
+
_DESCRIPTION = 'Workspaces workflow monitor, version {}. Monitor execution of a workflow from ' \
'the command line.'
diff --git a/apps/cli/utilities/wf_monitor/src/wf_monitor/wf_event.py b/apps/cli/utilities/wf_monitor/src/wf_monitor/wf_event.py
index 7fb68490e..ec105af95 100644
--- a/apps/cli/utilities/wf_monitor/src/wf_monitor/wf_event.py
+++ b/apps/cli/utilities/wf_monitor/src/wf_monitor/wf_event.py
@@ -37,7 +37,7 @@ class WorkflowEvent:
return json.dumps(d)
def __str__(self):
- return self.json()
+ return f'WorkflowEvent with data {self.json()}'
def __repr__(self):
- return f'<WorkflowEvent {self.__dict__}>'
\ No newline at end of file
+ return f'<wf_monitor.WorkflowEvent {self.__dict__}>'
--
GitLab