ui

Author: jagath-jaikumar

poetry.lock

@@ -15,8 +15,6 @@ typer = "*"
 
 rescuebox = { path = "../../", develop = true }
 rb-lib = { path = "../rb-lib", develop = true }
-anytree = "^2.12.1"
-loguru = "^0.7.2"
 
 
 [build-system]

src/rb-api/pyproject.toml

@@ -1,3 +1,7 @@
+"""
+This router contains dynamic routes only! Do not add static routes here.
+"""
+
 import inspect
 from typing import Callable, Generator, Optional
 

src/rb-api/rb/api/routes/cli.py

@@ -1,10 +1,9 @@
+import json
 import os
 
-import typer
-from anytree import Node, RenderTree
 from fastapi import APIRouter, Request
 from fastapi.templating import Jinja2Templates
-from loguru import logger
+from rb.lib.typer import typer_app_to_tree
 
 from rescuebox.main import app as rescuebox_app
 
@@ -17,55 +16,7 @@
 
 @ui_router.get("/")
 async def interface(request: Request):
-    tree = _typer_app_to_tree(rescuebox_app)
+    tree = typer_app_to_tree(rescuebox_app)
     return templates.TemplateResponse(
-        "index.html.j2", {"request": request, "tree": tree}
+        "index.html.j2", {"request": request, "tree": json.dumps(tree)}
     )
-
-
-def _typer_app_to_tree(app: typer.Typer) -> dict:
-    # Create root node
-    root = Node("rescuebox", command=None, is_group=True)
-
-    def add_commands_to_node(typer_app: typer.Typer, parent_node: Node):
-        # Add groups recursively
-        for group in getattr(typer_app, "registered_groups", []):
-            group_node = Node(
-                group.name,
-                parent=parent_node,
-                command=None,
-                is_group=True,
-            )
-            # Recursively add any nested groups/commands
-            add_commands_to_node(group.typer_instance, group_node)
-
-        # Add commands at this level
-        for command in getattr(typer_app, "registered_commands", []):
-            command_name = getattr(command, "name", None) or command.callback.__name__
-
-            Node(
-                command_name,
-                parent=parent_node,
-                command=command,
-                is_group=False,
-            )
-
-    # Build the full tree structure
-    add_commands_to_node(app, root)
-
-    # Debug print the tree
-    for pre, fill, node in RenderTree(root):
-        logger.debug("%s%s" % (pre, node.name))
-
-    def node_to_dict(node: Node) -> dict:
-        result = {"name": node.name, "command": node.command, "is_group": node.is_group}
-        if not node.is_group:
-            # the endpoint is the path without the rescuebox root
-            result["endpoint"] = "/" + "/".join([_.name for _ in node.path][1:])
-        if node.children:
-            result["children"] = [node_to_dict(child) for child in node.children]
-        return result
-
-    # Convert the entire tree to dictionary format
-    tree_dict = node_to_dict(root)
-    return tree_dict