Call model_construct in both v1 and v2 pydantic

lsst · Jul 19, 2023 · c1079d5 · c1079d5
1 parent b0faaf8
commit c1079d5
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/python/lsst/pipe/base/graph/quantumNode.py b/python/lsst/pipe/base/graph/quantumNode.py
@@ -35,7 +35,7 @@
     Quantum,
     SerializedQuantum,
 )
-from lsst.daf.butler._compat import PYDANTIC_V2, _BaseModelCompat
+from lsst.daf.butler._compat import _BaseModelCompat
 from lsst.utils.introspection import find_outside_stacklevel
 
 from ..pipeline import TaskDef
@@ -164,18 +164,11 @@ class SerializedQuantumNode(_BaseModelCompat):
 
     @classmethod
     def direct(cls, *, quantum: dict[str, Any], taskLabel: str, nodeId: str) -> SerializedQuantumNode:
-        if PYDANTIC_V2:
-            node = cls.model_construct(
-                __fields_set=_fields_set,
-                quantum=SerializedQuantum.direct(**quantum),
-                taskLabel=taskLabel,
-                nodeId=uuid.UUID(nodeId),
-            )
-        else:
-            node = SerializedQuantumNode.__new__(cls)
-            setter = object.__setattr__
-            setter(node, "quantum", SerializedQuantum.direct(**quantum))
-            setter(node, "taskLabel", taskLabel)
-            setter(node, "nodeId", uuid.UUID(nodeId))
-            setter(node, "__fields_set__", _fields_set)
+        node = cls.model_construct(
+            __fields_set=_fields_set,
+            quantum=SerializedQuantum.direct(**quantum),
+            taskLabel=taskLabel,
+            nodeId=uuid.UUID(nodeId),
+        )
+
         return node