params-proto 3.2.0__py3-none-any.whl → 3.2.2__py3-none-any.whl

params_proto/cli/cli_parse.py

@@ -57,6 +57,32 @@ def _normalize_class_name(class_name: str) -> str:
   return class_name.replace("-", "").replace("_", "").lower()
 
 
+def _get_required_fields(cls) -> List[str]:
+  """Get list of required field names (fields without defaults) in order."""
+  import dataclasses
+
+  required = []
+
+  # Check if it's a dataclass
+  if dataclasses.is_dataclass(cls):
+    for field in dataclasses.fields(cls):
+      has_default = (
+        field.default is not dataclasses.MISSING
+        or field.default_factory is not dataclasses.MISSING
+      )
+      if not has_default:
+        required.append(field.name)
+  else:
+    # For regular classes, check annotations and class-level defaults
+    annotations = getattr(cls, "__annotations__", {})
+    for name in annotations:
+      if not hasattr(cls, name):
+        # No class-level default
+        required.append(name)
+
+  return required
+
+
 def _match_class_by_name(name: str, classes: list) -> Union[type, None]:
   """Match a string to one of the Union classes.
 
@@ -187,6 +213,8 @@ def parse_cli_args(wrapper) -> Dict[str, Any]:
   positional_values = []
   union_selections = {}  # param_name -> selected_class
   union_attrs = {}  # (param_name, attr_name) -> value
+  union_positional = {}  # param_name -> [positional_args] for subcommand fields
+  current_union_param = None  # Track which union we're collecting positionals for
 
   args = sys.argv[1:]
   i = 0
@@ -377,12 +405,18 @@ def parse_cli_args(wrapper) -> Dict[str, Any]:
           selected_class = _match_class_by_name(arg, union_classes)
           if selected_class:
             union_selections[param_name] = selected_class
+            current_union_param = param_name  # Track for following positionals
+            union_positional[param_name] = []
             matched_union = True
             i += 1
             break
 
       if not matched_union:
-        positional_values.append(arg)
+        # If we have a current union, add positional to its list
+        if current_union_param is not None:
+          union_positional[current_union_param].append(arg)
+        else:
+          positional_values.append(arg)
         i += 1
 
   # Assign positional arguments to required parameters
@@ -433,6 +467,33 @@ def parse_cli_args(wrapper) -> Dict[str, Any]:
           # No annotations, treat as string
           attrs[attr_name] = value_str
 
+    # Assign positional args to required fields of the selected class
+    if param_name in union_positional and union_positional[param_name]:
+      positionals = union_positional[param_name]
+      required_fields = _get_required_fields(selected_class)
+
+      for field_idx, field_name in enumerate(required_fields):
+        if field_name in attrs:
+          # Already set by named arg, skip
+          continue
+        if field_idx < len(positionals):
+          # Get type annotation for conversion
+          if hasattr(selected_class, "__annotations__"):
+            field_type = selected_class.__annotations__.get(field_name, str)
+            try:
+              attrs[field_name] = _convert_type(positionals[field_idx], field_type)
+            except (ValueError, TypeError):
+              raise SystemExit(
+                f"error: invalid value for {field_name}: {positionals[field_idx]}"
+              )
+          else:
+            attrs[field_name] = positionals[field_idx]
+
+      # Check for extra positional args
+      if len(positionals) > len(required_fields):
+        extra = positionals[len(required_fields):]
+        raise SystemExit(f"error: unrecognized arguments: {' '.join(extra)}")
+
     # If selected_class is a proto.prefix singleton, merge its overrides
     from params_proto.proto import _SINGLETONS, ptype
 
@@ -447,6 +508,14 @@ def parse_cli_args(wrapper) -> Dict[str, Any]:
               attrs[key] = value
         break
 
+    # Check for missing required fields
+    required_fields = _get_required_fields(selected_class)
+    for field_name in required_fields:
+      if field_name not in attrs:
+        raise SystemExit(
+          f"error: {selected_class.__name__} requires argument: {field_name}"
+        )
+
     # Instantiate the class with collected attributes
     try:
       instance = selected_class(**attrs)

params_proto/proto.py

@@ -844,10 +844,15 @@ def proto(
       # Handle existing metaclass
       existing_meta = type(obj)
       if existing_meta is not type:
-        # Merge with existing metaclass
-        class MergedMeta(existing_meta, ptype):
-          pass
-        metaclass = MergedMeta
+        # Check if existing metaclass is already ptype or a subclass of ptype
+        if issubclass(existing_meta, ptype):
+          # Already using ptype, no need to merge
+          metaclass = existing_meta
+        else:
+          # Merge with existing metaclass
+          class MergedMeta(existing_meta, ptype):
+            pass
+          metaclass = MergedMeta
       else:
         metaclass = ptype
 
@@ -872,9 +877,12 @@ def proto(
         namespace[key] = value
 
       # Create new class with metaclass
+      # IMPORTANT: Use (obj,) as bases to make new class a SUBCLASS of original.
+      # This ensures super() works correctly - the original class is in the MRO,
+      # so Python's super() validation passes when checking isinstance(self, original_class).
       new_cls = metaclass(
         obj.__name__,
-        obj.__bases__,
+        (obj,),
         namespace
       )
 

params_proto/v1/params_proto.py

@@ -17,7 +17,13 @@ import inspect
 import re
 from typing import Callable, TypeVar, Union
 
-from waterbear import DefaultBear
+try:
+    from waterbear import DefaultBear
+except ImportError:
+    raise ImportError(
+        "params_proto.v1 requires waterbear. Install it with: pip install waterbear\n"
+        "Note: The v3 API (from params_proto import proto) does not require waterbear."
+    )
 
 
 def _strtobool(val):

params_proto/v2/proto.py

@@ -8,7 +8,13 @@ from types import BuiltinFunctionType, SimpleNamespace
 from warnings import warn
 
 from expandvars import expandvars
-from waterbear import Bear
+try:
+    from waterbear import Bear
+except ImportError:
+    raise ImportError(
+        "params_proto.v2 requires waterbear. Install it with: pip install waterbear\n"
+        "Note: The v3 API (from params_proto import proto) does not require waterbear."
+    )
 
 from params_proto.parse_env_template import all_available
 from params_proto.v2.utils import dot_to_deps

{params_proto-3.2.0.dist-info → params_proto-3.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: params-proto
-Version: 3.2.0
+Version: 3.2.2
 Summary: Modern Hyper Parameter Management for Machine Learning
 Project-URL: Homepage, https://github.com/geyang/params-proto
 Project-URL: Documentation, https://params-proto.readthedocs.io
@@ -23,7 +23,6 @@ Requires-Dist: argcomplete
 Requires-Dist: argparse
 Requires-Dist: expandvars
 Requires-Dist: termcolor
-Requires-Dist: waterbear>=2.6.8
 Provides-Extra: dev
 Requires-Dist: pandas; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'

{params_proto-3.2.0.dist-info → params_proto-3.2.2.dist-info}/RECORD

@@ -3,24 +3,24 @@ params_proto/app.py,sha256=UySpd1op3M44Szk6Ekyn0fJcnZsQvMTMPdaEybwWsLE,19
 params_proto/documentation.py,sha256=mIqmcwGWo8tM1BuNzLIwVTzdbQ3qyPus7yWTaOce4dM,8091
 params_proto/envvar.py,sha256=A87jxSAQ2tjbKLbrm96lblV90zNdtBGCSV6QRe2DrgA,8398
 params_proto/parse_env_template.py,sha256=mXTvKpNhT2jGr3HpwKw42shd18O0QACmSJn6yWMDdKA,1298
-params_proto/proto.py,sha256=AGUHrU0OmWxqkYvJJqR6SzQTxZz_Zis0XYYaiFentmo,39077
+params_proto/proto.py,sha256=B3TqH9nPQgq9sXWrwpPnbcGiiWMR9eNS_0gXnWw_QGc,39557
 params_proto/type_utils.py,sha256=x68rL5m76ZFRKsCRgH_i_4vLpt6ldWEsEAalgacFIH8,7364
 params_proto/cli/__init__.py,sha256=sLpN3GmaBqd_d0J0nvUNOeGlV74_-jQGW0nDUU34tjA,493
 params_proto/cli/ansi_help.py,sha256=-1gzbvOpi9GjPlqgiINOYQAfIstzg0-ukv1se88TYCQ,10967
-params_proto/cli/cli_parse.py,sha256=qf9HFTOIJiIMKboqxa6sWdfIEzG9VN8JUHq05L9XDls,16126
+params_proto/cli/cli_parse.py,sha256=kVBSgCCVZk32NOfPfyj-pYWXBLyqitFZzsfme8LspcE,18835
 params_proto/cli/help_gen.py,sha256=Iv9MWC7TJT4_OUWozTfCr8-Nmp_-K8Ohoim_dtsN5AY,12921
 params_proto/hyper/__init__.py,sha256=4zMnKk9H7NPlaTTRzbL2MC7anzwkBbd2_kW51aYhCPs,157
 params_proto/hyper/proxies.py,sha256=OMiaKK-gQx-zT1xeCmZevBSDgWUwwkzz0n54A5_wC60,4492
 params_proto/hyper/sweep.py,sha256=QUjsNdpJUoZU2WMF022LRqTh9rx5dgabpRCfs895q2Q,31444
 params_proto/v1/__init__.py,sha256=NGYZ6Iqicc5M6iyWT6N8FsD0iGLl2by5yZUIsHKhjXw,48
 params_proto/v1/hyper.py,sha256=zFzViWtSkQdqDJXuan33X2OZwKSHHY39Q5HSNPXl0iQ,2883
-params_proto/v1/params_proto.py,sha256=g2TMTG0SXyp01gsvd9EO42m28Hr2aS79xzOnMeH_WVk,8728
+params_proto/v1/params_proto.py,sha256=KUQCKr7HRHFjOQGurqfWspxcBMJ6k1RTjXKSFOJZpa4,8961
 params_proto/v2/__init__.py,sha256=C89S5VvAr4DSeRBwX4Z1p07lNDiVLu9PhosmcImYs1A,77
 params_proto/v2/hyper.py,sha256=onBAkT8Ja8IkeHEOq1AwCdTuBzAnthIe766ZE0lAy-M,11462
 params_proto/v2/partial.py,sha256=_ovi4NY8goYgHurfYt1OV0E9DSMXGYucjMVIyG1Q_xc,983
-params_proto/v2/proto.py,sha256=KvinzgzwRQr2bHDNtrU7App2kgAyB-SEfBe4SNYceh0,18995
+params_proto/v2/proto.py,sha256=-BTTwFOhJsaPnujwFIDh14QMB8r_ZdridK9I2Jkqd_U,19228
 params_proto/v2/utils.py,sha256=5EWvwboZDTsCYfzSED_J6RVFyNLIlf95nIu4p_ZSVxA,3540
-params_proto-3.2.0.dist-info/METADATA,sha256=p5CeTi6QrS9C-ipTVzIsfQAvptl2gFLfLccdUBqsfGs,8991
-params_proto-3.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-params_proto-3.2.0.dist-info/licenses/LICENSE.md,sha256=c2qSYi9tUMZtzj9SEsMeKhub5LJUmHwBtDLiIMM5b6U,1526
-params_proto-3.2.0.dist-info/RECORD,,
+params_proto-3.2.2.dist-info/METADATA,sha256=EvdIaWolnBuaF6bU2orZOozwzDgGNVNipF4wYYw_CIU,8959
+params_proto-3.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+params_proto-3.2.2.dist-info/licenses/LICENSE.md,sha256=c2qSYi9tUMZtzj9SEsMeKhub5LJUmHwBtDLiIMM5b6U,1526
+params_proto-3.2.2.dist-info/RECORD,,