ob-metaflow-extensions 1.4.14rc0__py2.py3-none-any.whl → 1.4.15__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/apps/app_deploy_decorator.py

@@ -106,6 +106,7 @@ class AppDeployDecorator(StepDecorator):
             code_package_key=package_sha,
             name_prefix=default_name,
             image=image,
+            max_entropy=self.MAX_ENTROPY,
             default_tags=[{k: str(v)} for k, v in default_tags.items()],
         )
         current._update_env(

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

@@ -1,6 +1,6 @@
 from . import app_cli
 from . import config
-from .deployer import AppDeployer, apps, DeployedApp
+from .deployer import AppDeployer, apps
 from .config.typed_configs import (
     ReplicaConfigDict,
     ResourceConfigDict,

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

@@ -3,8 +3,8 @@ from .perimeters import PerimeterExtractor
 from .capsule import CapsuleApi
 import json
 from ._state_machine import DEPLOYMENT_READY_CONDITIONS, LogLine
-from .app_config import AppConfig, AppConfigError, AuthType
-from .capsule import CapsuleDeployer, list_and_filter_capsules, _format_url_string
+from .app_config import AppConfig, AppConfigError
+from .capsule import CapsuleDeployer, list_and_filter_capsules
 from functools import partial
 import sys
 import uuid
@@ -37,16 +37,6 @@ class AppDeployer(TypedCoreConfig):
             self._app_config = AppConfig(self._config)
         return self._app_config
 
-    def _set_perimenter_and_api_server(self):
-        if self._state["perimeter"] is None:
-            perimeter, api_server = PerimeterExtractor.during_metaflow_execution()
-            if perimeter is None or api_server is None:
-                raise RuntimeError(
-                    "Perimeter not found in metaflow config or environment variables"
-                )
-            self._state["perimeter"] = perimeter
-            self._state["api_url"] = api_server
-
     # Things that need to be set before deploy
     @classmethod
     def _set_state(
@@ -57,6 +47,7 @@ class AppDeployer(TypedCoreConfig):
         code_package_key: str = None,
         name_prefix: str = None,
         image: str = None,
+        max_entropy: int = 4,
         default_tags: List[Dict[str, str]] = None,
         project: str = None,
         branch: str = None,
@@ -67,10 +58,15 @@ class AppDeployer(TypedCoreConfig):
         cls._state["code_package_key"] = code_package_key
         cls._state["name_prefix"] = name_prefix
         cls._state["image"] = image
+        cls._state["max_entropy"] = max_entropy
         cls._state["default_tags"] = default_tags
         cls._state["project"] = project
         cls._state["branch"] = branch
 
+        assert (
+            max_entropy > 0
+        ), "max_entropy must be greater than 0. Since AppDeployer's deploy fn can be called many time inside a step itself."
+
     def deploy(
         self,
         readiness_condition=DEPLOYMENT_READY_CONDITIONS.ATLEAST_ONE_RUNNING,
@@ -82,7 +78,13 @@ class AppDeployer(TypedCoreConfig):
         **kwargs,
     ) -> "DeployedApp":
 
-        self._set_perimenter_and_api_server()
+        # Name setting from top level if none is set in the code
+        if self._deploy_config._core_config.name is None:
+            name = self._state[
+                "name_prefix"
+            ]  # for now the name-prefix cannot be very large.
+            entropy = uuid.uuid4().hex[: self._state["max_entropy"]]
+            self._deploy_config._core_config.name = f"{name}-{entropy}"
 
         if len(self._state["default_tags"]) > 0:
             self._deploy_config._core_config.tags = (
@@ -172,41 +174,10 @@ class DeployedApp:
         self._deployed_version = deployed_version
         self._deployed_at = deployed_at
 
-    @classmethod
-    def _get_capsule_api(cls) -> CapsuleApi:
+    def _get_capsule_api(self) -> CapsuleApi:
         perimeter, api_server = PerimeterExtractor.during_metaflow_execution()
         return CapsuleApi(api_server, perimeter)
 
-    @classmethod
-    def from_capsule_id(cls, capsule_id: str) -> "DeployedApp":
-        capsule_api = cls._get_capsule_api()
-        capsule = capsule_api.get(capsule_id)
-        capsule_type = (
-            capsule.get("spec", {}).get("authConfig", {}).get("authType", None)
-        )
-        public_url = (
-            capsule.get("status", {}).get("accessInfo", {}).get("outOfClusterURL", None)
-        )
-        name = capsule.get("spec", {}).get(
-            "displayName",
-        )
-        deployed_version = capsule.get(
-            "version",
-        )
-        deployed_at = capsule.get("metadata", {}).get(
-            "createdAt",
-        )
-        if any(i is None for i in [capsule_type, public_url, name]):
-            raise ValueError(f"Invalid capsule id: {capsule_id}")
-        return cls(
-            capsule_id,
-            capsule_type,
-            _format_url_string(public_url),
-            name,
-            deployed_version,
-            deployed_at,
-        )
-
     def logs(self, previous=False) -> Dict[str, List[LogLine]]:
         """
         Returns a dictionary of worker_id to logs.
@@ -314,15 +285,6 @@ class DeployedApp:
             f"deployed_version='{self._deployed_version}')"
         )
 
-    def auth(self):
-        if self.auth_style != AuthType.API:
-            raise ValueError(
-                "Only API auth style is supported for accessing auth headers"
-            )
-        from metaflow.metaflow_config import SERVICE_HEADERS
-
-        return SERVICE_HEADERS
-
 
 class apps:
 

metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py

@@ -108,4 +108,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, DeployedApp
+from .ob_internal import AppDeployer

metaflow_extensions/outerbounds/toplevel/ob_internal.py

@@ -1,4 +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, DeployedApp
+from ..plugins.apps.core import AppDeployer

{ob_metaflow_extensions-1.4.14rc0.dist-info → ob_metaflow_extensions-1.4.15.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.4.14rc0
+Version: 1.4.15
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial
 Description-Content-Type: text/markdown
 Requires-Dist: boto3
 Requires-Dist: kubernetes
-Requires-Dist: ob-metaflow (==2.18.3.2)
+Requires-Dist: ob-metaflow (==2.18.7.1)
 
 # Outerbounds platform package
 

{ob_metaflow_extensions-1.4.14rc0.dist-info → ob_metaflow_extensions-1.4.15.dist-info}/RECORD

@@ -6,12 +6,12 @@ metaflow_extensions/outerbounds/plugins/auth_server.py,sha256=_Q9_2EL0Xy77bCRphk
 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=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metaflow_extensions/outerbounds/plugins/apps/app_deploy_decorator.py,sha256=Skk4UjTw3h355JYOnsKr86U4oqpn9qchM1I9uG5MeSA,4859
+metaflow_extensions/outerbounds/plugins/apps/app_deploy_decorator.py,sha256=WWFvyl0EDUbp_UwmWjXBqlLfPEZ-lq98NJ5F5skBDKU,4901
 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=bfvH1wZpSZq4-Lu25U9MlsZmwqkP8_MH7QLxKwRfXXU,250
+metaflow_extensions/outerbounds/plugins/apps/core/__init__.py,sha256=c6uCgKlgEkTmM9BVdAO-m3vZvUpK2KW_AZZ2236now4,237
 metaflow_extensions/outerbounds/plugins/apps/core/_state_machine.py,sha256=al907t2C86BPf4V1V03PLTJRJMOc8gdl1CxLLbklnDU,20281
 metaflow_extensions/outerbounds/plugins/apps/core/app_cli.py,sha256=rD7oimnkEm___K2Ttiwe12B-Xzqi76tk4_HyFQArBQs,42736
 metaflow_extensions/outerbounds/plugins/apps/core/app_config.py,sha256=PHt-HdNfTHIuhY-eB5vkRMp1RKQNWJ4DKdgZWyYgUuc,4167
@@ -20,7 +20,7 @@ metaflow_extensions/outerbounds/plugins/apps/core/capsule.py,sha256=sIlnmBZYf38S
 metaflow_extensions/outerbounds/plugins/apps/core/click_importer.py,sha256=kgoPQmK_-8PSSTc3QMSaynCLQ5VWTkKFOC69FPURyXA,998
 metaflow_extensions/outerbounds/plugins/apps/core/config_schema.yaml,sha256=zLZiDpg1OvZQyZmx2Y4j38B6f206eamOS2zH0dZmCcg,9955
 metaflow_extensions/outerbounds/plugins/apps/core/dependencies.py,sha256=JlWT9f27yzZeJPlqTQk134WDfQgOdyxC5iaw3pLlhqY,4006
-metaflow_extensions/outerbounds/plugins/apps/core/deployer.py,sha256=5WBV-VXaqWymhteLsq13uwWzoTsMc-R1v55Ap_yhypk,10660
+metaflow_extensions/outerbounds/plugins/apps/core/deployer.py,sha256=dNKlDu6n8SufEd5NKmsErl1RYhQXuEe_DgtA0mk7awg,9472
 metaflow_extensions/outerbounds/plugins/apps/core/perimeters.py,sha256=ETlqTkHDvVaWusrbNncFf7pcGJarj0r-5qodC4gZWQM,3068
 metaflow_extensions/outerbounds/plugins/apps/core/secrets.py,sha256=sgDiAmpSC8Y5xjlaOEp79F6m0S3x4RONf_vJ5PUAfu8,6127
 metaflow_extensions/outerbounds/plugins/apps/core/utils.py,sha256=2M2zU8DhbAlJee8P0xKXINAku81PcUylS3sVCSb0TUs,7896
@@ -115,8 +115,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=mWJkV_uHFJoKYfkcPRBocXBMVF-wW1rf_QqNHLvIH30,3836
-metaflow_extensions/outerbounds/toplevel/ob_internal.py,sha256=jYuv_RV3zerO8oVSDqyW-IDT--xTV4GLPirZ6vOiv80,206
+metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py,sha256=StTRMBHjuxfxe-wQs8ikoAZc4xnhlceY0R4avaJ1Ps8,3823
+metaflow_extensions/outerbounds/toplevel/ob_internal.py,sha256=DXCaAtLzlE-bFIiVWEv-iV2JKIWsoSGaUeH4jIQZ9gs,193
 metaflow_extensions/outerbounds/toplevel/s3_proxy.py,sha256=zdqG7Z12cGuoYYCi2P4kqC3WsgL3xfdJGIb7ejecHH4,2862
 metaflow_extensions/outerbounds/toplevel/plugins/azure/__init__.py,sha256=WUuhz2YQfI4fz7nIcipwwWq781eaoHEk7n4GAn1npDg,63
 metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py,sha256=BbZiaH3uILlEZ6ntBLKeNyqn3If8nIXZFq_Apd7Dhco,70
@@ -126,7 +126,7 @@ metaflow_extensions/outerbounds/toplevel/plugins/optuna/__init__.py,sha256=6D1wL
 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.4.14rc0.dist-info/METADATA,sha256=uK2AjSt-xmcbORtNU9FBkyiNr5aDoB7Mfgr_CQuqRUA,522
-ob_metaflow_extensions-1.4.14rc0.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.4.14rc0.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.4.14rc0.dist-info/RECORD,,
+ob_metaflow_extensions-1.4.15.dist-info/METADATA,sha256=ITZYVHFNFyum2A979q_dlwPOh9qYZd8TQDpUTpRy-aE,519
+ob_metaflow_extensions-1.4.15.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.4.15.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.4.15.dist-info/RECORD,,