params-proto 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

params_proto/envvar.py

@@ -153,24 +153,44 @@ class _EnvVar:
       return os.environ[name], True
     return None, False
 
-  def get(self, *, lazy: bool = True) -> Any:
+  def invalidate_cache(self):
+    """Clear the cached value, forcing re-read from environment on next access."""
+    self._cached_value = None
+    self._is_cached = False
+
+  def __get__(self, obj, objtype=None):
     """
-    Get the value from environment variable(s).
+    Descriptor protocol: auto-resolve EnvVar when accessed as a class attribute.
+
+    This enables EnvVar to work in plain classes (not decorated with @ParamsProto):
+
+        class MyConfig:
+            api_key: str = EnvVar @ "API_KEY" | "default"
+
+        # Accessing MyConfig.api_key returns the resolved value, not the _EnvVar object
+        print(MyConfig.api_key)  # "default" or value of $API_KEY
 
-    When multiple templates are specified (OR operation), tries each in order
-    and returns the first one that is set in the environment.
+    Values are cached after first resolution. Use invalidate_cache() to force re-read:
+
+        envvar = MyConfig.__dict__['api_key']  # Get the _EnvVar object
+        envvar.invalidate_cache()
+        print(MyConfig.api_key)  # Re-reads from environment
 
     Args:
-        lazy: If True (default), cache the result for subsequent calls.
-              Set to False to always re-read from environment.
+        obj: Instance (None if accessed on class)
+        objtype: The class being accessed
 
     Returns:
-        Value from environment or default, converted to dtype if specified
+        The resolved environment variable value
     """
     from params_proto.type_utils import _convert_type
 
-    # Return cached value if lazy loading is enabled and we have a cached value
-    if lazy and self._is_cached:
+    # Don't resolve the singleton EnvVar instance itself (has no templates)
+    if not self.templates:
+      return self
+
+    # Return cached value if available
+    if self._is_cached:
       return self._cached_value
 
     # No templates means return default
@@ -192,18 +212,12 @@ class _EnvVar:
     if result is not None and self.dtype is not None:
       result = _convert_type(result, self.dtype)
 
-    # Cache the result for lazy loading
-    if lazy:
-      self._cached_value = result
-      self._is_cached = True
+    # Cache the result
+    self._cached_value = result
+    self._is_cached = True
 
     return result
 
-  def invalidate_cache(self):
-    """Clear the cached value, forcing re-read from environment on next get()."""
-    self._cached_value = None
-    self._is_cached = False
-
   def __repr__(self):
     if self.templates:
       if len(self.templates) == 1:

params_proto/proto.py

@@ -177,7 +177,7 @@ class ProtoWrapper:
       if is_env_var:
         # Resolve env var at decoration time
         # NO auto-inference from parameter name for security reasons
-        env_value = default.get()
+        env_value = default.__get__(None, None)
 
         # Apply type conversion based on dtype (if provided) or annotation
         if env_value is not None:
@@ -801,7 +801,17 @@ def proto(
 
       for name in annotations.keys():
         if hasattr(obj, name):
-          value = getattr(obj, name)
+          # Look up value in class dict hierarchy to bypass descriptors like _EnvVar.__get__
+          value = None
+          for klass in obj.__mro__:
+            if klass is object:
+              continue
+            if name in vars(klass):
+              value = vars(klass)[name]
+              break
+          else:
+            value = getattr(obj, name)
+
           # Check for EnvVar first (before callable check, since _EnvVar has __call__)
           is_env_var = (
             hasattr(value, "__class__") and value.__class__.__name__ == "_EnvVar"
@@ -809,7 +819,7 @@ def proto(
 
           if is_env_var:
             # Resolve env var at decoration time
-            env_value = value.get()
+            env_value = value.__get__(None, None)
             annotation = annotations.get(name, str)
 
             # Apply type conversion based on dtype (if provided) or annotation
@@ -848,6 +858,11 @@ def proto(
           except AttributeError:
             pass
 
+      # Replace _EnvVar objects with resolved values from defaults
+      # This ensures the descriptor doesn't interfere with class attribute access
+      for key, value in defaults.items():
+        namespace[key] = value
+
       # Create new class with metaclass
       new_cls = metaclass(
         obj.__name__,

{params_proto-3.1.0.dist-info → params_proto-3.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: params-proto
-Version: 3.1.0
+Version: 3.1.1
 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

{params_proto-3.1.0.dist-info → params_proto-3.1.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 params_proto/__init__.py,sha256=JJfjHf6dpkNpLDGOyH0KBWFo44nQoxSIzmwfGZb36ZU,114
 params_proto/app.py,sha256=UySpd1op3M44Szk6Ekyn0fJcnZsQvMTMPdaEybwWsLE,19
 params_proto/documentation.py,sha256=mIqmcwGWo8tM1BuNzLIwVTzdbQ3qyPus7yWTaOce4dM,8091
-params_proto/envvar.py,sha256=PxSgNkk-GHksMiAYhRozSjCX3aCinfaPfCpuhuEbeho,7964
+params_proto/envvar.py,sha256=A87jxSAQ2tjbKLbrm96lblV90zNdtBGCSV6QRe2DrgA,8398
 params_proto/parse_env_template.py,sha256=mXTvKpNhT2jGr3HpwKw42shd18O0QACmSJn6yWMDdKA,1298
-params_proto/proto.py,sha256=r6o5baHpVa4WUCPcMbDfRBwdd_4sstOSCc3Xq56UZvw,37813
+params_proto/proto.py,sha256=81q5EyPYtH7uHCT0L2ydiin5Na2kfJ2VO3LmDfu8AXM,38386
 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
@@ -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.1.0.dist-info/METADATA,sha256=z_LZb9qVHv2YH_Y_wFkMut3BTgzQRLYsAo_AZnTfQWg,8991
-params_proto-3.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-params_proto-3.1.0.dist-info/licenses/LICENSE.md,sha256=c2qSYi9tUMZtzj9SEsMeKhub5LJUmHwBtDLiIMM5b6U,1526
-params_proto-3.1.0.dist-info/RECORD,,
+params_proto-3.1.1.dist-info/METADATA,sha256=Z8W21Wa1zInNKFoeY7TVXu2OQNo3TCQWjtX_RzmjgWM,8991
+params_proto-3.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+params_proto-3.1.1.dist-info/licenses/LICENSE.md,sha256=c2qSYi9tUMZtzj9SEsMeKhub5LJUmHwBtDLiIMM5b6U,1526
+params_proto-3.1.1.dist-info/RECORD,,