outerbounds 0.3.52rc2__py3-none-any.whl → 0.3.52rc5__py3-none-any.whl

outerbounds/command_groups/local_setup_cli.py

@@ -805,22 +805,6 @@ def switch_perimeter(output="", id=None, force=False):
         "Perimeter was successfully switched!",
     )
 
-    if "WORKSTATION_ID" not in os.environ:
-        click.secho(
-            "outerbounds switch-perimeter is only supported on workstations.",
-            fg="red",
-            err=True,
-        )
-        switch_perimeter_step.update(
-            status=OuterboundsCommandStatus.FAIL,
-            reason="outerbounds switch-perimeter is only supported on workstations.",
-            mitigation="",
-        )
-        switch_perimeter_response.add_step(switch_perimeter_step)
-        if output == "json":
-            click.echo(json.dumps(switch_perimeter_response.as_dict(), indent=4))
-        return
-
     metaflow_home_dir = path.expanduser(
         os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
     )
@@ -881,6 +865,7 @@ def switch_perimeter(output="", id=None, force=False):
             click.secho(
                 "Force flag is set. Perimeter will be switched, but can have unintended consequences on other running processes.",
                 fg="yellow",
+                err=True,
             )
 
         ob_config_dict = {"OB_CURRENT_PERIMETER": id}
@@ -889,9 +874,12 @@ def switch_perimeter(output="", id=None, force=False):
         with os.fdopen(fd, "w") as file:
             json.dump(ob_config_dict, file, indent=4)
 
-        click.secho("Perimeter switched to {}".format(id), fg="green")
+        click.secho("Perimeter switched to {}".format(id), fg="green", err=True)
     except BlockingIOError:
         # This exception is raised if the file is already locked (non-blocking mode)
+        # Note that its the metaflow package (the extension actually) that acquires a shared read lock
+        # on the file whenever a process imports metaflow.
+        # In the future we might want to get smarter about it and show which process is holding the lock.
         click.secho(
             "Can't switch perimeter while Metaflow is in use. Please make sure there are no running python processes or notebooks using metaflow.",
             fg="red",
@@ -926,22 +914,6 @@ def show_current_perimeter(output=""):
         "Current Perimeter Fetch Successful.",
     )
 
-    if "WORKSTATION_ID" not in os.environ:
-        click.secho(
-            "outerbounds switch-perimeter is only supported on workstations.",
-            fg="red",
-            err=True,
-        )
-        show_current_perimeter_step.update(
-            status=OuterboundsCommandStatus.FAIL,
-            reason="outerbounds show-current-perimeter is only supported on workstations.",
-            mitigation="",
-        )
-        show_current_perimeter_response.add_step(show_current_perimeter_step)
-        if output == "json":
-            click.echo(json.dumps(show_current_perimeter_response.as_dict(), indent=4))
-        return
-
     metaflow_home_dir = path.expanduser(
         os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
     )
@@ -1000,6 +972,7 @@ def show_current_perimeter(output=""):
         click.secho(
             "Current Perimeter: {}".format(ob_config_dict["OB_CURRENT_PERIMETER"]),
             fg="green",
+            err=True,
         )
         show_current_perimeter_response.add_or_update_data(
             "current_perimeter", ob_config_dict["OB_CURRENT_PERIMETER"]
@@ -1043,22 +1016,6 @@ def list_perimeters(output=""):
         "ListPerimeters", OuterboundsCommandStatus.OK, "Perimeter Fetch Successful."
     )
 
-    if "WORKSTATION_ID" not in os.environ:
-        click.secho(
-            "outerbounds list-perimeters is only supported on workstations.",
-            fg="red",
-            err=True,
-        )
-        list_perimeters_step.update(
-            status=OuterboundsCommandStatus.FAIL,
-            reason="outerbounds list-perimeters is only supported on workstations.",
-            mitigation="",
-        )
-        list_perimeters_response.add_step(list_perimeters_step)
-        if output == "json":
-            click.echo(json.dumps(list_perimeters_response.as_dict(), indent=4))
-        return
-
     metaflow_home_dir = path.expanduser(
         os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
     )
@@ -1134,8 +1091,12 @@ def list_perimeters(output=""):
             ),
         )
         list_perimeters_response.add_step(list_perimeters_step)
+        if output == "json":
+            click.echo(json.dumps(list_perimeters_response.as_dict(), indent=4))
         return
 
+    click.secho("Perimeter: {} (active)".format(active_perimeter), fg="green", err=True)
+
     perimeter_list = []
     for file in os.listdir(metaflow_home_dir):
         if file.startswith("config_") and file.endswith(".json"):
@@ -1144,6 +1105,10 @@ def list_perimeters(output=""):
                 {"id": perimeter_id, "active": perimeter_id == active_perimeter}
             )
 
+            if perimeter_id != active_perimeter:
+                click.secho("Perimeter: {}".format(perimeter_id), err=True)
+
     list_perimeters_response.add_or_update_data("perimeters", perimeter_list)
+
     if output == "json":
         click.echo(json.dumps(list_perimeters_response.as_dict(), indent=4))

outerbounds/command_groups/workstations_cli.py

@@ -196,11 +196,25 @@ def configure_cloud_workstation(config_dir=None, profile=None, binary=None, outp
     default="",
     help="The named metaflow profile in which your workstation exists",
 )
-def list_workstations(config_dir=None, profile=None):
+@click.option(
+    "-o",
+    "--output",
+    default="json",
+    help="Show output in the specified format.",
+    type=click.Choice(["json"]),
+)
+def list_workstations(config_dir=None, profile=None, output="json"):
+    list_response = OuterboundsCommandResponse()
+    list_step = CommandStatus(
+        "listWorkstations",
+        OuterboundsCommandStatus.OK,
+        "Workstation list successfully fetched!",
+    )
+    list_response.add_or_update_data("workstations", [])
+
     try:
         if not profile:
             profile = metaflowconfig.get_metaflow_profile()
-
         metaflow_token = metaflowconfig.get_metaflow_token_from_config(
             config_dir, profile
         )
@@ -210,17 +224,23 @@ def list_workstations(config_dir=None, profile=None):
         workstations_response = requests.get(
             f"{api_url}/v1/workstations", headers={"x-api-key": metaflow_token}
         )
-        try:
-            workstations_response.raise_for_status()
-            click.echo(json.dumps(workstations_response.json(), indent=4))
-        except HTTPError:
-            click.secho("Failed to generate workstation token.", fg="red")
-            click.secho(
-                "Error: {}".format(json.dumps(workstations_response.json(), indent=4))
-            )
+        workstations_response.raise_for_status()
+        list_response.add_or_update_data(
+            "workstations", workstations_response.json()["workstations"]
+        )
+        if output == "json":
+            click.echo(json.dumps(list_response.as_dict(), indent=4))
     except Exception as e:
-        click.secho("Failed to list workstations", fg="red")
-        click.secho("Error: {}".format(str(e)), fg="red")
+        list_step.update(
+            OuterboundsCommandStatus.FAIL, "Failed to list workstations", ""
+        )
+        list_response.add_step(list_step)
+        if output == "json":
+            list_response.add_or_update_data("error", str(e))
+            click.echo(json.dumps(list_response.as_dict(), indent=4))
+        else:
+            click.secho("Failed to list workstations", fg="red", err=True)
+            click.secho("Error: {}".format(str(e)), fg="red", err=True)
 
 
 @cli.command(help="Hibernate workstation", hidden=True)

outerbounds/utils/schema.py

@@ -63,11 +63,11 @@ class OuterboundsCommandResponse:
             self._message = "We found one or more warnings with your installation."
 
     def as_dict(self):
+        self._data["steps"] = [step.as_dict() for step in self._steps]
         return {
             "status": self.status.value,
             "code": self._code,
             "message": self._message,
-            "steps": [step.as_dict() for step in self._steps],
             "metadata": self.metadata,
             "data": self._data,
         }

{outerbounds-0.3.52rc2.dist-info → outerbounds-0.3.52rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.52rc2
+Version: 0.3.52rc5
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps

{outerbounds-0.3.52rc2.dist-info → outerbounds-0.3.52rc5.dist-info}/RECORD

@@ -2,13 +2,13 @@ outerbounds/__init__.py,sha256=GPdaubvAYF8pOFWJ3b-sPMKCpyfpteWVMZWkmaYhxRw,32
 outerbounds/cli_main.py,sha256=e9UMnPysmc7gbrimq2I4KfltggyU7pw59Cn9aEguVcU,74
 outerbounds/command_groups/__init__.py,sha256=QPWtj5wDRTINDxVUL7XPqG3HoxHNvYOg08EnuSZB2Hc,21
 outerbounds/command_groups/cli.py,sha256=61VsBlPG2ykP_786eCyllqeM8DMhPAOfj2FhktrSd7k,207
-outerbounds/command_groups/local_setup_cli.py,sha256=mzNKshItJkIz7vmHtkX1hakfHFfT5gTI5HK3xBLFxqk,41846
-outerbounds/command_groups/workstations_cli.py,sha256=rV8_DlF7coEmJ84VLEtqo6-HyY3ALAyU_ig6Cy-8npk,18605
+outerbounds/command_groups/local_setup_cli.py,sha256=fHZJTFJJO49X0_uhAmDwyOMtvOZVlbMxAF9iLs8euwo,40672
+outerbounds/command_groups/workstations_cli.py,sha256=f3gwHMZPHzeOcGj5VfC5tZZA18JQhFzy2LRGzqAosOk,19286
 outerbounds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/utils/kubeconfig.py,sha256=l1mUP1j9VIq3fsffi5bJ1Nk-hYlwd1dIqkpj7DvVS1E,7936
 outerbounds/utils/metaflowconfig.py,sha256=_Khqzu0KE6X05KkVbb39GXN6CFpG2WRr6Xs35pT2l7A,3299
-outerbounds/utils/schema.py,sha256=4_ONlvZGpBb51KKd-q6mNSKWI9P1huOKafrsf9kVqp8,2152
-outerbounds-0.3.52rc2.dist-info/METADATA,sha256=fe_E3svueXjSzXsQJaJYXYt8LDGfOP_S3cA6wTcIskI,1367
-outerbounds-0.3.52rc2.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.3.52rc2.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.52rc2.dist-info/RECORD,,
+outerbounds/utils/schema.py,sha256=Ht_Yf5uoKO0m36WXHZLSPmWPH6EFWXfZDQsiAUquc5k,2160
+outerbounds-0.3.52rc5.dist-info/METADATA,sha256=XUUknKD5TQrXjRRdnGHCiH3G07aZPWdnbeUYs1xyfOo,1367
+outerbounds-0.3.52rc5.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+outerbounds-0.3.52rc5.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
+outerbounds-0.3.52rc5.dist-info/RECORD,,