pyglove 0.5.0.dev202510290810__tar.gz → 0.5.0.dev202511040811__tar.gz

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyglove
-Version: 0.5.0.dev202510290810
+Version: 0.5.0.dev202511040811
 Summary: PyGlove: A library for manipulating Python objects.
 Home-page: https://github.com/google/pyglove
 Author: PyGlove Authors

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/symbolic/list_test.py

@@ -506,8 +506,7 @@ class ListTest(unittest.TestCase):
   def test_index(self):
     sl = List([0, 1, 2, 1])
     self.assertEqual(sl.index(1), 1)
-    with self.assertRaisesRegex(
-        ValueError, '3 is not in list'):
+    with self.assertRaisesRegex(ValueError, '.* not in list'):
       _ = sl.index(3)
 
     # Index of inferred value is based on its symbolic form.

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/typing/annotation_conversion.py

@@ -16,6 +16,7 @@
 import builtins
 import collections
 import inspect
+import sys
 import types
 import typing
 
@@ -197,6 +198,8 @@ def annotation_from_str(
   def _resolve(type_id: str):
 
     def _as_forward_ref() -> typing.ForwardRef:
+      if sys.version_info >= (3, 14):
+        return typing.ForwardRef(type_id)  # pytype: disable=not-callable
       return typing.ForwardRef(type_id, False, parent_module)  # pytype: disable=not-callable
 
     def _resolve_name(name: str, parent_obj: typing.Any):

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/typing/annotation_conversion_test.py

@@ -34,6 +34,12 @@ class Foo:
 _MODULE = sys.modules[__name__]
 
 
+def typing_forward_ref(name: str) -> typing.ForwardRef:
+  if sys.version_info >= (3, 14):
+    return typing.ForwardRef(name)
+  return typing.ForwardRef(name, False, _MODULE)
+
+
 class AnnotationFromStrTest(unittest.TestCase):
   """Tests for annotation_from_str."""
 
@@ -69,7 +75,7 @@ class AnnotationFromStrTest(unittest.TestCase):
     )
     self.assertEqual(
         annotation_conversion.annotation_from_str('list[Foo.Baz]', _MODULE),
-        list[typing.ForwardRef('Foo.Baz', False, _MODULE)]
+        list[typing_forward_ref('Foo.Baz')]
     )
 
   def test_generic_types(self):
@@ -138,18 +144,12 @@ class AnnotationFromStrTest(unittest.TestCase):
     self.assertEqual(
         annotation_conversion.annotation_from_str(
             'AAA', _MODULE),
-        typing.ForwardRef(
-            'AAA', False, _MODULE
-        )
+        typing_forward_ref('AAA')
     )
     self.assertEqual(
         annotation_conversion.annotation_from_str(
             'typing.List[AAA]', _MODULE),
-        typing.List[
-            typing.ForwardRef(
-                'AAA', False, _MODULE
-            )
-        ]
+        typing.List[typing_forward_ref('AAA')]
     )
 
   def test_reloading(self):
@@ -157,20 +157,12 @@ class AnnotationFromStrTest(unittest.TestCase):
     self.assertEqual(
         annotation_conversion.annotation_from_str(
             'typing.List[Foo]', _MODULE),
-        typing.List[
-            typing.ForwardRef(
-                'Foo', False, _MODULE
-            )
-        ]
+        typing.List[typing_forward_ref('Foo')]
     )
     self.assertEqual(
         annotation_conversion.annotation_from_str(
             'typing.List[Foo.Bar]', _MODULE),
-        typing.List[
-            typing.ForwardRef(
-                'Foo.Bar', False, _MODULE
-            )
-        ]
+        typing.List[typing_forward_ref('Foo.Bar')]
     )
     delattr(_MODULE, '__reloading__')
 

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/typing/type_conversion.py

@@ -15,6 +15,7 @@
 
 import calendar
 import datetime
+import sys
 from typing import Any, Callable, Optional, Tuple, Type, Union
 
 from pyglove.core import utils
@@ -135,9 +136,22 @@ def _register_builtin_converters():
   register_converter(int, float, float)
 
   # int <=> datetime.datetime.
-  register_converter(int, datetime.datetime, datetime.datetime.utcfromtimestamp)
-  register_converter(datetime.datetime, int,
-                     lambda x: calendar.timegm(x.timetuple()))
+  if sys.version_info >= (3, 11):
+    register_converter(
+        int,
+        datetime.datetime,
+        lambda x: datetime.datetime.fromtimestamp(x, datetime.UTC)
+    )
+  else:
+    register_converter(
+        int, datetime.datetime, datetime.datetime.utcfromtimestamp
+    )
+
+  register_converter(
+      datetime.datetime,
+      int,
+      lambda x: calendar.timegm(x.timetuple())
+  )
 
   # string <=> KeyPath.
   register_converter(str, utils.KeyPath, utils.KeyPath.parse)

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/typing/type_conversion_test.py

@@ -130,7 +130,7 @@ class BuiltInConversionsTest(unittest.TestCase):
   def test_datetime_to_int(self):
     """Test built-in converter between int and datetime.datetime."""
     timestamp = calendar.timegm(datetime.datetime.now().timetuple())
-    now = datetime.datetime.utcfromtimestamp(timestamp)
+    now = datetime.datetime.fromtimestamp(timestamp, datetime.UTC)
     self.assertEqual(vs.Object(datetime.datetime).apply(timestamp), now)
     self.assertEqual(vs.Int().apply(now), timestamp)
     self.assertEqual(

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/utils/json_conversion_test.py

@@ -271,7 +271,8 @@ class JSONConvertibleTest(unittest.TestCase):
     self.assert_conversion_is(typing.List[typing.List[int]])
     self.assert_conversion_is(typing.Annotated[int, 'abc'])
     self.assert_conversion_is(typing.Dict[str, typing.Any])
-    self.assert_conversion_is(typing.Union[int, str])
+    # From Python 3.14, union no longer preserves `is` identity.
+    self.assert_conversion_equal(typing.Union[int, str])
     self.assert_conversion_is(typing.Sequence[int])
     self.assert_conversion_is(typing.Set[int])
     self.assert_conversion_is(typing.FrozenSet[int])

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/views/html/controls/tab.py

@@ -158,6 +158,39 @@ class TabControl(HtmlControl):
         position='beforebegin',
     )
 
+  def remove(self, index_or_name: Union[int, str]) -> Tab:
+    """Removes a tab identified by index or name."""
+    index = self.indexof(index_or_name)
+    if index == -1:
+      raise ValueError(f'Tab not found: {index_or_name!r}')
+
+    with pg_flags.notify_on_change(False):
+      tab = self.tabs.pop(index)
+
+    self._run_javascript(
+        f"""
+        const button = document.querySelectorAll('#{self.element_id()}-button-group > .tab-button')[{index}];
+        if (button) {{
+          button.remove();
+        }}
+        const content = document.querySelectorAll('#{self.element_id()}-content-group > .tab-content')[{index}];
+        if (content) {{
+          content.remove();
+        }}
+        """
+    )
+
+    if not self.tabs:
+      self._sync_members(selected=0)
+      return tab
+
+    if self.selected == index:
+      new_selected = index - 1 if index == len(self.tabs) else index
+      self.select(max(0, new_selected))
+    elif self.selected > index:
+      self._sync_members(selected=self.selected - 1)
+    return tab
+
   def indexof(self, index_or_name: Union[int, str]) -> int:
     if isinstance(index_or_name, int):
       index = index_or_name

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/core/views/html/controls/tab_test.py

@@ -154,6 +154,43 @@ class TabControlTest(unittest.TestCase):
       self.assertEqual(len(scripts), 1)
       self.assertEqual(tab.selected, 1)
 
+  def test_remove(self):
+    tabs = [tab_lib.Tab(l, l, name=l) for l in ['a', 'b', 'c', 'd']]
+    tc = tab_lib.TabControl(tabs, selected='c')
+    self.assertEqual([t.name for t in tc.tabs], ['a', 'b', 'c', 'd'])
+    self.assertEqual(tc.selected, 2)
+
+    # Trigger rendering so scripts are tracked.
+    _ = tc.to_html()
+    with tc.track_scripts() as scripts:
+      tc.remove('b')
+      self.assertEqual(len(scripts), 1)
+    self.assertEqual([t.name for t in tc.tabs], ['a', 'c', 'd'])
+    self.assertEqual(tc.selected, 1)
+
+    with tc.track_scripts() as scripts:
+      # Remove currently selected tab 'c'
+      tc.remove('c')
+      # 1 script for remove, 1 for select.
+      self.assertEqual(len(scripts), 2)
+    self.assertEqual([t.name for t in tc.tabs], ['a', 'd'])
+    self.assertEqual(tc.selected, 1)
+
+    with tc.track_scripts() as scripts:
+      tc.remove(1)
+      self.assertEqual(len(scripts), 2)
+    self.assertEqual([t.name for t in tc.tabs], ['a'])
+    self.assertEqual(tc.selected, 0)
+
+    with tc.track_scripts() as scripts:
+      tc.remove('a')
+      self.assertEqual(len(scripts), 1)
+    self.assertEqual(tc.tabs, [])
+    self.assertEqual(tc.selected, 0)
+
+    with self.assertRaisesRegex(ValueError, 'Tab not found'):
+      tc.remove('x')
+
 
 if __name__ == '__main__':
   unittest.main()

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove/ext/evolution/base_test.py

@@ -57,7 +57,7 @@ class NextValue(base.Mutator):
   """A mutator to increase current DNA by 1."""
 
   def mutate(self, dna, step):
-    return dna.next_dna()
+    return dna.next_dna() or dna
 
 
 def search_space():

{pyglove-0.5.0.dev202510290810 → pyglove-0.5.0.dev202511040811}/pyglove.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyglove
-Version: 0.5.0.dev202510290810
+Version: 0.5.0.dev202511040811
 Summary: PyGlove: A library for manipulating Python objects.
 Home-page: https://github.com/google/pyglove
 Author: PyGlove Authors