pyglove 0.5.0.dev202509100809__py3-none-any.whl → 0.5.0.dev202509120809__py3-none-any.whl

pyglove/core/__init__.py

@@ -306,6 +306,7 @@ format = utils.format  # pylint: disable=redefined-builtin
 print = utils.print  # pylint: disable=redefined-builtin
 docstr = utils.docstr
 catch_errors = utils.catch_errors
+match_error = utils.match_error
 timeit = utils.timeit
 
 contextual_override = utils.contextual_override

pyglove/core/utils/__init__.py

@@ -148,6 +148,7 @@ from pyglove.core.utils.docstr_utils import docstr
 
 # Handling exceptions.
 from pyglove.core.utils.error_utils import catch_errors
+from pyglove.core.utils.error_utils import match_error
 from pyglove.core.utils.error_utils import CatchErrorsContext
 from pyglove.core.utils.error_utils import ErrorInfo
 

pyglove/core/utils/error_utils.py

@@ -108,6 +108,64 @@ def catch_errors(
   Yields:
     A CatchErrorsContext object.
   """
+  errors = _parse_error_spec(errors)
+  context = CatchErrorsContext()
+  try:
+    yield context
+  except BaseException as e:    # pylint: disable=broad-exception-caught
+    if match_error(e, errors):
+      context.error = e
+      if error_handler is not None:
+        error_handler(e)
+    else:
+      raise
+
+
+def match_error(
+    error: BaseException,
+    errors: Union[
+        Union[Type[BaseException], Tuple[Type[BaseException], str]],
+        Sequence[Union[Type[BaseException], Tuple[Type[BaseException], str]]],
+        Dict[Type[BaseException], List[str]],
+    ],
+) -> bool:
+  """Returns True if the error matches the specification, .
+
+  Args:
+    error: The error to match.
+    errors: A sequence of exception types or tuples of exception type and error
+      messages (described in regular expression) as the desired exception types
+      to match.
+
+  Returns:
+    True if the error matches the specification, False otherwise.
+  """
+  error_mapping = _parse_error_spec(errors)
+  error_message = error.__class__.__name__ + ': ' + str(error)
+  for error_type, error_regexes in error_mapping.items():
+    if isinstance(error, error_type):
+      if not error_regexes:
+        return True
+      else:
+        for regex in error_regexes:
+          assert regex is not None
+          if not regex.startswith(('^', '.*')):
+            regex = '.*' + regex
+          if re.match(regex, error_message):
+            return True
+  return False
+
+
+def _parse_error_spec(
+    errors: Union[
+        Union[Type[BaseException], Tuple[Type[BaseException], str]],
+        Sequence[Union[Type[BaseException], Tuple[Type[BaseException], str]]],
+        Dict[Type[BaseException], List[str]],
+    ]
+) -> Dict[Type[BaseException], List[str]]:
+  """Parses a sequence of error specifications into a dictionary."""
+  if isinstance(errors, dict):
+    return errors
   if not isinstance(errors, (tuple, list)):
     errors = [errors]
   elif (
@@ -136,28 +194,4 @@ def catch_errors(
       error_mapping[error_type] = []
     if regex is not None:
       error_mapping[error_type].append(regex)
-
-  context = CatchErrorsContext()
-  try:
-    yield context
-  except tuple(error_mapping.keys()) as e:
-    error_message = e.__class__.__name__ + ': ' + str(e)
-    found_match = False
-    for error_type, error_regexes in error_mapping.items():
-      if isinstance(e, error_type):
-        if not error_regexes:
-          found_match = True
-        else:
-          for regex in error_regexes:
-            assert regex is not None
-            if not regex.startswith(('^', '.*')):
-              regex = '.*' + regex
-            if re.match(regex, error_message):
-              found_match = True
-              break
-    if found_match:
-      context.error = e
-      if error_handler is not None:
-        error_handler(e)
-    else:
-      raise e
+  return error_mapping

{pyglove-0.5.0.dev202509100809.dist-info → pyglove-0.5.0.dev202509120809.dist-info}/METADATA

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

{pyglove-0.5.0.dev202509100809.dist-info → pyglove-0.5.0.dev202509120809.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyglove/__init__.py,sha256=LP1HNk_VVWMHaakX3HZ0NeZ2c4lq2uJaRbalvT8haOg,1352
-pyglove/core/__init__.py,sha256=23XwyBxalafAnDAsJSSxTz56AtjBjq_d5SPCKCNdCoM,9668
+pyglove/core/__init__.py,sha256=H4Yah3bYPrEqvuwRvhbA1MbQn7W6l2j5mmXkeAUNI30,9700
 pyglove/core/logging.py,sha256=pD5A6K8TOWoQdYZ1IgGHHd_vIcqtcWQ51Eep5Hswfwc,3305
 pyglove/core/logging_test.py,sha256=3z_c6wnxbqDbwUmSOAZzeDPXvzoweYL5QHUQVMJ5Xgo,1917
 pyglove/core/coding/__init__.py,sha256=tuHIg19ZchtkOQbdFVTVLkUpBa5f1eo66XtnKw3lcIU,1645
@@ -134,14 +134,14 @@ pyglove/core/typing/typed_missing.py,sha256=-l1omAu0jBZv5BnsFYXBqfvQwVBnmPh_X1wc
 pyglove/core/typing/typed_missing_test.py,sha256=TCNsb1SRpFaVdxYn2mB_yaLuja8w5Qn5NP7uGiZVBWs,2301
 pyglove/core/typing/value_specs.py,sha256=8E83QDZMb3lMXhgzfVNt9u6Bg3NPkvpjLXetjkps8UU,103263
 pyglove/core/typing/value_specs_test.py,sha256=eGXVxdduIM-oEaapJS9Kh7WSQHRUFegLIJ1GEzQkKHA,131017
-pyglove/core/utils/__init__.py,sha256=I2bRTzigU7qJVEATGlLUFkYzkiCBBCCEwrQyhsrRNmI,8602
+pyglove/core/utils/__init__.py,sha256=2aw4n1kYG9xlX2tWI-H5i25cBuK1ME9Lmf-F31VlKEk,8657
 pyglove/core/utils/common_traits.py,sha256=PWxOgPhG5H60ZwfO8xNAEGRjFUqqDZQBWQYomOfvdy8,3640
 pyglove/core/utils/common_traits_test.py,sha256=DIuZB_1xfmeTVfWnGOguDQcDAM_iGgBOe8C-5CsIqBc,1122
 pyglove/core/utils/contextual.py,sha256=RxBQkDM2gB6QwZj_2oMels6oh-zQPGJJlinZbbqHuYQ,5148
 pyglove/core/utils/contextual_test.py,sha256=OOcthquVyAekTqt1RyYcEMHaockMIokpbv4pSf13Nzs,3252
 pyglove/core/utils/docstr_utils.py,sha256=5BY40kXozPKVGOB0eN8jy1P5_GHIzqFJ9FXAu_kzxaw,5119
 pyglove/core/utils/docstr_utils_test.py,sha256=TBHNwvhGyyoEs7dNOv5bW7h3B_y2smDyoAR9uPDiidI,4179
-pyglove/core/utils/error_utils.py,sha256=U9Ms3G1a_WUXaFgWccyPL7yOIf4k8Wi0nyXJ3yIaIfY,5264
+pyglove/core/utils/error_utils.py,sha256=5if1LlouHMx9EkZt-rhlkDU53Qc-hmXgjhJHhhI125s,6392
 pyglove/core/utils/error_utils_test.py,sha256=gnsEwFmgDNNVNvuQyhSWai8GDfLoCuX_DMqYow9Q2l4,2547
 pyglove/core/utils/formatting.py,sha256=Wn4d933LQLhuMIfjdRJgpxOThCxBxQrkRBa6Z1-hL_I,15591
 pyglove/core/utils/formatting_test.py,sha256=hhg-nL6DyE5A2QA92ALHK5QtfAYKfPpTbBARF-IT1j0,14241
@@ -216,8 +216,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.5.0.dev202509100809.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-pyglove-0.5.0.dev202509100809.dist-info/METADATA,sha256=1F0uzEXLoiYGE7RVoGYlMQVGIH56hEEIRwlLr6Dq1zk,7089
-pyglove-0.5.0.dev202509100809.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyglove-0.5.0.dev202509100809.dist-info/top_level.txt,sha256=wITzJSKcj8GZUkbq-MvUQnFadkiuAv_qv5qQMw0fIow,8
-pyglove-0.5.0.dev202509100809.dist-info/RECORD,,
+pyglove-0.5.0.dev202509120809.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+pyglove-0.5.0.dev202509120809.dist-info/METADATA,sha256=zdKeS_0gKQBWo2LJ6QD7EEV62BOIdy7Scb0dWSO7iU4,7089
+pyglove-0.5.0.dev202509120809.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyglove-0.5.0.dev202509120809.dist-info/top_level.txt,sha256=wITzJSKcj8GZUkbq-MvUQnFadkiuAv_qv5qQMw0fIow,8
+pyglove-0.5.0.dev202509120809.dist-info/RECORD,,