feature: connect fuzzy searcher to visualiser

Author: lilatomic

alpacloud/promls/cli.py

@@ -138,6 +138,7 @@ def ish(url, filter: str, display: PrintMode):
 @search.command()
 @arg_url
 @opt_filter
-def browse(url, filter):
+def browse(url, filter: str):
 	"""Browse metrics in an interactive visualizer"""
-	PromlsVisApp(do_fetch(url), filter or "").run()
+	real_filter = filter or ".*"
+	PromlsVisApp(do_fetch(url), real_filter, filter_any(re.compile(real_filter))).run()

alpacloud/promls/vis.py

@@ -8,7 +8,7 @@
 from textual.widget import Widget
 from textual.widgets import Footer, Header, Input, Label, Static, Tree
 
-from alpacloud.promls.filter import MetricsTree, filter_any
+from alpacloud.promls.filter import MetricsTree, Predicate, filter_any, filter_ish, filter_name
 from alpacloud.promls.metrics import Metric
 from alpacloud.promls.util import paths_to_tree
 
@@ -56,14 +56,17 @@ class PromlsVisApp(App):
 
 	BINDINGS = [
 		Binding("ctrl+f", "find", "find", priority=True),
+		Binding("ctrl+g", "goto", "goto", priority=True),
+		Binding("ctrl+z", "fuzzy_find", "fuzzy find", priority=True),
 		Binding("greater_than_sign", "expand_all", "Expand all", show=False),
 		Binding("less_than_sign", "collapse_all", "Collapse all", show=False),
 	]
 
-	def __init__(self, metrics: MetricsTree, query: str, *args, **kwargs):
+	def __init__(self, metrics: MetricsTree, query: str, predicate: Predicate, *args, **kwargs):
 		super().__init__(*args, **kwargs)
 		self.metrics = metrics
 		self.query = query
+		self.predicate = predicate
 
 	def compose(self) -> ComposeResult:
 		yield Header()
@@ -80,6 +83,16 @@ async def do_find(self, s: str):
 		self.load_metrics(self.metrics)
 
 	async def action_find(self) -> None:
+		self.handle_find_mode_change(filter_any(re.compile(self.query)))
+
+	async def action_fuzzy_find(self) -> None:
+		self.handle_find_mode_change(filter_ish(self.query))
+
+	async def action_goto(self):
+		self.handle_find_mode_change(filter_name(re.compile(self.query)))
+
+	def handle_find_mode_change(self, predicate: Predicate):
+		self.predicate = predicate
 		findbox = self.query_one(FindBox)
 		findbox.focus()
 
@@ -117,7 +130,7 @@ def load_metrics(self, metrics: MetricsTree):
 		tree.clear()
 		root = tree.root
 
-		filtered = metrics.filter(filter_any(re.compile(self.query)))
+		filtered = metrics.filter(self.predicate)
 		self._add_node(root, paths_to_tree(filtered.metrics, sep="_"))
 
 		root.expand_all()