Merge pull request #243 from jumpstarter-dev/post-init

Treewide: harmonize __post_init__

__templates__/driver/jumpstarter_driver/driver.py.tmpl

@@ -10,7 +10,8 @@ class ${DRIVER_CLASS}(Driver):
     some_other_config: int = 69
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         # some initialization here.
 
     @classmethod

packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py

@@ -33,12 +33,13 @@ class CanClient(DriverClient, can.BusABC):
     """
 
     def __post_init__(self):
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self._periodic_tasks: List[_SelfRemovingCyclicTask] = []
         self._filters = None
         self._is_shutdown: bool = False
 
-        super().__post_init__()
-
     @property
     @validate_call(validate_return=True)
     def state(self) -> can.BusState:

packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py

@@ -45,7 +45,9 @@ def client(cls) -> str:
         return "jumpstarter_driver_can.client.CanClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.bus = can.Bus(channel=self.channel, interface=self.interface)
 
     @export
@@ -195,7 +197,9 @@ def client(cls) -> str:
         return "jumpstarter_driver_can.client.IsoTpClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.bus = can.Bus(channel=self.channel, interface=self.interface)
         self.notifier = can.Notifier(self.bus, [])
         self.stack = isotp.NotifierBasedCanStack(

packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py

@@ -29,6 +29,9 @@ class DutlinkConfig:
     tty: str | None = field(init=False, default=None)
 
     def __post_init__(self):
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         for dev in usb.core.find(idVendor=0x2B23, idProduct=0x1012, find_all=True):
             serial = usb.util.get_string(dev, dev.iSerialNumber)
             if serial == self.serial or self.serial is None:
@@ -80,15 +83,17 @@ def control(self, direction, ty, actions, action, value):
 
 
 @dataclass(kw_only=True)
-class DutlinkSerial(DutlinkConfig, PySerial):
-    url: str | None = field(init=False, default=None)
-
+class DutlinkSerialConfig(DutlinkConfig, Driver):
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
 
         self.url = self.tty
 
-        super(PySerial, self).__post_init__()
+
+@dataclass(kw_only=True)
+class DutlinkSerial(PySerial, DutlinkSerialConfig):
+    url: str | None = field(init=False, default=None)
 
 
 @dataclass(kw_only=True)
@@ -247,7 +252,8 @@ class Dutlink(DutlinkConfig, CompositeInterface, Driver):
     """
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
 
         self.children["power"] = DutlinkPower(serial=self.serial, timeout_s=self.timeout_s)
         self.children["storage"] = DutlinkStorageMux(

packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py

@@ -29,7 +29,9 @@ class HttpServer(Driver):
     runner: Optional[web.AppRunner] = field(init=False, default=None)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         os.makedirs(self.root_dir, exist_ok=True)
         self.app.router.add_routes(
             [

packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py

@@ -33,7 +33,9 @@ class PySerial(Driver):
     baudrate: int = field(default=115200)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.device = serial_for_url(self.url, baudrate=self.baudrate)
 
     @classmethod

packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver.py

@@ -15,7 +15,8 @@ def client(cls) -> str:
         return "jumpstarter_driver_raspberrypi.client.DigitalOutputClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         # Initialize as InputDevice first
         self.device = InputDevice(pin=self.pin)
 
@@ -49,7 +50,8 @@ def client(cls) -> str:
         return "jumpstarter_driver_raspberrypi.client.DigitalInputClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         self.device = DigitalInputDevice(pin=self.pin)
 
     @export

packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver.py

@@ -22,7 +22,9 @@ class SDWire(StorageMuxInterface, Driver):
     storage_device: str | None = field(default=None)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         for dev in usb.core.find(idVendor=0x04E8, idProduct=0x6001, find_all=True):
             if self.storage_device is None:
                 context = pyudev.Context()

packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py

@@ -45,7 +45,9 @@ class Tftp(Driver):
     _loop: Optional[asyncio.AbstractEventLoop] = field(init=False, default=None)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         os.makedirs(self.root_dir, exist_ok=True)
         if self.host is None:
             self.host = self.get_default_ip()

packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver.py

@@ -34,7 +34,8 @@ def client(cls) -> str:
         return "jumpstarter_driver_ustreamer.client.UStreamerClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
 
         cmdline = [self.executable]
 

packages/jumpstarter/jumpstarter/client/core.py

@@ -45,7 +45,8 @@ class AsyncDriverClient(
     logger: logging.Logger = field(init=False)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         jumpstarter_pb2_grpc.ExporterServiceStub.__init__(self, self.channel)
         router_pb2_grpc.RouterServiceStub.__init__(self, self.channel)
         self.logger = logging.getLogger(self.__class__.__name__)

packages/jumpstarter/jumpstarter/client/lease.py

@@ -31,6 +31,9 @@ class Lease(AbstractContextManager, AbstractAsyncContextManager):
     tls_config: TLSConfigV1Alpha1 = field(default_factory=TLSConfigV1Alpha1)
 
     def __post_init__(self):
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.controller = jumpstarter_pb2_grpc.ControllerServiceStub(self.channel)
         self.manager = self.portal.wrap_async_context_manager(self)
 

packages/jumpstarter/jumpstarter/common/metadata.py

@@ -9,9 +9,6 @@ class Metadata:
     uuid: UUID = field(default_factory=uuid4)
     labels: dict[str, str] = field(default_factory=dict)
 
-    def __post_init__(self):
-        pass
-
     @property
     def name(self):
         return self.labels.get("jumpstarter.dev/name", "unknown")
@@ -20,6 +17,3 @@ def name(self):
 @dataclass(kw_only=True, slots=True)
 class MetadataFilter:
     labels: dict[str, str] = field(default_factory=dict)
-
-    def __post_init__(self):
-        pass

packages/jumpstarter/jumpstarter/driver/base.py

@@ -60,7 +60,9 @@ class Driver(
     logger: logging.Logger = field(init=False)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.logger = logging.getLogger(self.__class__.__name__)
         self.logger.setLevel(self.log_level)