feat: switch permit_dask to True by default

src/coffea/nanoevents/factory.py

@@ -20,14 +20,7 @@
     TrivialUprootOpener,
     UprootSourceMapping,
 )
-from coffea.nanoevents.schemas import (
-    BaseSchema,
-    DelphesSchema,
-    NanoAODSchema,
-    PFNanoAODSchema,
-    PHYSLITESchema,
-    TreeMakerSchema,
-)
+from coffea.nanoevents.schemas import BaseSchema, NanoAODSchema
 from coffea.nanoevents.util import key_to_tuple, quote, tuple_to_key, unquote
 
 _offsets_label = quote(",!offsets")
@@ -240,7 +233,7 @@ def __setstate__(self, state):
     def from_root(
         cls,
         file,
-        treepath="/Events",
+        treepath=uproot._util.unset,
         entry_start=None,
         entry_stop=None,
         chunks_per_file=uproot._util.unset,
@@ -252,7 +245,7 @@ def from_root(
         access_log=None,
         iteritems_options={},
         use_ak_forth=True,
-        permit_dask=False,
+        permit_dask=True,
     ):
         """Quickly build NanoEvents from a root file
 
@@ -287,42 +280,24 @@ def from_root(
             permit_dask:
                 Allow nanoevents to use dask as a backend.
         """
+
+        if treepath is not uproot._util.unset and not isinstance(
+            file, uproot.reading.ReadOnlyDirectory
+        ):
+            raise ValueError(
+                """Specification of treename by argument to from_root is no longer supported in coffea 2023.
+            Please use one of the allow types for "files" specified by uproot: https://github.com/scikit-hep/uproot5/blob/v5.1.2/src/uproot/_dask.py#L109-L132
+            """
+            )
+
         if (
             permit_dask
             and not isinstance(schemaclass, FunctionType)
             and schemaclass.__dask_capable__
         ):
-            behavior = None
-            if schemaclass is BaseSchema:
-                from coffea.nanoevents.methods import base
-
-                behavior = base.behavior
-            elif schemaclass is NanoAODSchema:
-                from coffea.nanoevents.methods import nanoaod
-
-                behavior = nanoaod.behavior
-            elif schemaclass is PFNanoAODSchema:
-                from coffea.nanoevents.methods import nanoaod
-
-                behavior = nanoaod.behavior
-            elif schemaclass is TreeMakerSchema:
-                from coffea.nanoevents.methods import base, vector
-
-                behavior = {}
-                behavior.update(base.behavior)
-                behavior.update(vector.behavior)
-            elif schemaclass is PHYSLITESchema:
-                from coffea.nanoevents.methods import physlite
-
-                behavior = physlite.behavior
-            elif schemaclass is DelphesSchema:
-                from coffea.nanoevents.methods import delphes
-
-                behavior = delphes.behavior
-
             map_schema = _map_schema_uproot(
                 schemaclass=schemaclass,
-                behavior=dict(behavior),
+                behavior=dict(schemaclass.behavior()),
                 metadata=metadata,
                 version="latest",
             )
@@ -360,7 +335,7 @@ def from_root(
             tree = file[treepath]
         elif "<class 'uproot.rootio.ROOTDirectory'>" == str(type(file)):
             raise RuntimeError(
-                "The file instance (%r) is an uproot3 type, but this module is only compatible with uproot4 or higher"
+                "The file instance (%r) is an uproot3 type, but this module is only compatible with uproot5 or higher"
                 % file
             )
         else:
@@ -463,33 +438,9 @@ def from_parquet(
             and not isinstance(schemaclass, FunctionType)
             and schemaclass.__dask_capable__
         ):
-            behavior = None
-            if schemaclass is BaseSchema:
-                from coffea.nanoevents.methods import base
-
-                behavior = base.behavior
-            elif schemaclass is NanoAODSchema:
-                from coffea.nanoevents.methods import nanoaod
-
-                behavior = nanoaod.behavior
-            elif schemaclass is TreeMakerSchema:
-                from coffea.nanoevents.methods import base, vector
-
-                behavior = {}
-                behavior.update(base.behavior)
-                behavior.update(vector.behavior)
-            elif schemaclass is PHYSLITESchema:
-                from coffea.nanoevents.methods import physlite
-
-                behavior = physlite.behavior
-            elif schemaclass is DelphesSchema:
-                from coffea.nanoevents.methods import delphes
-
-                behavior = delphes.behavior
-
             map_schema = _map_schema_parquet(
                 schemaclass=schemaclass,
-                behavior=dict(behavior),
+                behavior=dict(schemaclass.behavior()),
                 metadata=metadata,
                 version="latest",
             )
@@ -713,7 +664,7 @@ def events(self):
 
         events = self._events()
         if events is None:
-            behavior = dict(self._schema.behavior)
+            behavior = dict(self._schema.behavior())
             behavior["__events_factory__"] = self
             events = awkward.from_buffers(
                 self._schema.form,

src/coffea/nanoevents/schemas/auto.py

@@ -109,8 +109,8 @@ def __init__(self, base_form: Dict[str, Any]):
             v for v in output.values()
         ]
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import base, candidate
 

src/coffea/nanoevents/schemas/base.py

@@ -125,8 +125,8 @@ def form(self):
         """Awkward form of this schema"""
         return self._form
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import base
 

src/coffea/nanoevents/schemas/delphes.py

@@ -297,8 +297,8 @@ def _preprocess_branch_form(objname, form):
 
         return output
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import delphes
 

src/coffea/nanoevents/schemas/nanoaod.py

@@ -321,8 +321,8 @@ def _build_collections(self, field_names, input_contents):
 
         return output.keys(), output.values()
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import nanoaod
 

src/coffea/nanoevents/schemas/pdune.py

@@ -225,8 +225,8 @@ def _build_collections(self, branch_forms):
     #    }
     #    return form
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import pdune
 

src/coffea/nanoevents/schemas/physlite.py

@@ -157,8 +157,8 @@ def _create_eventindex_form(base_form, key):
         }
         return form
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import physlite
 

src/coffea/nanoevents/schemas/treemaker.py

@@ -164,8 +164,8 @@ def _build_collections(self, branch_forms):
 
         return branch_forms
 
-    @property
-    def behavior(self):
+    @classmethod
+    def behavior(cls):
         """Behaviors necessary to implement this schema"""
         from coffea.nanoevents.methods import base, vector
 

tests/test_analysis_tools.py

@@ -10,14 +10,14 @@
 fname = "tests/samples/nano_dy.root"
 eagerevents = NanoEventsFactory.from_root(
     {os.path.abspath(fname): "Events"},
-    schemaclass=NanoAODSchema.v6,
+    schemaclass=NanoAODSchema,
     metadata={"dataset": "DYJets"},
+    permit_dask=False,
 ).events()
 dakevents = NanoEventsFactory.from_root(
     {os.path.abspath(fname): "Events"},
     schemaclass=NanoAODSchema,
     metadata={"dataset": "DYJets"},
-    permit_dask=True,
 ).events()
 uprootevents = uproot.dask({fname: "Events"})
 

tests/test_nanoevents.py

@@ -71,9 +71,11 @@ def crossref(events):
 def test_read_nanomc(suffix):
     path = os.path.abspath(f"tests/samples/nano_dy.{suffix}")
     # parquet files were converted from even older nanoaod
-    nanoversion = NanoAODSchema.v6 if suffix == "root" else NanoAODSchema.v5
+    nanoversion = NanoAODSchema
     factory = getattr(NanoEventsFactory, f"from_{suffix}")(
-        {path: "Events"}, schemaclass=nanoversion
+        {path: "Events"},
+        schemaclass=nanoversion,
+        permit_dask=False,
     )
     events = factory.events()
 
@@ -132,9 +134,11 @@ def test_read_from_uri(suffix):
 
     path = Path(os.path.abspath(f"tests/samples/nano_dy.{suffix}")).as_uri()
 
-    nanoversion = NanoAODSchema.v6 if suffix == "root" else NanoAODSchema.v5
+    nanoversion = NanoAODSchema
     factory = getattr(NanoEventsFactory, f"from_{suffix}")(
-        {path: "Events"}, schemaclass=nanoversion
+        {path: "Events"},
+        schemaclass=nanoversion,
+        permit_dask=False,
     )
     events = factory.events()
 
@@ -145,9 +149,11 @@ def test_read_from_uri(suffix):
 def test_read_nanodata(suffix):
     path = os.path.abspath(f"tests/samples/nano_dimuon.{suffix}")
     # parquet files were converted from even older nanoaod
-    nanoversion = NanoAODSchema.v6 if suffix == "root" else NanoAODSchema.v5
+    nanoversion = NanoAODSchema
     factory = getattr(NanoEventsFactory, f"from_{suffix}")(
-        {path: "Events"}, schemaclass=nanoversion
+        {path: "Events"},
+        schemaclass=nanoversion,
+        permit_dask=False,
     )
     events = factory.events()
 
@@ -158,7 +164,9 @@ def test_read_nanodata(suffix):
 def test_missing_eventIds_error():
     path = os.path.abspath("tests/samples/missing_luminosityBlock.root") + ":Events"
     with pytest.raises(RuntimeError):
-        factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema)
+        factory = NanoEventsFactory.from_root(
+            path, schemaclass=NanoAODSchema, permit_dask=False
+        )
         factory.events()
 
 
@@ -168,7 +176,9 @@ def test_missing_eventIds_warning():
         RuntimeWarning, match=r"Missing event_ids \: \[\'luminosityBlock\'\]"
     ):
         NanoAODSchema.error_missing_event_ids = False
-        factory = NanoEventsFactory.from_root(path, schemaclass=NanoAODSchema)
+        factory = NanoEventsFactory.from_root(
+            path, schemaclass=NanoAODSchema, permit_dask=False
+        )
         factory.events()