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

outerbounds/command_groups/workstations_cli.py

@@ -110,8 +110,10 @@ def configure_cloud_workstation(config_dir=None, profile=None, binary=None, outp
     kubeconfig_configure_step = CommandStatus(
         "ConfigureKubeConfig", OuterboundsCommandStatus.OK, "Kubeconfig is configured"
     )
-
     try:
+        if not profile:
+            profile = metaflowconfig.get_metaflow_profile()
+
         metaflow_token = metaflowconfig.get_metaflow_token_from_config(
             config_dir, profile
         )
@@ -196,6 +198,9 @@ def configure_cloud_workstation(config_dir=None, profile=None, binary=None, outp
 )
 def list_workstations(config_dir=None, profile=None):
     try:
+        if not profile:
+            profile = metaflowconfig.get_metaflow_profile()
+
         metaflow_token = metaflowconfig.get_metaflow_token_from_config(
             config_dir, profile
         )
@@ -215,7 +220,7 @@ def list_workstations(config_dir=None, profile=None):
             )
     except Exception as e:
         click.secho("Failed to list workstations", fg="red")
-        click.secho("Error: {}".format(str(e)))
+        click.secho("Error: {}".format(str(e)), fg="red")
 
 
 @cli.command(help="Hibernate workstation", hidden=True)
@@ -243,6 +248,8 @@ def hibernate_workstation(config_dir=None, profile=None, workstation=None):
         click.secho("Please specify a workstation ID", fg="red")
         return
     try:
+        if not profile:
+            profile = metaflowconfig.get_metaflow_profile()
         metaflow_token = metaflowconfig.get_metaflow_token_from_config(
             config_dir, profile
         )
@@ -267,7 +274,7 @@ def hibernate_workstation(config_dir=None, profile=None, workstation=None):
             )
     except Exception as e:
         click.secho("Failed to hibernate workstation", fg="red")
-        click.secho("Error: {}".format(str(e)))
+        click.secho("Error: {}".format(str(e)), fg="red")
 
 
 @cli.command(help="Restart workstation to the int", hidden=True)
@@ -295,6 +302,9 @@ def restart_workstation(config_dir=None, profile=None, workstation=None):
         click.secho("Please specify a workstation ID", fg="red")
         return
     try:
+        if not profile:
+            profile = metaflowconfig.get_metaflow_profile()
+
         metaflow_token = metaflowconfig.get_metaflow_token_from_config(
             config_dir, profile
         )
@@ -319,7 +329,7 @@ def restart_workstation(config_dir=None, profile=None, workstation=None):
             )
     except Exception as e:
         click.secho("Failed to restart workstation", fg="red")
-        click.secho("Error: {}".format(str(e)))
+        click.secho("Error: {}".format(str(e)), fg="red")
 
 
 @cli.command(help="Install dependencies needed by workstations", hidden=True)

outerbounds/utils/metaflowconfig.py

@@ -1,11 +1,12 @@
 import json
 import os
+from os import path
 
 
 def init_config():
     # Read configuration from $METAFLOW_HOME/config_<profile>.json.
     home = os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
-    profile = os.environ.get("METAFLOW_PROFILE")
+    profile = get_metaflow_profile()
     path_to_config = os.path.join(home, "config.json")
     if profile:
         path_to_config = os.path.join(home, "config_%s.json" % profile)
@@ -21,6 +22,35 @@ def init_config():
     return config
 
 
+def get_metaflow_profile():
+    # If OBP_CONFIG_DIR is set, use that, otherwise use METAFLOW_HOME
+    # If neither are set, use ~/.metaflowconfig
+    obp_config_dir = path.expanduser(
+        os.environ.get(
+            "OBP_CONFIG_DIR", os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
+        )
+    )
+
+    file_path = os.path.join(obp_config_dir, "ob_config.json")
+
+    if os.path.exists(file_path):
+        with open(file_path, "r") as f:
+            ob_config = json.loads(f.read())
+
+        if "OB_CURRENT_PERIMETER" in ob_config:
+            return ob_config["OB_CURRENT_PERIMETER"]
+        else:
+            raise Exception(f"OB_CURRENT_PERIMETER not found in {file_path}")
+    elif "OBP_CONFIG_DIR" in os.environ:
+        raise Exception(
+            "OBP_CONFIG_DIR is set, but no ob_config.json found in that directory"
+        )
+    elif "METAFLOW_PROFILE" in os.environ:
+        return os.environ["METAFLOW_PROFILE"]
+
+    return ""
+
+
 def get_metaflow_token_from_config(config_dir: str, profile: str) -> str:
     """
     Return the Metaflow service auth key from the config file.

{outerbounds-0.3.52rc0.dist-info → outerbounds-0.3.52rc1.dist-info}/METADATA

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

{outerbounds-0.3.52rc0.dist-info → outerbounds-0.3.52rc1.dist-info}/RECORD

@@ -3,12 +3,12 @@ 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/workstations_cli.py,sha256=VgydQzCas3mlAFyzZuanjl1E8Zh7pBrbKbbP6t6N2WU,18237
+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=zdSeZEc1h4yJAZUrfWIO9EYSy84wdE_JCSEiCxb-su8,2341
+outerbounds/utils/metaflowconfig.py,sha256=_Khqzu0KE6X05KkVbb39GXN6CFpG2WRr6Xs35pT2l7A,3299
 outerbounds/utils/schema.py,sha256=4_ONlvZGpBb51KKd-q6mNSKWI9P1huOKafrsf9kVqp8,2152
-outerbounds-0.3.52rc0.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.3.52rc0.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.52rc0.dist-info/METADATA,sha256=xkqrbbaDvrjERYy5fZ0kqk8Y_TEGneAjF5H0e6-uiNs,1148
-outerbounds-0.3.52rc0.dist-info/RECORD,,
+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,,