ob-metaflow-extensions 1.1.49__py2.py3-none-any.whl → 1.1.50__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/perimeters.py

@@ -0,0 +1,56 @@
+import os
+import fcntl
+from os import path
+import json
+from metaflow.exception import MetaflowException
+from typing import Union
+
+CURRENT_PERIMETER_KEY = "OB_CURRENT_PERIMETER"
+CURRENT_PERIMETER_URL = "OB_CURRENT_PERIMETER_MF_CONFIG_URL"
+
+
+def get_perimeter_config_url_if_set_in_ob_config() -> Union[str, None]:
+    # 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")
+        )
+    )
+
+    profile = os.environ.get("METAFLOW_PROFILE")
+    file_path = (
+        os.path.join(obp_config_dir, "ob_config.json")
+        if not profile
+        else os.path.join(obp_config_dir, f"ob_config_{profile}.json")
+    )
+
+    if os.path.exists(file_path):
+        # Acquire a shared read lock on the file
+        # This is important! Any process that is using metaflow at the moment will hold this lock
+        # disallowing the outerbounds CLI from changing the perimeter mid process.
+        # Note that this is an advisory lock, the file can still be edited by any process should it choose to.
+        # The lock is released when the metaflow process finishes, whether gracefully or not.
+        fd = os.open(file_path, os.O_RDONLY)
+        fcntl.flock(fd, fcntl.LOCK_SH)
+
+        with open(file_path, "r") as f:
+            ob_config = json.loads(f.read())
+
+        if CURRENT_PERIMETER_KEY in ob_config and CURRENT_PERIMETER_URL in ob_config:
+            os.environ[CURRENT_PERIMETER_KEY] = ob_config[CURRENT_PERIMETER_KEY]
+            os.environ[CURRENT_PERIMETER_URL] = ob_config[CURRENT_PERIMETER_URL]
+            return ob_config[CURRENT_PERIMETER_URL]
+        else:
+            raise MetaflowException(
+                "{} does not contain the key {}".format(
+                    file_path, CURRENT_PERIMETER_KEY
+                )
+            )
+    elif "OBP_CONFIG_DIR" in os.environ:
+        raise MetaflowException(
+            "Environment variable OBP_CONFIG_DIR is set to {} but this directory does not contain an ob_config.json file.".format(
+                os.environ["OBP_CONFIG_DIR"]
+            )
+        )
+    return None

metaflow_extensions/outerbounds/remote_config.py

@@ -7,6 +7,9 @@ from typing import Optional, Dict
 import requests
 from metaflow.exception import MetaflowException
 from requests.models import HTTPError
+from metaflow_extensions.outerbounds.plugins.perimeters import (
+    get_perimeter_config_url_if_set_in_ob_config,
+)
 
 OBP_REMOTE_CONFIG_KEY = "OBP_METAFLOW_CONFIG_URL"
 HOSTNAME_KEY = "OBP_API_SERVER"
@@ -87,11 +90,14 @@ def init_config() -> Dict[str, str]:
     if OBP_REMOTE_CONFIG_KEY not in remote_config:
         return remote_config
 
+    perimeter_config_url = get_perimeter_config_url_if_set_in_ob_config()
+    if perimeter_config_url:
+        remote_config[OBP_REMOTE_CONFIG_KEY] = perimeter_config_url
+
     metaflow_config = resolve_config_from_remote(
         remote_url=remote_config[OBP_REMOTE_CONFIG_KEY],
         auth_token=remote_config[AUTH_KEY],
     )
-    metaflow_config[AUTH_KEY] = remote_config[AUTH_KEY]
 
     # set cache
     os.environ[CONFIG_READ_ONCE_KEY] = json.dumps(metaflow_config)

{ob_metaflow_extensions-1.1.49.dist-info → ob_metaflow_extensions-1.1.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.49
+Version: 1.1.50
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob_metaflow_extensions-1.1.49.dist-info → ob_metaflow_extensions-1.1.50.dist-info}/RECORD

@@ -1,8 +1,9 @@
 metaflow_extensions/outerbounds/__init__.py,sha256=TRGvIUMjkfneWtYUFSWoubu_Kf2ekAL4WLbV3IxOj9k,499
-metaflow_extensions/outerbounds/remote_config.py,sha256=S9mTxLyf4EbsM_mpoeEL8pjWG-TruXUKYYodk3-qFgg,3812
+metaflow_extensions/outerbounds/remote_config.py,sha256=jHNHDbWAoKOgv3IH2I-Gzwfe2tr1gO3ds_VjsXBaCh8,4045
 metaflow_extensions/outerbounds/config/__init__.py,sha256=mYo95obHU1IE1wbPkeVz_pfTzNqlNabp1QBEMTGllbE,112
 metaflow_extensions/outerbounds/plugins/__init__.py,sha256=rK-EPg7107su6dY-yAx1IK3wAzyvQIIg6y4um_F_BXc,9343
 metaflow_extensions/outerbounds/plugins/auth_server.py,sha256=rUzhRfE0ov3pWTM9S4UdAhnz13JBb5amiQCs5d1xJQU,1418
+metaflow_extensions/outerbounds/plugins/perimeters.py,sha256=z8tSAkWtiITB-JtSQS7fkhlBwvxSxeTgEwFjahAzv-U,2238
 metaflow_extensions/outerbounds/plugins/kubernetes/__init__.py,sha256=5zG8gShSj8m7rgF4xgWBZFuY3GDP5n1T0ktjRpGJLHA,69
 metaflow_extensions/outerbounds/plugins/kubernetes/kubernetes_client.py,sha256=k5HP9JJIcZhCDUKrR9u--B_wbwL3RTPCJWhgEWgh7k0,1806
 metaflow_extensions/outerbounds/profilers/__init__.py,sha256=wa_jhnCBr82TBxoS0e8b6_6sLyZX0fdHicuGJZNTqKw,29
@@ -12,7 +13,7 @@ metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py,
 metaflow_extensions/outerbounds/toplevel/plugins/azure/__init__.py,sha256=WUuhz2YQfI4fz7nIcipwwWq781eaoHEk7n4GAn1npDg,63
 metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py,sha256=BbZiaH3uILlEZ6ntBLKeNyqn3If8nIXZFq_Apd7Dhco,70
 metaflow_extensions/outerbounds/toplevel/plugins/kubernetes/__init__.py,sha256=5zG8gShSj8m7rgF4xgWBZFuY3GDP5n1T0ktjRpGJLHA,69
-ob_metaflow_extensions-1.1.49.dist-info/METADATA,sha256=VvpQ3PzuRmpVjk7paQ2A2V-D_rXX2T3fLpGTfr3JkP4,565
-ob_metaflow_extensions-1.1.49.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.1.49.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.1.49.dist-info/RECORD,,
+ob_metaflow_extensions-1.1.50.dist-info/METADATA,sha256=duZTQ3sCjV6IFnVCq9DmkR56x9f5bpgo6USljOHfHKE,565
+ob_metaflow_extensions-1.1.50.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.50.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.50.dist-info/RECORD,,