Feat/issue103 (#107)

* feat(handlers): Swap TK msgbox to console prompts

Addresses #103

- Also addressed issue with multiple online Celery worker checks

* feat(formatting): improve console output / logging

Author: in03

poetry.lock

@@ -23,6 +23,7 @@ notify-py = "^0.3.3"
 shortuuid = "^1.0.8"
 yaspin = "^2.1.0"
 ffmpeg-python = "^0.2.0"
+asciimatics = "^1.14.0"
 
 [tool.poetry.dev-dependencies]
 mkdocs-material = "^7.3.6"

pyproject.toml

@@ -1,4 +1,5 @@
 import logging
+import time
 from typing import Union
 
 from rich import print
@@ -17,6 +18,22 @@
 logger = logging.getLogger(__name__)
 
 
+def check_worker_presence():
+    """Warn user if no celery workers are available"""
+
+    online_workers = celery_app.control.inspect().active_queues()
+
+    if not online_workers:
+
+        logger.warning(
+            "[yellow]There are no workers currently online to process jobs!\n"
+            "Make sure you start at least one."
+        )
+
+    logger.debug(f"[magenta]Online workers:[/]\n{online_workers}")
+    return online_workers
+
+
 def check_for_updates(github_url: str, package_name: str) -> Union[dict, None]:
 
     """Compare git origin to local git or package dist for updates
@@ -88,36 +105,21 @@ def check_for_updates(github_url: str, package_name: str) -> Union[dict, None]:
     }
 
 
-def check_worker_compatability():
+def check_worker_compatability(online_workers):
 
     if settings["app"]["disable_version_constrain"]:
         logger.warning(
             "[yellow]Version constrain is disabled![/] [red][bold]Thar be dragons :dragon_face:\n"
         )
-        # time.sleep(2)
+        time.sleep(2)
         return
 
     spinner = yaspin(
         text="Checking worker compatability...",
         color="cyan",
     )
 
-    # Get online workers and package current commit
-    spinner.start()
-    online_workers = celery_app.control.inspect().active_queues()
-    git_full_sha = pkg_info.get_package_current_commit("resolve_proxy_encoder")
-
-    if git_full_sha is None:
-        spinner.fail("❌ ")
-        logger.warning(
-            "[yellow]Couldn't get local package git commit SHA\n"
-            + "Any incompatible workers will not be reported.\n"
-            + "[red]CONTINUE AT OWN RISK![/]"
-        )
-        return
-
-    git_short_sha = git_full_sha[-4:]
-
+    # Get online workers
     if online_workers is None:
 
         spinner.fail("❌ ")
@@ -132,9 +134,20 @@ def check_worker_compatability():
 
         return
 
-    spinner.stop()
-    logger.debug(f"Online workers: {online_workers}")
+    # Get package current commit
     spinner.start()
+    git_full_sha = pkg_info.get_package_current_commit("resolve_proxy_encoder")
+
+    if git_full_sha is None:
+        spinner.fail("❌ ")
+        logger.warning(
+            "[yellow]Couldn't get local package git commit SHA\n"
+            + "Any incompatible workers will not be reported.\n"
+            + "[red]CONTINUE AT OWN RISK![/]"
+        )
+        return
+
+    git_short_sha = git_full_sha[-4:]
 
     # Get incompatible workers
     incompatible_workers = []

resolve_proxy_encoder/app/checks.py

@@ -21,7 +21,9 @@
 from .utils.core import setup_rich_logging
 
 
-def print_routing_key():
+def get_colorized_routing_key():
+
+    """Returns a formatted the routing key based on version info"""
 
     ver_colour = "red"
     queue = "Unknown"
@@ -35,7 +37,7 @@ def print_routing_key():
         ver_colour = "green" if settings["version_info"]["is_latest"] else "yellow"
         queue = settings["version_info"]["commit_short_sha"]
 
-    print(f"[cyan]Routing to queue:[/] [{ver_colour}]'{queue}'[/]")
+    return f"[{ver_colour}]'{queue}'[/]"
 
 
 # Init classes
@@ -55,11 +57,18 @@ def queue():
     Queue proxies from the currently open
     DaVinci Resolve timeline
     """
-    checks.check_worker_compatability()
 
-    print_routing_key()
+    checks.check_worker_compatability(settings["online_workers"])
+
+    print("\n")
+    console.rule(
+        f"[green bold]Queuing proxies from Resolve's active timeline[/] :outbox_tray:",
+        align="left",
+    )
+    print("\n")
+
+    logger.info(f"[cyan]Routing to queue: {get_colorized_routing_key()}\n")
 
-    print("\n\n[green]Queuing proxies from Resolve's active timeline[/] :outbox_tray:")
     from ..queuer import queue
 
     queue.main()
@@ -74,6 +83,10 @@ def link():
 
     from ..queuer import link
 
+    print("\n")
+    console.rule(f"[green bold]Link proxies[/] :link:", align="left")
+    print("\n")
+
     link.main()
 
 
@@ -87,6 +100,8 @@ def work(
 ):
     """Prompt to start Celery workers on local machine"""
 
+    print("\n")
+    console.rule(f"[green bold]Start workers[/] :construction_worker:", align="left")
     print("\n")
 
     # Print worker queue
@@ -124,6 +139,10 @@ def purge():
         None
     """
 
+    print("\n")
+    console.rule(f"[red bold]Purge all tasks! :fire:", align="left")
+    print("\n")
+
     if Confirm.ask(
         "[yellow]Are you sure you want to purge all tasks?\n"
         "All active tasks and task history will be lost![/]"
@@ -138,7 +157,12 @@ def mon():
     Launch Flower Celery monitor in default browser new window
     """
 
-    print("[green]Launching Flower celery monitor[/] :sunflower:")
+    print("\n")
+    console.rule(
+        f"[green bold]Start Flower Celery monitor[/] :sunflower:", align="left"
+    )
+    print("\n")
+
     webbrowser.open_new(settings["celery"]["flower_url"])
 
 
@@ -148,20 +172,30 @@ def mon():
 def config():
     """Open user settings configuration file for editing"""
 
-    print("[green]Opening user settings file for modification")
+    print("\n")
+    console.rule(
+        f"[green bold]Open 'user_settings.yaml' config[/] :gear:", align="left"
+    )
+    print("\n")
+
     webbrowser.open_new(settings.user_file)
 
 
 def init():
     """Run before CLI App load."""
 
+    # Check for any updates and inject version info into user settings.
     version_info = checks.check_for_updates(
         github_url=settings["app"]["update_check_url"],
         package_name="resolve_proxy_encoder",
     )
 
     settings.update({"version_info": version_info})
 
+    # Check for online workers to pass to other checks
+    online_workers = checks.check_worker_presence()
+    settings.update({"online_workers": online_workers})
+
 
 def main():
     init()

resolve_proxy_encoder/app/cli.py

@@ -54,6 +54,7 @@ def app_exit(level: int = 0, timeout: int = -1, cleanup_funcs: list = []):
                 x()
 
     if timeout < 0:
+        print()
         answer = Prompt.ask("Press [yellow]ENTER[/] to exit")
         sys.exit(level)