pyglove 0.4.5.dev202411020808__tar.gz → 0.4.5.dev202411040809__tar.gz

{pyglove-0.4.5.dev202411020808 → pyglove-0.4.5.dev202411040809}/PKG-INFO

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

{pyglove-0.4.5.dev202411020808 → pyglove-0.4.5.dev202411040809}/pyglove/core/typing/value_specs.py

@@ -2612,35 +2612,53 @@ class Union(Generic, ValueSpecBase):
              ],
              root_path: object_utils.KeyPath) -> typing.Any:
     """Union specific apply."""
+    # Match strong-typed candidates first.
+    if not self.type_resolved:
+      return value
+
     for c in self._candidates:
-      if (c.type_resolved
-          and (c.value_type is None or isinstance(value, c.value_type))):
+      if c.value_type is not None and isinstance(value, c.value_type):
         return c.apply(
             value,
             allow_partial=allow_partial,
             child_transform=child_transform,
-            root_path=root_path)
+            root_path=root_path
+        )
+
+    def _try_candidate(c, value) -> typing.Tuple[typing.Any, bool]:
+      try:
+        return c.apply(
+            value, allow_partial=allow_partial,
+            child_transform=child_transform, root_path=root_path
+        ), True
+      except TypeError:
+        return value, False
+
+    # Match non-strong-typed candidates (e.g. Callable).
+    for c in self._candidates:
+      if c.value_type is None:
+        value, success = _try_candidate(c, value)
+        if success:
+          return value
 
     # NOTE(daiyip): This code is to support consider A as B scenario when there
     # is a converter from A to B (converter may return value that is not B). A
     # use case is that tf.Variable is not a tf.Tensor, but value spec of
     # tf.Tensor should be able to accept tf.Variable.
-    matched_candidate = None
     for c in self._candidates:
-      if c.type_resolved and type_conversion.get_converter(
-          type(value), c.value_type) is not None:
-        matched_candidate = c
-        break
-
-    if self.type_resolved:
-      # `_apply` is entered only when there is a type match or conversion path.
-      assert matched_candidate is not None
-      return matched_candidate.apply(
-          value, allow_partial, child_transform, root_path)
-
-    # Return value directly if the forward declaration of the current union
-    # is unsolved.
-    return value
+      if c.value_type is None:
+        continue
+      converter = type_conversion.get_converter(type(value), c.value_type)
+      if converter is not None:
+        return c.apply(
+            converter(value),
+            allow_partial=allow_partial,
+            child_transform=child_transform,
+            root_path=root_path
+        )
+    raise TypeError(
+        f'{value!r} does not match any candidate of {self!r}.'
+    )
 
   def _extend(self, base: 'Union') -> None:
     """Union specific extension."""

{pyglove-0.4.5.dev202411020808 → pyglove-0.4.5.dev202411040809}/pyglove/core/typing/value_specs_test.py

@@ -11,9 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for pyglove.core.typing.value_specs."""
-
 import contextlib
+import datetime
 import inspect
 import sys
 import typing
@@ -3141,6 +3140,15 @@ class UnionTest(ValueSpecTest):
       with self.assertRaisesRegex(TypeError, 'Expect .* but encountered .*'):
         _ = v.apply('foo')
 
+    # Union with strong-type and non-strong-type candidates.
+    self.assertEqual(
+        vs.Union([typing.Callable[[int], int], str]).apply('foo'), 'foo'
+    )
+    # Union with type conversion.
+    self.assertIsInstance(
+        vs.Union([int, str]).apply(datetime.datetime.now()), int
+    )
+
     # Bad cases.
     with self.assertRaisesRegex(ValueError, 'Value cannot be None'):
       vs.Union([vs.Int(), vs.Str()]).apply(None)
@@ -3149,6 +3157,11 @@ class UnionTest(ValueSpecTest):
         TypeError, 'Expect \\(.*\\) but encountered <(type|class) \'list\'>.'):
       vs.Union([vs.Int(), vs.Str()]).apply([])
 
+    with self.assertRaisesRegex(
+        TypeError, '1 does not match any candidate of .*'
+    ):
+      vs.Union([typing.Callable[[int], int], str]).apply(1)
+
   def test_is_compatible(self):
     self.assertTrue(
         vs.Union([vs.Int(), vs.Bool()]).is_compatible(

{pyglove-0.4.5.dev202411020808 → pyglove-0.4.5.dev202411040809}/pyglove.egg-info/PKG-INFO

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