pyglove 0.4.5.dev202410110105__py3-none-any.whl → 0.4.5.dev202410160809__py3-none-any.whl

pyglove/core/symbolic/ref.py

@@ -14,7 +14,7 @@
 """Symbolic reference."""
 
 import numbers
-from typing import Any, Callable, Optional, Tuple
+from typing import Any, Callable, List, Optional, Tuple
 from pyglove.core import object_utils
 from pyglove.core import typing as pg_typing
 from pyglove.core.symbolic import base
@@ -182,14 +182,17 @@ class Ref(Object, base.Inferential):
         self,
         title=title or f'{type(self._value).__name__}(...)',
         **kwargs
-    ).add_style(
+    )
+
+  def _html_style(self) -> List[str]:
+    return [
         """
         details.ref .summary_title::before {
           content: 'ref: ';
           color: #aaa;
         }
         """
-    )
+    ]
 
 
 def maybe_ref(value: Any) -> Optional[Ref]:

pyglove/core/views/html/tree_view.py

@@ -54,9 +54,15 @@ class HtmlTreeView(HtmlView):
       """Returns the keys to include (at the immediate child level)."""
       return []
 
-    def _html_tree_view_collapse_level(self) -> int:
-      """Returns the level to collapse the tree (relative to this node)."""
-      return 0
+    def _html_tree_view_uncollapse_level(self) -> Optional[int]:
+      """Returns the level of the subtree to uncollapse.
+
+      Returns:
+        The level of subtree to uncollapse. If None, the subtree will be fully
+        expanded. Please note that the uncollapsed subtree will show only when
+        current node is uncollapsed.
+      """
+      return 1
 
     def _html_tree_view_uncollapse(self) -> KeyPathSet:
       """Returns the node paths (relative to current node) to uncollapse."""
@@ -77,8 +83,10 @@ class HtmlTreeView(HtmlView):
         special_keys: Optional[Sequence[Union[int, str]]] = None,
         include_keys: Optional[Iterable[Union[int, str]]] = None,
         exclude_keys: Optional[Iterable[Union[int, str]]] = None,
-        collapse_level: Optional[int] = 1,
-        uncollapse: Union[KeyPathSet, base.NodeFilter, None] = None,
+        collapse_level: Optional[int] = HtmlView.PresetArgValue(1),
+        uncollapse: Union[
+            KeyPathSet, base.NodeFilter, None
+        ] = HtmlView.PresetArgValue(None),
         filter: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),  # pylint: disable=redefined-builtin
         highlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
         lowlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
@@ -198,8 +206,10 @@ class HtmlTreeView(HtmlView):
         special_keys: Optional[Sequence[Union[int, str]]] = None,
         include_keys: Optional[Iterable[Union[int, str]]] = None,
         exclude_keys: Optional[Iterable[Union[int, str]]] = None,
-        collapse_level: Optional[int] = 1,
-        uncollapse: Union[KeyPathSet, base.NodeFilter, None] = None,
+        collapse_level: Optional[int] = HtmlView.PresetArgValue(1),
+        uncollapse: Union[
+            KeyPathSet, base.NodeFilter, None
+        ] = HtmlView.PresetArgValue(None),
         filter: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),  # pylint: disable=redefined-builtin
         highlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
         lowlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
@@ -301,8 +311,10 @@ class HtmlTreeView(HtmlView):
       special_keys: Optional[Sequence[Union[int, str]]] = None,
       include_keys: Optional[Iterable[Union[int, str]]] = None,
       exclude_keys: Optional[Iterable[Union[int, str]]] = None,
-      collapse_level: Optional[int] = 1,
-      uncollapse: Union[KeyPathSet, base.NodeFilter, None] = None,
+      collapse_level: Optional[int] = HtmlView.PresetArgValue(1),
+      uncollapse: Union[
+          KeyPathSet, base.NodeFilter, None
+      ] = HtmlView.PresetArgValue(None),
       filter: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),  # pylint: disable=redefined-builtin
       highlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
       lowlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
@@ -347,17 +359,17 @@ class HtmlTreeView(HtmlView):
     root_path = root_path or KeyPath()
     uncollapse = self.init_uncollapse(uncollapse)
 
+    child_collapse_level = collapse_level
     if isinstance(value, HtmlTreeView.Extension):
-      extension_collapse_level = value._html_tree_view_collapse_level()    # pylint: disable=protected-access
+      subtree_uncollapse_level = value._html_tree_view_uncollapse_level()    # pylint: disable=protected-access
 
       # If the extension has child levels to uncollapse, honor them above the
       # collapse level passed from the root. However, we can see the
       # uncollapsed extension subtree only when the extension's parent node is
       # uncollapsed.
-      if (extension_collapse_level > 0
-          and root_path.depth + extension_collapse_level > collapse_level):
-        collapse_level = root_path.depth + extension_collapse_level
-
+      child_collapse_level = self.max_collapse_level(
+          collapse_level, subtree_uncollapse_level, root_path
+      )
       if not callable(uncollapse):
         extension_uncollapse = value._html_tree_view_uncollapse().copy()  # pylint: disable=protected-access
         if extension_uncollapse:
@@ -384,7 +396,7 @@ class HtmlTreeView(HtmlView):
         special_keys=special_keys,
         include_keys=include_keys,
         exclude_keys=exclude_keys,
-        collapse_level=collapse_level,
+        collapse_level=child_collapse_level,
         uncollapse=uncollapse,
         max_summary_len_for_str=max_summary_len_for_str,
         enable_summary_tooltip=enable_summary_tooltip,
@@ -703,8 +715,10 @@ class HtmlTreeView(HtmlView):
       special_keys: Optional[Sequence[Union[int, str]]] = None,
       include_keys: Optional[Iterable[Union[int, str]]] = None,
       exclude_keys: Optional[Iterable[Union[int, str]]] = None,
-      collapse_level: Optional[int] = 1,
-      uncollapse: Union[KeyPathSet, base.NodeFilter, None] = None,
+      collapse_level: Optional[int] = HtmlView.PresetArgValue(1),
+      uncollapse: Union[
+          KeyPathSet, base.NodeFilter, None
+      ] = HtmlView.PresetArgValue(None),
       filter: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),  # pylint: disable=redefined-builtin
       highlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
       lowlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
@@ -848,8 +862,10 @@ class HtmlTreeView(HtmlView):
       special_keys: Optional[Sequence[Union[int, str]]] = None,
       include_keys: Optional[Iterable[Union[int, str]]] = None,
       exclude_keys: Optional[Iterable[Union[int, str]]] = None,
-      collapse_level: Optional[int] = 1,
-      uncollapse: Union[KeyPathSet, base.NodeFilter, None] = None,
+      collapse_level: Optional[int] = HtmlView.PresetArgValue(1),
+      uncollapse: Union[
+          KeyPathSet, base.NodeFilter, None
+      ] = HtmlView.PresetArgValue(None),
       filter: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),  # pylint: disable=redefined-builtin
       highlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
       lowlight: Optional[base.NodeFilter] = HtmlView.PresetArgValue(None),
@@ -1108,6 +1124,17 @@ class HtmlTreeView(HtmlView):
     value = value if inspect.isclass(value) else type(value)
     return object_utils.camel_to_snake(value.__name__, '-')
 
+  @staticmethod
+  def max_collapse_level(
+      original_level: int | None,
+      subtree_uncollapse_level: int | None,
+      root_path: KeyPath
+  ) -> int | None:
+    """Consolidates the collapse level."""
+    if original_level is None or subtree_uncollapse_level is None:
+      return None
+    return max(original_level, root_path.depth + subtree_uncollapse_level)
+
 
 _REGEX_CAMEL_TO_SNAKE = re.compile(r'(?<!^)(?=[A-Z])')
 

pyglove/core/views/html/tree_view_test.py

@@ -578,16 +578,18 @@ class ContentTest(TestCase):
         'open',
         4
     )
-    self.assert_count(
-        self._view.content(x, collapse_level=4),
-        'open',
-        6
-    )
-    self.assert_count(
-        self._view.content(x, collapse_level=None),
-        'open',
-        8
-    )
+    with base.HtmlView.preset_args(collapse_level=4):
+      self.assert_count(
+          self._view.content(x),
+          'open',
+          6
+      )
+    with base.HtmlView.preset_args(collapse_level=None):
+      self.assert_count(
+          self._view.content(x),
+          'open',
+          8
+      )
 
   def test_uncollapse(self):
     x = dict(
@@ -729,8 +731,8 @@ class ExtensionTest(TestCase):
       def _html_tree_view_exclude_keys(self) -> Sequence[str]:
         return ['z']
 
-      def _html_tree_view_collapse_level(self) -> int:
-        return 1
+      def _html_tree_view_uncollapse_level(self) -> int:
+        return 2
 
       def _html_tree_view_uncollapse(self) -> KeyPathSet:
         return KeyPathSet(['x.a', 'y.b'], include_intermediate=True)
@@ -771,7 +773,29 @@ class ExtensionTest(TestCase):
             collapse_level=0,
         ),
         """
-        <details class="pyglove list"><summary><div class="summary_title">list(...)</div></summary><div class="complex_value list"><table><tr><td><span class="object_key int">0</span></td><td><div><details open class="pyglove foo bar"><summary><div class="summary_title">Foo(...)</div></summary><div class="complex_value foo bar"><div class="special_value"><details open class="pyglove dict"><summary><div class="summary_name">x</div><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">a</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">foo</span></td><td><div><span class="simple_value int">2</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><table><tr><td><span class="object_key str">y</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">b</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">bar</span></td><td><div><span class="simple_value int">3</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr><tr><td><span class="object_key str">w</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">d</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">qux</span></td><td><div><span class="simple_value int">5</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details>
+        <details class="pyglove list"><summary><div class="summary_title">list(...)</div></summary><div class="complex_value list"><table><tr><td><span class="object_key int">0</span></td><td><div><details open class="pyglove foo bar"><summary><div class="summary_title">Foo(...)</div></summary><div class="complex_value foo bar"><div class="special_value"><details open class="pyglove dict"><summary><div class="summary_name">x</div><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">a</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">foo</span></td><td><div><span class="simple_value int">2</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><table><tr><td><span class="object_key str">y</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">b</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">bar</span></td><td><div><span class="simple_value int">3</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr><tr><td><span class="object_key str">w</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">d</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">qux</span></td><td><div><span class="simple_value int">5</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details>
+        """
+    )
+    self.assert_content(
+        self._view.render(
+            [Foo()],
+            enable_summary_tooltip=False,
+            enable_key_tooltip=False,
+            collapse_level=1,
+        ),
+        """
+        <details open class="pyglove list"><summary><div class="summary_title">list(...)</div></summary><div class="complex_value list"><table><tr><td><span class="object_key int">0</span></td><td><div><details open class="pyglove foo bar"><summary><div class="summary_title">Foo(...)</div></summary><div class="complex_value foo bar"><div class="special_value"><details open class="pyglove dict"><summary><div class="summary_name">x</div><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">a</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">foo</span></td><td><div><span class="simple_value int">2</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><table><tr><td><span class="object_key str">y</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">b</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">bar</span></td><td><div><span class="simple_value int">3</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr><tr><td><span class="object_key str">w</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">d</span></td><td><div><details class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">qux</span></td><td><div><span class="simple_value int">5</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details>
+        """
+    )
+    self.assert_content(
+        self._view.render(
+            [Foo()],
+            enable_summary_tooltip=False,
+            enable_key_tooltip=False,
+            collapse_level=None,
+        ),
+        """
+        <details open class="pyglove list"><summary><div class="summary_title">list(...)</div></summary><div class="complex_value list"><table><tr><td><span class="object_key int">0</span></td><td><div><details open class="pyglove foo bar"><summary><div class="summary_title">Foo(...)</div></summary><div class="complex_value foo bar"><div class="special_value"><details open class="pyglove dict"><summary><div class="summary_name">x</div><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">a</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">foo</span></td><td><div><span class="simple_value int">2</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div><table><tr><td><span class="object_key str">y</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">b</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">bar</span></td><td><div><span class="simple_value int">3</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr><tr><td><span class="object_key str">w</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">d</span></td><td><div><details open class="pyglove dict"><summary><div class="summary_title">dict(...)</div></summary><div class="complex_value dict"><table><tr><td><span class="object_key str">qux</span></td><td><div><span class="simple_value int">5</span></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details></div></td></tr></table></div></details>
         """
     )
 

{pyglove-0.4.5.dev202410110105.dist-info → pyglove-0.4.5.dev202410160809.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyglove
-Version: 0.4.5.dev202410110105
+Version: 0.4.5.dev202410160809
 Summary: PyGlove: A library for manipulating Python objects.
 Home-page: https://github.com/google/pyglove
 Author: PyGlove Authors

{pyglove-0.4.5.dev202410110105.dist-info → pyglove-0.4.5.dev202410160809.dist-info}/RECORD

@@ -101,7 +101,7 @@ pyglove/core/symbolic/object_test.py,sha256=9-iwW3WVXfQnN4Jj2nlWFXAMJz3PEAYVlINg
 pyglove/core/symbolic/origin.py,sha256=5bH1jZvFHY5jwku32vDm8Bj2i-buv-YNuzOOsA5GlSA,6177
 pyglove/core/symbolic/origin_test.py,sha256=dU_ZGrGDetM_lYVMn3wQO0d367_t_t8eESe3NrKPBNE,3159
 pyglove/core/symbolic/pure_symbolic.py,sha256=FVq-5Cg5uZe3ybTIrTqTHIEJIpje0oxzV2kKL6UKlsU,3244
-pyglove/core/symbolic/ref.py,sha256=DX5Hsn7TOv25vgyCUtnFFDmYdCg5VGoWggUnGr4UMak,7596
+pyglove/core/symbolic/ref.py,sha256=Edw6tnCvDSnZeMkHaX4U_kIiYyquWeOYTdVpQsIEkMw,7643
 pyglove/core/symbolic/ref_test.py,sha256=KW6a-m7UwHcIAp94ku95ClMGQ9Tj3kX2cnx6EVNb1CI,8426
 pyglove/core/symbolic/symbolize.py,sha256=ohID9-V8QiFe7OMpPlRomiqUnKBVMpypd8ZuMuHaa4s,6582
 pyglove/core/symbolic/symbolize_test.py,sha256=o7bRfMhGc6uw2FIH8arE99-bPb3i0YixcHYyiP-QqeQ,6487
@@ -143,8 +143,8 @@ pyglove/core/views/base_test.py,sha256=_sFd2ynUgVoAF4aCv33Gg1m9WvMjl1pPXosOQExma
 pyglove/core/views/html/__init__.py,sha256=FpwzhpomAkIjaOQh6mkIjaXC0KWHvGFIRCAQUAdxdC8,1029
 pyglove/core/views/html/base.py,sha256=xOjCQj-l2kb82yXVr9RFpK7U3jwJNo8y7DJ35Qr_cAw,15463
 pyglove/core/views/html/base_test.py,sha256=ZUAhwfjNTOusxLBJXfEvqRJL70QukzJ2j4bGyOb3tFA,22059
-pyglove/core/views/html/tree_view.py,sha256=hlKZH_FAc7rOL22p1a5o8E3xNlrQxd2A4WOzEhLZTvE,40121
-pyglove/core/views/html/tree_view_test.py,sha256=ZbzYKrtU_sDaYHKBGLsasC-4mCQSkStaPBMcJ204xco,42359
+pyglove/core/views/html/tree_view.py,sha256=y_bWlgR0UhWSH83UIHbRKbO-vd8eNEWHfc-cDWDFa5Y,41041
+pyglove/core/views/html/tree_view_test.py,sha256=4h_mtjuwBtaWgYDVh5WWuUV0l7WC_raKh2bJfugzbIE,47204
 pyglove/ext/__init__.py,sha256=3jp8cJvKW6PENOZlmVAbT0w-GBRn_kjhc0wDX3XjpOE,755
 pyglove/ext/early_stopping/__init__.py,sha256=_xkT3K_MycFuF3k2N74sfr9FPFcXMD3pfv5vuc4Tx5M,1116
 pyglove/ext/early_stopping/base.py,sha256=KolexwKDAXhI9iY7hoaDO1mbc3TA4gDn0UifxURwbk0,2358
@@ -184,8 +184,8 @@ pyglove/ext/scalars/randoms.py,sha256=LkMIIx7lOq_lvJvVS3BrgWGuWl7Pi91-lA-O8x_gZs
 pyglove/ext/scalars/randoms_test.py,sha256=nEhiqarg8l_5EOucp59CYrpO2uKxS1pe0hmBdZUzRNM,2000
 pyglove/ext/scalars/step_wise.py,sha256=IDw3tuTpv0KVh7AN44W43zqm1-E0HWPUlytWOQC9w3Y,3789
 pyglove/ext/scalars/step_wise_test.py,sha256=TL1vJ19xVx2t5HKuyIzGoogF7N3Rm8YhLE6JF7i0iy8,2540
-pyglove-0.4.5.dev202410110105.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-pyglove-0.4.5.dev202410110105.dist-info/METADATA,sha256=TpSgORxENh7dTGyJZaxm93E3XCa_xCW627N66kHx1Pc,6666
-pyglove-0.4.5.dev202410110105.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-pyglove-0.4.5.dev202410110105.dist-info/top_level.txt,sha256=wITzJSKcj8GZUkbq-MvUQnFadkiuAv_qv5qQMw0fIow,8
-pyglove-0.4.5.dev202410110105.dist-info/RECORD,,
+pyglove-0.4.5.dev202410160809.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+pyglove-0.4.5.dev202410160809.dist-info/METADATA,sha256=HQllCHpuATBemqASRPzlPcRErpcI_XJSIsoccBID5lc,6666
+pyglove-0.4.5.dev202410160809.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pyglove-0.4.5.dev202410160809.dist-info/top_level.txt,sha256=wITzJSKcj8GZUkbq-MvUQnFadkiuAv_qv5qQMw0fIow,8
+pyglove-0.4.5.dev202410160809.dist-info/RECORD,,