pyglove 0.5.0.dev202509110810__tar.gz → 0.5.0.dev202509130808__tar.gz

{pyglove-0.5.0.dev202509110810 → pyglove-0.5.0.dev202509130808}/PKG-INFO

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

{pyglove-0.5.0.dev202509110810 → pyglove-0.5.0.dev202509130808}/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-0.5.0.dev202509110810 → pyglove-0.5.0.dev202509130808}/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-0.5.0.dev202509110810 → pyglove-0.5.0.dev202509130808}/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.dev202509110810 → pyglove-0.5.0.dev202509130808}/pyglove.egg-info/PKG-INFO

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