params-proto 3.0.0rc24__py3-none-any.whl → 3.0.0rc26__py3-none-any.whl

params_proto/hyper/sweep.py

@@ -62,14 +62,16 @@ class ParameterIterator:
 
   def __mul__(self, other):
     """
-    Cartesian product with another ParameterIterator.
+    Cartesian product with another ParameterIterator or dict.
 
     Example:
-        piter1 = piter({Config.lr: [0.001, 0.01]})
-        piter2 = piter({Config.batch_size: [32, 64]})
-        combined = piter1 * piter2  # 4 combinations
+        piter @ {"lr": [0.001, 0.01]} * {"batch_size": [32, 64]}
+        # Creates 4 combinations
     """
-    if not isinstance(other, ParameterIterator):
+    # Auto-wrap dicts as ParameterIterator
+    if isinstance(other, dict):
+      other = piter._create_iterator(other)
+    elif not isinstance(other, ParameterIterator):
       raise TypeError(f"Cannot multiply ParameterIterator with {type(other)}")
 
     # Materialize other to a list so we can iterate multiple times
@@ -142,57 +144,81 @@ class ParameterIterator:
     return len(self.list)
 
 
-def piter(spec):
+class PiterFactory:
   """
-  Create a parameter iterator from a specification dict.
+  Factory for creating parameter iterators.
 
-  Args:
-      spec: Dict mapping parameter names (strings) to values or lists of values.
-            Keys should be parameter names, optionally with prefix (e.g., "config.lr").
-            Values can be single values or lists/iterables.
+  Supports both function-call syntax and @ operator syntax:
+      piter({"lr": [0.001, 0.01]})      # function call
+      piter @ {"lr": [0.001, 0.01]}     # @ operator
 
-  Returns:
-      ParameterIterator that zips parameter lists element-wise.
+  The @ operator enables clean chaining:
+      piter @ {"lr": [0.001, 0.01]} * piter @ {"batch_size": [32, 64]}
+  """
 
-  Example:
-      # Element-wise zip (default behavior)
-      piter({"lr": [0.001, 0.01], "batch_size": [32, 64]})
-      # Creates 2 configs: (0.001, 32), (0.01, 64)
+  def __call__(self, spec):
+    """Create parameter iterator (function-call syntax)."""
+    return self._create_iterator(spec)
 
-      # Fixed value
-      piter({"seed": 200})
-      # Creates 1 config with seed=200
+  def __matmul__(self, spec):
+    """Create parameter iterator (@ operator syntax)."""
+    return self._create_iterator(spec)
 
-      # For Cartesian product, use * operator:
-      piter({"lr": [0.001, 0.01]}) * piter({"batch_size": [32, 64]})
-      # Creates 4 configs (2 × 2)
+  def _create_iterator(self, spec):
+    """
+    Create a parameter iterator from a specification dict.
 
-      # With prefixes for multiple proto classes
-      piter({"model.depth": [18, 50], "training.lr": [0.001, 0.01]})
-      # Creates 2 configs (zipped)
-  """
-  # Convert values to lists if needed
-  params = {}
-  for key, values in spec.items():
-    if not isinstance(key, str):
-      raise TypeError(f"Parameter keys must be strings, got {type(key)}")
-    param_values = values if isinstance(values, (list, tuple, range)) else [values]
-    params[key] = param_values
-
-  # Create iterator by zipping parameter lists
-  def zip_iter():
-    if not params:
-      return
+    Args:
+        spec: Dict mapping parameter names (strings) to values or lists of values.
+              Keys should be parameter names, optionally with prefix (e.g., "config.lr").
+              Values can be single values or lists/iterables.
+
+    Returns:
+        ParameterIterator that zips parameter lists element-wise.
+
+    Example:
+        # Element-wise zip (default behavior)
+        piter({"lr": [0.001, 0.01], "batch_size": [32, 64]})
+        # Creates 2 configs: (0.001, 32), (0.01, 64)
+
+        # Fixed value
+        piter({"seed": 200})
+        # Creates 1 config with seed=200
+
+        # For Cartesian product, use * operator:
+        piter @ {"lr": [0.001, 0.01]} * piter @ {"batch_size": [32, 64]}
+        # Creates 4 configs (2 × 2)
+
+        # With prefixes for multiple proto classes
+        piter({"model.depth": [18, 50], "training.lr": [0.001, 0.01]})
+        # Creates 2 configs (zipped)
+    """
+    # Convert values to lists if needed
+    params = {}
+    for key, values in spec.items():
+      if not isinstance(key, str):
+        raise TypeError(f"Parameter keys must be strings, got {type(key)}")
+      param_values = values if isinstance(values, (list, tuple, range)) else [values]
+      params[key] = param_values
+
+    # Create iterator by zipping parameter lists
+    def zip_iter():
+      if not params:
+        return
+
+      keys = list(params.keys())
+      value_lists = [params[k] for k in keys]
+
+      # Zip parameter lists element-wise
+      for combination in zip(*value_lists):
+        config = dict(zip(keys, combination))
+        yield config
 
-    keys = list(params.keys())
-    value_lists = [params[k] for k in keys]
+    return ParameterIterator(zip_iter())
 
-    # Zip parameter lists element-wise
-    for combination in zip(*value_lists):
-      config = dict(zip(keys, combination))
-      yield config
 
-  return ParameterIterator(zip_iter())
+# Singleton instance for use as both function and @ operator
+piter = PiterFactory()
 
 
 def dot_join(*keys):

params_proto/proto.py

@@ -755,6 +755,30 @@ def proto(
         klass_annotations = getattr(klass, "__annotations__", {})
         annotations.update(klass_annotations)
 
+      # Infer types for untyped class attributes from their default values
+      # This allows `untyped_attr = "hello"` to be treated as `untyped_attr: str = "hello"`
+      # For None defaults, use Any since NoneType isn't useful as a type hint
+      from typing import Any
+
+      for klass in reversed(obj.__mro__):
+        if klass is object:
+          continue
+        for name, value in vars(klass).items():
+          # Skip if already annotated, private/dunder, or is a method/descriptor
+          if name in annotations:
+            continue
+          if name.startswith("_"):
+            continue
+          if callable(value) and not (hasattr(value, "__class__") and value.__class__.__name__ == "_EnvVar"):
+            continue
+          if isinstance(value, (classmethod, staticmethod, property)):
+            continue
+          # Infer type from the default value, use Any for None
+          if value is None:
+            annotations[name] = Any
+          else:
+            annotations[name] = type(value)
+
       for name in annotations.keys():
         if hasattr(obj, name):
           value = getattr(obj, name)

{params_proto-3.0.0rc24.dist-info → params_proto-3.0.0rc26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: params-proto
-Version: 3.0.0rc24
+Version: 3.0.0rc26
 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
@@ -119,7 +119,7 @@ uv run python scratch/demo_v3.py 42
 ## Installation
 
 ```bash
-pip install params-proto==3.0.0-rc7
+pip install params-proto==3.0.0-rc25
 ```
 
 ## Key Features

{params_proto-3.0.0rc24.dist-info → params_proto-3.0.0rc26.dist-info}/RECORD

@@ -3,7 +3,7 @@ params_proto/app.py,sha256=UySpd1op3M44Szk6Ekyn0fJcnZsQvMTMPdaEybwWsLE,19
 params_proto/documentation.py,sha256=mIqmcwGWo8tM1BuNzLIwVTzdbQ3qyPus7yWTaOce4dM,8091
 params_proto/envvar.py,sha256=Gui4AJGPiBSDSyIC3KjmXGmewFmgihAF0QEOm-ufFVo,4323
 params_proto/parse_env_template.py,sha256=mXTvKpNhT2jGr3HpwKw42shd18O0QACmSJn6yWMDdKA,1298
-params_proto/proto.py,sha256=oMTHLNtAMgU7qWLNOSjssGEUP0il4mt4rWdmUwfzEBg,40898
+params_proto/proto.py,sha256=Q3NSmjxKZC7yKGref5F3o7KJEnALaaHWjwd1kDJRDXQ,41914
 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
@@ -11,7 +11,7 @@ params_proto/cli/cli_parse.py,sha256=aRXkPdfyRFJeXb6W6NwQ1bkkkhjUQlvin1k4GaUtbFg
 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=U9xpJ4o3_jlGMUkcW9YrGE9VvYeld91AOLjkYGnDSMc,28604
+params_proto/hyper/sweep.py,sha256=F6uac1o7_zzahgvnwcuqwn-7C48Xl-RlHKsrk6wulsU,29475
 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
@@ -20,7 +20,7 @@ params_proto/v2/hyper.py,sha256=onBAkT8Ja8IkeHEOq1AwCdTuBzAnthIe766ZE0lAy-M,1146
 params_proto/v2/partial.py,sha256=_ovi4NY8goYgHurfYt1OV0E9DSMXGYucjMVIyG1Q_xc,983
 params_proto/v2/proto.py,sha256=KvinzgzwRQr2bHDNtrU7App2kgAyB-SEfBe4SNYceh0,18995
 params_proto/v2/utils.py,sha256=5EWvwboZDTsCYfzSED_J6RVFyNLIlf95nIu4p_ZSVxA,3540
-params_proto-3.0.0rc24.dist-info/METADATA,sha256=YjoFx1VC6zfVyvnGjAnBpuoQO8dY6ELw9xcZaZSNdmI,8994
-params_proto-3.0.0rc24.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-params_proto-3.0.0rc24.dist-info/licenses/LICENSE.md,sha256=c2qSYi9tUMZtzj9SEsMeKhub5LJUmHwBtDLiIMM5b6U,1526
-params_proto-3.0.0rc24.dist-info/RECORD,,
+params_proto-3.0.0rc26.dist-info/METADATA,sha256=8k3wrzgdJnM0Oh_8lw9sBJmlmKusAVZgjg3kx_WhYIw,8995
+params_proto-3.0.0rc26.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+params_proto-3.0.0rc26.dist-info/licenses/LICENSE.md,sha256=c2qSYi9tUMZtzj9SEsMeKhub5LJUmHwBtDLiIMM5b6U,1526
+params_proto-3.0.0rc26.dist-info/RECORD,,