outerbounds 0.3.179rc3__py3-none-any.whl → 0.3.179rc4__py3-none-any.whl

outerbounds/apps/app_cli.py

@@ -25,6 +25,7 @@ from .app_config import (
     CAPSULE_DEBUG,
     AuthType,
 )
+from .perimeters import PerimeterExtractor
 from .cli_to_config import build_config_from_options
 from .utils import CommaSeparatedListType, KVPairType, KVDictType
 from . import experimental
@@ -137,28 +138,16 @@ def app(ctx):
     config_dir = os.path.expanduser(
         os.environ.get("METAFLOW_HOME", "~/.metaflowconfig")
     )
-    api_url = metaflowconfig.get_sanitized_url_from_config(
-        config_dir, profile, "OBP_API_SERVER"
+    perimeter, api_server = PerimeterExtractor.for_ob_cli(
+        config_dir=config_dir, profile=profile
     )
-    ctx.obj.api_url = api_url
-    if os.environ.get("OB_CURRENT_PERIMETER") or os.environ.get("OBP_PERIMETER"):
-        ctx.obj.perimeter = os.environ.get("OB_CURRENT_PERIMETER") or os.environ.get(
-            "OBP_PERIMETER"
-        )
-    else:
-        ob_config_file_path = metaflowconfig.get_ob_config_file_path(
-            config_dir, profile
+    if perimeter is None or api_server is None:
+        raise AppConfigError(
+            "Perimeter not found in the environment, Found perimeter: %s, api_server: %s"
+            % (perimeter, api_server)
         )
-        if os.path.exists(ob_config_file_path):
-            with open(ob_config_file_path, "r") as f:
-                ob_config = json.load(f)
-            ctx.obj.perimeter = ob_config.get("OB_CURRENT_PERIMETER")
-        else:
-            raise AppConfigError(
-                "OB_CURRENT_PERIMETER or OBP_PERIMETER is not set and no ob_config.json file found in %s for Profile %s. It was checking it in the following location: %s"
-                % (config_dir, profile, ob_config_file_path)
-            )
-
+    ctx.obj.perimeter = perimeter
+    ctx.obj.api_url = api_server
     os.makedirs(ctx.obj.app_state_dir, exist_ok=True)
 
 

outerbounds/apps/perimeters.py

@@ -0,0 +1,49 @@
+import os
+import json
+from typing import Tuple
+
+
+class PerimeterExtractor:
+    @classmethod
+    def for_ob_cli(cls, config_dir: str, profile: str) -> Tuple[str, str]:
+        """
+        This function will be called when we are trying to extract the perimeter
+        via the ob cli's execution. We will rely on the following logic:
+        1. check environment variables like OB_CURRENT_PERIMETER / OBP_PERIMETER
+        2. run init config to extract the perimeter related configurations.
+
+        Returns
+        -------
+            Tuple[str, str] : Tuple containing perimeter name , API server url.
+        """
+        from outerbounds.utils import metaflowconfig
+
+        perimeter = None
+        api_server = None
+        if os.environ.get("OB_CURRENT_PERIMETER") or os.environ.get("OBP_PERIMETER"):
+            perimeter = os.environ.get("OB_CURRENT_PERIMETER") or os.environ.get(
+                "OBP_PERIMETER"
+            )
+
+        if os.environ.get("OBP_API_SERVER"):
+            api_server = os.environ.get("OBP_API_SERVER")
+
+        if perimeter is None:
+            metaflow_config = metaflowconfig.init_config(config_dir, profile)
+            perimeter = metaflow_config.get("OBP_PERIMETER")
+            api_server = metaflow_config.get("OBP_API_SERVER")
+
+        return perimeter, api_server
+
+        pass
+
+    @classmethod
+    def during_metaflow_execution(cls):
+        pass  # todo: implement this
+
+
+def general_purpose_perimeter_extractor(config_dir: str, profile: str) -> str:
+    """
+    This function will rely on a mix of configuration variables and utilities with ob package to extract the perimeter
+    from the current environment.
+    """

{outerbounds-0.3.179rc3.dist-info → outerbounds-0.3.179rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.179rc3
+Version: 0.3.179rc4
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -29,8 +29,8 @@ Requires-Dist: google-cloud-secret-manager (>=2.20.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: metaflow-checkpoint (==0.2.1)
 Requires-Dist: ob-metaflow (==2.15.17.1)
-Requires-Dist: ob-metaflow-extensions (==1.1.166rc4)
-Requires-Dist: ob-metaflow-stubs (==6.0.3.179rc3)
+Requires-Dist: ob-metaflow-extensions (==1.1.166rc5)
+Requires-Dist: ob-metaflow-stubs (==6.0.3.179rc4)
 Requires-Dist: opentelemetry-distro (>=0.41b0) ; extra == "otel"
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.20.0) ; extra == "otel"
 Requires-Dist: opentelemetry-instrumentation-requests (>=0.41b0) ; extra == "otel"

{outerbounds-0.3.179rc3.dist-info → outerbounds-0.3.179rc4.dist-info}/RECORD

@@ -40,7 +40,7 @@ outerbounds/_vendor/yaml/scanner.py,sha256=ZcI8IngR56PaQ0m27WU2vxCqmDCuRjz-hr7pi
 outerbounds/_vendor/yaml/serializer.py,sha256=8wFZRy9SsQSktF_f9OOroroqsh4qVUe53ry07P9UgCc,4368
 outerbounds/_vendor/yaml/tokens.py,sha256=JBSu38wihGr4l73JwbfMA7Ks1-X84g8-NskTz7KwPmA,2578
 outerbounds/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-outerbounds/apps/app_cli.py,sha256=ZVQws3h8Kqb6x9cEpycq6DO9ezFRmjyPAdEU2ge_hjE,25074
+outerbounds/apps/app_cli.py,sha256=r-cwgZ04qL6yAa1mYMKLR4y7zKc7lzLR7tA6oCT78rs,24534
 outerbounds/apps/app_config.py,sha256=KBmW9grhiuG9XZG-R0GZkM-024cjj6ztGzOX_2wZW34,11291
 outerbounds/apps/artifacts.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/apps/capsule.py,sha256=5lx2M8z8hYNf4_5sX1jk61alrqpEDM8aC0ZVUXu69wI,18883
@@ -52,6 +52,7 @@ outerbounds/apps/config_schema.yaml,sha256=27uanKvGQkhOj8jsGRKkenxuYpMLAFnlx486r
 outerbounds/apps/dependencies.py,sha256=SqvdFQdFZZW0wXX_CHMHCrfE0TwaRkTvGCRbQ2Mx3q0,3935
 outerbounds/apps/deployer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/apps/experimental/__init__.py,sha256=ExPFIJSF8FcE1pKVyiNQnX8aBi3Rz8YFQ2_s5NVeU7I,3056
+outerbounds/apps/perimeters.py,sha256=5aX9CK4051KcZkS6XzkeQLAYnE4HPwZ48au4P60_T4A,1668
 outerbounds/apps/secrets.py,sha256=27qf04lOBqRjvcswj0ldHOmntP2T6SEjtMJtkJQ_GUg,6100
 outerbounds/apps/utils.py,sha256=549dmQ-r61ihDf5nIAKQv7kDJuxBaO4Xd6BR2xMsI_w,8086
 outerbounds/apps/validations.py,sha256=AVEw9eCvkzqq1m5ZC8btaWrSR6kWYKzarELfrASuAwQ,1117
@@ -72,7 +73,7 @@ outerbounds/utils/metaflowconfig.py,sha256=l2vJbgPkLISU-XPGZFaC8ZKmYFyJemlD6bwB-
 outerbounds/utils/schema.py,sha256=lMUr9kNgn9wy-sO_t_Tlxmbt63yLeN4b0xQXbDUDj4A,2331
 outerbounds/utils/utils.py,sha256=4Z8cszNob_8kDYCLNTrP-wWads_S_MdL3Uj3ju4mEsk,501
 outerbounds/vendor.py,sha256=gRLRJNXtZBeUpPEog0LOeIsl6GosaFFbCxUvR4bW6IQ,5093
-outerbounds-0.3.179rc3.dist-info/METADATA,sha256=EcUNjyINCJVGyTvORAJ-YOaJuw0y9Z8JO6cq48kSOvI,1846
-outerbounds-0.3.179rc3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-outerbounds-0.3.179rc3.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
-outerbounds-0.3.179rc3.dist-info/RECORD,,
+outerbounds-0.3.179rc4.dist-info/METADATA,sha256=PULOgUdcjAk8I8hTDx5nrdB-gfPuj3UcRk3CqJxLNhA,1846
+outerbounds-0.3.179rc4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+outerbounds-0.3.179rc4.dist-info/entry_points.txt,sha256=AP6rZg7y5SK9e9a9iVq0Fi9Q2KPjPZSwtZ6R98rLw-8,56
+outerbounds-0.3.179rc4.dist-info/RECORD,,