From 25558bb45922e1f4a65d45ff4f1dfde8d28612ec Mon Sep 17 00:00:00 2001
From: Doug Davis <ddavis@anaconda.com>
Date: Wed, 29 Nov 2023 11:19:57 -0600
Subject: [PATCH] naming, simplify

---
 src/dask_awkward/layers/layers.py | 22 +++++++---------------
 src/dask_awkward/lib/io/io.py     | 11 ++++++++++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/dask_awkward/layers/layers.py b/src/dask_awkward/layers/layers.py
index 5f40658d2..5ab32095a 100644
--- a/src/dask_awkward/layers/layers.py
+++ b/src/dask_awkward/layers/layers.py
@@ -107,13 +107,13 @@ def mock_empty(self, backend: BackendT = "cpu") -> AwkwardArray:
         )
 
 
-def io_func_reor_wrapped(func: ImplementsIOFunction) -> bool:
-    return hasattr(func, "__reor_wrapped__")
+def io_func_rer_wrapped(func: ImplementsIOFunction) -> bool:
+    return hasattr(func, "__rer_wrapped__")
 
 
 def maybe_unwrap(func: Callable) -> Callable:
-    if io_func_reor_wrapped(func):
-        return func.__reor_wrapped__  # type: ignore
+    if io_func_rer_wrapped(func):
+        return func.__rer_wrapped__  # type: ignore
     return func
 
 
@@ -242,7 +242,7 @@ def prepare_for_projection(self) -> tuple[AwkwardInputLayer, TypeTracerReport, T
             ImplementsProjection, fn
         ).prepare_for_projection()
 
-        if io_func_reor_wrapped(self.io_func):
+        if io_func_rer_wrapped(self.io_func):
             new_return = (new_meta_array, type(new_meta_array)([]))
         else:
             new_return = new_meta_array
@@ -267,16 +267,8 @@ def project(
         fn = maybe_unwrap(self.io_func)
         io_func = cast(ImplementsProjection, fn).project(report=report, state=state)
 
-        if io_func_reor_wrapped(self.io_func):
-            from dask_awkward.lib.io.io import return_empty_on_raise
-
-            io_func = return_empty_on_raise(
-                io_func,
-                allowed_exceptions=self.io_func.allowed_exceptions,  # type: ignore
-                backend=self.io_func.backend,  # type: ignore
-                success_callback=self.io_func.success_callback,  # type: ignore
-                failure_callback=self.io_func.failure_callback,  # type: ignore
-            )
+        if io_func_rer_wrapped(self.io_func):
+            io_func = self.io_func.recreate(io_func)  # type: ignore
 
         return AwkwardInputLayer(
             name=self.name,
diff --git a/src/dask_awkward/lib/io/io.py b/src/dask_awkward/lib/io/io.py
index 4629ec522..543605e72 100644
--- a/src/dask_awkward/lib/io/io.py
+++ b/src/dask_awkward/lib/io/io.py
@@ -535,13 +535,22 @@ def __init__(
         success_callback: Callable[..., ak.Array],
         failure_callback: Callable[..., ak.Array],
     ):
-        self.__reor_wrapped__ = fn
+        self.__rer_wrapped__ = fn
         self.fn = fn
         self.allowed_exceptions = allowed_exceptions
         self.backend = backend
         self.success_callback = success_callback
         self.failure_callback = failure_callback
 
+    def recreate(self, fn):
+        return return_empty_on_raise(
+            fn,
+            self.allowed_exceptions,
+            self.backend,
+            self.success_callback,
+            self.failure_callback,
+        )
+
     def __call__(self, *args, **kwargs):
         try:
             result = self.fn(*args, **kwargs)