Linting for refactor wf status

lanl · Sep 10, 2024 · 4734930 · 4734930
1 parent 298071b
commit 4734930
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/beeflow/tests/test_wf_manager.py b/beeflow/tests/test_wf_manager.py
@@ -53,8 +53,8 @@ def teardown_workflow():
 def setup_teardown_workflow(teardown_workflow, mocker, temp_db):
     """Set up and tear down for tests that use the workflow directory."""
     mocker.patch('beeflow.wf_manager.resources.wf_utils.get_workflow_interface',
-            return_value=MockWFI())
-    mocker.patch('beeflow.wf_manager.resources.wf_utils.get_db_path', new=lambda:temp_db.db_file)
+                 return_value=MockWFI())
+    mocker.patch('beeflow.wf_manager.resources.wf_utils.get_db_path', new=lambda: temp_db.db_file)
     mocker.patch('beeflow.wf_manager.resources.wf_utils.connect_db', new=mock_connect_db)
     wf_utils.create_workflow_dir(WF_ID)
     wf_utils.create_wf_status(WF_ID)
@@ -174,7 +174,7 @@ def test_start_workflow(client, mocker, temp_db):
 def test_workflow_status(client, mocker, setup_teardown_workflow, temp_db):
     """Test getting workflow status."""
     mocker.patch('beeflow.wf_manager.resources.wf_utils.get_workflow_interface',
-            return_value=MockWFI())
+                 return_value=MockWFI())
     mocker.patch('beeflow.wf_manager.resources.wf_utils.get_db_path', new=lambda: temp_db.db_file)
     mocker.patch('beeflow.wf_manager.resources.wf_actions.db_path', temp_db.db_file)
     wf_name = 'wf'
@@ -252,7 +252,7 @@ def test_resume_workflow(client, mocker, setup_teardown_workflow, temp_db):
     mocker.patch('beeflow.wf_manager.resources.wf_utils.get_workflow_interface',
                  return_value=MockWFI())
     mocker.patch('beeflow.tests.mocks.MockWFI.get_workflow_state',
-            return_value='PAUSED')
+                 return_value='PAUSED')
     mocker.patch('beeflow.wf_manager.resources.wf_utils.connect_db', new=mock_connect_db)
     mocker.patch('beeflow.wf_manager.resources.wf_utils.submit_tasks_tm', return_value=None)
     mocker.patch('beeflow.wf_manager.resources.wf_utils.submit_tasks_scheduler', return_value=None)

diff --git a/beeflow/wf_manager/resources/wf_actions.py b/beeflow/wf_manager/resources/wf_actions.py
@@ -23,7 +23,6 @@ def __init__(self):
 
     def post(self, wf_id):
         """Start workflow. Send ready tasks to the task manager."""
-        db = connect_db(wfm_db, db_path)
         if wf_utils.start_workflow(wf_id):
             resp = make_response(jsonify(msg='Started workflow!', status='ok'), 200)
         else:
@@ -45,7 +44,7 @@ def get(wf_id):
 
         for task in tasks:
             tasks_status.append((task.id, task.name, task.state))
-        wf_status = wf_utils.read_wf_status(wf_id) 
+        wf_status = wf_utils.read_wf_status(wf_id)
 
         resp = make_response(jsonify(tasks_status=tasks_status,
                              wf_status=wf_status, status='ok'), 200)
@@ -57,7 +56,6 @@ def delete(self, wf_id):
         option = self.reqparse.parse_args()['option']
         db = connect_db(wfm_db, db_path)
         if option == "cancel":
-            wfi = wf_utils.get_workflow_interface(wf_id)
             # Remove all tasks currently in the database
             wf_utils.update_wf_status(wf_id, 'Cancelled')
             log.info(f"Workflow {wf_id} cancelled")
@@ -76,7 +74,6 @@ def delete(self, wf_id):
 
     def patch(self, wf_id):
         """Pause or resume workflow."""
-        db = connect_db(wfm_db, db_path)
         self.reqparse.add_argument('option', type=str, location='json')
         option = self.reqparse.parse_args()['option']
 

diff --git a/beeflow/wf_manager/resources/wf_utils.py b/beeflow/wf_manager/resources/wf_utils.py
@@ -106,6 +106,7 @@ def update_wf_status(wf_id, status_msg):
     wfi = get_workflow_interface(wf_id)
     wfi.set_workflow_state(status_msg)
 
+
 def read_wf_status(wf_id):
     """Read workflow status metadata file."""
     bee_workdir = get_bee_workdir()
@@ -302,9 +303,8 @@ def setup_workflow(wf_id, wf_name, wf_dir, wf_workdir, no_start, workflow=None,
 
 def start_workflow(wf_id):
     """Attempt to start the workflow, returning True if successful."""
-    db = connect_db(wfm_db, get_db_path())
     wfi = get_workflow_interface(wf_id)
-    state = read_wf_status(wf_id) 
+    state = read_wf_status(wf_id)
     if state in ('RUNNING', 'PAUSED', 'COMPLETED'):
         return False
     wfi.execute_workflow()