outerbounds 0.3.52rc4__py3-none-any.whl → 0.3.52rc6__py3-none-any.whl

outerbounds/command_groups/local_setup_cli.py

@@ -788,7 +788,7 @@ def configure(
     help="Show output in the specified format.",
     type=click.Choice(["json", ""]),
 )
-@click.option("--id", default="", help="Perimeter name to switch to")
+@click.option("--id", default="", type=str, help="Perimeter name to switch to")
 @click.option(
     "-f",
     "--force",
@@ -868,10 +868,10 @@ def switch_perimeter(output="", id=None, force=False):
                 err=True,
             )
 
-        ob_config_dict = {"OB_CURRENT_PERIMETER": id}
+        ob_config_dict = {"OB_CURRENT_PERIMETER": str(id)}
 
         # Now that we have the lock, we can safely write to the file
-        with os.fdopen(fd, "w") as file:
+        with open(path_to_config, "w") as file:
             json.dump(ob_config_dict, file, indent=4)
 
         click.secho("Perimeter switched to {}".format(id), fg="green", err=True)

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.52rc4.dist-info → outerbounds-0.3.52rc6.dist-info}/METADATA

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

{outerbounds-0.3.52rc4.dist-info → outerbounds-0.3.52rc6.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=fHZJTFJJO49X0_uhAmDwyOMtvOZVlbMxAF9iLs8euwo,40672
-outerbounds/command_groups/workstations_cli.py,sha256=rV8_DlF7coEmJ84VLEtqo6-HyY3ALAyU_ig6Cy-8npk,18605
+outerbounds/command_groups/local_setup_cli.py,sha256=7U4mZbAXBDsY-ghKAzcfgMkuwnTExDW0nyJ52nVCg-g,40694
+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.52rc4.dist-info/METADATA,sha256=LJHnhTVbFMczpzkSvjtj1YsPo70s2jnxDCuEy-tJLf4,1367
-outerbounds-0.3.52rc4.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.3.52rc4.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.52rc4.dist-info/RECORD,,
+outerbounds/utils/schema.py,sha256=Ht_Yf5uoKO0m36WXHZLSPmWPH6EFWXfZDQsiAUquc5k,2160
+outerbounds-0.3.52rc6.dist-info/METADATA,sha256=RZn_J3Jy1JYymPhAygV-QcheRb-GEVN_VPx8jzFzRSw,1367
+outerbounds-0.3.52rc6.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+outerbounds-0.3.52rc6.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
+outerbounds-0.3.52rc6.dist-info/RECORD,,