ob-metaflow-extensions 1.1.175rc1__py2.py3-none-any.whl → 1.1.175rc3__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/apps/core/experimental/__init__.py

@@ -1,5 +1,3 @@
-from functools import wraps
-from ..click_importer import click
 import os
 from typing import TYPE_CHECKING
 
@@ -9,40 +7,6 @@ if TYPE_CHECKING:
 DEFAULT_BRANCH = "test"
 
 
-def wrapping_cli_options(func):
-    @click.option(
-        "--project",
-        type=str,
-        help="The flow project the app/endpoint belongs to",
-        default=None,
-    )
-    @click.option(
-        "--branch",
-        type=str,
-        help="The branch the app/endpoint belongs to",
-        default=None,
-    )
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        return func(*args, **kwargs)
-
-    return wrapper
-
-
-def build_config_from_options(options):
-    """Build an app configuration from CLI options."""
-    keys = [
-        "project",
-        "branch",
-    ]
-    config = {}
-    for key in keys:
-        if options.get(key):
-            config[key] = options.get(key)
-
-    return config
-
-
 # Account for project / branch and the capsule input.
 def capsule_input_overrides(app_config: "AppConfig", capsule_input: dict):
     project = app_config.get_state("project", None)
@@ -53,6 +17,10 @@ def capsule_input_overrides(app_config: "AppConfig", capsule_input: dict):
             [dict(key="project", value=project), dict(key="branch", value=branch)]
         )
 
+    persistence = app_config.get_state("persistence", None)
+    if persistence is not None and persistence != "none":
+        capsule_input["persistence"] = persistence
+
     model_asset_conf = app_config.get_state("models", None)
     data_asset_conf = app_config.get_state("data", None)
     code_info = _code_info(app_config)

metaflow_extensions/outerbounds/plugins/apps/core/perimeters.py

@@ -41,5 +41,47 @@ class PerimeterExtractor:
 
     @classmethod
     def during_metaflow_execution(cls) -> str:
-        # TODO: implement this
-        return ""
+        from metaflow.metaflow_config_funcs import init_config
+
+        clean_url = (
+            lambda url: f"https://{url}".rstrip("/")
+            if not url.startswith("https://")
+            else url
+        )
+
+        config = init_config()
+        api_server, perimeter, integrations_url = None, None, None
+        perimeter = config.get(
+            "OBP_PERIMETER", os.environ.get("OBP_PERIMETER", perimeter)
+        )
+        if perimeter is None:
+            raise RuntimeError(
+                "Perimeter not found in metaflow config or environment variables"
+            )
+
+        api_server = config.get(
+            "OBP_API_SERVER", os.environ.get("OBP_API_SERVER", api_server)
+        )
+
+        if api_server is not None and not api_server.startswith("https://"):
+            api_server = clean_url(api_server)
+
+        if api_server is not None:
+            return perimeter, api_server
+
+        integrations_url = config.get(
+            "OBP_INTEGRATIONS_URL", os.environ.get("OBP_INTEGRATIONS_URL", None)
+        )
+
+        if integrations_url is not None and not integrations_url.startswith("https://"):
+            integrations_url = clean_url(integrations_url)
+
+        if integrations_url is not None:
+            api_server = integrations_url.rstrip("/integrations")
+
+        if api_server is None:
+            raise RuntimeError(
+                "API server not found in metaflow config or environment variables"
+            )
+
+        return perimeter, api_server

metaflow_extensions/outerbounds/plugins/apps/core/validations.py

@@ -1,21 +1,16 @@
 import os
+from typing import List
 from .app_config import AppConfig, AppConfigError
 from .secrets import SecretRetriever, SecretNotFound
-from .dependencies import bake_deployment_image
 
 
-def deploy_validations(app_config: AppConfig, cache_dir: str, logger):
-
-    # First check if the secrets for the app exist.
-    app_secrets = app_config.get("secrets", [])
+def secrets_validator(secrets: List[str]):
     secret_retriever = SecretRetriever()
-    for secret in app_secrets:
+    for secret in secrets:
         try:
             secret_retriever.get_secret_as_dict(secret)
         except SecretNotFound:
-            raise AppConfigError(f"Secret not found: {secret}")
-
-    # TODO: Next check if the compute pool exists.
+            raise Exception(f"Secret named `{secret}` not found")
 
 
 def run_validations(app_config: AppConfig):

metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py

@@ -76,3 +76,4 @@ from ..plugins.snowflake import Snowflake
 from ..plugins.checkpoint_datastores import nebius_checkpoints, coreweave_checkpoints
 from ..plugins.aws import assume_role
 from . import ob_internal
+from .ob_internal import AppDeployer

metaflow_extensions/outerbounds/toplevel/ob_internal.py

@@ -1,3 +1,4 @@
 from ..plugins.kubernetes.pod_killer import PodKiller
 from ..plugins.fast_bakery.baker import bake_image
 from ..plugins.apps import core as app_core
+from ..plugins.apps.core import AppDeployer

{ob_metaflow_extensions-1.1.175rc1.dist-info → ob_metaflow_extensions-1.1.175rc3.dist-info}/METADATA

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

{ob_metaflow_extensions-1.1.175rc1.dist-info → ob_metaflow_extensions-1.1.175rc3.dist-info}/RECORD

@@ -1,38 +1,44 @@
 metaflow_extensions/outerbounds/__init__.py,sha256=Gb8u06s9ClQsA_vzxmkCzuMnigPy7kKcDnLfb7eB-64,514
 metaflow_extensions/outerbounds/remote_config.py,sha256=pEFJuKDYs98eoB_-ryPjVi9b_c4gpHMdBHE14ltoxIU,4672
 metaflow_extensions/outerbounds/config/__init__.py,sha256=JsQGRuGFz28fQWjUvxUgR8EKBLGRdLUIk_buPLJplJY,1225
-metaflow_extensions/outerbounds/plugins/__init__.py,sha256=rWDE4k-KbsFsCoqct1Rw7w3bSV0jLunx6LMBKD2SYEA,13747
+metaflow_extensions/outerbounds/plugins/__init__.py,sha256=8DmLGwlr6UZWe39rbJdhO5ANemDp2ZwxY6MlqVPCppc,13740
 metaflow_extensions/outerbounds/plugins/auth_server.py,sha256=_Q9_2EL0Xy77bCRphkwT1aSu8gQXRDOH-Z-RxTUO8N4,2202
 metaflow_extensions/outerbounds/plugins/perimeters.py,sha256=QXh3SFP7GQbS-RAIxUOPbhPzQ7KDFVxZkTdKqFKgXjI,2697
 metaflow_extensions/outerbounds/plugins/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/apps/app_cli.py,sha256=aVgKe2CBcOgXQL2TYgO-sdIFlTntvbjHZFphR1w1CAM,64
+metaflow_extensions/outerbounds/plugins/apps/app_deploy_decorator.py,sha256=aN2B7nf0IwnOg_9kpqVSkGyZPhr4D9YI1WuCSlNP92s,3498
 metaflow_extensions/outerbounds/plugins/apps/app_utils.py,sha256=sw9whU17lAzlD2K2kEDNjlk1Ib-2xE2UNhJkmzD8Qv8,8543
 metaflow_extensions/outerbounds/plugins/apps/consts.py,sha256=iHsyqbUg9k-rgswCs1Jxf5QZIxR1V-peCDRjgr9kdBM,177
 metaflow_extensions/outerbounds/plugins/apps/deploy_decorator.py,sha256=VkmiMdNYHhNdt-Qm9AVv7aE2LWFsIFEc16YcOYjwF6Q,8568
 metaflow_extensions/outerbounds/plugins/apps/supervisord_utils.py,sha256=GQoN2gyPClcpR9cLldJmbCfqXnoAHxp8xUnY7vzaYtY,9026
-metaflow_extensions/outerbounds/plugins/apps/core/__init__.py,sha256=sF7oUom2kksRR8dtbBqXa8wrJrSIpBdZ9SEaR9mHz2U,22
+metaflow_extensions/outerbounds/plugins/apps/core/__init__.py,sha256=c6uCgKlgEkTmM9BVdAO-m3vZvUpK2KW_AZZ2236now4,237
 metaflow_extensions/outerbounds/plugins/apps/core/_state_machine.py,sha256=8RvEqRI9WaUiFu2LBKIqWRbbe9bSM2EptTR56wPit-0,18434
-metaflow_extensions/outerbounds/plugins/apps/core/app_cli.py,sha256=WaMTWJSWa3UkvuCCU3_StscimOdzDdXe4H4F-lng_34,52214
-metaflow_extensions/outerbounds/plugins/apps/core/app_config.py,sha256=9WE2nCLAn3kYKTa0JJbiiSj2BYMS-LM4UdOSahHB0Og,12243
+metaflow_extensions/outerbounds/plugins/apps/core/app_cli.py,sha256=HR4nQXyxHSe6NbUF0mutsOQR_rIT-_U6C-mdSQ1_8Os,42326
+metaflow_extensions/outerbounds/plugins/apps/core/app_config.py,sha256=PHt-HdNfTHIuhY-eB5vkRMp1RKQNWJ4DKdgZWyYgUuc,4167
 metaflow_extensions/outerbounds/plugins/apps/core/artifacts.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metaflow_extensions/outerbounds/plugins/apps/core/capsule.py,sha256=GGT_Sr9dx6R5lc8_9ATMmLU_A4ARRol6ZTzS9lc2URY,33468
-metaflow_extensions/outerbounds/plugins/apps/core/cli_to_config.py,sha256=2_VC1Ezn5RdtEkD-v4V_sk65ARluRtE-QQ0K6XE8Cbg,3296
+metaflow_extensions/outerbounds/plugins/apps/core/capsule.py,sha256=kOyHX8mzt44N4x4MKXCcBTZxS9ZcmRcUgbVuTgAMPpA,33879
 metaflow_extensions/outerbounds/plugins/apps/core/click_importer.py,sha256=kgoPQmK_-8PSSTc3QMSaynCLQ5VWTkKFOC69FPURyXA,998
-metaflow_extensions/outerbounds/plugins/apps/core/config_schema.yaml,sha256=p33f5Qex4FhtlYWaBjeuLKS87OCKR1HgoZr3CPnNok8,9269
-metaflow_extensions/outerbounds/plugins/apps/core/config_schema_autogen.json,sha256=Oftw8dQN-CSp_Su0XmenD6mR_ZplhLm8M4RB3mqvckk,9852
-metaflow_extensions/outerbounds/plugins/apps/core/dependencies.py,sha256=03pZY-JRN-dYN-iyZ73zoEIEKmrOvbY4qld7RlRXYuw,3976
-metaflow_extensions/outerbounds/plugins/apps/core/deployer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metaflow_extensions/outerbounds/plugins/apps/core/perimeters.py,sha256=1J1_-5legFPskv3HTRwQMpzTytE3TO8KRT2IvVOrWcQ,1584
+metaflow_extensions/outerbounds/plugins/apps/core/config_schema.yaml,sha256=iTThO2vNQrFWe9nYfjiOcMf6FOQ6vU_1ZhXhUAr0L24,8142
+metaflow_extensions/outerbounds/plugins/apps/core/dependencies.py,sha256=HDPj7rDARcsKeex5GwH0IP8rOXMH6YdOufgXDknP1S8,4006
+metaflow_extensions/outerbounds/plugins/apps/core/deployer.py,sha256=oARCVpHSNb7MnCKnIvzNB6fGDfF7BvAB19hDobETuZc,4234
+metaflow_extensions/outerbounds/plugins/apps/core/perimeters.py,sha256=jeFGAUnFQkBFiOMp_Ls7Ofb80Qogh509suam5sMucYU,3030
 metaflow_extensions/outerbounds/plugins/apps/core/secrets.py,sha256=aWzcAayQEJghQgFP_qp9w6jyvan_hoL4_ceqZ0ZjLd4,6126
 metaflow_extensions/outerbounds/plugins/apps/core/utils.py,sha256=RLO6p25Fzq4olLFtQmfSl9LT0NPDfUosxPrsjO9sczo,7897
-metaflow_extensions/outerbounds/plugins/apps/core/validations.py,sha256=kR2eXckx0XJ4kUOOLkMRepbTh0INtL1Z8aV4-fZpfc8,678
+metaflow_extensions/outerbounds/plugins/apps/core/validations.py,sha256=Inr9AJDe-L3PMMMxcJPH1zulh9_SynqITb2BzGseLh4,471
 metaflow_extensions/outerbounds/plugins/apps/core/_vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/apps/core/_vendor/spinner/__init__.py,sha256=gTm0NdQGTRxmghye1CYkhRtodji0MezsqAWs9OrLLRc,102
 metaflow_extensions/outerbounds/plugins/apps/core/_vendor/spinner/spinners.py,sha256=0Hl1dskTzfibHPM5dfHV3no1maFduOCJ48r8mr3tgr0,15786
 metaflow_extensions/outerbounds/plugins/apps/core/code_package/__init__.py,sha256=8McF7pgx8ghvjRnazp2Qktlxi9yYwNiwESSQrk-2oW8,68
-metaflow_extensions/outerbounds/plugins/apps/core/code_package/code_packager.py,sha256=RWvM5BKjgLhu7icsO_n5SSYC57dwyST0dWpoWF88ovU,22881
+metaflow_extensions/outerbounds/plugins/apps/core/code_package/code_packager.py,sha256=wrGKpsg9pBU2rvhIveJ3kzc5ODUTtzciybcGHyi7pR8,22815
 metaflow_extensions/outerbounds/plugins/apps/core/code_package/examples.py,sha256=aF8qKIJxCVv_ugcShQjqUsXKKKMsm1oMkQIl8w3QKuw,4016
-metaflow_extensions/outerbounds/plugins/apps/core/experimental/__init__.py,sha256=RUZBAyqFnX3pRQxTjNmS1-qpgQcc9xQGQD2yJh4MA_M,3349
+metaflow_extensions/outerbounds/plugins/apps/core/config/__init__.py,sha256=fSFBjC5ujTpBlNJGyVsaoWl5VZ_8mXbEIPiFvzTrgKA,382
+metaflow_extensions/outerbounds/plugins/apps/core/config/cli_generator.py,sha256=0R0-wy7RxAMR9doVRvuluRYxAYgyjZXlTIkOeYGyz7M,5350
+metaflow_extensions/outerbounds/plugins/apps/core/config/config_utils.py,sha256=zBZSe-1CsHj5MxrKNuAGLy11yXD4qF_IJJkdORfCW6A,32089
+metaflow_extensions/outerbounds/plugins/apps/core/config/schema_export.py,sha256=tigPtb0we-urwbmctG1GbaQ9NKRKZn4KBbJKmaEntCg,9501
+metaflow_extensions/outerbounds/plugins/apps/core/config/typed_configs.py,sha256=RufXI8BQn6G5kixY6P27VYJ0d36ZG-JNFW15bA1bnk4,3179
+metaflow_extensions/outerbounds/plugins/apps/core/config/typed_init_generator.py,sha256=1iszHsXjxAWeGI4XhwoTT8lVtzQwstF3ZOiVYBykO6w,10256
+metaflow_extensions/outerbounds/plugins/apps/core/config/unified_config.py,sha256=58PsC1ZK3p5wNvavVRzb4Qq764wOUjPuSvXDsrrsSw4,35474
+metaflow_extensions/outerbounds/plugins/apps/core/experimental/__init__.py,sha256=rd4qGTkHndKYfJmoAKZWiY0KK4j5BK6RBrtle-it1Mg,2746
 metaflow_extensions/outerbounds/plugins/aws/__init__.py,sha256=VBGdjNKeFLXGZuqh4jVk8cFtO1AWof73a6k_cnbAOYA,145
 metaflow_extensions/outerbounds/plugins/aws/assume_role.py,sha256=mBewNlnSYsR2rFXFkX-DUH6ku01h2yOcMcLHoCL7eyI,161
 metaflow_extensions/outerbounds/plugins/aws/assume_role_decorator.py,sha256=b3te8-RJxsj5cqXbQTFxxeIfnqTERAFInzLgXLVLyYA,2391
@@ -100,8 +106,8 @@ metaflow_extensions/outerbounds/plugins/vllm/vllm_manager.py,sha256=sp_TX2SrImJG
 metaflow_extensions/outerbounds/profilers/__init__.py,sha256=wa_jhnCBr82TBxoS0e8b6_6sLyZX0fdHicuGJZNTqKw,29
 metaflow_extensions/outerbounds/profilers/gpu.py,sha256=3Er8uKQzfm_082uadg4yn_D4Y-iSCgzUfFmguYxZsz4,27485
 metaflow_extensions/outerbounds/toplevel/__init__.py,sha256=qWUJSv_r5hXJ7jV_On4nEasKIfUCm6_UjkjXWA_A1Ts,90
-metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py,sha256=_fKWv_-O1k5Nk5A1q05Ioh-PSsFXGL-jiAt7zfl8pIE,2999
-metaflow_extensions/outerbounds/toplevel/ob_internal.py,sha256=g0LGhp3947dr30-BcvwAad2XA0vCIeQBupnOx0aQAfI,149
+metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py,sha256=xVCIvKeEzMwu2vfsWYqnq4aetMGmPBjpzOXrZfBr5iI,3036
+metaflow_extensions/outerbounds/toplevel/ob_internal.py,sha256=DXCaAtLzlE-bFIiVWEv-iV2JKIWsoSGaUeH4jIQZ9gs,193
 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
@@ -109,7 +115,7 @@ metaflow_extensions/outerbounds/toplevel/plugins/ollama/__init__.py,sha256=GRSz2
 metaflow_extensions/outerbounds/toplevel/plugins/snowflake/__init__.py,sha256=LptpH-ziXHrednMYUjIaosS1SXD3sOtF_9_eRqd8SJw,50
 metaflow_extensions/outerbounds/toplevel/plugins/torchtune/__init__.py,sha256=uTVkdSk3xZ7hEKYfdlyVteWj5KeDwaM1hU9WT-_YKfI,50
 metaflow_extensions/outerbounds/toplevel/plugins/vllm/__init__.py,sha256=ekcgD3KVydf-a0xMI60P4uy6ePkSEoFHiGnDq1JM940,45
-ob_metaflow_extensions-1.1.175rc1.dist-info/METADATA,sha256=VP01xYbBd5gcBFfuM4qV50ZVUUxsIIsof6BtCyLhrCY,524
-ob_metaflow_extensions-1.1.175rc1.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.1.175rc1.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.1.175rc1.dist-info/RECORD,,
+ob_metaflow_extensions-1.1.175rc3.dist-info/METADATA,sha256=wnDlhzELSLX2xxzL6U87sqIbb1tWYehFruJ783o-8Gg,524
+ob_metaflow_extensions-1.1.175rc3.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.175rc3.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.175rc3.dist-info/RECORD,,

metaflow_extensions/outerbounds/plugins/apps/core/cli_to_config.py

@@ -1,99 +0,0 @@
-from . import experimental
-
-
-def build_config_from_options(options):
-    """Build an app configuration from CLI options."""
-    config = {}
-
-    # Set basic fields
-    for key in [
-        "name",
-        "port",
-        "image",
-        "compute_pools",
-        "description",
-        "app_type",
-        "force_upgrade",
-    ]:
-        if options.get(key):
-            config[key] = options[key]
-
-    # Handle list fields
-    if options.get("tags"):
-        config["tags"] = list(options["tags"])
-    if options.get("secrets"):
-        config["secrets"] = list(options["secrets"])
-
-    # Build env dict from key-value pairs
-    if options.get("envs"):
-        env_dict = {}
-        for env_item in options["envs"]:
-            env_dict.update(env_item)
-        config["environment"] = env_dict
-
-    # Handle dependencies (only one type allowed)
-    deps = {}
-    if options.get("dep_from_task"):
-        deps["from_task"] = options["dep_from_task"]
-    elif options.get("dep_from_run"):
-        deps["from_run"] = options["dep_from_run"]
-    elif options.get("dep_from_requirements"):
-        deps["from_requirements_file"] = options["dep_from_requirements"]
-    elif options.get("dep_from_pyproject"):
-        deps["from_pyproject_toml"] = options["dep_from_pyproject"]
-
-    # TODO: [FIX ME]: Get better CLI abstraction for pypi/conda dependencies
-
-    if deps:
-        config["dependencies"] = deps
-
-    # Handle resources
-    resources = {}
-    for key in ["cpu", "memory", "gpu", "disk"]:
-        if options.get(key):
-            resources[key] = options[key]
-
-    if resources:
-        config["resources"] = resources
-
-    # Handle health check options
-    health_check = {}
-    if options.get("health_check_enabled") is not None:
-        health_check["enabled"] = options["health_check_enabled"]
-    if options.get("health_check_path"):
-        health_check["path"] = options["health_check_path"]
-    if options.get("health_check_initial_delay") is not None:
-        health_check["initial_delay_seconds"] = options["health_check_initial_delay"]
-    if options.get("health_check_period") is not None:
-        health_check["period_seconds"] = options["health_check_period"]
-
-    if health_check:
-        config["health_check"] = health_check
-
-    # Handle package options
-    if options.get("package_src_path") or options.get("package_suffixes"):
-        config["package"] = {}
-        if options.get("package_src_path"):
-            config["package"]["src_path"] = options["package_src_path"]
-        if options.get("package_suffixes"):
-            config["package"]["suffixes"] = options["package_suffixes"]
-
-    # Handle auth options
-    if options.get("auth_type") or options.get("auth_public"):
-        config["auth"] = {}
-        if options.get("auth_type"):
-            config["auth"]["type"] = options["auth_type"]
-        if options.get("auth_public"):
-            config["auth"]["public"] = options["auth_public"]
-
-    replicas = {}
-    if options.get("min_replicas") is not None:
-        replicas["min"] = options["min_replicas"]
-    if options.get("max_replicas") is not None:
-        replicas["max"] = options["max_replicas"]
-    if len(replicas) > 0:
-        config["replicas"] = replicas
-
-    config.update(experimental.build_config_from_options(options))
-
-    return config