pyglove 0.4.5.dev202504210810__tar.gz → 0.4.5.dev202504230810__tar.gz

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/PKG-INFO

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

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/pyglove/core/coding/errors.py

@@ -28,7 +28,7 @@ class CodeError(RuntimeError):
   def __init__(
       self,
       code: str,
-      cause: Exception,
+      cause: BaseException,
       ):
     self.code = code
     self.cause = cause
@@ -93,7 +93,7 @@ class CodeError(RuntimeError):
 class SerializationError(RuntimeError):
   """Object serialization error."""
 
-  def __init__(self, message: Optional[str], cause: Exception):
+  def __init__(self, message: Optional[str], cause: BaseException):
     self.message = message
     self.cause = cause
 

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/pyglove/core/coding/execution.py

@@ -131,7 +131,7 @@ def evaluate(
         result = eval(  # pylint: disable=eval-used
             compile(last_expr, '', mode='eval'), global_vars
         )
-      except Exception as e:
+      except BaseException as e:
         raise errors.CodeError(code, e) from e
 
       for result_var in result_vars:
@@ -139,7 +139,7 @@ def evaluate(
     else:
       try:
         exec(compile(code_block, '', mode='exec'), global_vars)  # pylint: disable=exec-used
-      except Exception as e:
+      except BaseException as e:
         raise errors.CodeError(code, e) from e
       global_vars[RESULT_KEY] = list(global_vars.values())[-1]
 
@@ -188,7 +188,7 @@ def sandbox_call(
       r = func(*args, **kwargs)
       try:
         return pickle.dumps(r)
-      except Exception as e:
+      except BaseException as e:
         raise errors.SerializationError(
             f'Cannot serialize sandbox result: {r}', e
         ) from e

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/pyglove/core/coding/execution_test.py

@@ -217,6 +217,10 @@ class EvaluateTest(unittest.TestCase):
       execution.evaluate(
           'raise ValueError()', permission=permissions.CodePermission.ALL
       )
+    with self.assertRaisesRegex(errors.CodeError, 'SystemExit'):
+      execution.evaluate(
+          'raise SystemExit()', permission=permissions.CodePermission.ALL
+      )
 
 
 @dataclasses.dataclass

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/pyglove/core/utils/formatting.py

@@ -161,6 +161,7 @@ def kvlist_str(
     label: Optional[str] = None,
     bracket_type: BracketType = BracketType.ROUND,
     custom_format: Optional[CustomFormatFn] = None,
+    memo: Optional[Set[int]] = None,
     **kwargs,
 ) -> str:
   """Formats a list key/value pairs into a comma delimited string.
@@ -178,6 +179,8 @@ def kvlist_str(
     custom_format: An optional custom format function, which will be applied to
       each value (and child values) in kvlist. If the function returns None, it
       will fall back to the default `pg.format`.
+    memo: A set of object ids that have been formatted. Used to avoid
+      infinite recursion in the formatting process.
     **kwargs: Keyword arguments that will be passed through unto child
       ``Formattable`` objects.
   Returns:
@@ -208,6 +211,7 @@ def kvlist_str(
           verbose=verbose,
           root_indent=child_indent,
           custom_format=custom_format,
+          memo=memo,
           **kwargs
       )
       if not compact:
@@ -271,6 +275,7 @@ def format(   # pylint: disable=redefined-builtin
     max_bytes_len: Optional[int] = None,
     *,
     custom_format: Optional[CustomFormatFn] = None,
+    memo: Optional[Set[int]] = None,
     **kwargs,
 ) -> str:
   """Formats a (maybe) hierarchical value with flags.
@@ -297,6 +302,8 @@ def format(   # pylint: disable=redefined-builtin
     custom_format: An optional custom format function, which will be applied to
       each value (and child values) in kvlist. If the function returns None, it
       will fall back to the default `pg.format`.
+    memo: A set of object ids that have been formatted. Used to avoid
+      infinite recursion in the formatting process.
     **kwargs: Keyword arguments that will be passed through unto child
       ``Formattable`` objects.
 
@@ -309,6 +316,14 @@ def format(   # pylint: disable=redefined-builtin
     if result is not None:
       return maybe_markdown_quote(result, markdown)
 
+  if memo is None:
+    memo = set()
+
+  id_ = id(value)
+  if id_ in memo:
+    return f'<recursive {value.__class__.__name__} at 0x{id_:x}>'  # pylint: disable=bad-whitespace
+  memo.add(id_)
+
   exclude_keys = exclude_keys or set()
 
   def _should_include_key(key: str) -> bool:
@@ -327,6 +342,7 @@ def format(   # pylint: disable=redefined-builtin
         max_str_len=max_str_len,
         max_bytes_len=max_bytes_len,
         custom_format=custom_format,
+        memo=memo,
         **kwargs
     )
 
@@ -345,6 +361,7 @@ def format(   # pylint: disable=redefined-builtin
           max_str_len=max_str_len,
           max_bytes_len=max_bytes_len,
           custom_format=custom_format,
+          memo=memo,
           **kwargs
       )
     elif isinstance(value, (list, tuple)):
@@ -393,6 +410,7 @@ def format(   # pylint: disable=redefined-builtin
              if compact else str_ext(value, custom_format, root_indent)]
         if strip_object_id and 'object at 0x' in s[-1]:
           s = [f'{value.__class__.__name__}(...)']
+  memo.remove(id_)
   return maybe_markdown_quote(''.join(s), markdown)
 
 
@@ -454,10 +472,10 @@ def camel_to_snake(text: str, separator: str = '_') -> str:
   return (separator.join(c for c in chunks if c)).lower()
 
 
-def printv(v: Any, **kwargs):
+def printv(*args, **kwargs):
   """Prints formatted value."""
   fs = kwargs.pop('file', sys.stdout)
-  print(format(v, **kwargs), file=fs)
+  print(*[format(v, **kwargs) for v in args], file=fs)
 
 
 def _indent(text: str, indent: int) -> str:

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/pyglove/core/utils/formatting_test.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import inspect
+import io
 import unittest
 
 from pyglove.core.utils import formatting
@@ -408,6 +409,26 @@ class FormatTest(unittest.TestCase):
         '{\'x\': <a/>}'
     )
 
+  def test_recursion(self):
+    # Recursive dict.
+    x = dict(x=1)
+    x['y'] = x
+    self.assertEqual(
+        formatting.format(x, compact=True),
+        f'{{\'x\': 1, \'y\': <recursive dict at 0x{id(x):x}>}}'
+    )
+    self.assertEqual(
+        formatting.format(x, compact=False),
+        f'{{\n  \'x\': 1,\n  \'y\': <recursive dict at 0x{id(x):x}>\n}}'
+    )
+    # Non-recursive dict.
+    y = dict(x=1)
+    a = dict(x=y, y=y)
+    self.assertEqual(
+        formatting.format(a, compact=True),
+        '{\'x\': {\'x\': 1}, \'y\': {\'x\': 1}}'
+    )
+
   def test_markdown(self):
 
     class A(formatting.Formattable):
@@ -448,6 +469,11 @@ class FormatTest(unittest.TestCase):
         formatting.format(b'bar', max_bytes_len=2), 'b\'ba...\''
     )
 
+  def test_printv(self):
+    with io.StringIO() as f:
+      formatting.printv(1, 2, 3, file=f)
+      self.assertEqual(f.getvalue(), '1 2 3\n')
+
 
 if __name__ == '__main__':
   unittest.main()

{pyglove-0.4.5.dev202504210810 → pyglove-0.4.5.dev202504230810}/pyglove.egg-info/PKG-INFO

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