ob-metaflow-extensions 1.1.49__tar.gz → 1.1.51__tar.gz

{ob-metaflow-extensions-1.1.49 → ob-metaflow-extensions-1.1.51}/PKG-INFO

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

ob-metaflow-extensions-1.1.51/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

{ob-metaflow-extensions-1.1.49 → ob-metaflow-extensions-1.1.51}/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 → ob-metaflow-extensions-1.1.51}/ob_metaflow_extensions.egg-info/PKG-INFO

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

{ob-metaflow-extensions-1.1.49 → ob-metaflow-extensions-1.1.51}/ob_metaflow_extensions.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ metaflow_extensions/outerbounds/remote_config.py
 metaflow_extensions/outerbounds/config/__init__.py
 metaflow_extensions/outerbounds/plugins/__init__.py
 metaflow_extensions/outerbounds/plugins/auth_server.py
+metaflow_extensions/outerbounds/plugins/perimeters.py
 metaflow_extensions/outerbounds/plugins/kubernetes/__init__.py
 metaflow_extensions/outerbounds/plugins/kubernetes/kubernetes_client.py
 metaflow_extensions/outerbounds/profilers/__init__.py

ob-metaflow-extensions-1.1.51/ob_metaflow_extensions.egg-info/requires.txt

@@ -0,0 +1,4 @@
+boto3
+kubernetes
+ob-metaflow==2.11.9.1
+ob-metaflow-stubs==2.11.9.1

{ob-metaflow-extensions-1.1.49 → ob-metaflow-extensions-1.1.51}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 from pathlib import Path
 
 
-version = "1.1.49"
+version = "1.1.51"
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 
@@ -18,7 +18,7 @@ setup(
     install_requires=[
         "boto3",
         "kubernetes",
-        "ob-metaflow == 2.11.4.9",
-        "ob-metaflow-stubs == 2.11.4.9",
+        "ob-metaflow == 2.11.9.1",
+        "ob-metaflow-stubs == 2.11.9.1",
     ],
 )

ob-metaflow-extensions-1.1.49/ob_metaflow_extensions.egg-info/requires.txt

@@ -1,4 +0,0 @@
-boto3
-kubernetes
-ob-metaflow==2.11.4.9
-ob-metaflow-stubs==2.11.4.9