bayinx 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

bayinx/__init__.py

@@ -1,2 +1,3 @@
 from bayinx.core import Model as Model
 from bayinx.core import Parameter as Parameter
+from bayinx.core.model import constrain as constrain

bayinx/core/flow.py

@@ -11,7 +11,7 @@ class Flow(eqx.Module):
     An abstract base class for a flow(of a normalizing flow).
 
     # Attributes
-    - `pars`: A dictionary of JAX Arrays representing parameters of the diffeomorphism.
+    - `params`: A dictionary of JAX Arrays representing parameters of the diffeomorphism.
     - `constraints`: A dictionary of simple functions that constrain their corresponding parameter.
     """
 

bayinx/core/model.py

@@ -1,26 +1,29 @@
 from abc import abstractmethod
-from typing import Any, Dict, Generic, Tuple, TypeVar
+from dataclasses import field, fields
+from typing import Any, Self, Tuple
 
 import equinox as eqx
 import jax.numpy as jnp
 import jax.tree as jt
-from jaxtyping import PyTree, Scalar
+from jaxtyping import Scalar
 
 from bayinx.core.constraint import Constraint
 from bayinx.core.parameter import Parameter
 
-P = TypeVar('P', bound=Dict[str, Parameter[PyTree]])
-class Model(eqx.Module, Generic[P]):
+
+def constrain(constraint: Constraint):
+    """Defines constraint metadata."""
+    return field(metadata={'constraint': constraint})
+
+
+class Model(eqx.Module):
     """
     An abstract base class used to define probabilistic models.
 
-    # Attributes
-    - `params`: A dictionary of parameters.
-    - `constraints`: A dictionary of constraints.
-    """
+    Annotate parameter attributes with `Parameter`.
 
-    params: P
-    constraints: Dict[str, Constraint]
+    Include constraints by setting them equal to `constrain(Constraint)`.
+    """
 
     @abstractmethod
     def eval(self, data: Any) -> Scalar:
@@ -29,50 +32,71 @@ class Model(eqx.Module, Generic[P]):
     # Default filter specification
     @property
     @eqx.filter_jit
-    def filter_spec(self):
+    def filter_spec(self) -> Self:
         """
         Generates a filter specification to subset relevant parameters for the model.
         """
         # Generate empty specification
-        filter_spec = jt.map(lambda _: False, self)
+        filter_spec: Self = jt.map(lambda _: False, self)
+
+        for f in fields(self):
+            # Extract attribute from field
+            attr = getattr(self, f.name)
 
-        # Specify relevant parameters
-        filter_spec = eqx.tree_at(
-            lambda model: model.params,
-            filter_spec,
-            replace={key: param.filter_spec for key, param in self.params.items()}
-        )
+            # Check if attribute is a parameter
+            if isinstance(attr, Parameter):
+                # Update filter specification for parameter
+                filter_spec = eqx.tree_at(
+                    lambda model: getattr(model, f.name),
+                    filter_spec,
+                    replace=attr.filter_spec
+                )
 
         return filter_spec
 
-    # Add constrain method
+
     @eqx.filter_jit
-    def constrain_params(self) -> Tuple[P, Scalar]:
+    def constrain_params(self) -> Tuple[Self, Scalar]:
         """
-        Constrain `params` to the appropriate domain.
+        Constrain parameters to the appropriate domain.
 
         # Returns
-        A dictionary of PyTrees representing the constrained parameters and the adjustment to the posterior density.
+        A constrained `Model` object and the adjustment to the posterior.
         """
-        t_params: P = self.params
+        constrained: Self = self
         target: Scalar = jnp.array(0.0)
 
-        for par, map in self.constraints.items():
-            # Apply transformation
-            t_params[par], ladj = map.constrain(t_params[par])
+        for f in fields(self):
+            # Extract attribute
+            attr = getattr(self, f.name)
+
+            # Check if constrained parameter
+            if isinstance(attr, Parameter) and 'constraint' in f.metadata:
+                param = attr
+                constraint = f.metadata['constraint']
+
+                # Apply constraint
+                param, laj = constraint.constrain(param)
+
+                # Update parameters for constrained model
+                constrained = eqx.tree_at(
+                    lambda model: getattr(model, f.name),
+                    constrained,
+                    replace=param
+                )
+
+                # Adjust posterior density
+                target += laj
 
-            # Adjust posterior density
-            target -= ladj
+        return constrained, target
 
-        return t_params, target
 
-    # Add default transform method
     @eqx.filter_jit
-    def transform_params(self) -> Tuple[P, Scalar]:
+    def transform_params(self) -> Tuple[Self, Scalar]:
         """
-        Apply a custom transformation to `params` if needed.
+        Apply a custom transformation to parameters if needed(defaults to constrained parameters).
 
         # Returns
-        A dictionary of transformed JAX Arrays representing the transformed parameters.
+        A transformed `Model` object and the adjustment to the posterior.
         """
         return self.constrain_params()

bayinx/core/parameter.py

@@ -21,6 +21,9 @@ class Parameter(eqx.Module, Generic[T]):
         # Insert parameter values
         self.vals = values
 
+    def __call__(self) -> T:
+        return self.vals
+
     # Default filter specification
     @property
     @eqx.filter_jit

bayinx/dists/censored/gamma2/__init__.py

@@ -0,0 +1 @@
+from . import r as r

{bayinx-0.3.2.dist-info → bayinx-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bayinx
-Version: 0.3.2
+Version: 0.3.4
 Summary: Bayesian Inference with JAX
 Requires-Python: >=3.12
 Requires-Dist: equinox>=0.11.12

{bayinx-0.3.2.dist-info → bayinx-0.3.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
-bayinx/__init__.py,sha256=htihTsJ54k-ljBLzt4ye8DR7ORwZhxv-bLMcEaDQeqY,86
+bayinx/__init__.py,sha256=5fb_tGeEVnrNt6IQqu7gZaJskBJHqjcg08JRPrY2ANo,139
 bayinx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bayinx/constraints/__init__.py,sha256=PSxvcuSox2JL61AG1iag2PTNKPcid_DbOQzHpYdj5RE,52
 bayinx/constraints/lower.py,sha256=wkYnWjaAEGQeXKfBo_gY0pcK9ElJUMkzGdAmWI8ykCk,1488
 bayinx/core/__init__.py,sha256=jSwEFdXqi-Bj_X8_H-YuaXp5ebEQpZTG2T18zpquzPo,207
 bayinx/core/constraint.py,sha256=F6-TXQjzt-tcNm8bHkRcGEtyE9bZQf2RbAh_MKDuM20,760
-bayinx/core/flow.py,sha256=lAPJdQnrIxC3JoowTp77Gvm0p0v_xQn8FMjFJWMnWbc,2340
-bayinx/core/model.py,sha256=ADSMapUJGyvKf_TpeC7Foaa3BJ03_Kc7FZxIEKNQkZE,2228
-bayinx/core/parameter.py,sha256=oxCCZcZ-DDBvfWzexfhQkSJPxNQnE1vYXtBhiEZG2bM,1025
+bayinx/core/flow.py,sha256=3q4rKvATnbUpuj4ICUd4lIxu_3z7GRDuNujVhAku1X0,2342
+bayinx/core/model.py,sha256=1vQPVjE0ebCdW7mLuabgQcCTi95o8n8CC6GuzJdNL1s,2956
+bayinx/core/parameter.py,sha256=eECqvfMNWSU8_CkGYaAfOCneMMQGZI21kF0mErsh2Rc,1080
 bayinx/core/variational.py,sha256=lqENISRrKY8ODLtl0D-D7TAA2gD7HGh37BnROM7p5hI,4783
 bayinx/dists/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bayinx/dists/bernoulli.py,sha256=xMV9BgtVX_1XkPdZ43q0meMIEkgMyuUPx--dyo6_DKs,1006
@@ -14,6 +14,7 @@ bayinx/dists/gamma2.py,sha256=8XYaOtcYJCrr5q1yHWfZaMJmASpLOrfyhrH_J06ksj8,1333
 bayinx/dists/normal.py,sha256=mvm6EoAlORy-yivuhMcExYCZUo0vJzMKMOWH-9iQBZU,2634
 bayinx/dists/uniform.py,sha256=7XgVvOrzINEFA6HJTYUOFwlWhEtrQQQ1aPJ_ZLOzLEc,2365
 bayinx/dists/censored/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bayinx/dists/censored/gamma2/__init__.py,sha256=2EaQcgCXEwaRoHChVlD02ZMfgiwQAqey6uLPov1lcwE,21
 bayinx/dists/censored/gamma2/r.py,sha256=3brRCKhE-74mRXyIyPcnyaWY2OJv8CZyUWPP9T1t09Y,2274
 bayinx/mhx/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 bayinx/mhx/vi/__init__.py,sha256=YfkXKsqo9Dk_AmQGjZKm4vfG8eLer2ez92G-cOExphs,193
@@ -25,6 +26,6 @@ bayinx/mhx/vi/flows/fullaffine.py,sha256=11y_A0oO3bkKDSz-EQ6Sf4Ec2M7vHZxw94EdvAD
 bayinx/mhx/vi/flows/planar.py,sha256=2I2WzIskl8MRpJkK13FQE3vSF-077qo8gRed_EL1Pn8,1920
 bayinx/mhx/vi/flows/radial.py,sha256=e0GfuO-CL8SVr3YnEfsxStpyKcJlFpzMyjMp3sa38hg,2503
 bayinx/mhx/vi/flows/sylvester.py,sha256=ppK0BmS_ThvrCEhJiP_-p-kj67TQHSlU_RUZpDbIhsQ,469
-bayinx-0.3.2.dist-info/METADATA,sha256=9cltWLDiwqg6VpnufQfKYEw_5ZCywJRp7gAPZAogLlA,3057
-bayinx-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bayinx-0.3.2.dist-info/RECORD,,
+bayinx-0.3.4.dist-info/METADATA,sha256=EpVIXPifXNloZfCCWNuNaVhWO_dMEujN3V_kVZz2Q6Y,3057
+bayinx-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bayinx-0.3.4.dist-info/RECORD,,