fixed tests, reordered tabs a bit, removed redundant code, made a colorful function private and fixed types between uuid and str

Author: bakspace-itk

OpenOrchestrator/database/db_util.py

@@ -369,23 +369,18 @@ def get_job(job_id: UUID | str) -> Job:
         return job
 
 
-def get_unique_log_process_names(job_id: UUID | str | None = None) -> tuple[str, ...]:
+def get_unique_log_process_names() -> tuple[str, ...]:
     """Get a list of unique process names in the logs database.
 
     Returns:
         A list of unique process names.
     """
-    if isinstance(job_id, str):
-        job_id = UUID(job_id)
     query = (
         select(Log.process_name)
         .distinct()
         .order_by(Log.process_name)
     )
 
-    if job_id:
-        query.where(job_id=job_id)
-
     with _get_session() as session:
         result = session.scalars(query).all()
         return tuple(result)

OpenOrchestrator/orchestrator/application.py

@@ -36,11 +36,11 @@ def __init__(self, port: int | None = None, show: bool = True) -> None:
 
         with ui.tab_panels(self.tabs, value='Settings', on_change=self.update_tab).classes('w-full') as self.tab_panels:
             self.t_tab = TriggerTab('Triggers')
-            self.q_tab = QueueTab("Queues")
             self.j_tab = JobsTab("Jobs", self.on_job_click)
             self.l_tab = LoggingTab("Logs")
-            self.s_tab = SchedulerTab("Schedulers")
+            self.q_tab = QueueTab("Queues")
             self.c_tab = ConstantTab("Constants")
+            self.s_tab = SchedulerTab("Schedulers")
             SettingsTab('Settings')
 
         self._define_on_close()
@@ -81,7 +81,7 @@ def on_job_click(self, job_id: str):
         """Used by JobTab to update and switch to logging tab.
 
         Args:
-            event: _description_
+            job_id: Job selected when switching to Logging tab.
         """
         self.l_tab.current_job_id = job_id
         self.l_tab.update()

OpenOrchestrator/orchestrator/tabs/jobs_tab.py

@@ -1,8 +1,8 @@
 """This module is responsible for the layout and functionality of the Schedulers tab
 in Orchestrator."""
+from typing import Callable
 
 from nicegui import ui
-from typing import Callable
 
 from OpenOrchestrator.database import db_util
 from OpenOrchestrator.orchestrator import test_helper
@@ -17,13 +17,14 @@
 ]
 
 
-class JobsTab():
+#pylint: disable-next=too-few-public-methods
+class JobsTab:
     """A class for the jobs tab."""
     def __init__(self, tab_name: str, on_job_click: Callable[[str], None]) -> None:
         with ui.tab_panel(tab_name):
             self.jobs_table = ui.table(title="Jobs", columns=COLUMNS, rows=[], row_key='job_id', pagination=50).classes("w-full")
             self.jobs_table.on("rowClick", self._row_click)
-            self.add_column_colors()
+            self._add_column_colors()
         test_helper.set_automation_ids(self, "jobs_tab")
         self.on_job_click = on_job_click
 
@@ -37,7 +38,7 @@ def _row_click(self, event):
         job_id = row["ID"]
         self.on_job_click(job_id)
 
-    def add_column_colors(self):
+    def _add_column_colors(self):
         """Add custom coloring to the jobs table."""
         # Add coloring to the status column
         color_dict = "{Running: 'blue', Done: 'green', Failed: 'red', Killed: 'grey-9'}"

OpenOrchestrator/tests/db_test_util.py

@@ -2,7 +2,6 @@
 
 from datetime import datetime, timedelta
 import os
-from sqlalchemy import MetaData
 
 from OpenOrchestrator.database import db_util, base
 
@@ -26,10 +25,6 @@ def drop_all_tables():
 
     base.Base.metadata.drop_all(engine)
 
-    metadata = MetaData()
-    metadata.reflect(bind=engine)
-    metadata.drop_all(bind=engine)
-
 
 def reset_triggers():
     """Delete all triggers in the database and create a new of each."""

OpenOrchestrator/tests/test_db_util.py

@@ -1,6 +1,7 @@
 """This module contains tests of the functionality of db_util."""
 
 import unittest
+import uuid
 from datetime import datetime, timedelta
 import time
 
@@ -24,8 +25,8 @@ def test_logs(self):
 
         for i in range(3):
             db_util.create_log(f"Test {i}", LogLevel.TRACE, None, "Message")
-            db_util.create_log(f"Test {i}", LogLevel.INFO, None, "Message")
-            db_util.create_log(f"Test {i}", LogLevel.ERROR, None, "Message")
+            db_util.create_log(f"Test {i}", LogLevel.INFO, uuid.uuid4(), "Message")
+            db_util.create_log(f"Test {i}", LogLevel.ERROR, str(uuid.uuid4()), "Message")
 
         # Get all logs
         logs = db_util.get_logs(0, 100)

OpenOrchestrator/tests/test_orchestrator_connection.py

@@ -2,7 +2,7 @@
 
 import unittest
 from datetime import datetime
-from uuid import UUID
+from uuid import UUID, uuid4
 import os
 
 from OpenOrchestrator.orchestrator_connection.connection import OrchestratorConnection
@@ -29,7 +29,7 @@ def setUpClass(cls) -> None:
                                                        is_blocking=False,
                                                        priority=0
                                                        )
-        cls.connection = OrchestratorConnection("Process", os.environ["CONN_STRING"], crypto_util.get_key(), "Args", cls.trigger_id, None)
+        cls.connection = OrchestratorConnection("Process", os.environ["CONN_STRING"], crypto_util.get_key(), "Args", str(cls.trigger_id), str(uuid4()))
 
     def test_trigger_pause(self):
         """Test pausing triggers."""
@@ -127,12 +127,12 @@ def test_queue_elements(self):
         self.assertNotEqual(element, element2)
 
         # Set status
-        self.connection.set_queue_element_status(element.id, QueueStatus.DONE)
+        self.connection.set_queue_element_status(str(element.id), QueueStatus.DONE)
         elements = self.connection.get_queue_elements("Bulk Queue", status=QueueStatus.DONE)
         self.assertEqual(len(elements), 1)
 
         # Delete element
-        self.connection.delete_queue_element(element.id)
+        self.connection.delete_queue_element(str(element.id))
         elements = self.connection.get_queue_elements("Bulk Queue")
         self.assertEqual(len(elements), 9)