pyglove 0.4.5.dev202502050809__py3-none-any.whl → 0.4.5.dev202502070809__py3-none-any.whl

pyglove/core/typing/annotation_conversion.py

@@ -195,24 +195,64 @@ def annotation_from_str(
     return t_id
 
   def _resolve(type_id: str):
+
+    def _as_forward_ref() -> typing.ForwardRef:
+      return typing.ForwardRef(type_id, False, parent_module)  # pytype: disable=not-callable
+
     def _resolve_name(name: str, parent_obj: typing.Any):
       if name == 'None':
-        return None
+        return None, True
       if parent_obj is not None and hasattr(parent_obj, name):
-        return getattr(parent_obj, name)
+        return getattr(parent_obj, name), False
       if hasattr(builtins, name):
-        return getattr(builtins, name)
+        return getattr(builtins, name), True
       if type_id == '...':
-        return ...
-      return utils.MISSING_VALUE
-    parent_obj = parent_module
-    for name in type_id.split('.'):
-      parent_obj = _resolve_name(name, parent_obj)
-      if parent_obj == utils.MISSING_VALUE:
-        return typing.ForwardRef(     # pytype: disable=not-callable
-            type_id, False, parent_module
-        )
-    return parent_obj
+        return ..., True
+      return utils.MISSING_VALUE, False
+
+    names = type_id.split('.')
+    if len(names) == 1:
+      reference, is_builtin = _resolve_name(names[0], parent_module)
+      if is_builtin:
+        return reference
+      if not is_builtin and (
+          # When reference is not found, we should treat it as a forward
+          # reference.
+          reference == utils.MISSING_VALUE
+          # When module is being reloaded, we should treat all non-builtin
+          # references as forward references.
+          or getattr(parent_module, '__reloading__', False)
+      ):
+        return _as_forward_ref()
+      return reference
+
+    root_obj, _ = _resolve_name(names[0], parent_module)
+    # When root object is not found, we should treat it as a forward reference.
+    if root_obj == utils.MISSING_VALUE:
+      return _as_forward_ref()
+
+    parent_obj = root_obj
+    # When root object is a module, we should treat reference to its children
+    # as non-forward references.
+    if inspect.ismodule(root_obj):
+      for name in names[1:]:
+        parent_obj, _ = _resolve_name(name, parent_obj)
+        if parent_obj == utils.MISSING_VALUE:
+          raise TypeError(f'{type_id!r} does not exist.')
+      return parent_obj
+    # When root object is non-module variable of current module, and when the
+    # module is being reloaded, we should treat reference to its children as
+    # forward references.
+    elif getattr(parent_module, '__reloading__', False):
+      return _as_forward_ref()
+    # When root object is non-module variable of current module, we should treat
+    # unresolved reference to its children as forward references.
+    else:
+      for name in names[1:]:
+        parent_obj, _ = _resolve_name(name, parent_obj)
+        if parent_obj == utils.MISSING_VALUE:
+          return _as_forward_ref()
+      return parent_obj
 
   root = _maybe_union()
   if _pos() != len(s):

pyglove/core/typing/annotation_conversion_test.py

@@ -27,7 +27,8 @@ from pyglove.core.typing.class_schema import ValueSpec
 
 
 class Foo:
-  pass
+  class Bar:
+    pass
 
 
 _MODULE = sys.modules[__name__]
@@ -58,6 +59,18 @@ class AnnotationFromStrTest(unittest.TestCase):
         annotation_conversion.annotation_from_str('tuple[int, str]'),
         tuple[int, str]
     )
+    self.assertEqual(
+        annotation_conversion.annotation_from_str('list[Foo]', _MODULE),
+        list[Foo]
+    )
+    self.assertEqual(
+        annotation_conversion.annotation_from_str('list[Foo.Bar]', _MODULE),
+        list[Foo.Bar]
+    )
+    self.assertEqual(
+        annotation_conversion.annotation_from_str('list[Foo.Baz]', _MODULE),
+        list[typing.ForwardRef('Foo.Baz', False, _MODULE)]
+    )
 
   def test_generic_types(self):
     self.assertEqual(
@@ -139,6 +152,28 @@ class AnnotationFromStrTest(unittest.TestCase):
         ]
     )
 
+  def test_reloading(self):
+    setattr(_MODULE, '__reloading__', True)
+    self.assertEqual(
+        annotation_conversion.annotation_from_str(
+            'typing.List[Foo]', _MODULE),
+        typing.List[
+            typing.ForwardRef(
+                'Foo', False, _MODULE
+            )
+        ]
+    )
+    self.assertEqual(
+        annotation_conversion.annotation_from_str(
+            'typing.List[Foo.Bar]', _MODULE),
+        typing.List[
+            typing.ForwardRef(
+                'Foo.Bar', False, _MODULE
+            )
+        ]
+    )
+    delattr(_MODULE, '__reloading__')
+
   def test_bad_annotation(self):
     with self.assertRaisesRegex(SyntaxError, 'Expected type identifier'):
       annotation_conversion.annotation_from_str('typing.List[]')
@@ -152,6 +187,9 @@ class AnnotationFromStrTest(unittest.TestCase):
     with self.assertRaisesRegex(SyntaxError, 'Expected "]"'):
       annotation_conversion.annotation_from_str('typing.Callable[[x')
 
+    with self.assertRaisesRegex(TypeError, '.* does not exist'):
+      annotation_conversion.annotation_from_str('typing.Foo', _MODULE)
+
 
 class FieldFromAnnotationTest(unittest.TestCase):
   """Tests for Field.fromAnnotation."""

pyglove/core/typing/class_schema.py

@@ -100,7 +100,6 @@ class ForwardRef(utils.Formattable):
   def __init__(self, module: types.ModuleType, qualname: str):
     self._module = module
     self._qualname = qualname
-    self._resolved_value = None
 
   @property
   def module(self) -> types.ModuleType:
@@ -129,9 +128,7 @@ class ForwardRef(utils.Formattable):
   @property
   def resolved(self) -> bool:
     """Returns True if the symbol for the name is resolved.."""
-    if self._resolved_value is None:
-      self._resolved_value = self._resolve()
-    return self._resolved_value is not None
+    return self._resolve() is not None
 
   def _resolve(self) -> Optional[Any]:
     names = self._qualname.split('.')
@@ -150,14 +147,13 @@ class ForwardRef(utils.Formattable):
   @property
   def cls(self) -> Type[Any]:
     """Returns the resolved reference class.."""
-    if self._resolved_value is None:
-      self._resolved_value = self._resolve()
-      if self._resolved_value is None:
-        raise TypeError(
-            f'{self.qualname!r} does not exist in '
-            f'module {self.module.__name__!r}'
-        )
-    return self._resolved_value
+    reference = self._resolve()
+    if reference is None:
+      raise TypeError(
+          f'{self.qualname!r} does not exist in '
+          f'module {self.module.__name__!r}'
+      )
+    return reference
 
   def format(
       self,

{pyglove-0.4.5.dev202502050809.dist-info → pyglove-0.4.5.dev202502070809.dist-info}/METADATA

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

{pyglove-0.4.5.dev202502050809.dist-info → pyglove-0.4.5.dev202502070809.dist-info}/RECORD

@@ -109,14 +109,14 @@ pyglove/core/tuning/sample_test.py,sha256=JqwDPy3EPC_VjU9dipk90jj1kovZB3Zb9hAjAl
 pyglove/core/typing/__init__.py,sha256=MwraQ-6K8NYI_xk4V3oaVSkrPqiU9InDtAgXPSRBvik,14494
 pyglove/core/typing/annotated.py,sha256=llaajIDj9GK-4kUGJoO4JsHU6ESPOra2SZ-jG6xmsOQ,3203
 pyglove/core/typing/annotated_test.py,sha256=p1qid3R-jeiOTTxOVq6hXW8XFvn-h1cUzJWISPst2l8,2484
-pyglove/core/typing/annotation_conversion.py,sha256=8q4-7uo12DZj1_AnDzF4UWQoplmHHtZ0lYIOlY8xVXo,13889
-pyglove/core/typing/annotation_conversion_test.py,sha256=Zl0LSL6z8exwgflb4kDJW2QfrvbixJMW4_7lXcHMl14,16271
+pyglove/core/typing/annotation_conversion.py,sha256=7aMxv5AhC5oYteBtVTRp1no16dFgfGFCLbmxVasrdzQ,15557
+pyglove/core/typing/annotation_conversion_test.py,sha256=tOUM7k_VNiGfBlSy_r6vMKk0lD8gRNT6dqnzBzvhul4,17422
 pyglove/core/typing/annotation_future_test.py,sha256=ZVLU3kheO2V-nrp-m5jrGMLgGMs4S6RWnJbyD9KbHl4,3746
 pyglove/core/typing/callable_ext.py,sha256=PiBQWPeUAH7Lgmf2xKCZqgK7N0OSrTdbnEkV8Ph31OA,9127
 pyglove/core/typing/callable_ext_test.py,sha256=TnWKU4_ZjvpbHZFtFHgFvCMDiCos8VmLlODcM_7Xg8M,10156
 pyglove/core/typing/callable_signature.py,sha256=DRpt7aShfkn8pb3SCiZzS_27eHbkQ_d2UB8BUhJjs0Q,27176
 pyglove/core/typing/callable_signature_test.py,sha256=iQmHsKPhJPQlMikDhEyxKyq7yWyXI9juKCLYgKhrH3U,25145
-pyglove/core/typing/class_schema.py,sha256=Xf3koEnx150Prqw3WDOP04xr1H8bEkUfMb4AKZcPg3M,54683
+pyglove/core/typing/class_schema.py,sha256=dKmF1dwv-7RmCjnAb412AciYZL3LJCToU5WTJWYLj3Y,54482
 pyglove/core/typing/class_schema_test.py,sha256=RurRdCyPuypKJ7izgcq9zW3JNHgODiJdQvDn0BDZDjU,29353
 pyglove/core/typing/custom_typing.py,sha256=qdnIKHWNt5kZAAFdpQXra8bBu6RljMbbJ_YDG2mhAUA,2205
 pyglove/core/typing/inspect.py,sha256=VLSz1KAunNm2hx0eEMjiwxKLl9FHlKr9nHelLT25iEA,7726
@@ -212,8 +212,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.dev202502050809.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-pyglove-0.4.5.dev202502050809.dist-info/METADATA,sha256=IiiuFK9RRBh8I9xh9WW4GM8el-96GLZI9uDK6IAVwho,7067
-pyglove-0.4.5.dev202502050809.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyglove-0.4.5.dev202502050809.dist-info/top_level.txt,sha256=wITzJSKcj8GZUkbq-MvUQnFadkiuAv_qv5qQMw0fIow,8
-pyglove-0.4.5.dev202502050809.dist-info/RECORD,,
+pyglove-0.4.5.dev202502070809.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+pyglove-0.4.5.dev202502070809.dist-info/METADATA,sha256=Z2hvG4oC_XncqvRRXEPayvW1hpjB_PTOUuN55aU2LwQ,7067
+pyglove-0.4.5.dev202502070809.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyglove-0.4.5.dev202502070809.dist-info/top_level.txt,sha256=wITzJSKcj8GZUkbq-MvUQnFadkiuAv_qv5qQMw0fIow,8
+pyglove-0.4.5.dev202502070809.dist-info/RECORD,,