outerbounds 0.3.187__py3-none-any.whl → 0.3.188rc0__py3-none-any.whl

outerbounds/__init__.py

@@ -1 +1,3 @@
-from .command_groups import cli
+from . import apps
+
+__all__ = ["apps"]

outerbounds/apps/__init__.py

@@ -0,0 +1,28 @@
+from outerbounds._vendor import click
+import os
+
+OUTERBOUNDS_APP_CLI_AVAILABLE = True
+os.environ["APPS_CLI_LOADING_IN_OUTERBOUNDS"] = "true"
+try:
+    from metaflow.ob_internal import app_core  # type: ignore
+except ImportError:
+    OUTERBOUNDS_APP_CLI_AVAILABLE = False
+
+
+if not OUTERBOUNDS_APP_CLI_AVAILABLE:
+
+    @click.group()
+    def _cli():
+        pass
+
+    @_cli.group(help="Dummy Group to append to CLI for Safety")
+    def app():
+        pass
+
+    @app.command(help="Dummy Command to append to CLI for Safety")
+    def cannot_deploy():
+        raise Exception("Outerbounds App CLI not available")
+
+    app_cli_group = app
+else:
+    app_cli_group = app_core.app_cli.app

outerbounds/command_groups/apps_cli.py

@@ -8,6 +8,7 @@ import shutil
 import subprocess
 
 from ..utils import metaflowconfig
+from ..apps import app_cli_group as app
 
 APP_READY_POLL_TIMEOUT_SECONDS = 300
 # Even after our backend validates that the app routes are ready, it takes a few seconds for
@@ -20,11 +21,6 @@ def cli(**kwargs):
     pass
 
 
-@click.group(help="Manage apps")
-def app(**kwargs):
-    pass
-
-
 @app.command(help="Start an app using a port and a name")
 @click.option(
     "-d",
@@ -414,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/command_groups/cli.py

@@ -8,6 +8,7 @@ from . import (
     fast_bakery_cli,
     secrets_cli,
     kubernetes_cli,
+    flowprojects_cli,
 )
 
 
@@ -22,6 +23,7 @@ from . import (
         fast_bakery_cli.cli,
         secrets_cli.cli,
         kubernetes_cli.cli,
+        flowprojects_cli.cli,
     ],
 )
 def cli(**kwargs):

outerbounds/command_groups/flowprojects_cli.py

@@ -0,0 +1,137 @@
+import json
+import os
+import sys
+import requests
+
+from ..utils import metaflowconfig
+from outerbounds._vendor import click
+
+
+@click.group()
+def cli(**kwargs):
+    pass
+
+
+@cli.group(help="Commands for pushing Deployments metadata.", hidden=True)
+def flowproject(**kwargs):
+    pass
+
+
+@flowproject.command()
+@click.option(
+    "-d",
+    "--config-dir",
+    default=os.path.expanduser(os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")),
+    help="Path to Metaflow configuration directory",
+    show_default=True,
+)
+@click.option(
+    "-p",
+    "--profile",
+    default=os.environ.get("METAFLOW_PROFILE", ""),
+    help="The named metaflow profile in which your workstation exists",
+)
+@click.option("--id", help="The ID for this deployment")
+def get_metadata(config_dir, profile, id):
+    api_url = metaflowconfig.get_sanitized_url_from_config(
+        config_dir, profile, "OBP_API_SERVER"
+    )
+    perimeter = _get_perimeter()
+    headers = _get_request_headers()
+
+    project, branch = _parse_id(id)
+
+    # GET the latest flowproject config in order to modify it
+    # /v1/perimeters/:perimeter/:project/:branch/flowprojects/latest
+    response = requests.get(
+        url=f"{api_url}/v1/perimeters/{perimeter}/projects/{project}/branches/{branch}/latestflowproject",
+        headers=headers,
+    )
+    if response.status_code >= 500:
+        raise Exception("API request failed.")
+
+    body = response.json()
+    if response.status_code >= 400:
+        raise Exception("request failed: %s" % body)
+
+    out = json.dumps(body)
+
+    print(out, file=sys.stdout)
+
+
+@flowproject.command()
+@click.option(
+    "-d",
+    "--config-dir",
+    default=os.path.expanduser(os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")),
+    help="Path to Metaflow configuration directory",
+    show_default=True,
+)
+@click.option(
+    "-p",
+    "--profile",
+    default=os.environ.get("METAFLOW_PROFILE", ""),
+    help="The named metaflow profile in which your workstation exists",
+)
+@click.argument("json_str")
+def set_metadata(config_dir, profile, json_str):
+    api_url = metaflowconfig.get_sanitized_url_from_config(
+        config_dir, profile, "OBP_API_SERVER"
+    )
+
+    perimeter = _get_perimeter()
+    headers = _get_request_headers()
+    payload = json.loads(json_str)
+
+    # POST the updated flowproject config
+    # /v1/perimeters/:perimeter/flowprojects
+    response = requests.post(
+        url=f"{api_url}/v1/perimeters/{perimeter}/flowprojects",
+        json=payload,
+        headers=headers,
+    )
+    if response.status_code >= 500:
+        raise Exception("API request failed. %s" % response.text)
+
+    if response.status_code >= 400:
+        raise Exception("request failed: %s" % response.text)
+    body = response.json()
+
+    print(body, file=sys.stdout)
+
+
+def _get_request_headers():
+    headers = {"Content-Type": "application/json", "Connection": "keep-alive"}
+    try:
+        from metaflow.metaflow_config import SERVICE_HEADERS
+
+        headers = {**headers, **(SERVICE_HEADERS or {})}
+    except ImportError:
+        headers = headers
+
+    return headers
+
+
+def _get_perimeter():
+    # Get current perimeter
+    from metaflow_extensions.outerbounds.remote_config import init_config  # type: ignore
+
+    conf = init_config()
+    if "OBP_PERIMETER" in conf:
+        perimeter = conf["OBP_PERIMETER"]
+    else:
+        # if the perimeter is not in metaflow config, try to get it from the environment
+        perimeter = os.environ.get("OBP_PERIMETER", None)
+    if perimeter is None:
+        raise Exception("Perimeter not found in config, but is required.")
+
+    return perimeter
+
+
+def _parse_id(id: str):
+    parts = id.split("/")
+    if len(parts) != 2:
+        raise Exception("ID should consist of two parts: project/branch")
+
+    project, branch = parts
+    return project, branch

{outerbounds-0.3.187.dist-info → outerbounds-0.3.188rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.187
+Version: 0.3.188rc0
 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.4)
 Requires-Dist: ob-metaflow (==2.15.18.1)
-Requires-Dist: ob-metaflow-extensions (==1.1.174)
-Requires-Dist: ob-metaflow-stubs (==6.0.3.187)
+Requires-Dist: ob-metaflow-extensions (==1.1.175rc0)
+Requires-Dist: ob-metaflow-stubs (==6.0.3.188rc0)
 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.187.dist-info → outerbounds-0.3.188rc0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-outerbounds/__init__.py,sha256=GPdaubvAYF8pOFWJ3b-sPMKCpyfpteWVMZWkmaYhxRw,32
+outerbounds/__init__.py,sha256=8kikk4NZ0M0ymHuZN2mzw4LpJKFk0rvjYZ1uRefM7PE,39
 outerbounds/_vendor/PyYAML.LICENSE,sha256=jTko-dxEkP1jVwfLiOsmvXZBAqcoKVQwfT5RZ6V36KQ,1101
 outerbounds/_vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/_vendor/_yaml/__init__.py,sha256=nD985-g4Mrx97PhtSzI2L53o8sCHUJ4ZoBWcUd7o0PQ,1449
@@ -39,11 +39,13 @@ outerbounds/_vendor/yaml/resolver.py,sha256=dPhU1d7G1JCMktPFvNhyqwj2oNvx1yf_Jfa3
 outerbounds/_vendor/yaml/scanner.py,sha256=ZcI8IngR56PaQ0m27WU2vxCqmDCuRjz-hr7pirbMPuw,52982
 outerbounds/_vendor/yaml/serializer.py,sha256=8wFZRy9SsQSktF_f9OOroroqsh4qVUe53ry07P9UgCc,4368
 outerbounds/_vendor/yaml/tokens.py,sha256=JBSu38wihGr4l73JwbfMA7Ks1-X84g8-NskTz7KwPmA,2578
+outerbounds/apps/__init__.py,sha256=oPp-ys_WWx_4xCQ_Yn7A23fIWVTiP2l_cpJ8jjFjNxU,678
 outerbounds/cli_main.py,sha256=e9UMnPysmc7gbrimq2I4KfltggyU7pw59Cn9aEguVcU,74
 outerbounds/command_groups/__init__.py,sha256=QPWtj5wDRTINDxVUL7XPqG3HoxHNvYOg08EnuSZB2Hc,21
-outerbounds/command_groups/apps_cli.py,sha256=v9OlQ1b4BGB-cBZiHB6W5gDocDoMmrQ7zdK11QiJ-B8,20847
-outerbounds/command_groups/cli.py,sha256=FTeeDrvyBb-qcs2xklTiCyVTN5I0tBPyBReqDIE4oWU,530
+outerbounds/command_groups/apps_cli.py,sha256=fXwFjL64ZxlysFuJKoVmj5iX6tmHuU2hU5on2P0fCFc,20830
+outerbounds/command_groups/cli.py,sha256=5xWLs-rp7QABrICWD-u13g8KCRLm9PwtHaJ6tmJzJvo,582
 outerbounds/command_groups/fast_bakery_cli.py,sha256=5kja7v6C651XAY6dsP_IkBPJQgfU4hA4S9yTOiVPhW0,6213
+outerbounds/command_groups/flowprojects_cli.py,sha256=gFAA_zUIyhD092Hd7IW5InuIxOqdwRJsHgyWQjy8LZw,3792
 outerbounds/command_groups/kubernetes_cli.py,sha256=2bxPKUp5g_gdwVo4lT-IeWvHxz6Jmj1KxG70nXNgX_M,14758
 outerbounds/command_groups/local_setup_cli.py,sha256=tuuqJRXQ_guEwOuQSIf9wkUU0yg8yAs31myGViAK15s,36364
 outerbounds/command_groups/perimeters_cli.py,sha256=iF_Uw7ROiSctf6FgoJEy30iDBLVE1j9FKuR3shgJRmc,19050
@@ -56,7 +58,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.187.dist-info/METADATA,sha256=u0xNfL-xHTCs4NiK7pGPdl_MkGL-urd9SBjz-cjZ80U,1837
-outerbounds-0.3.187.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-outerbounds-0.3.187.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.187.dist-info/RECORD,,
+outerbounds-0.3.188rc0.dist-info/METADATA,sha256=SZ1BegkoEFM7WFpoOBGlh6306zdwvnEcTTuHjl9QZOI,1846
+outerbounds-0.3.188rc0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+outerbounds-0.3.188rc0.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
+outerbounds-0.3.188rc0.dist-info/RECORD,,

outerbounds-0.3.188rc0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+outerbounds=outerbounds.cli_main:cli
+

outerbounds-0.3.187.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-outerbounds=outerbounds:cli
-