filter bundles and endpoints by name in CLI (#84)

Author: phil-scale

launch/cli/bundles.py

@@ -1,3 +1,6 @@
+import re
+from typing import Optional
+
 import click
 from rich.syntax import Syntax
 from rich.table import Column, Table
@@ -15,8 +18,9 @@ def bundles(ctx: click.Context):
 
 
 @bundles.command("list")
+@click.option("--name", "-n", help="Regex to use to filter by name", default=None)
 @click.pass_context
-def list_bundles(ctx: click.Context):
+def list_bundles(ctx: click.Context, name: Optional[str]):
     """
     List all of your Bundles
     """
@@ -31,13 +35,15 @@ def list_bundles(ctx: click.Context):
         title_justify="left",
     )
     with spinner("Fetching bundles"):
-        for model_bundle in client.list_model_bundles():
-            table.add_row(
-                model_bundle.id,
-                model_bundle.name,
-                model_bundle.location,
-                model_bundle.packaging_type,
-            )
+        model_bundles = client.list_model_bundles()
+        for model_bundle in model_bundles:
+            if name is None or re.match(name, model_bundle.name):
+                table.add_row(
+                    model_bundle.id,
+                    model_bundle.name,
+                    model_bundle.location,
+                    model_bundle.packaging_type,
+                )
     pretty_print(table)
 
 

launch/cli/endpoints.py

@@ -1,5 +1,6 @@
+import re
 from pprint import pformat
-from typing import NamedTuple
+from typing import NamedTuple, Optional
 
 import click
 import questionary as q
@@ -34,6 +35,7 @@ class EndpointRow(NamedTuple):
 
 @click.pass_context
 @endpoints.command("list")
+@click.option("--name", "-n", help="Regex to use to filter by name", default=None)
 @click.option("-o", "--orderby", required=False, type=click.Choice(EndpointRow._fields), help="How to order the table")
 @click.option(
     "-d",
@@ -45,7 +47,7 @@ class EndpointRow(NamedTuple):
     help="Whether to sort in descending order",
 )
 @click.pass_context
-def list_endpoints(ctx: click.Context, orderby, descending):
+def list_endpoints(ctx: click.Context, name: Optional[str], orderby, descending: bool):
     """List all of your Endpoints"""
     client = init_client(ctx)
 
@@ -69,20 +71,21 @@ def list_endpoints(ctx: click.Context, orderby, descending):
         model_endpoints = client.list_model_endpoints()
         endpoint_rows = []
         for servable_endpoint in model_endpoints:
-            row = EndpointRow(
-                servable_endpoint.model_endpoint.id,
-                servable_endpoint.model_endpoint.name,
-                servable_endpoint.model_endpoint.bundle_name,
-                servable_endpoint.model_endpoint.status,
-                servable_endpoint.model_endpoint.endpoint_type,
-                str((servable_endpoint.model_endpoint.deployment_state or {}).get("min_workers", "")),
-                str((servable_endpoint.model_endpoint.deployment_state or {}).get("max_workers", "")),
-                str((servable_endpoint.model_endpoint.deployment_state or {}).get("available_workers", "")),
-                str((servable_endpoint.model_endpoint.deployment_state or {}).get("unavailable_workers", "")),
-                str((servable_endpoint.model_endpoint.resource_state or {}).get("gpus", "0")),
-                servable_endpoint.model_endpoint.metadata or "{}",
-            )
-            endpoint_rows.append(row)
+            if name is None or re.match(name, servable_endpoint.model_endpoint.name):
+                row = EndpointRow(
+                    servable_endpoint.model_endpoint.id,
+                    servable_endpoint.model_endpoint.name,
+                    servable_endpoint.model_endpoint.bundle_name,
+                    servable_endpoint.model_endpoint.status,
+                    servable_endpoint.model_endpoint.endpoint_type,
+                    str((servable_endpoint.model_endpoint.deployment_state or {}).get("min_workers", "")),
+                    str((servable_endpoint.model_endpoint.deployment_state or {}).get("max_workers", "")),
+                    str((servable_endpoint.model_endpoint.deployment_state or {}).get("available_workers", "")),
+                    str((servable_endpoint.model_endpoint.deployment_state or {}).get("unavailable_workers", "")),
+                    str((servable_endpoint.model_endpoint.resource_state or {}).get("gpus", "0")),
+                    servable_endpoint.model_endpoint.metadata or "{}",
+                )
+                endpoint_rows.append(row)
 
         if orderby is not None:
             endpoint_rows = sorted(endpoint_rows, key=lambda x: getattr(x, orderby), reverse=descending)