fix: split up meta for label (#117)

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

Author: henryiii

pyproject.toml

@@ -46,6 +46,7 @@ dependencies = [
   "plotext >=5.2.2",
   "hist >=2.4",
   "textual >=0.13.0",
+  'typing_extensions; python_version<"3.8"'
 ]
 
 [project.optional-dependencies]

src/uproot_browser/tree.py

@@ -6,8 +6,9 @@
 
 import dataclasses
 import functools
+import sys
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any
 
 import uproot
 import uproot.reading
@@ -16,15 +17,36 @@
 from rich.text import Text
 from rich.tree import Tree
 
+if sys.version_info < (3, 8):
+    from typing_extensions import TypedDict
+else:
+    from typing import TypedDict
+
 console = Console()
 
-__all__ = ("make_tree", "process_item", "print_tree", "UprootEntry", "console")
+__all__ = (
+    "make_tree",
+    "process_item",
+    "print_tree",
+    "UprootEntry",
+    "console",
+    "MetaDict",
+)
 
 
 def __dir__() -> tuple[str, ...]:
     return __all__
 
 
+class MetaDictRequired(TypedDict, total=True):
+    label_text: Text
+    label_icon: str
+
+
+class MetaDict(MetaDictRequired, total=False):
+    guide_style: str
+
+
 @dataclasses.dataclass
 class UprootEntry:
     path: str
@@ -38,11 +60,18 @@ def is_dir(self) -> bool:
             return len(self.item.branches) > 0
         return False
 
-    def meta(self) -> dict[str, Any]:
+    def meta(self) -> MetaDict:
         return process_item(self.item)
 
     def label(self) -> Text:
-        return process_item(self.item)["label"]  # type: ignore[no-any-return]
+        meta = self.meta()
+        return Text.assemble(meta["label_icon"], meta["label_text"])
+
+    def tree_args(self) -> dict[str, Any]:
+        d: dict[str, Text | str] = {"label": self.label()}
+        if "guide_style" in self.meta():
+            d["guide_style"] = self.meta()["guide_style"]
+        return d
 
     @property
     def children(self) -> list[UprootEntry]:
@@ -68,7 +97,7 @@ def make_tree(node: UprootEntry, *, tree: Tree | None = None) -> Tree:
     Given an object, build a rich.tree.Tree output.
     """
 
-    tree = Tree(**node.meta()) if tree is None else tree.add(**node.meta())
+    tree = Tree(**node.tree_args()) if tree is None else tree.add(**node.tree_args())
 
     for child in node.children:
         make_tree(child, tree=tree)
@@ -77,24 +106,23 @@ def make_tree(node: UprootEntry, *, tree: Tree | None = None) -> Tree:
 
 
 @functools.singledispatch
-def process_item(uproot_object: Any) -> Dict[str, Any]:
+def process_item(uproot_object: Any) -> MetaDict:
     """
     Given an unknown object, return a rich.tree.Tree output. Specialize for known objects.
     """
     name = getattr(uproot_object, "name", "<unnamed>")
     classname = getattr(uproot_object, "classname", uproot_object.__class__.__name__)
-    label = Text.assemble(
-        "❓ ",
+    label_text = Text.assemble(
         (f"{name} ", "bold"),
         (classname, "italic"),
     )
-    return {"label": label}
+    return MetaDict(label_icon="❓ ", label_text=label_text)
 
 
 @process_item.register
 def _process_item_tfile(
     uproot_object: uproot.reading.ReadOnlyDirectory,
-) -> Dict[str, Any]:
+) -> MetaDict:
     """
     Given an TFile, return a rich.tree.Tree output.
     """
@@ -109,33 +137,34 @@ def _process_item_tfile(
         path_name = escape(path.name)
         link_text = f"file://{path}"
 
-    label = Text.from_markup(f":file_folder: [link {link_text}]{path_name}")
+    label_text = Text.from_markup(f"[link {link_text}]{path_name}")
 
-    return {
-        "label": label,
-        "guide_style": "bold bright_blue",
-    }
+    return MetaDict(
+        label_icon="📁 ",
+        label_text=label_text,
+        guide_style="bold bright_blue",
+    )
 
 
 @process_item.register
-def _process_item_ttree(uproot_object: uproot.TTree) -> Dict[str, Any]:
+def _process_item_ttree(uproot_object: uproot.TTree) -> MetaDict:
     """
     Given an tree, return a rich.tree.Tree output.
     """
-    label = Text.assemble(
-        "🌴 ",
+    label_text = Text.assemble(
         (f"{uproot_object.name} ", "bold"),
         f"({uproot_object.num_entries:g})",
     )
 
-    return {
-        "label": label,
-        "guide_style": "bold bright_green",
-    }
+    return MetaDict(
+        label_icon="🌴 ",
+        label_text=label_text,
+        guide_style="bold bright_green",
+    )
 
 
 @process_item.register
-def _process_item_tbranch(uproot_object: uproot.TBranch) -> Dict[str, Any]:
+def _process_item_tbranch(uproot_object: uproot.TBranch) -> MetaDict:
     """
     Given an branch, return a rich.tree.Tree output.
     """
@@ -148,29 +177,35 @@ def _process_item_tbranch(uproot_object: uproot.TBranch) -> Dict[str, Any]:
     if len(uproot_object.branches):
         icon = "🌿 "
 
-    label = Text.assemble(
-        icon,
+    label_text = Text.assemble(
         (f"{uproot_object.name} ", "bold"),
         (f"{uproot_object.typename}", "italic"),
     )
-    return {"label": label}
+
+    return MetaDict(
+        label_icon=icon,
+        label_text=label_text,
+        guide_style="bold bright_green",
+    )
 
 
 @process_item.register
-def _process_item_th(uproot_object: uproot.behaviors.TH1.Histogram) -> Dict[str, Any]:
+def _process_item_th(uproot_object: uproot.behaviors.TH1.Histogram) -> MetaDict:
     """
     Given an histogram, return a rich.tree.Tree output.
     """
     icon = "📊 " if uproot_object.kind == "COUNT" else "📈 "
     sizes = " × ".join(f"{len(ax)}" for ax in uproot_object.axes)
 
-    label = Text.assemble(
-        icon,
+    label_text = Text.assemble(
         (f"{uproot_object.name} ", "bold"),
         (f"{uproot_object.classname} ", "italic"),
         f"({sizes})",
     )
-    return {"label": label}
+    return MetaDict(
+        label_icon=icon,
+        label_text=label_text,
+    )
 
 
 # pylint: disable-next=redefined-outer-name

src/uproot_browser/tui/browser.css

@@ -23,7 +23,7 @@ Browser Widget {
 }
 
 Tree > .tree--cursor {
-    background: $secondary-darken;
+    background: $secondary-darken-1;
     color: $text;
     text-style: bold;
 }

src/uproot_browser/tui/browser.py

@@ -17,7 +17,7 @@
 from textual.reactive import var
 
 with contextlib.suppress(AttributeError):
-    light_background = 0xDF, 0xDF, 0xDF  # $surface-darken-1
+    light_background = 0xEF, 0xEF, 0xEF  # $surface-darken-1
     # pylint: disable-next=protected-access
     plt._dict.themes["default"][0] = light_background
     # pylint: disable-next=protected-access
@@ -144,10 +144,11 @@ def on_uproot_selected(self, message: UprootSelected) -> None:
             content_switcher.current = "error"
 
 
-if __name__ == "<run_path>":
+if __name__ in {"<run_path>", "__main__"}:
     import uproot_browser.dirs
 
     fname = uproot_browser.dirs.filename(
         "../scikit-hep-testdata/src/skhep_testdata/data/uproot-Event.root"
     )
     app = Browser(path=Path(fname))
+    app.run()

src/uproot_browser/tui/left_panel.py

@@ -42,20 +42,17 @@ def __init__(self, path: Path, **args: Any) -> None:
     def render_label(
         self,
         node: textual.widgets.tree.TreeNode[UprootEntry],
-        base_style: Style,  # noqa: ARG002
+        base_style: Style,
         style: Style,  # ,
     ) -> rich.text.Text:
-        meta = {
-            "@click": f"click_label({node.id})",
-            "tree_node": node.id,
-        }
         assert node.data
-        icon_label = node.data.label()
-        icon_label.apply_meta(meta)
+        meta = node.data.meta()
+        label_icon = rich.text.Text(meta["label_icon"])
+        label_icon.stylize(base_style)
 
-        # label = icon_label.copy()
-        icon_label.stylize(style)
-        return icon_label
+        label = rich.text.Text.assemble(label_icon, meta["label_text"])
+        label.stylize(style)
+        return label
 
     def on_mount(self) -> None:
         self.load_directory(self.root)