outerbounds 0.3.175rc1__py3-none-any.whl → 0.3.176rc2__py3-none-any.whl

outerbounds/apps/app_cli.py

@@ -13,14 +13,11 @@ from .app_config import (
     AuthType,
 )
 from .cli_to_config import build_config_from_options
-from .utils import (
-    CommaSeparatedListType,
-    KVPairType,
-)
+from .utils import CommaSeparatedListType, KVPairType, KVDictType
 from . import experimental
 from .validations import deploy_validations
 from .code_package import CodePackager
-from .capsule import Capsule
+from .capsule import Capsule, list_and_filter_capsules
 import shlex
 import time
 import uuid
@@ -30,6 +27,8 @@ LOGGER_TIMESTAMP = "magenta"
 LOGGER_COLOR = "green"
 LOGGER_BAD_COLOR = "red"
 
+NativeList = list
+
 
 def _logger(
     body="", system_msg=False, head="", bad=False, timestamp=True, nl=True, color=None
@@ -75,6 +74,36 @@ def _pre_create_debug(app_config: AppConfig, capsule: Capsule, state_dir: str):
             )
 
 
+def print_table(data, headers):
+    """Print data in a formatted table."""
+    if not data:
+        return
+
+    # Calculate column widths
+    col_widths = [len(h) for h in headers]
+
+    # Calculate actual widths based on data
+    for row in data:
+        for i, cell in enumerate(row):
+            col_widths[i] = max(col_widths[i], len(str(cell)))
+
+    # Print header
+    header_row = " | ".join(
+        [headers[i].ljust(col_widths[i]) for i in range(len(headers))]
+    )
+    click.secho("-" * len(header_row), fg="yellow")
+    click.secho(header_row, fg="yellow", bold=True)
+    click.secho("-" * len(header_row), fg="yellow")
+
+    # Print data rows
+    for row in data:
+        formatted_row = " | ".join(
+            [str(row[i]).ljust(col_widths[i]) for i in range(len(row))]
+        )
+        click.secho(formatted_row, fg="green", bold=True)
+    click.secho("-" * len(header_row), fg="yellow")
+
+
 @click.group()
 def cli():
     """Outerbounds CLI tool."""
@@ -490,6 +519,139 @@ def deploy(ctx, command, **options):
         raise e
 
 
+def _parse_capsule_table(filtered_capsules):
+    headers = ["Name", "ID", "Ready", "App Type", "Port", "Tags", "URL"]
+    table_data = []
+
+    for capsule in filtered_capsules:
+        spec = capsule.get("spec", {})
+        status = capsule.get("status", {})
+        cap_id = capsule.get("id")
+
+        display_name = spec.get("displayName", "")
+        ready = str(status.get("readyToServeTraffic", False))
+        auth_type = spec.get("authConfig", {}).get("authType", "")
+        port = str(spec.get("port", ""))
+        tags_str = ", ".join(
+            [f"{tag['key']}={tag['value']}" for tag in spec.get("tags", [])]
+        )
+        url = status.get("accessInfo", {}).get("outOfClusterURL", "")
+
+        table_data.append(
+            [
+                display_name,
+                cap_id,
+                ready,
+                auth_type,
+                port,
+                tags_str,
+                f"https://{url}",
+            ]
+        )
+    return headers, table_data
+
+
+@app.command(help="List apps in the Outerbounds Platform.")
+@click.option("--project", type=str, help="Filter apps by project")
+@click.option("--branch", type=str, help="Filter apps by branch")
+@click.option("--name", type=str, help="Filter apps by name")
+@click.option(
+    "--tag",
+    "tags",
+    type=KVDictType,
+    help="Filter apps by tag. Format KEY=VALUE. Example --tag foo=bar --tag x=y. If multiple tags are provided, the app must match all of them.",
+    multiple=True,
+)
+@click.option(
+    "--format",
+    type=click.Choice(["json", "text"]),
+    help="Format the output",
+    default="text",
+)
+@click.option(
+    "--auth-type", type=click.Choice(AuthType.enums()), help="Filter apps by Auth type"
+)
+@click.pass_context
+def list(ctx, project, branch, name, tags, format, auth_type):
+    """List apps in the Outerbounds Platform."""
+
+    filtered_capsules = list_and_filter_capsules(
+        ctx.obj.api_url, ctx.obj.perimeter, project, branch, name, tags, auth_type, None
+    )
+    if format == "json":
+        click.echo(json.dumps(filtered_capsules, indent=4))
+    else:
+        headers, table_data = _parse_capsule_table(filtered_capsules)
+        print_table(table_data, headers)
+
+
+@app.command(help="Delete an app/apps from the Outerbounds Platform.")
+@click.option("--name", type=str, help="Filter app to delete by name")
+@click.option("--id", "cap_id", type=str, help="Filter app to delete by id")
+@click.option("--project", type=str, help="Filter apps to delete by project")
+@click.option("--branch", type=str, help="Filter apps to delete by branch")
+@click.option(
+    "--tag",
+    "tags",
+    multiple=True,
+    type=KVPairType,
+    help="Filter apps to delete by tag. Format KEY=VALUE. Example --tag foo=bar --tag x=y. If multiple tags are provided, the app must match all of them.",
+)
+@click.pass_context
+def delete(ctx, name, cap_id, project, branch, tags):
+
+    """Delete an app/apps from the Outerbounds Platform."""
+    # Atleast one of the args need to be provided
+    if not any(
+        [
+            name is not None,
+            cap_id is not None,
+            project is not None,
+            branch is not None,
+            len(tags) != 0,
+        ]
+    ):
+        raise AppConfigError(
+            "Atleast one of the options need to be provided. You can use --name, --id, --project, --branch, --tag"
+        )
+
+    filtered_capsules = list_and_filter_capsules(
+        ctx.obj.api_url, ctx.obj.perimeter, project, branch, name, tags, None, cap_id
+    )
+
+    headers, table_data = _parse_capsule_table(filtered_capsules)
+    click.secho("The following apps will be deleted:", fg="red", bold=True)
+    print_table(table_data, headers)
+
+    # Confirm the deletion
+    confirm = click.prompt(
+        click.style(
+            "💊 Are you sure you want to delete these apps?", fg="red", bold=True
+        ),
+        default="no",
+        type=click.Choice(["yes", "no"]),
+    )
+    if confirm == "no":
+        exit(1)
+
+    def item_show_func(x):
+        if not x:
+            return None
+        name = x.get("spec", {}).get("displayName", "")
+        id = x.get("id", "")
+        return click.style("💊 deleting %s [%s]" % (name, id), fg="red", bold=True)
+
+    with click.progressbar(
+        filtered_capsules,
+        label=click.style("💊 Deleting apps...", fg="red", bold=True),
+        fill_char=click.style("█", fg="red", bold=True),
+        empty_char=click.style("░", fg="red", bold=True),
+        item_show_func=item_show_func,
+    ) as bar:
+        for capsule in bar:
+            Capsule.delete(capsule.get("id"), ctx.obj.api_url, ctx.obj.perimeter)
+
+
 @app.command(help="Run an app locally (for testing).")
 @common_run_options
 @click.pass_context

outerbounds/apps/capsule.py

@@ -270,9 +270,10 @@ def get_capsule(capsule_id: str, api_url: str, request_headers: dict):
 
 
 def delete_capsule(capsule_id: str, api_url: str, request_headers: dict):
+    _url = os.path.join(api_url, capsule_id)
     response = safe_requests_wrapper(
         requests.delete,
-        os.path.join(api_url, capsule_id),
+        _url,
         headers=request_headers,
         retryable_status_codes=[409],  # todo : verify me
     )
@@ -281,15 +282,117 @@ def delete_capsule(capsule_id: str, api_url: str, request_headers: dict):
             f"Failed to delete capsule: {response.status_code} {response.text}"
         )
 
+    if response.status_code == 200:
+        return True
+    return False
+
+
+def list_capsules(api_url: str, request_headers: dict):
+    response = safe_requests_wrapper(
+        requests.get,
+        api_url,
+        headers=request_headers,
+    )
+    if response.status_code >= 400:
+        raise TODOException(
+            f"Failed to list capsules: {response.status_code} {response.text}"
+        )
     return response.json()
 
 
+def list_and_filter_capsules(
+    api_url, perimeter, project, branch, name, tags, auth_type, capsule_id
+):
+    capsules = Capsule.list(api_url, perimeter)
+
+    def _tags_match(tags, key, value):
+        for t in tags:
+            if t["key"] == key and t["value"] == value:
+                return True
+        return False
+
+    def _all_tags_match(tags, tags_to_match):
+        for t in tags_to_match:
+            if _tags_match(tags, t["key"], t["value"]):
+                return True
+        return False
+
+    def _filter_capsules(capsules, project, branch, name, tags, auth_type, capsule_id):
+        _filtered_capsules = []
+        for capsule in capsules:
+            set_tags = capsule.get("spec", {}).get("tags", [])
+            display_name = capsule.get("spec", {}).get("displayName", None)
+            set_id = capsule.get("id", None)
+            set_auth_type = (
+                capsule.get("spec", {}).get("authConfig", {}).get("authType", None)
+            )
+
+            if auth_type and set_auth_type != auth_type:
+                continue
+            if project and not _tags_match(set_tags, "project", project):
+                continue
+            if branch and not _tags_match(set_tags, "branch", branch):
+                continue
+            if name and display_name != name:
+                continue
+            if tags and not _all_tags_match(set_tags, tags):
+                continue
+            if capsule_id and set_id != capsule_id:
+                continue
+
+            _filtered_capsules.append(capsule)
+        return _filtered_capsules
+
+    return _filter_capsules(
+        capsules, project, branch, name, tags, auth_type, capsule_id
+    )
+
+
 class Capsule:
 
     status: CapsuleStateMachine
 
     identifier = None
 
+    @classmethod
+    def list(cls, base_url: str, perimeter: str):
+        base_url = cls._create_base_url(base_url, perimeter)
+        from metaflow.metaflow_config import SERVICE_HEADERS
+
+        request_headers = {
+            **{"Content-Type": "application/json", "Connection": "keep-alive"},
+            **(SERVICE_HEADERS or {}),
+        }
+        _capsules = list_capsules(base_url, request_headers)
+        if "capsules" not in _capsules:
+            raise TODOException(f"Failed to list capsules")
+        return _capsules.get("capsules", [])
+
+    @classmethod
+    def delete(cls, identifier: str, base_url: str, perimeter: str):
+        base_url = cls._create_base_url(base_url, perimeter)
+        from metaflow.metaflow_config import SERVICE_HEADERS
+
+        request_headers = {
+            **{"Content-Type": "application/json", "Connection": "keep-alive"},
+            **(SERVICE_HEADERS or {}),
+        }
+        return delete_capsule(identifier, base_url, request_headers)
+
+    @classmethod
+    def _create_base_url(
+        cls,
+        base_url: str,
+        perimeter: str,
+    ):
+        return os.path.join(
+            base_url,
+            "v1",
+            "perimeters",
+            perimeter,
+            "capsules",
+        )
+
     # TODO: Current default timeout is very large of 5 minutes. Ideally we should have finished the deployed in less than 1 minutes.
     def __init__(
         self,
@@ -299,12 +402,9 @@ class Capsule:
         debug_dir: Optional[str] = None,
     ):
         self._app_config = app_config
-        self._base_url = os.path.join(
+        self._base_url = self._create_base_url(
             base_url,
-            "v1",
-            "perimeters",
             app_config.get_state("perimeter"),
-            "capsules",
         )
         self._create_timeout = create_timeout
         self._debug_dir = debug_dir
@@ -371,9 +471,3 @@ class Capsule:
                 state_machine.check_for_debug(self._debug_dir)
 
         return capsule_response
-
-    def list(self):
-        return list_capsules(self._base_url, self._request_headers)
-
-    def delete(self):
-        return delete_capsule(self.identifier, self._base_url, self._request_headers)

outerbounds/apps/utils.py

@@ -18,6 +18,31 @@ class MaximumRetriesExceeded(Exception):
         return f"Maximum retries exceeded for {self.url}[{self.method}] {self.status_code} {self.text}"
 
 
+class KeyValueDictPair(click.ParamType):
+    name = "KV-DICT-PAIR"
+
+    def convert(self, value, param, ctx):
+        # Parse a string of the form KEY=VALUE into a dict {KEY: VALUE}
+        if len(value.split("=", 1)) != 2:
+            self.fail(
+                f"Invalid format for {value}. Expected format: KEY=VALUE", param, ctx
+            )
+
+        key, _value = value.split("=", 1)
+        try:
+            return {"key": key, "value": json.loads(_value)}
+        except json.JSONDecodeError:
+            return {"key": key, "value": _value}
+        except Exception as e:
+            self.fail(f"Invalid value for {value}. Error: {e}", param, ctx)
+
+    def __str__(self):
+        return repr(self)
+
+    def __repr__(self):
+        return "KV-PAIR"
+
+
 class KeyValuePair(click.ParamType):
     name = "KV-PAIR"
 
@@ -155,6 +180,7 @@ KVPairType = KeyValuePair()
 MetaflowArtifactType = MountMetaflowArtifact()
 SecretMountType = MountSecret()
 CommaSeparatedListType = CommaSeparatedList()
+KVDictType = KeyValueDictPair()
 
 
 class TODOException(Exception):

outerbounds/command_groups/apps_cli.py

@@ -410,7 +410,7 @@ def kill_process(config_dir=None, profile=None, port=-1, name=""):
     default=os.environ.get("METAFLOW_PROFILE", ""),
     help="The named metaflow profile in which your workstation exists",
 )
-def list(config_dir=None, profile=None):
+def list_local(config_dir=None, profile=None):
     if "WORKSTATION_ID" not in os.environ:
         click.secho(
             "All outerbounds app commands can only be run from a workstation.",

{outerbounds-0.3.175rc1.dist-info → outerbounds-0.3.176rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.175rc1
+Version: 0.3.176rc2
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -29,8 +29,8 @@ Requires-Dist: google-cloud-secret-manager (>=2.20.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: metaflow-checkpoint (==0.2.1)
 Requires-Dist: ob-metaflow (==2.15.14.1)
-Requires-Dist: ob-metaflow-extensions (==1.1.161rc1)
-Requires-Dist: ob-metaflow-stubs (==6.0.3.175rc1)
+Requires-Dist: ob-metaflow-extensions (==1.1.163rc3)
+Requires-Dist: ob-metaflow-stubs (==6.0.3.176rc2)
 Requires-Dist: opentelemetry-distro (>=0.41b0) ; extra == "otel"
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.20.0) ; extra == "otel"
 Requires-Dist: opentelemetry-instrumentation-requests (>=0.41b0) ; extra == "otel"

{outerbounds-0.3.175rc1.dist-info → outerbounds-0.3.176rc2.dist-info}/RECORD

@@ -40,10 +40,10 @@ outerbounds/_vendor/yaml/scanner.py,sha256=ZcI8IngR56PaQ0m27WU2vxCqmDCuRjz-hr7pi
 outerbounds/_vendor/yaml/serializer.py,sha256=8wFZRy9SsQSktF_f9OOroroqsh4qVUe53ry07P9UgCc,4368
 outerbounds/_vendor/yaml/tokens.py,sha256=JBSu38wihGr4l73JwbfMA7Ks1-X84g8-NskTz7KwPmA,2578
 outerbounds/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-outerbounds/apps/app_cli.py,sha256=zJFjoO6wPjRoKOPywWZ7NqXt4HwlHfPMQ6AquvKKAus,17833
+outerbounds/apps/app_cli.py,sha256=kAKanVOVdBKI82ihAkRL2XcCLYyA-qkr_4FPS9xY-XI,23377
 outerbounds/apps/app_config.py,sha256=KBmW9grhiuG9XZG-R0GZkM-024cjj6ztGzOX_2wZW34,11291
 outerbounds/apps/artifacts.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-outerbounds/apps/capsule.py,sha256=BRUBF8WV_lm4QCnxxPQ6jlikdKS_bvf41pwrRqgWIpQ,13608
+outerbounds/apps/capsule.py,sha256=8UC0MXn3SeLBwX8k3ej5Uiqy6U5tcynIrNFZ0GRqFNk,16696
 outerbounds/apps/cli_to_config.py,sha256=hV6rfPgCiAX03O363GkvdjSIJBt3-oSbL6F2sTUucFE,3195
 outerbounds/apps/code_package/__init__.py,sha256=8McF7pgx8ghvjRnazp2Qktlxi9yYwNiwESSQrk-2oW8,68
 outerbounds/apps/code_package/code_packager.py,sha256=SQDBXKwizzpag5GpwoZpvvkyPOodRSQwk2ecAAfO0HI,23316
@@ -53,11 +53,11 @@ outerbounds/apps/dependencies.py,sha256=SqvdFQdFZZW0wXX_CHMHCrfE0TwaRkTvGCRbQ2Mx
 outerbounds/apps/deployer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/apps/experimental/__init__.py,sha256=12L_FzZyzv162uo4I6cmlrxat7feUtIu_kxbObTJZTA,3059
 outerbounds/apps/secrets.py,sha256=27qf04lOBqRjvcswj0ldHOmntP2T6SEjtMJtkJQ_GUg,6100
-outerbounds/apps/utils.py,sha256=JymjsgpU0osF-eDvstFS9zkM7bqliJdqAEV7kAjqxCM,7298
+outerbounds/apps/utils.py,sha256=xKaSJRmAYToyWvantixLES1vdi5vLLdoQ6yZXAv9IBw,8089
 outerbounds/apps/validations.py,sha256=AVEw9eCvkzqq1m5ZC8btaWrSR6kWYKzarELfrASuAwQ,1117
 outerbounds/cli_main.py,sha256=e9UMnPysmc7gbrimq2I4KfltggyU7pw59Cn9aEguVcU,74
 outerbounds/command_groups/__init__.py,sha256=QPWtj5wDRTINDxVUL7XPqG3HoxHNvYOg08EnuSZB2Hc,21
-outerbounds/command_groups/apps_cli.py,sha256=weXYgUbTVIxMSweLVdod_C1laiB32YKwYhf22OfqQJE,20815
+outerbounds/command_groups/apps_cli.py,sha256=ecXyLhGxjbct62iqviP9qBX8s4d-XG56ICpTM2h2etk,20821
 outerbounds/command_groups/cli.py,sha256=I8b0zyY_xhZfmaLgJcgR98YXxgirkUK7xsjknEd4nfc,534
 outerbounds/command_groups/fast_bakery_cli.py,sha256=5kja7v6C651XAY6dsP_IkBPJQgfU4hA4S9yTOiVPhW0,6213
 outerbounds/command_groups/flowprojects_cli.py,sha256=gFAA_zUIyhD092Hd7IW5InuIxOqdwRJsHgyWQjy8LZw,3792
@@ -72,7 +72,7 @@ outerbounds/utils/metaflowconfig.py,sha256=l2vJbgPkLISU-XPGZFaC8ZKmYFyJemlD6bwB-
 outerbounds/utils/schema.py,sha256=lMUr9kNgn9wy-sO_t_Tlxmbt63yLeN4b0xQXbDUDj4A,2331
 outerbounds/utils/utils.py,sha256=4Z8cszNob_8kDYCLNTrP-wWads_S_MdL3Uj3ju4mEsk,501
 outerbounds/vendor.py,sha256=gRLRJNXtZBeUpPEog0LOeIsl6GosaFFbCxUvR4bW6IQ,5093
-outerbounds-0.3.175rc1.dist-info/METADATA,sha256=BzZlrHhvLf-__NA2SX6gihlFIgGuXyJ-VhzpVrjSi3Q,1846
-outerbounds-0.3.175rc1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-outerbounds-0.3.175rc1.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.175rc1.dist-info/RECORD,,
+outerbounds-0.3.176rc2.dist-info/METADATA,sha256=sv3uctge_hMpjW2RR9Il9aD6N1d_bIIXfYvnjcdtL9c,1846
+outerbounds-0.3.176rc2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+outerbounds-0.3.176rc2.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
+outerbounds-0.3.176rc2.dist-info/RECORD,,