From 138ed66a671f34ed46e844557893d614a91427ed Mon Sep 17 00:00:00 2001
From: Doug Latornell <dlatornell@eoas.ubc.ca>
Date: Mon, 4 Mar 2024 15:57:26 -0800
Subject: [PATCH] Remove "host_name" arg from make_averaged_dataset worker

The "host_name" argument in the "make_averaged_dataset" worker was removed as
it's unnecessary. Tests and calls to NextWorker were updated accordingly to
reflect this change.
---
 nowcast/next_workers.py                     | 10 ++------
 nowcast/workers/make_averaged_dataset.py    |  3 ---
 tests/test_next_workers.py                  |  4 ++--
 tests/workers/test_make_averaged_dataset.py | 26 ++++++++-------------
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/nowcast/next_workers.py b/nowcast/next_workers.py
index b878e665..45a9f95c 100644
--- a/nowcast/next_workers.py
+++ b/nowcast/next_workers.py
@@ -1509,7 +1509,7 @@ def after_download_results(msg, config, checklist):
                     next_workers[msg.type].append(
                         NextWorker(
                             "nowcast.workers.make_averaged_dataset",
-                            args=["skookum", "day", var_group, "--run-date", run_date],
+                            args=["day", var_group, "--run-date", run_date],
                         )
                     )
                 if arrow.get(run_date).shift(days=+1).day == 1:
@@ -1571,13 +1571,7 @@ def after_make_averaged_dataset(msg, config, checklist):
             next_workers[msg.type].append(
                 NextWorker(
                     "nowcast.workers.make_averaged_dataset",
-                    args=[
-                        "skookum",
-                        "month",
-                        reshapr_var_group,
-                        "--run-date",
-                        first_of_month,
-                    ],
+                    args=["month", reshapr_var_group, "--run-date", first_of_month],
                     host="localhost",
                 )
             )
diff --git a/nowcast/workers/make_averaged_dataset.py b/nowcast/workers/make_averaged_dataset.py
index 47463e7c..5dd6ae67 100644
--- a/nowcast/workers/make_averaged_dataset.py
+++ b/nowcast/workers/make_averaged_dataset.py
@@ -47,9 +47,6 @@ def main():
     _configure_structlog()
     worker = NowcastWorker(NAME, description=__doc__)
     worker.init_cli()
-    worker.cli.add_argument(
-        "host_name", help="Name of the host to run the downsampling extraction on"
-    )
     worker.cli.add_argument(
         "avg_time_interval",
         choices={"day", "month"},
diff --git a/tests/test_next_workers.py b/tests/test_next_workers.py
index 3c0ea34b..1ec7092d 100644
--- a/tests/test_next_workers.py
+++ b/tests/test_next_workers.py
@@ -2104,7 +2104,7 @@ def test_success_nowcast_green_launch_make_averaged_dataset_day(
         )
         expected = NextWorker(
             "nowcast.workers.make_averaged_dataset",
-            args=["skookum", "day", var_group, "--run-date", "2024-02-07"],
+            args=["day", var_group, "--run-date", "2024-02-07"],
             host="localhost",
         )
         assert expected in workers
@@ -2246,7 +2246,7 @@ def test_month_end_day_success_launch_month_average(
         workers = next_workers.after_make_averaged_dataset(msg, config, checklist)
         expected = NextWorker(
             "nowcast.workers.make_averaged_dataset",
-            args=["skookum", "month", reshapr_var_group, "--run-date", "2024-02-01"],
+            args=["month", reshapr_var_group, "--run-date", "2024-02-01"],
             host="localhost",
         )
         assert expected in workers
diff --git a/tests/workers/test_make_averaged_dataset.py b/tests/workers/test_make_averaged_dataset.py
index e1760825..9297075d 100644
--- a/tests/workers/test_make_averaged_dataset.py
+++ b/tests/workers/test_make_averaged_dataset.py
@@ -86,37 +86,31 @@ def test_instantiate_worker(self, mock_worker):
             "SalishSeaCast worker that creates a down-sampled time-series dataset netCDF4 file"
         )
 
-    def test_add_host_name_arg(self, mock_worker):
-        worker = make_averaged_dataset.main()
-
-        assert worker.cli.parser._actions[3].dest == "host_name"
-        assert worker.cli.parser._actions[3].help
-
     def test_add_avg_time_interval_arg(self, mock_worker):
         worker = make_averaged_dataset.main()
 
-        assert worker.cli.parser._actions[4].dest == "avg_time_interval"
-        assert worker.cli.parser._actions[4].choices == {"day", "month"}
-        assert worker.cli.parser._actions[4].help
+        assert worker.cli.parser._actions[3].dest == "avg_time_interval"
+        assert worker.cli.parser._actions[3].choices == {"day", "month"}
+        assert worker.cli.parser._actions[3].help
 
     def test_add_reshapr_var_group_arg(self, mock_worker):
         worker = make_averaged_dataset.main()
 
-        assert worker.cli.parser._actions[5].dest == "reshapr_var_group"
-        assert worker.cli.parser._actions[5].choices == {
+        assert worker.cli.parser._actions[4].dest == "reshapr_var_group"
+        assert worker.cli.parser._actions[4].choices == {
             "biology",
             "chemistry",
             "physics",
         }
-        assert worker.cli.parser._actions[5].help
+        assert worker.cli.parser._actions[4].help
 
     def test_add_run_date_option(self, mock_worker):
         worker = make_averaged_dataset.main()
-        assert worker.cli.parser._actions[6].dest == "run_date"
+        assert worker.cli.parser._actions[5].dest == "run_date"
         expected = nemo_nowcast.cli.CommandLineInterface.arrow_date
-        assert worker.cli.parser._actions[6].type == expected
-        assert worker.cli.parser._actions[6].default == arrow.now().floor("day")
-        assert worker.cli.parser._actions[6].help
+        assert worker.cli.parser._actions[5].type == expected
+        assert worker.cli.parser._actions[5].default == arrow.now().floor("day")
+        assert worker.cli.parser._actions[5].help
 
 
 class TestConfig: