refactor: return union of daq job and thread when starting daq jobs

src/daq/daq_job.py

@@ -5,7 +5,7 @@
 import tomllib
 
 from daq.caen.n1081b import DAQJobN1081B
-from daq.models import DAQJob, DAQJobConfig
+from daq.models import DAQJob, DAQJobConfig, DAQJobThread
 
 DAQ_JOB_TYPE_TO_CLASS: dict[str, type[DAQJob]] = {
     "n1081b": DAQJobN1081B,
@@ -40,14 +40,14 @@ def load_daq_jobs(job_config_dir: str) -> list[DAQJob]:
     return jobs
 
 
-def start_daq_job(daq_job: DAQJob) -> threading.Thread:
+def start_daq_job(daq_job: DAQJob) -> DAQJobThread:
     thread = threading.Thread(target=daq_job.start, daemon=True)
     thread.start()
 
-    return thread
+    return DAQJobThread(daq_job, thread)
 
 
-def start_daq_jobs(daq_jobs: list[DAQJob]) -> list[threading.Thread]:
+def start_daq_jobs(daq_jobs: list[DAQJob]) -> list[DAQJobThread]:
     threads = []
     for daq_job in daq_jobs:
         threads.append(start_daq_job(daq_job))

src/daq/models.py

@@ -1,4 +1,5 @@
 import logging
+import threading
 from dataclasses import dataclass
 from typing import Any
 
@@ -26,3 +27,9 @@ def start(self):
 
     def stop(self):
         self._should_stop = True
+
+
+@dataclass
+class DAQJobThread:
+    daq_job: DAQJob
+    thread: threading.Thread

src/test_entrypoint.py

@@ -7,10 +7,10 @@
 logging.basicConfig(level=logging.DEBUG)
 
 daq_jobs = load_daq_jobs("configs/")
-threads = start_daq_jobs(daq_jobs)
+daq_job_threads = start_daq_jobs(daq_jobs)
 
 while True:
-    any_thread_alive = any(t.is_alive() for t in threads)
+    any_thread_alive = any(t.thread.is_alive() for t in daq_job_threads)
     if not any_thread_alive:
         break