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

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

@@ -744,14 +744,6 @@ def list(ctx, project, branch, name, tags, format, auth_type):
         print_table(table_data, headers)
 
 
-@app.command()
-@auto_cli_options()
-@click.pass_context
-@click.argument("command", nargs=-1, type=click.UNPROCESSED, required=False)
-def deploy2(ctx, **kwargs):
-    pass
-
-
 @app.command(help="Delete an app/apps from the Outerbounds Platform.")
 @click.option("--name", type=str, help="Filter app to delete by name")
 @click.option("--id", "cap_id", type=str, help="Filter app to delete by id")

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

@@ -267,10 +267,13 @@ class ConfigField:
         self._qual_name_stack = []
 
     # This function allows config fields to be made aware of the
-    # owner instance's names. Its via in the ConfigMeta classes'
-    # _set_owner_instance function. But the  _set_owner_instance gets
-    # called within the ConfigField's __set__ function
-    # (when the actual instance of the value is being set)
+    # owner instance's names. It's called from the `commit_owner_names_across_tree`
+    # Decorator. Its called once the config instance is completely ready and
+    # it wil not have any further runtime instance modifications done to it.
+    # The core intent is to ensure that the full config lineage tree is captured and
+    # we have a full trace of where the config is coming from so that we can showcase it
+    # to users when they make configurational errors. It also allows us to reference those
+    # config values in the error messages across different types of errors.
     def _set_owner_name(self, owner_name: str):
         self._qual_name_stack.append(owner_name)
 
@@ -288,7 +291,6 @@ class ConfigField:
         return instance.__dict__.get(self.name)
 
     def __set__(self, instance, value):
-
         if self.parsing_fn:
             value = self.parsing_fn(value)
 
@@ -299,12 +301,6 @@ class ConfigField:
                     f"Value {value} is not of type {self.field_type} for the field {self.name}"
                 )
 
-        # We set the owner instance in the ConfigMeta based classes so they
-        # propagate it down to the ConfigField based classes.
-        if ConfigMeta.is_instance(value):
-            for x in self._qual_name_stack + [self.name]:
-                value._set_owner_instance(x)
-
         instance.__dict__[self.name] = value
 
     def __str__(self) -> str:
@@ -316,6 +312,55 @@ class ConfigField:
         return f"<ConfigField name='{self.name}' type={type_name} default={self.default!r}>"
 
 
+# Add this decorator function before the ConfigMeta class
+# One of the core utilities of the ConfigMeta class
+# is that we can track the tree of elements in the Config
+# class that allow us to make those visible at runtime when
+# the user has some configurational error. it also allows us to
+# Figure out what the user is trying to extactly configure and where
+# that configuration is coming from.
+# Hence this decorator is set on what ever configMeta class based function
+# so that when it gets called, the full call tree is properly set.
+def commit_owner_names_across_tree(func):
+    """
+    Decorator that commits owner names across the configuration tree before executing the decorated function.
+
+    This decorator ensures that all ConfigField instances in the configuration tree are aware of their
+    fully qualified names by traversing the tree and calling _set_owner_name on each field.
+    """
+
+    def wrapper(self, *args, **kwargs):
+        def _commit_owner_names_recursive(instance, field_name_stack=None):
+            if field_name_stack is None:
+                field_name_stack = []
+
+            if not ConfigMeta.is_instance(instance):
+                return
+
+            fields = instance._fields  # type: ignore
+            # fields is a dictionary of field_name: ConfigField
+            for field_name, field_info in fields.items():
+                if ConfigMeta.is_instance(field_info.field_type):
+                    # extract the actual instance of the ConfigMeta class
+                    _instance = instance.__dict__[field_name]
+                    # The instance should hold the _commit_owner_names_across_tree
+                    _commit_owner_names_recursive(
+                        _instance, field_name_stack + [field_name]
+                    )
+                else:
+                    if len(field_name_stack) > 0:
+                        for x in field_name_stack:
+                            field_info._set_owner_name(x)  # type: ignore
+
+        # Commit owner names before executing the original function
+        _commit_owner_names_recursive(self)
+
+        # Execute the original function
+        return func(self, *args, **kwargs)
+
+    return wrapper
+
+
 class ConfigMeta(type):
     """Metaclass implementing the configuration system's class transformation layer.
 
@@ -395,10 +440,6 @@ class ConfigMeta(type):
             if isinstance(value, ConfigField):
                 fields[key] = value
 
-        def _set_owner_to_instance(self, instance_name: str):
-            for field_name, field_info in fields.items():  # field_info is a ConfigField
-                field_info._set_owner_name(instance_name)
-
         # Store fields metadata on the class
         namespace["_fields"] = fields
 
@@ -407,7 +448,6 @@ class ConfigMeta(type):
             return fields[field_name]
 
         namespace["_get_field"] = get_field
-        namespace["_set_owner_instance"] = _set_owner_to_instance
 
         # Auto-generate __init__ method;
         # Override it for all classes.

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

@@ -5,7 +5,7 @@ This module provides a mechanism to dynamically generate explicit typed classes
 from ConfigMeta classes that IDEs can understand and provide autocomplete for.
 """
 
-from typing import Any, Dict, List, Optional, Union, Type
+from typing import Any, Dict, List, Optional, Union, Type, Set
 
 from .config_utils import ConfigMeta
 
@@ -37,6 +37,45 @@ else:
 """
 
 
+def collect_nested_configs_recursive(
+    config_class: Type, visited: Optional[Set[str]] = None
+) -> Dict[str, Type]:
+    """
+    Recursively collect all nested ConfigMeta classes from a config class.
+
+    Args:
+        config_class: A class that inherits from ConfigMeta
+        visited: Set of already visited class names to avoid infinite recursion
+
+    Returns:
+        Dictionary mapping class names to ConfigMeta classes
+    """
+    if visited is None:
+        visited = set()
+
+    nested_configs = {}
+
+    # Avoid infinite recursion by tracking visited classes
+    if config_class.__name__ in visited:
+        return nested_configs
+
+    visited.add(config_class.__name__)
+
+    # First pass: collect immediate nested configs
+    for field_name, field_info in config_class._fields.items():
+        if ConfigMeta.is_instance(field_info.field_type):
+            nested_class = field_info.field_type
+            nested_configs[nested_class.__name__] = nested_class
+
+            # Recursively collect nested configs from this nested class
+            deeper_nested = collect_nested_configs_recursive(
+                nested_class, visited.copy()
+            )
+            nested_configs.update(deeper_nested)
+
+    return nested_configs
+
+
 def generate_typed_class_code(config_class: Type) -> str:
     """
     Generate the actual Python code for a typed class that IDEs can understand.
@@ -52,22 +91,19 @@ def generate_typed_class_code(config_class: Type) -> str:
 
     class_name = f"Typed{config_class.__name__}"
 
-    # Generate TypedDict for nested configs
+    # Generate TypedDict for nested configs - now recursive
     nested_typeddict_code = []
 
-    # First pass: collect all nested configs
-    nested_configs = {}
-    for field_name, field_info in config_class._fields.items():
-        if ConfigMeta.is_instance(field_info.field_type):
-            nested_configs[field_info.field_type.__name__] = field_info.field_type
+    # Recursively collect all nested configs
+    nested_configs = collect_nested_configs_recursive(config_class)
 
-    # Generate TypedDict classes for nested configs
+    # Generate TypedDict classes for all nested configs
     for nested_name, nested_class in nested_configs.items():
         dict_name = f"{nested_name}Dict"
         fields = []
 
         for field_name, field_info in nested_class._fields.items():
-            field_type = _get_type_string(field_info.field_type)
+            field_type = _get_type_string(field_info.field_type, quote_config_meta=True)
             if not field_info.required:
                 field_type = f"Optional[{field_type}]"
             fields.append(f"    {field_name}: {field_type}")
@@ -142,8 +178,13 @@ def generate_typed_class_code(config_class: Type) -> str:
     return (newline + newline).join(full_code)
 
 
-def _get_type_string(field_type: Type) -> str:
-    """Convert a type to its string representation for code generation."""
+def _get_type_string(field_type: Type, quote_config_meta: bool = False) -> str:
+    """Convert a type to its string representation for code generation.
+
+    Args:
+        field_type: The type to convert
+        quote_config_meta: Whether to quote ConfigMeta type references for forward declarations
+    """
     if field_type == str:
         return "str"
     elif field_type == int:
@@ -152,6 +193,10 @@ def _get_type_string(field_type: Type) -> str:
         return "float"
     elif field_type == bool:
         return "bool"
+    elif ConfigMeta.is_instance(field_type):
+        # Handle ConfigMeta classes by referencing their Dict type
+        dict_type = f"{field_type.__name__}Dict"
+        return f'"{dict_type}"' if quote_config_meta else dict_type
     elif hasattr(field_type, "__origin__"):
         # Handle generic types like List[str], Dict[str, str], etc.
         origin = field_type.__origin__
@@ -159,18 +204,18 @@ def _get_type_string(field_type: Type) -> str:
 
         if origin == list:
             if args:
-                return f"List[{_get_type_string(args[0])}]"
+                return f"List[{_get_type_string(args[0], quote_config_meta)}]"
             return "List[Any]"
         elif origin == dict:
             if len(args) == 2:
-                return f"Dict[{_get_type_string(args[0])}, {_get_type_string(args[1])}]"
+                return f"Dict[{_get_type_string(args[0], quote_config_meta)}, {_get_type_string(args[1], quote_config_meta)}]"
             return "Dict[str, Any]"
         elif origin == Union:
             # Handle Optional types
             if len(args) == 2 and type(None) in args:
                 non_none_type = args[0] if args[1] is type(None) else args[1]
-                return f"Optional[{_get_type_string(non_none_type)}]"
-            return f"Union[{', '.join(_get_type_string(arg) for arg in args)}]"
+                return f"Optional[{_get_type_string(non_none_type, quote_config_meta)}]"
+            return f"Union[{', '.join(_get_type_string(arg, quote_config_meta) for arg in args)}]"
 
     # Default case - use the type name
     return getattr(field_type, "__name__", str(field_type))
@@ -251,7 +296,7 @@ def create_typed_init_class_dynamic(config_class: Type) -> Type:
     def create_init_method():
         # Build the signature dynamically
         sig_params = []
-        annotations = {"return": None}
+        annotations: Dict[str, Any] = {"return": type(None)}
 
         for field_name, field_info in config_class._fields.items():
             field_type = field_info.field_type
@@ -295,7 +340,7 @@ def create_typed_init_class_dynamic(config_class: Type) -> Type:
         __init__.__annotations__ = annotations
         return __init__
 
-    def create_config(self) -> config_class:
+    def create_config(self):
         """Create and return the ConfigMeta class instance."""
         return config_class.from_dict(self._kwargs)
 
@@ -326,7 +371,7 @@ def create_typed_init_class_dynamic(config_class: Type) -> Type:
 
 
 # Auto-generate and write typed classes to a file
-def generate_typed_classes_file(output_file: str = None):
+def generate_typed_classes_file(output_file: Optional[str] = None):
     """
     Generate typed classes and write them to a file for IDE support.
 

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

@@ -29,6 +29,7 @@ from .config_utils import (
     validate_config_meta,
     validate_required_fields,
     ConfigValidationFailedException,
+    commit_owner_names_across_tree,
 )
 
 
@@ -49,26 +50,26 @@ class UnitParser:
             "default_unit": "Mi",
             "requires_unit": True,  # if a Unit free value is provided then we will add the default unit to it.
             # Regex to match values with units (e.g., "512Mi", "4Gi", "1024Ki")
-            "unit_regex": r"^\d+(\.\d+)?(Ki|Mi|Gi|Ti|Pi|Ei)$",
+            "correct_unit_regex": r"^\d+(\.\d+)?(Ki|Mi|Gi|Ti|Pi|Ei)$",
         },
         "cpu": {
             "default_unit": None,
             "requires_unit": False,  # if a Unit free value is provided then we will not add the default unit to it.
             # Accepts values like 400m, 4, 0.4, 1000n, etc.
             # Regex to match values with units (e.g., "400m", "1000n", "2", "0.5")
-            "unit_regex": r"^(\d+(\.\d+)?(m|n)?|\d+(\.\d+)?)$",
+            "correct_unit_regex": r"^(\d+(\.\d+)?(m|n)?|\d+(\.\d+)?)$",
         },
         "disk": {
             "default_unit": "Mi",
             "requires_unit": True,  # if a Unit free value is provided then we will add the default unit to it.
             # Regex to match values with units (e.g., "100Mi", "1Gi", "500Ki")
-            "unit_regex": r"^\d+(\.\d+)?(Ki|Mi|Gi|Ti|Pi|Ei)$",
+            "correct_unit_regex": r"^\d+(\.\d+)?(Ki|Mi|Gi|Ti|Pi|Ei)$",
         },
         "gpu": {
             "default_unit": None,
             "requires_unit": False,
             # Regex to match values with units (usually just integer count, e.g., "1", "2")
-            "unit_regex": r"^\d+$",
+            "correct_unit_regex": r"^\d+$",
         },
     }
 
@@ -76,10 +77,9 @@ class UnitParser:
         self.metric_name = metric_name
 
     def validate(self, value: str):
-        if self.metrics[self.metric_name]["requires_unit"]:
-            if not re.match(self.metrics[self.metric_name]["unit_regex"], value):
-                return False
-        return True
+        if re.match(self.metrics[self.metric_name]["correct_unit_regex"], value):
+            return True
+        return False
 
     def process(self, value: str):
         value = str(value)
@@ -92,12 +92,9 @@ class UnitParser:
                 )
                 return value
 
-            if re.match(self.metrics[self.metric_name]["unit_regex"], value):
-                return value
-
         return value
 
-    def parse(self, value: str):
+    def parse(self, value: Union[str, None]):
         if value is None:
             return None
         return self.process(value)
@@ -117,7 +114,7 @@ class UnitParser:
                     field_name=metric_name,
                     field_info=field_info,
                     current_value=value,
-                    message=f"Invalid value for `{metric_name}`. Must be of the format {parser.metrics[metric_name]['unit_regex']}.",
+                    message=f"Invalid value for `{metric_name}`. Must be of the format {parser.metrics[metric_name]['correct_unit_regex']}.",
                 )
             return validation
 
@@ -138,7 +135,7 @@ class BasicValidations:
                 field_name=self.field_name,
                 field_info=self._get_field(),
                 current_value=current_value,
-                message=f"Configuration field {self.field_name} has invalid value {current_value}. Value must be one of: {' '.join(enums)}",
+                message=f"Configuration field {self.field_name} has invalid value {current_value}. Value must be one of: {'/'.join(enums)}",
             )
         return True
 
@@ -934,6 +931,7 @@ How to read this schema:
     def validate(self):
         validate_config_meta(self)
 
+    @commit_owner_names_across_tree
     def commit(self):
         self.validate()
         validate_required_fields(self)

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.175rc4
+Version: 1.2.0
 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.15.18.1)
+Requires-Dist: ob-metaflow (==2.15.21.1)
 
 # Outerbounds platform package
 

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

@@ -13,7 +13,7 @@ metaflow_extensions/outerbounds/plugins/apps/deploy_decorator.py,sha256=VkmiMdNY
 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=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_cli.py,sha256=9YyvOQzPNlpxA2K9AZ4jYpfDWpLSp66u_NotGGE5DHg,42155
 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=fRcJ_GgC4FxGscRS4M4mcMNpjoHA6Zdc1LIgdfDkJkI,33935
@@ -33,11 +33,11 @@ metaflow_extensions/outerbounds/plugins/apps/core/code_package/code_packager.py,
 metaflow_extensions/outerbounds/plugins/apps/core/code_package/examples.py,sha256=aF8qKIJxCVv_ugcShQjqUsXKKKMsm1oMkQIl8w3QKuw,4016
 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/config_utils.py,sha256=bozzUR8rbfOnb5M532RZxB5QNvVgEC1gnVjfCvQ82Yk,34053
 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=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/config/typed_init_generator.py,sha256=KiJ1eiwtBR5eWdBzWqvO6KlqJ2qzjJvl3w4c1uJ3g0Y,13419
+metaflow_extensions/outerbounds/plugins/apps/core/config/unified_config.py,sha256=HzLFqMHuo-2o3KR4hJlTtMkl978yvCnGu2lm_PnhEp0,35548
 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.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,,
+ob_metaflow_extensions-1.2.0.dist-info/METADATA,sha256=ZlwS67W8SEHHEGzsdvxWg6TODhFy-N-o9GpflqBkMR4,519
+ob_metaflow_extensions-1.2.0.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.2.0.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.2.0.dist-info/RECORD,,