brainstate 0.1.0.post20250208__py2.py3-none-any.whl → 0.1.0.post20250209__py2.py3-none-any.whl

brainstate/_state.py

@@ -19,8 +19,10 @@ import contextlib
 import dataclasses
 import threading
 from functools import wraps, partial
-from typing import (Any, Union, Callable, Generic, Mapping,
-                    TypeVar, Optional, TYPE_CHECKING, Tuple, Dict, List, Sequence)
+from typing import (
+    Any, Union, Callable, Generic, Mapping,
+    TypeVar, Optional, TYPE_CHECKING, Tuple, Dict, List, Sequence
+)
 
 import jax
 import numpy as np
@@ -28,7 +30,7 @@ from jax.api_util import shaped_abstractify
 from jax.extend import source_info_util
 
 from brainstate.typing import ArrayLike, PyTree, Missing
-from brainstate.util import DictManager, PrettyRepr, PrettyType, PrettyAttr
+from brainstate.util import DictManager, PrettyReprTree
 
 __all__ = [
     'State', 'ShortTermState', 'LongTermState', 'HiddenState', 'ParamState', 'TreefyState',
@@ -184,7 +186,7 @@ def _get_trace_stack_level() -> int:
     return len(TRACE_CONTEXT.state_stack)
 
 
-class State(Generic[A], PrettyRepr):
+class State(Generic[A], PrettyReprTree):
     """
     The pointer to specify the dynamical data.
 
@@ -427,45 +429,25 @@ class State(Generic[A], PrettyRepr):
         del metadata['_value']
         return TreefyState(type(self), self._value, **metadata)
 
-    def __pretty_repr__(self):
-        yield PrettyType(type=type(self))
-        for name, value in vars(self).items():
-            if name == '_value':
-                name = 'value'
-            if name == '_name':
-                if value is None:
-                    continue
-                else:
-                    name = 'name'
-            if name == 'tag' and value is None:
-                continue
-            if name in ['_level', '_source_info', '_been_writen']:
-                continue
-            yield PrettyAttr(name, repr(value))
-
-    def __treescope_repr__(self, path, subtree_renderer):
-        children = {}
-        for name, value in vars(self).items():
-            if name == '_value':
-                name = 'value'
-            if name == '_name':
-                if value is None:
-                    continue
-                else:
-                    name = 'name'
-            if name == 'tag' and value is None:
-                continue
-            if name in ['_level', '_source_info', '_been_writen']:
-                continue
-            children[name] = value
-
-        import treescope  # type: ignore[import-not-found,import-untyped]
-        return treescope.repr_lib.render_object_constructor(
-            object_type=type(self),
-            attributes=children,
-            path=path,
-            subtree_renderer=subtree_renderer,
-        )
+    def __pretty_repr_item__(self, k, v):
+        if k in ['_level', '_source_info', '_been_writen']:
+            return None, None
+        if k == '_value':
+            return 'value', v
+
+        if k == '_name':
+            if self.name is None:
+                return None, None
+            else:
+                return 'name', v
+
+        if k == 'tag':
+            if self.tag is None:
+                return None, None
+            else:
+                return 'tag', v
+
+        return k, v
 
     def __eq__(self, other: object) -> bool:
         return type(self) is type(other) and vars(other) == vars(self)
@@ -802,7 +784,7 @@ class StateTraceStack(Generic[A]):
         return StateTraceStack().merge(self, other)
 
 
-class TreefyState(Generic[A], PrettyRepr):
+class TreefyState(Generic[A], PrettyReprTree):
     """
     The state as a pytree.
     """
@@ -824,35 +806,19 @@ class TreefyState(Generic[A], PrettyRepr):
 
         def __delattr__(self, name: str) -> None: ...
 
-    def __pretty_repr__(self):
-        yield PrettyType(type=type(self))
-        yield PrettyAttr('type', self.type.__name__)
-        for name, value in vars(self).items():
-            if name == '_value':
-                name = 'value'
-            if name == '_name':
-                if value is None:
-                    continue
-                else:
-                    name = 'name'
-            if name in ['_level', '_source_info', 'type']:
-                continue
-            yield PrettyAttr(name, repr(value))
-
-    def __treescope_repr__(self, path, subtree_renderer):
-        children = {'type': self.type}
-        for name, value in vars(self).items():
-            if name == 'type':
-                continue
-            children[name] = value
-
-        import treescope  # type: ignore[import-not-found,import-untyped]
-        return treescope.repr_lib.render_object_constructor(
-            object_type=type(self),
-            attributes=children,
-            path=path,
-            subtree_renderer=subtree_renderer,
-        )
+    def __pretty_repr_item__(self, k, v):
+        if k in ['_level', '_source_info', '_been_writen']:
+            return None, None
+        if k == '_value':
+            return 'value', v
+
+        if k == '_name':
+            if self.name is None:
+                return None, None
+            else:
+                return 'name', v
+
+        return k, v
 
     def replace(self, value: B) -> TreefyState[B]:
         """

brainstate/compile/_make_jaxpr.py

@@ -206,7 +206,7 @@ class StatefulFunction(object):
         self._cached_state_trace: Dict[Any, StateTraceStack] = dict()
 
     def __repr__(self) -> str:
-        return (f"{self.__class__.__name__}({self.fun}, "
+        return (f"{self.__class__.__name__}("
                 f"static_argnums={self.static_argnums}, "
                 f"axis_env={self.axis_env}, "
                 f"abstracted_axes={self.abstracted_axes}, "

brainstate/graph/_graph_node.py

@@ -27,7 +27,7 @@ import numpy as np
 
 from brainstate._state import State, TreefyState
 from brainstate.typing import Key
-from brainstate.util._pretty_repr import PrettyRepr, pretty_repr_avoid_duplicate, PrettyType, PrettyAttr
+from brainstate.util._pretty_repr import PrettyRepr, yield_unique_pretty_repr_items, PrettyType, PrettyAttr
 from ._graph_operation import register_graph_node_type
 
 __all__ = [
@@ -88,7 +88,7 @@ class Node(PrettyRepr, metaclass=GraphNodeMeta):
         """
         Pretty repr for the object.
         """
-        yield from pretty_repr_avoid_duplicate(self, _default_repr_object, _default_repr_attr)
+        yield from yield_unique_pretty_repr_items(self, _default_repr_object, _default_repr_attr)
 
     def __treescope_repr__(self, path, subtree_renderer):
         """

brainstate/util/_dict.py

@@ -24,11 +24,12 @@ import jax
 
 from brainstate.typing import Filter, PathParts
 from ._filter import to_predicate
-from ._pretty_repr import PrettyRepr, PrettyType, PrettyAttr, pretty_repr_avoid_duplicate, get_repr
+from ._pretty_repr import PrettyRepr, PrettyType, PrettyAttr, yield_unique_pretty_repr_items, pretty_repr
 from ._struct import dataclass
 
 __all__ = [
-    'NestedDict', 'FlattedDict', 'flat_mapping', 'nest_mapping',
+    'PrettyDict', 'NestedDict', 'FlattedDict', 'flat_mapping', 'nest_mapping',
+    'PrettyList', 'PrettyReprTree',
 ]
 
 A = TypeVar('A')
@@ -40,6 +41,44 @@ ExtractValueFn = abc.Callable[[Any], Any]
 SetValueFn = abc.Callable[[V, Any], V]
 
 
+
+
+class PrettyReprTree(PrettyRepr):
+    """
+    Pretty representation of a tree.
+    """
+
+    def __pretty_repr__(self):
+        return yield_unique_pretty_repr_items(
+            self,
+            repr_object=self._repr_object,
+            repr_attr=self._repr_attr,
+        )
+
+    def __pretty_repr_item__(self, k, v):
+        return k, v
+
+    def _repr_object(self, node: PrettyDict):
+        yield PrettyType(type(node), value_sep=': ', start='({', end='})')
+
+    def _repr_attr(self, node):
+        for k, v in vars(node).items():
+            k, v = self.__pretty_repr_item__(k, v)
+            if k is None:
+                continue
+
+            if isinstance(v, list):
+                v = PrettyList(v)
+
+            if isinstance(v, dict):
+                v = PrettyDict(v)
+
+            if isinstance(v, PrettyDict):
+                v = NestedStateRepr(v)
+
+            yield PrettyAttr(repr(k), v)
+
+
 # the empty node is a struct.dataclass to be compatible with JAX.
 @dataclass
 class _EmptyNode:
@@ -213,10 +252,10 @@ class PrettyDict(dict, PrettyRepr):
 
     def __repr__(self) -> str:
         # repr the individual object with the pretty representation
-        return get_repr(self)
+        return pretty_repr(self)
 
     def __pretty_repr__(self):
-        yield from pretty_repr_avoid_duplicate(self, _default_repr_object, _default_repr_attr)
+        yield from yield_unique_pretty_repr_items(self, _default_repr_object, _default_repr_attr)
 
     def split(self, *filters) -> Union[PrettyDict[K, V], Tuple[PrettyDict[K, V], ...]]:
         raise NotImplementedError
@@ -237,15 +276,20 @@ class PrettyDict(dict, PrettyRepr):
 
 
 def _default_repr_object(node: PrettyDict):
-    yield PrettyType(type(node), value_sep=': ', start='({', end='})')
+    yield PrettyType('', value_sep=': ', start='{', end='}')
 
 
-def _default_repr_attr(node: PrettyDict):
+def _default_repr_attr(node):
     for k, v in node.items():
+        if isinstance(v, list):
+            v = PrettyList(v)
+
         if isinstance(v, dict):
             v = PrettyDict(v)
+
         if isinstance(v, PrettyDict):
             v = NestedStateRepr(v)
+
         yield PrettyAttr(repr(k), v)
 
 
@@ -735,3 +779,37 @@ def _flat_unflatten(
 jax.tree_util.register_pytree_with_keys(FlattedDict,
                                         _nest_flatten_with_keys,
                                         _flat_unflatten)  # type: ignore[arg-type]
+
+
+@jax.tree_util.register_pytree_node_class
+class PrettyList(list, PrettyRepr):
+    __module__ = 'brainstate.util'
+
+    def __pretty_repr__(self):
+        yield from yield_unique_pretty_repr_items(self, _list_repr_object, _list_repr_attr)
+
+    def __repr__(self):
+        return pretty_repr(self)
+
+    def tree_flatten(self):
+        return list(self), ()
+
+    @classmethod
+    def tree_unflatten(cls, aux_data, children):
+        return cls(children)
+
+
+def _list_repr_attr(node: PrettyList):
+    for v in node:
+        if isinstance(v, list):
+            v = PrettyList(v)
+        if isinstance(v, dict):
+            v = PrettyDict(v)
+        if isinstance(v, PrettyDict):
+            v = NestedStateRepr(v)
+        yield PrettyAttr('', v)
+
+
+def _list_repr_object(node: PrettyDict):
+    yield PrettyType('', value_sep='', start='[', end=']')
+

brainstate/util/_pretty_repr.py

@@ -21,9 +21,11 @@ import dataclasses
 import threading
 from abc import ABC, abstractmethod
 from functools import partial
-from typing import Any, Iterator, Mapping, TypeVar, Union, Callable, Optional
+from typing import Any, Iterator, Mapping, TypeVar, Union, Callable, Optional, Sequence
 
 __all__ = [
+    'yield_unique_pretty_repr_items',
+    'pretty_repr',
     'PrettyType',
     'PrettyAttr',
     'PrettyRepr',
@@ -80,7 +82,7 @@ class PrettyRepr(ABC):
 
     def __repr__(self) -> str:
         # repr the individual object with the pretty representation
-        return get_repr(self)
+        return pretty_repr(self)
 
 
 def _repr_elem(obj: PrettyType, elem: Any) -> str:
@@ -93,7 +95,7 @@ def _repr_elem(obj: PrettyType, elem: Any) -> str:
     return f'{obj.elem_indent}{elem.start}{elem.key}{obj.value_sep}{value}{elem.end}'
 
 
-def get_repr(obj: PrettyRepr) -> str:
+def pretty_repr(obj: PrettyRepr) -> str:
     """
     Get the pretty representation of an object.
     """
@@ -140,9 +142,10 @@ class PrettyMapping(PrettyRepr):
     Pretty representation of a mapping.
     """
     mapping: Mapping
+    type_name: str = ''
 
     def __pretty_repr__(self):
-        yield PrettyType(type='', value_sep=': ', start='{', end='}')
+        yield PrettyType(type=self.type_name, value_sep=': ', start='{', end='}')
 
         for key, value in self.mapping.items():
             yield PrettyAttr(repr(key), value)
@@ -168,7 +171,7 @@ def _default_repr_attr(node):
         yield PrettyAttr(name, repr(value))
 
 
-def pretty_repr_avoid_duplicate(
+def yield_unique_pretty_repr_items(
     node,
     repr_object: Optional[Callable] = None,
     repr_attr: Optional[Callable] = None
@@ -206,3 +209,4 @@ def pretty_repr_avoid_duplicate(
     finally:
         if clear_seen:
             CONTEXT.seen_modules_repr = None
+

{brainstate-0.1.0.post20250208.dist-info → brainstate-0.1.0.post20250209.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: brainstate
-Version: 0.1.0.post20250208
+Version: 0.1.0.post20250209
 Summary: A ``State``-based Transformation System for Program Compilation and Augmentation.
 Home-page: https://github.com/chaobrain/brainstate
 Author: BrainState Developers

{brainstate-0.1.0.post20250208.dist-info → brainstate-0.1.0.post20250209.dist-info}/RECORD

@@ -1,5 +1,5 @@
 brainstate/__init__.py,sha256=AkZyyFkn4fB8g2aT6Rc2MO1xICPpUZuDtdze-eUQNc0,1496
-brainstate/_state.py,sha256=GZ46liHZSHbAHQEuELvOeoJ27P9xiZDz06G2AASjAjA,29142
+brainstate/_state.py,sha256=W1Q_RAL01rUSLZuOARMuX9I-26tBuIl_VzNWAziz6A8,27518
 brainstate/_state_test.py,sha256=rJUFRSXEqrrl4qANRewY9mnDlzSbtHwBIGeZ0ku-8Dg,1650
 brainstate/_utils.py,sha256=uJ6WWKq3yb05ZdktCQGLWOXsOJveL1H9pR7eev70Jes,1693
 brainstate/environ.py,sha256=PZnVFWPioUBuWmwCO8wwCKrHQfP3BR-5lYPRl5i5GDA,17698
@@ -30,7 +30,7 @@ brainstate/compile/_loop_collect_return.py,sha256=TrKBZhtQecTtuiVz_HOeyepde-znzj
 brainstate/compile/_loop_collect_return_test.py,sha256=bA-_11E8A_0jR5umEO3e409y7bb5QYDTgSL-SBaX7kQ,1802
 brainstate/compile/_loop_no_collection.py,sha256=qto2__Zt2PJntkjB9AXEgraGLvNUJS483BhCXjJyqv0,7495
 brainstate/compile/_loop_no_collection_test.py,sha256=oStB1CSG_iLp9sHdXd1hJNFvlxbzjck9Iy4sABoJDj4,1419
-brainstate/compile/_make_jaxpr.py,sha256=J4oWoPBwG-fdJvNhBEtNgmo3rXrIWCoajELhaIumgPU,33309
+brainstate/compile/_make_jaxpr.py,sha256=MuAa9LjXi29DjYgDUrK0WaomkjbhHZk9mWW04XGcV98,33297
 brainstate/compile/_make_jaxpr_test.py,sha256=3gwdiutn_PJyiweu3oPEXumxEVHKaE2xDGvkwZy2GEo,4367
 brainstate/compile/_progress_bar.py,sha256=5pCMCEmbTO5XmKtzRUJGA178tuBznWKuh9Kw00wAL1I,7524
 brainstate/compile/_unvmap.py,sha256=CJA6D9lUcBfvdLrpFVvC2AdTJqe9uY0Ht6PltQJyr4U,4228
@@ -42,7 +42,7 @@ brainstate/functional/_normalization.py,sha256=i2EV7hSsqcNdcYRX2wAxjq8doHwyN9eNJ
 brainstate/functional/_others.py,sha256=_u_Ys-LiLzDAP4zJggVwaVvirgoS3jvhXMREoS6JOkM,1737
 brainstate/functional/_spikes.py,sha256=QY-2ayJkgkGELcq-bftPEaf_hJptVf_SP3fY36QvlZc,2678
 brainstate/graph/__init__.py,sha256=noo4TjBg6iEhjjwk0sAGUhR7Ge-z8Vnc2rLYUvnqttw,1295
-brainstate/graph/_graph_node.py,sha256=swAokZLKswSTaq2WEhyLIs38sy_67C6maHI6T3e1hvY,8339
+brainstate/graph/_graph_node.py,sha256=XwzOuaZG9x4eZknQjzJoTnnYAy7wcKD5Vox1VkYr8GM,8345
 brainstate/graph/_graph_node_test.py,sha256=BFGfdzZFDHI0XK7hHotSVWKt3em1taGvn8FHF9NCXx8,2702
 brainstate/graph/_graph_operation.py,sha256=cIwGo3ICgtce2fmdn917r81evMFjJIKeW9doaQK4DD8,64111
 brainstate/graph/_graph_operation_test.py,sha256=zjvpKjQAFWtw8YZuqOk_jmlZNb_-E8oPyNx57dyc8jI,18556
@@ -109,16 +109,16 @@ brainstate/random/_rand_state.py,sha256=nuoQ8GU1MfJPRNN-ZmRQsggVjoyPhaEdZmwM7_4-
 brainstate/random/_random_for_unit.py,sha256=kGp4EUX19MXJ9Govoivbg8N0bddqOldKEI2h_TbdONY,2057
 brainstate/util/__init__.py,sha256=-FWEuSKXG3mWxYphGFAy3UEuVe39lFs1GruluzdXDoI,1502
 brainstate/util/_caller.py,sha256=T3bzu7-09r-6EOrU6Muca_aMXSQua_X2lXjEqb-w39w,2782
-brainstate/util/_dict.py,sha256=Yapug-_RZQYjvd8cZ3v90_MX7rUYJDBzBnZJT6a0NXY,26178
+brainstate/util/_dict.py,sha256=tb5nPrTKJe4G_BDv33XYTUaYQDz6od-5psG4TKemc7A,28111
 brainstate/util/_dict_test.py,sha256=Dn0TdjX6wLBXaTD4jfYTu6cKfFHwKSxi4_3bX7kB_IA,5621
 brainstate/util/_error.py,sha256=eyZ8PGFixqe2K5OEfjSDzI-2tU0ieYQoUpBP7yStlPQ,878
 brainstate/util/_filter.py,sha256=1-bvFHdjeehvXeHTrCEp8xr25lopKe8d3XZGCNegq0s,4970
 brainstate/util/_others.py,sha256=jsPZwP-v_5HRV-LB5F0NUsiqr04y8bmGIsu_JMyVcbQ,14762
-brainstate/util/_pretty_repr.py,sha256=bDpU4gbkS4B8cXBkiN8kBQNmruxiJzDRF-eIqzyeYnM,5716
+brainstate/util/_pretty_repr.py,sha256=vNwRlj4sI4QJ_koyIs7eKdUMeB_QWwzRYsE8PpAWN3g,5833
 brainstate/util/_scaling.py,sha256=pc_eM_SZVwkY65I4tJh1ODiHNCoEhsfFXl2zBK0PLAg,7562
 brainstate/util/_struct.py,sha256=KMMHcshOM20gYhSahNzWLxsTt-Rt3AeX3Uz26-rP9vI,17619
-brainstate-0.1.0.post20250208.dist-info/LICENSE,sha256=VZe9u1jgUL2eCY6ZPOYgdb8KCblCHt8ECdbtJid6e1s,11550
-brainstate-0.1.0.post20250208.dist-info/METADATA,sha256=bPJy4z_tBevWkxdyS5QXYtcXxvYwGYs44SuYIkqq4Ns,3585
-brainstate-0.1.0.post20250208.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-brainstate-0.1.0.post20250208.dist-info/top_level.txt,sha256=eQbGgKn0ptx7FDWuua0V0wr4K1VHi2iOUCYo3fUQBRA,11
-brainstate-0.1.0.post20250208.dist-info/RECORD,,
+brainstate-0.1.0.post20250209.dist-info/LICENSE,sha256=VZe9u1jgUL2eCY6ZPOYgdb8KCblCHt8ECdbtJid6e1s,11550
+brainstate-0.1.0.post20250209.dist-info/METADATA,sha256=vc9kKmrq5JM9Os6brL4zecy55nEpd9ASK9GZNJBQV9g,3585
+brainstate-0.1.0.post20250209.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+brainstate-0.1.0.post20250209.dist-info/top_level.txt,sha256=eQbGgKn0ptx7FDWuua0V0wr4K1VHi2iOUCYo3fUQBRA,11
+brainstate-0.1.0.post20250209.dist-info/RECORD,,