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

metaflow_extensions/outerbounds/plugins/__init__.py

@@ -324,7 +324,6 @@ CLIS_DESC = [
     ("nvct", ".nvct.nvct_cli.cli"),
     ("fast-bakery", ".fast_bakery.fast_bakery_cli.cli"),
     ("snowpark", ".snowpark.snowpark_cli.cli"),
-    ("app", ".apps.app_cli.cli"),
 ]
 STEP_DECORATORS_DESC = [
     ("nvidia", ".nvcf.nvcf_decorator.NvcfDecorator"),

metaflow_extensions/outerbounds/plugins/apps/app_cli.py

@@ -1,3 +0,0 @@
-from .core import app_cli as ob_apps_cli
-
-cli = ob_apps_cli.cli

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

@@ -1,4 +1,24 @@
-from typing import List, Tuple, Dict, Union
+import sys
+from typing import TYPE_CHECKING, Dict, List, Tuple, Union
+
+
+# on 3.8+ use the stdlib TypedDict;
+# in TYPE_CHECKING blocks mypy/pyright still pick it up on older Pythons
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    if TYPE_CHECKING:
+        # for the benefit of type-checkers
+        from typing import TypedDict  # noqa: F401
+    # runtime no-op TypedDict shim
+    class _TypedDictMeta(type):
+        def __new__(cls, name, bases, namespace, total=True):
+            # ignore total at runtime
+            return super().__new__(cls, name, bases, namespace)
+
+    class TypedDict(dict, metaclass=_TypedDictMeta):
+        # Runtime stand-in for typing.TypedDict on <3.8.
+        pass
 
 
 class _dagNode:
@@ -134,9 +154,6 @@ class _capsuleDeployerStateMachine:
         dot.render("state_machine", view=False)
 
 
-from typing import TypedDict
-
-
 class AccessInfo(TypedDict):
     outOfClusterURL: str
     inClusterURL: str
@@ -158,9 +175,6 @@ class WorkerStatus(TypedDict):
     version: str
 
 
-from typing import Dict, List, TypedDict
-
-
 class WorkerInfoDict(TypedDict):
     # TODO : Check if we need to account for the `Terminating` state
     pending: Dict[str, List[WorkerStatus]]
@@ -191,7 +205,7 @@ class DEPLOYMENT_READY_CONDITIONS:
     2) [all_running] Atleast min_replicas number of workers are running for the deployment to be considered ready.
         - Usecase: Operators may require that all replicas are available before traffic is routed. Needed when inference endpoints maybe under some SLA or require a larger load
     3) [fully_finished] Atleast min_replicas number of workers are running for the deployment and there are no pending or crashlooping workers from previous versions lying around.
-        - Usecase: Ensuring endpoint is fully available and no other versions are running.
+        - Usecase: Ensuring endpoint is fully available and no other versions are running or endpoint has been fully scaled down.
     4) [async] The deployment will be assumed ready as soon as the server responds with a 200.
         - Usecase: Operators may only care that the URL is minted for the deployment or the deployment eventually scales down to 0.
     """
@@ -203,7 +217,7 @@ class DEPLOYMENT_READY_CONDITIONS:
     # It doesn't imply that all the workers relating to other deployments have been torn down.
     ALL_RUNNING = "all_running"
 
-    # `FULLY_FINISHED` implies that the deployment has the minimum number of replicas and all the workers are related to the current deployment instance's version.
+    # `FULLY_FINISHED` implies Atleast min_replicas number of workers are running for the deployment and there are no pending or crashlooping workers from previous versions lying around.
     FULLY_FINISHED = "fully_finished"
 
     # `ASYNC` implies that the deployment will be assumed ready after the URL is minted and the worker statuses are not checked.
@@ -273,10 +287,13 @@ class DEPLOYMENT_READY_CONDITIONS:
                 and not capsule_status["updateInProgress"]
             )
         elif readiness_condition == cls.FULLY_FINISHED:
-            _readiness_condition_satisfied = (
-                worker_semantic_status["status"]["fully_finished"]
-                and not capsule_status["updateInProgress"]
-            )
+            # We dont wait for updateInProgress in this condition since
+            # UpdateInProgress can switch to false when users scale all replicas down to 0.
+            # So for this condition to satisfy we will only rely on the worker semantic status.
+            # ie. the thing actually tracking what is running and what is not.
+            _readiness_condition_satisfied = worker_semantic_status["status"][
+                "fully_finished"
+            ]
         elif readiness_condition == cls.ASYNC:
             # The async readiness condition is satisfied immediately after the server responds
             # with the URL.
@@ -402,6 +419,11 @@ def _capsule_worker_status_diff(
 def _capsule_worker_semantic_status(
     workers: List[WorkerStatus], version: str, min_replicas: int
 ) -> CapsuleWorkerSemanticStatus:
+    def _filter_workers_by_phase(
+        workers: List[WorkerStatus], phase: str
+    ) -> List[WorkerStatus]:
+        return [w for w in workers if w.get("phase") == phase]
+
     def _make_version_dict(
         _workers: List[WorkerStatus], phase: str
     ) -> Dict[str, List[WorkerStatus]]:
@@ -447,8 +469,12 @@ def _capsule_worker_semantic_status(
         "all_running": count_for_version(running_workers) >= min_replicas,
         "fully_finished": (
             count_for_version(running_workers) >= min_replicas
-            and len(pending_workers) == 0
-            and len(crashlooping_workers) == 0
+            # count the workers of different versions that are runnning
+            # and ensure that only the current version's workers are running.
+            and count_for_version(running_workers)
+            == len(_filter_workers_by_phase(workers, "Running"))
+            and len(_filter_workers_by_phase(workers, "Pending")) == 0
+            and len(_filter_workers_by_phase(workers, "CrashLoopBackOff")) == 0
         ),
         "current_info": {
             "pending": count_for_version(pending_workers),

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

@@ -206,7 +206,7 @@ class CapsuleWorkersStateMachine:
 
 class CapsuleInput:
     @classmethod
-    def construct_exec_command(cls, commands: list[str]):
+    def construct_exec_command(cls, commands: List[str]):
         commands = ["set -eEuo pipefail"] + commands
         command_string = "\n".join(commands)
         # First constuct a base64 encoded string of the quoted command
@@ -254,7 +254,7 @@ class CapsuleInput:
             replicas.get("min"),
             replicas.get("max"),
         )
-        if fixed:
+        if fixed is not None:
             _min, _max = fixed, fixed
         gpu_resource = app_config.get_state("resources").get("gpu")
         resources = {}
@@ -711,7 +711,7 @@ class CapsuleDeployer:
     def _get_min_replicas(self):
         replicas = self._app_config.get_state("replicas", {})
         fixed, _min, _ = replicas.get("fixed"), replicas.get("min"), replicas.get("max")
-        if fixed:
+        if fixed is not None:
             return fixed
         return _min
 
@@ -740,9 +740,9 @@ class CapsuleDeployer:
             # We first need to check if someone has not upgraded the capsule under the hood and
             # the current deployment instance is invalid.
             self._backend_version_mismatch_check(
-                capsule_response, self.current_deployment_instance_version
+                capsule_response, self.current_deployment_instance_version  # type: ignore
             )
-            state_machine.add_status(capsule_response.get("status", {}))
+            state_machine.add_status(capsule_response.get("status", {}))  # type: ignore
             workers_state_machine.add_status(workers_response)
             state_machine.report_current_status(logger)
 

metaflow_extensions/outerbounds/plugins/apps/core/config/typed_configs.py

@@ -2,11 +2,38 @@
 Auto-generated typed classes for ConfigMeta classes.
 
 This module provides IDE-friendly typed interfaces for all configuration classes.
+The reason we auto-generate this file is because we want to provide a bridge between what is the ConfigMeta classes and the typed programmatic interface.
+The CoreConfig class is setup in a way that if any additionally params are missed out from being auto-generated then it will not affect the core functionality of the programmatic API.
+The new parameters will just not show up in IDE autocompletions.
+It is fine if this file is not regularly updated by running the script in the .pre-commit-config.app-changes.yaml
+but it is recommended that this file not be deleted or manually edited.
+
 """
 
-from typing import Optional, List, Dict, Any, TypedDict
+from typing import Optional, List, Dict, Any
 from .unified_config import CoreConfig
 
+import sys
+from typing import TYPE_CHECKING
+
+# on 3.8+ use the stdlib TypedDict;
+# in TYPE_CHECKING blocks mypy/pyright still pick it up on older Pythons
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    if TYPE_CHECKING:
+        # for the benefit of type-checkers
+        from typing import TypedDict  # noqa: F401
+    # runtime no-op TypedDict shim
+    class _TypedDictMeta(type):
+        def __new__(cls, name, bases, namespace, total=True):
+            # ignore total at runtime
+            return super().__new__(cls, name, bases, namespace)
+
+    class TypedDict(dict, metaclass=_TypedDictMeta):
+        # Runtime stand-in for typing.TypedDict on <3.8.
+        pass
+
 
 class ResourceConfigDict(TypedDict, total=False):
     cpu: Optional[str]

metaflow_extensions/outerbounds/plugins/apps/core/config/typed_init_generator.py

@@ -13,6 +13,29 @@ import os
 
 current_dir = os.path.dirname(__file__)
 
+TYPED_DICT_IMPORT = """
+import sys
+from typing import TYPE_CHECKING
+
+# on 3.8+ use the stdlib TypedDict;
+# in TYPE_CHECKING blocks mypy/pyright still pick it up on older Pythons
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    if TYPE_CHECKING:
+        # for the benefit of type-checkers
+        from typing import TypedDict  # noqa: F401
+    # runtime no-op TypedDict shim
+    class _TypedDictMeta(type):
+        def __new__(cls, name, bases, namespace, total=True):
+            # ignore total at runtime
+            return super().__new__(cls, name, bases, namespace)
+
+    class TypedDict(dict, metaclass=_TypedDictMeta):
+        # Runtime stand-in for typing.TypedDict on <3.8.
+        pass
+"""
+
 
 def generate_typed_class_code(config_class: Type) -> str:
     """
@@ -167,9 +190,10 @@ def generate_typed_classes_module(
         Complete Python module code
     """
     imports = [
-        "from typing import Optional, List, Dict, Any, TypedDict",
+        "from typing import Optional, List, Dict, Any",
         "from .unified_config import "
         + ", ".join(cls.__name__ for cls in config_classes),
+        TYPED_DICT_IMPORT,
     ]
 
     class_codes = []
@@ -186,6 +210,18 @@ def generate_typed_classes_module(
         + newline
         + "This module provides IDE-friendly typed interfaces for all configuration classes."
         + newline
+        + "The reason we auto-generate this file is because we want to provide a bridge between what is the ConfigMeta classes and the typed programmatic interface."
+        + newline
+        + "The CoreConfig class is setup in a way that if any additionally params are missed out from being auto-generated "
+        + "then it will not affect the core functionality of the programmatic API."
+        + newline
+        + "The new parameters will just not show up in IDE autocompletions."
+        + newline
+        + "It is fine if this file is not regularly updated by running the script in the .pre-commit-config.app-changes.yaml"
+        + newline
+        + "but it is recommended that this file not be deleted or manually edited."
+        + newline
+        + newline
         + '"""'
         + newline
         + newline

metaflow_extensions/outerbounds/plugins/apps/core/config/unified_config.py

@@ -345,12 +345,14 @@ class ReplicaConfig(metaclass=ConfigMeta):
                 replica_config.fixed is None,
             ]
         ):
+            # if nothing is set then set
             replica_config.fixed = 1
+        elif replica_config.min is not None and replica_config.max is None:
+            replica_config.max = replica_config.min
         return
 
     @staticmethod
     def validate(replica_config: "ReplicaConfig"):
-        # TODO: Have a better validation story.
         both_min_max_set = (
             replica_config.min is not None and replica_config.max is not None
         )

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

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

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

@@ -1,22 +1,22 @@
 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=8DmLGwlr6UZWe39rbJdhO5ANemDp2ZwxY6MlqVPCppc,13740
+metaflow_extensions/outerbounds/plugins/__init__.py,sha256=SgqRTG7FFk-jrPBNPYQ-D0W26Yr_dgg7ZL-YJInTQGw,13706
 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_cli.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=c6uCgKlgEkTmM9BVdAO-m3vZvUpK2KW_AZZ2236now4,237
-metaflow_extensions/outerbounds/plugins/apps/core/_state_machine.py,sha256=8RvEqRI9WaUiFu2LBKIqWRbbe9bSM2EptTR56wPit-0,18434
+metaflow_extensions/outerbounds/plugins/apps/core/_state_machine.py,sha256=b0WI7jVIReWo52AtWXFlaoET2u3nOVH9oITnVlWFIBk,19881
 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=kOyHX8mzt44N4x4MKXCcBTZxS9ZcmRcUgbVuTgAMPpA,33879
+metaflow_extensions/outerbounds/plugins/apps/core/capsule.py,sha256=fRcJ_GgC4FxGscRS4M4mcMNpjoHA6Zdc1LIgdfDkJkI,33935
 metaflow_extensions/outerbounds/plugins/apps/core/click_importer.py,sha256=kgoPQmK_-8PSSTc3QMSaynCLQ5VWTkKFOC69FPURyXA,998
 metaflow_extensions/outerbounds/plugins/apps/core/config_schema.yaml,sha256=iTThO2vNQrFWe9nYfjiOcMf6FOQ6vU_1ZhXhUAr0L24,8142
 metaflow_extensions/outerbounds/plugins/apps/core/dependencies.py,sha256=HDPj7rDARcsKeex5GwH0IP8rOXMH6YdOufgXDknP1S8,4006
@@ -35,9 +35,9 @@ metaflow_extensions/outerbounds/plugins/apps/core/config/__init__.py,sha256=fSFB
 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/config/typed_configs.py,sha256=bAC2lV1xWtcw0r2LPlqDrggeXPLOyrtZha2KDpm_Vx0,4454
+metaflow_extensions/outerbounds/plugins/apps/core/config/typed_init_generator.py,sha256=bdWS5THMeae08wHvTrMq-cJP52r4sTMP1dsABHX0cK0,11766
+metaflow_extensions/outerbounds/plugins/apps/core/config/unified_config.py,sha256=bUL-W91BvJ5O94wegoxPpBGOdyZYMzPEMeFF96UpYPI,35595
 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
@@ -115,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.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,,
+ob_metaflow_extensions-1.1.175rc4.dist-info/METADATA,sha256=QKrSlPcSdpTnsJIJS6c4xl5B04HoNnpVeBldTegc3BQ,524
+ob_metaflow_extensions-1.1.175rc4.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.175rc4.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.175rc4.dist-info/RECORD,,