CTX-6562: status command improvements.

coretex/cli/commands/node.py

@@ -22,10 +22,10 @@
 
 from ..modules import ui
 from ..modules import node as node_module
-from ..modules.node import NodeStatus
+from ..modules.node import NodeStatus, getNodeStatus
 from ..modules.user import initializeUserSession
 from ..modules.utils import onBeforeCommandExecute, checkEnvironment
-from ..modules.update import activateAutoUpdate, getNodeStatus
+from ..modules.update import activateAutoUpdate
 from ...utils import docker
 from ...configuration import NodeConfiguration, InvalidConfiguration, ConfigurationNotFound
 
@@ -189,9 +189,8 @@ def status() -> None:
         "busy": "cyan",
         "reconnecting": "yellow"
     }
-
     statusEcho = click.style(nodeStatus.name, fg = statusColors[nodeStatus.name])
-    ui.stdEcho(f"Current status of node is {statusEcho}.")
+    click.echo(f"Node is {statusEcho}.")
 
 
 @click.command()
@@ -207,9 +206,9 @@ def logs(tail: Optional[int], follow: bool, timestamps: bool) -> None:
 
 
 @click.group()
-@onBeforeCommandExecute(docker.isDockerAvailable)
+@onBeforeCommandExecute(docker.isDockerAvailable, excludeSubcommands = ["status"])
 @onBeforeCommandExecute(initializeUserSession)
-@onBeforeCommandExecute(node_module.checkResourceLimitations)
+@onBeforeCommandExecute(node_module.checkResourceLimitations, excludeSubcommands = ["status"])
 @onBeforeCommandExecute(checkEnvironment)
 def node() -> None:
     pass

coretex/cli/modules/ui.py

@@ -23,7 +23,7 @@
 import inquirer
 
 from ...node import NodeMode
-from ...configuration import UserConfiguration, NodeConfiguration
+from ...configuration import NodeConfiguration
 
 
 def clickPrompt(

coretex/cli/modules/update.py

@@ -67,12 +67,3 @@ def activateAutoUpdate() -> None:
 
     if not jobExists(str(updateScriptPath)):
         scheduleJob(UPDATE_SCRIPT_NAME)
-
-
-def getNodeStatus() -> NodeStatus:
-    try:
-        response = requests.get(f"http://localhost:21000/status", timeout = 1)
-        status = response.json()["status"]
-        return NodeStatus(status)
-    except:
-        return NodeStatus.inactive