Merge pull request #341 from OpenMined/yash/fixes

de-bug report

syftbox/app/cli.py

@@ -8,10 +8,16 @@
 from syftbox.app.manager import install_app, list_app, uninstall_app
 from syftbox.lib.lib import DEFAULT_CONFIG_PATH, ClientConfig
 
-app = Typer(name="SyftBox Apps", pretty_exceptions_enable=False, no_args_is_help=True, help="Manage SyftBox apps")
+app = Typer(
+    name="SyftBox Apps",
+    help="Manage SyftBox apps",
+    no_args_is_help=True,
+    pretty_exceptions_enable=False,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
 state = {"config": None}
 
-CONFIG_OPTS = Option("-c", "--config", "--config-path", help="Path to the SyftBox config file")
+CONFIG_OPTS = Option("-c", "--config", "--config_path", help="Path to the SyftBox config file")
 
 
 @app.command()
@@ -54,7 +60,7 @@ def uninstall(
     config = load_conf(config_path)
     result = uninstall_app(app_name, config)
     if not result:
-        rprint(f"App not found [bold]'{app_name}'[/bold]")
+        rprint(f"[bold red]Error:[/bold red] '{app_name}' app not found")
         sys.exit(1)
 
     rprint(f"Uninstalled app [bold]'{app_name}'[/bold] from {result}")

syftbox/client/cli.py

@@ -9,7 +9,11 @@
 from syftbox.client.utils.net import get_free_port, is_port_in_use
 from syftbox.lib.lib import DEFAULT_CONFIG_PATH, DEFAULT_SERVER_URL, DEFAULT_SYNC_FOLDER
 
-app = Typer(name="SyftBox Client", pretty_exceptions_enable=False)
+app = Typer(
+    name="SyftBox Client",
+    pretty_exceptions_enable=False,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
 
 # Define options separately to keep the function signature clean
 # fmt: off

syftbox/lib/debug.py

@@ -13,9 +13,13 @@
 def debug_report() -> str:
     config_path = os.environ.get("SYFTBOX_CLIENT_CONFIG_PATH", DEFAULT_CONFIG_PATH)
     client_config = None
+    apps = []
+    app_dir = None
     try:
         client_config = ClientConfig.load(config_path)
-        app_list = list_app(client_config)
+        result = list_app(client_config)
+        app_dir = str(result.apps_dir)
+        apps = [app.name for app in result.apps]
         client_config = asdict(client_config)
         del client_config["_server_client"]
     except Exception:
@@ -43,8 +47,8 @@ def debug_report() -> str:
             "command": syftbox_path or "syftbox executable not found in PATH",
             "client_config_path": str(config_path),
             "client_config": client_config,
-            "apps_dir": str(app_list.apps_dir),
-            "apps": app_list.apps,
+            "apps_dir": app_dir,
+            "apps": apps,
         },
         "syftbox_env": {key: value for key, value in os.environ.items() if key.startswith("SYFT")},
     }

syftbox/main.py

@@ -8,9 +8,10 @@
 
 app = Typer(
     name="SyftBox",
-    no_args_is_help=True,
     help="SyftBox CLI",
+    no_args_is_help=True,
     pretty_exceptions_enable=False,
+    context_settings={"help_option_names": ["-h", "--help"]},
 )
 
 

syftbox/server/cli.py

@@ -7,7 +7,11 @@
 from syftbox.client.cli import VERBOSE_OPTS
 from syftbox.server.server import app as fastapi_app
 
-app = Typer(name="SyftBox Server", pretty_exceptions_enable=False)
+app = Typer(
+    name="SyftBox Server",
+    pretty_exceptions_enable=False,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
 
 
 # Define options separately to keep the function signature clean

syftbox/server/templates/install.sh

@@ -188,7 +188,7 @@ show_debug_and_exit() {
     echo "Alias           : $py"
     echo "Version         : $($py -V)"
     echo "which           : $(which $py)"
-    echo "python/[ip env vars"
+    echo "python env vars"
     env | grep -E "(PYTHON|PIP)" || echo "-"
     echo
     info "Python Virtual Environment"