feat: moved jobs to their own module

ENRG-tr · Oct 13, 2024 · b271550 · b271550
1 parent 34ba946
commit b271550
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/daq/caen/n1081b.py → src/daq/jobs/caen/n1081b.py b/src/daq/caen/n1081b.py → src/daq/jobs/caen/n1081b.py
diff --git a/src/daq/serve_http.py → src/daq/jobs/serve_http.py b/src/daq/serve_http.py → src/daq/jobs/serve_http.py
diff --git a/src/daq/store/csv.py → src/daq/jobs/store/csv.py b/src/daq/store/csv.py → src/daq/jobs/store/csv.py
diff --git a/src/daq/store/root.py → src/daq/jobs/store/root.py b/src/daq/store/root.py → src/daq/jobs/store/root.py
diff --git a/src/daq/test_job.py → src/daq/jobs/test_job.py b/src/daq/test_job.py → src/daq/jobs/test_job.py
diff --git a/src/daq/store/types.py b/src/daq/store/types.py
@@ -1,5 +1,5 @@
-from daq.store.csv import DAQJobStoreConfigCSV
-from daq.store.root import DAQJobStoreConfigROOT
+from daq.jobs.store.csv import DAQJobStoreConfigCSV
+from daq.jobs.store.root import DAQJobStoreConfigROOT
 
 DAQ_STORE_CONFIG_TYPE_TO_CLASS = {
     "csv": DAQJobStoreConfigCSV,

diff --git a/src/daq/types.py b/src/daq/types.py
@@ -1,12 +1,12 @@
 from typing import Dict
 
 from daq.base import DAQJob
-from daq.caen.n1081b import DAQJobN1081B
+from daq.jobs.caen.n1081b import DAQJobN1081B
+from daq.jobs.serve_http import DAQJobServeHTTP
+from daq.jobs.store.csv import DAQJobStoreCSV
+from daq.jobs.store.root import DAQJobStoreROOT
+from daq.jobs.test_job import DAQJobTest
 from daq.models import DAQJobStats
-from daq.serve_http import DAQJobServeHTTP
-from daq.store.csv import DAQJobStoreCSV
-from daq.store.root import DAQJobStoreROOT
-from daq.test_job import DAQJobTest
 
 DAQ_JOB_TYPE_TO_CLASS: dict[str, type[DAQJob]] = {
     "n1081b": DAQJobN1081B,

diff --git a/src/run_tests.py b/src/run_tests.py
@@ -16,5 +16,5 @@ def run_tests():
 
 if __name__ == "__main__":
     test_suite = run_tests()
-    runner = unittest.TextTestRunner(verbosity=3)
+    runner = unittest.TextTestRunner(verbosity=1)
     runner.run(test_suite)
diff --git a/src/tests/test_csv.py b/src/tests/test_csv.py
@@ -3,7 +3,7 @@
 from datetime import datetime, timedelta
 from unittest.mock import MagicMock, mock_open, patch
 
-from daq.store.csv import (
+from daq.jobs.store.csv import (
     DAQ_JOB_STORE_CSV_FLUSH_INTERVAL_SECONDS,
     CSVFile,
     DAQJobStoreConfigCSV,
@@ -17,7 +17,7 @@ def setUp(self):
         self.config = MagicMock()
         self.store = DAQJobStoreCSV(self.config)
 
-    @patch("daq.store.csv.modify_file_path", return_value="test.csv")
+    @patch("daq.jobs.store.csv.modify_file_path", return_value="test.csv")
     @patch("builtins.open", new_callable=mock_open)
     @patch("os.path.exists", return_value=False)
     @patch("pathlib.Path.touch")
@@ -40,7 +40,7 @@ def test_handle_message_new_file(
         file = self.store._open_csv_files["test.csv"]
         self.assertEqual(len(file.write_queue), 3)  # 1 header + 2 rows
 
-    @patch("daq.store.csv.modify_file_path", return_value="test.csv")
+    @patch("daq.jobs.store.csv.modify_file_path", return_value="test.csv")
     @patch("builtins.open", new_callable=mock_open)
     @patch("os.path.exists", return_value=True)
     def test_handle_message_existing_file(self, mock_exists, mock_open, mock_add_date):

diff --git a/src/tests/test_n1081b.py b/src/tests/test_n1081b.py
@@ -4,7 +4,7 @@
 from N1081B import N1081B
 from websocket import WebSocket
 
-from daq.caen.n1081b import DAQJobN1081B, DAQJobN1081BConfig
+from daq.jobs.caen.n1081b import DAQJobN1081B, DAQJobN1081BConfig
 from daq.store.models import DAQJobMessageStore