redesign: move igneous wait to igneous queue wait

Author: william-silversmith

igneous_cli/cli.py

@@ -885,24 +885,6 @@ def _is_empty():
 
   return _is_empty
 
-@main.command()
-@click.argument("queue", type=str)
-@click.option('--aws-region', default=SQS_REGION_NAME, help=f"AWS region in which the SQS queue resides.", show_default=True)
-@click.option('--rate', default=30.0, help=f"Number of seconds between each poll of the queue.", show_default=True)
-@click.pass_context
-def wait(ctx, queue, aws_region, rate):
-  """Wait for a queue to empty without executing tasks.
-
-  This can be useful for filling a queue and then waiting
-  for a cluster to finish processing before loading the next
-  set of tasks in a script.
-  """
-  tq = TaskQueue(normalize_path(queue), region_name=aws_region)
-  empty_fn = is_empty(tq)
-
-  while not empty_fn():
-    time.sleep(rate)
-
 @main.command()
 @click.argument("queue", type=str)
 @click.option('--aws-region', default=SQS_REGION_NAME, help=f"AWS region in which the SQS queue resides.", show_default=True)
@@ -1969,13 +1951,30 @@ def queuegroup():
   """
   pass
 
+@queuegroup.command()
+@click.argument("queue", type=str)
+@click.option('--aws-region', default=SQS_REGION_NAME, help=f"AWS region in which the SQS queue resides.", show_default=True)
+@click.option('--rate', default=30.0, help=f"Number of seconds between each poll of the queue.", show_default=True)
+@click.pass_context
+def wait(ctx, queue, aws_region, rate):
+  """Wait for a queue to empty without executing tasks.
+
+  This can be useful for filling a queue and then waiting
+  for a cluster to finish processing before loading the next
+  set of tasks in a script.
+  """
+  tq = TaskQueue(normalize_path(queue), region_name=aws_region)
+  empty_fn = is_empty(tq)
+
+  while not empty_fn():
+    time.sleep(rate)
+
 @queuegroup.command()
 @click.argument("path")
 def rezero(path):
   """Reset collected statistics for queue."""
   TaskQueue(normalize_path(path)).rezero()
 
-
 def natural_time_delta(seconds:float) -> str:
   sec = abs(seconds)
   if sec == 0.0: