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

outerbounds/command_groups/local_setup_cli.py

@@ -1,28 +1,28 @@
-from base64 import b64decode, b64encode
-from importlib.machinery import PathFinder
-from os import path
-from pathlib import Path
+import base64
+import hashlib
 import json
 import os
 import re
+import subprocess
 import sys
 import zlib
-from typing import Dict, Any
+from base64 import b64decode, b64encode
+from importlib.machinery import PathFinder
+from os import path
+from pathlib import Path
+from typing import Any, Callable, Dict, List
 
 import boto3
 import click
-import subprocess
+import requests
+from requests.exceptions import HTTPError
+
 from ..utils import kubeconfig, metaflowconfig
 from ..utils.schema import (
-    OuterboundsCommandResponse,
     CommandStatus,
+    OuterboundsCommandResponse,
     OuterboundsCommandStatus,
 )
-import requests
-from requests.exceptions import HTTPError
-import hashlib
-import base64
-from typing import Callable, List
 
 NO_METAFLOW_INSTALL_MESSAGE = "Resolution of 'metaflow' module succeeded but no Metaflow installation was detected."
 
@@ -592,7 +592,15 @@ class ConfigurationWriter:
     def process_decoded_config(self):
         config_type = self.decoded_config.get("OB_CONFIG_TYPE", "inline")
         if config_type == "inline":
-            return
+            if "OBP_METAFLOW_CONFIG_URL" in self.decoded_config:
+                self.decoded_config = {
+                    "OBP_METAFLOW_CONFIG_URL": self.decoded_config[
+                        "OBP_METAFLOW_CONFIG_URL"
+                    ],
+                    "METAFLOW_SERVICE_AUTH_KEY": self.decoded_config[
+                        "METAFLOW_SERVICE_AUTH_KEY"
+                    ],
+                }
         elif config_type == "aws-secrets-manager":
             try:
                 secret_arn = self.decoded_config["AWS_SECRETS_MANAGER_SECRET_ARN"]
@@ -607,7 +615,7 @@ class ConfigurationWriter:
                 self.decoded_config = json.loads(response["SecretBinary"])
             except Exception as e:
                 raise DecodedConfigProcessingError(
-                    f"Failed to retrieve secret {secret_arn}\n\n{str(e)}"
+                    f"Failed to retrieve secret {secret_arn}\n\n{str(e)} from AWS Secrets Manager"
                 )
         else:
             raise DecodedConfigProcessingError(f"Unknown config type: {config_type}")
@@ -759,9 +767,7 @@ def configure(
     try:
         writer.process_decoded_config()
     except DecodedConfigProcessingError as e:
-        click.secho(
-            "Resolving the configuration from AWS Secrets Manager failed.", fg="red"
-        )
+        click.secho("Resolving the configuration remotely failed.", fg="red")
         click.secho(str(e), fg="magenta")
         sys.exit(1)
     try:
@@ -799,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")
     )
@@ -875,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}
@@ -883,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",
@@ -920,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")
     )
@@ -994,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"]
@@ -1037,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")
     )
@@ -1128,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"):
@@ -1138,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-0.3.52rc1.dist-info → outerbounds-0.3.52rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.52rc1
+Version: 0.3.52rc4
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -14,13 +14,17 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: azure
+Provides-Extra: gcp
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: azure-identity (>=1.15.0,<2.0.0) ; extra == "azure"
 Requires-Dist: azure-storage-blob (>=12.9.0,<13.0.0) ; extra == "azure"
 Requires-Dist: boto3
 Requires-Dist: click (>=8.1.3,<9.0.0)
-Requires-Dist: ob-metaflow (==2.11.0.3)
-Requires-Dist: ob-metaflow-extensions (==1.1.42rc0)
+Requires-Dist: google-api-core (>=2.16.1,<3.0.0) ; extra == "gcp"
+Requires-Dist: google-auth (>=2.27.0,<3.0.0) ; extra == "gcp"
+Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0) ; extra == "gcp"
+Requires-Dist: ob-metaflow (==2.11.0.4)
+Requires-Dist: ob-metaflow-extensions (==1.1.42rc1)
 Requires-Dist: opentelemetry-distro (==0.41b0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.20.0)
 Requires-Dist: opentelemetry-instrumentation-requests (==0.41b0)

{outerbounds-0.3.52rc1.dist-info → outerbounds-0.3.52rc4.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=HOTvOlb22cF86QmDpdQc6UVx4gFa2hBzsM8qI7Yj6vY,41486
+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/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.52rc1.dist-info/METADATA,sha256=H7kYM9NyYPvO2csoZeCGTlN-tVOxiRJG4UBYvIsRJAg,1148
-outerbounds-0.3.52rc1.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.3.52rc1.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.52rc1.dist-info/RECORD,,
+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,,