OpenOrchestrator 1.2.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

OpenOrchestrator/database/queues.py

@@ -20,6 +20,7 @@ class QueueStatus(enum.Enum):
     IN_PROGRESS = 'In Progress'
     DONE = 'Done'
     FAILED = 'Failed'
+    ABANDONED = 'Abandoned'
 
 
 class Base(DeclarativeBase):

OpenOrchestrator/database/triggers.py

@@ -21,6 +21,7 @@ class TriggerStatus(enum.Enum):
     FAILED = "Failed"
     DONE = "Done"
     PAUSED = "Paused"
+    PAUSING = "Pausing"
 
 
 class TriggerType(enum.Enum):

OpenOrchestrator/database/truncated_string.py

@@ -0,0 +1,18 @@
+"""Module for truncating a string by removing the middle part."""
+
+import math
+
+
+def truncate_message(message: str, max_length: int = 8000) -> str:
+    """Truncate a message to max_length characters
+
+    Args:
+        message: The string to truncate
+        max_length: Maximum allowed length, defaults to 8000
+
+    Returns:
+        A string with length set to max_length
+    """
+    if len(message) <= max_length:
+        return message
+    return message[:math.ceil(max_length/2)] + message[-math.floor(max_length/2):]

OpenOrchestrator/orchestrator/datetime_input.py

@@ -19,8 +19,9 @@ class DatetimeInput(ui.input):
             on_change: A callable to execute on change. Defaults to None.
             allow_empty: Whether to allow an empty input on validation. Defaults to False.
         """
-        super().__init__(label, value=None, on_change=on_change)
+        super().__init__(label, on_change=lambda: self._on_change(on_change))
         self.props("clearable")
+        self.complete = False
 
         # Define dialog
         with ui.dialog() as self._dialog, ui.card():
@@ -38,6 +39,8 @@ class DatetimeInput(ui.input):
 
         self._define_validation(allow_empty)
 
+        self.complete = True
+
     def _define_validation(self, allow_empty: bool):
         if not allow_empty:
             self.validation = {
@@ -47,7 +50,7 @@ class DatetimeInput(ui.input):
 
         else:
             def validate(value: str):
-                if value is None:
+                if not value:
                     return True
 
                 return self.get_datetime() is not None
@@ -73,3 +76,14 @@ class DatetimeInput(ui.input):
             value: The new datetime value.
         """
         self.value = value.strftime(self.PY_FORMAT)
+
+    def _on_change(self, func: Optional[Callable[..., Any]]) -> None:
+        """Wrapper for the input's on_change function.
+        This avoids that the on_change function is called
+        before the element is fully initialized.
+
+        Args:
+            func: The on_change function of the element.
+        """
+        if self.complete and func:
+            func()

OpenOrchestrator/orchestrator/popups/constant_popup.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 # pylint: disable-next=too-few-public-methods
 class ConstantPopup():
     """A popup for creating/updating queue triggers."""
-    def __init__(self, constant_tab: ConstantTab, constant: Constant = None):
+    def __init__(self, constant_tab: ConstantTab, constant: Constant | None = None):
         """Create a new popup.
         If a constant is given it will be updated instead of creating a new constant.
 
@@ -41,9 +41,7 @@ class ConstantPopup():
                     ui.button("Delete", color='red', on_click=self._delete_constant)
 
         self._define_validation()
-
-        if constant:
-            self._pre_populate()
+        self._pre_populate()
 
     def _define_validation(self):
         """Define validation rules for input elements."""
@@ -52,9 +50,10 @@ class ConstantPopup():
 
     def _pre_populate(self):
         """Pre populate the inputs with an existing constant."""
-        self.name_input.value = self.constant.name
-        self.name_input.disable()
-        self.value_input.value = self.constant.value
+        if self.constant:
+            self.name_input.value = self.constant.name
+            self.name_input.disable()
+            self.value_input.value = self.constant.value
 
     def _create_constant(self):
         """Creates a new constant in the database using the data from the
@@ -89,6 +88,8 @@ class ConstantPopup():
         self.constant_tab.update()
 
     async def _delete_constant(self):
+        if not self.constant:
+            return
         if await question_popup(f"Delete constant '{self.constant.name}?", "Delete", "Cancel", color1='red'):
             db_util.delete_constant(self.constant.name)
             self.dialog.close()

OpenOrchestrator/orchestrator/popups/credential_popup.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 # pylint: disable-next=too-few-public-methods
 class CredentialPopup():
     """A popup for creating/updating queue triggers."""
-    def __init__(self, constant_tab: ConstantTab, credential: Credential = None):
+    def __init__(self, constant_tab: ConstantTab, credential: Credential | None = None):
         """Create a new popup.
         If a credential is given it will be updated instead of creating a new credential.
 
@@ -43,9 +43,7 @@ class CredentialPopup():
                     ui.button("Delete", color='red', on_click=self._delete_credential)
 
         self._define_validation()
-
-        if credential:
-            self._pre_populate()
+        self._pre_populate()
 
     def _define_validation(self):
         """Define validation functions for ui elements."""
@@ -55,9 +53,10 @@ class CredentialPopup():
 
     def _pre_populate(self):
         """Pre populate the inputs with an existing credential."""
-        self.name_input.value = self.credential.name
-        self.name_input.disable()
-        self.username_input.value = self.credential.username
+        if self.credential:
+            self.name_input.value = self.credential.name
+            self.name_input.disable()
+            self.username_input.value = self.credential.username
 
     def _save_credential(self):
         """Create or update a credential in the database using the data from the UI."""
@@ -93,6 +92,8 @@ class CredentialPopup():
 
     async def _delete_credential(self):
         """Delete the selected credential."""
+        if not self.credential:
+            return
         if await question_popup(f"Delete credential '{self.credential.name}'?", "Delete", "Cancel", color1='red'):
             db_util.delete_credential(self.credential.name)
             self.dialog.close()

OpenOrchestrator/orchestrator/popups/trigger_popup.py

@@ -5,11 +5,11 @@ from typing import TYPE_CHECKING
 from datetime import datetime
 
 from nicegui import ui
-from croniter import croniter, CroniterBadCronError
+from cronsim import CronSim, CronSimError
 
 from OpenOrchestrator.orchestrator.datetime_input import DatetimeInput
 from OpenOrchestrator.database import db_util
-from OpenOrchestrator.database.triggers import Trigger, TriggerStatus, TriggerType
+from OpenOrchestrator.database.triggers import Trigger, TriggerStatus, TriggerType, ScheduledTrigger, SingleTrigger, QueueTrigger
 from OpenOrchestrator.orchestrator.popups import generic_popups
 
 if TYPE_CHECKING:
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 # pylint: disable-next=(too-many-instance-attributes, too-few-public-methods)
 class TriggerPopup():
     """A popup for creating/updating triggers."""
-    def __init__(self, trigger_tab: TriggerTab, trigger_type: TriggerType, trigger: Trigger = None):
+    def __init__(self, trigger_tab: TriggerTab, trigger_type: TriggerType, trigger: Trigger | None = None):
         """Create a new popup.
         If a trigger is given it will be updated instead of creating a new trigger.
 
@@ -65,9 +65,7 @@ class TriggerPopup():
 
         self._disable_unused()
         self._define_validation()
-
-        if trigger:
-            self._pre_populate()
+        self._pre_populate()
 
     def _define_validation(self):
         self.trigger_input.validation = {"Please enter a trigger name": bool}
@@ -77,15 +75,18 @@ class TriggerPopup():
 
         def validate_cron(value: str):
             try:
-                croniter(value)
+                CronSim(value, datetime.now())
                 return True
-            except CroniterBadCronError:
+            except CronSimError:
                 return False
 
         self.cron_input.validation = {"Invalid cron expression": validate_cron}
 
     def _pre_populate(self):
         """Populate the form with values from an existing trigger"""
+        if not self.trigger:
+            return
+
         self.trigger_input.value = self.trigger.trigger_name
         self.name_input.value = self.trigger.process_name
         self.path_input.value = self.trigger.process_path
@@ -93,13 +94,13 @@ class TriggerPopup():
         self.git_check.value = self.trigger.is_git_repo
         self.blocking_check.value = self.trigger.is_blocking
 
-        if self.trigger_type == TriggerType.SCHEDULED:
+        if isinstance(self.trigger, ScheduledTrigger):
             self.cron_input.value = self.trigger.cron_expr
 
-        if self.trigger_type in (TriggerType.SINGLE, TriggerType.SCHEDULED):
+        if isinstance(self.trigger, (SingleTrigger, ScheduledTrigger)):
             self.time_input.set_datetime(self.trigger.next_run)
 
-        if self.trigger_type == TriggerType.QUEUE:
+        if isinstance(self.trigger, QueueTrigger):
             self.queue_input.value = self.trigger.queue_name
             self.batch_input.value = self.trigger.min_batch_size
 
@@ -117,8 +118,8 @@ class TriggerPopup():
 
     def _cron_change(self):
         if self.cron_input.validate():
-            cron_iter = croniter(self.cron_input.value, datetime.now())
-            self.time_input.set_datetime(cron_iter.next(datetime))
+            cron_iter = CronSim(self.cron_input.value, datetime.now())
+            self.time_input.set_datetime(next(cron_iter))
 
     async def _validate(self) -> bool:
         result = True
@@ -154,7 +155,7 @@ class TriggerPopup():
 
         trigger_name = self.trigger_input.value
         process_name = self.name_input.value
-        next_run = self.time_input.get_datetime()
+        next_run: datetime = self.time_input.get_datetime()  # type: ignore
         cron_expr = self.cron_input.value
         queue_name = self.queue_input.value
         min_batch_size = self.batch_input.value
@@ -177,18 +178,17 @@ class TriggerPopup():
             # Update existing trigger
             self.trigger.trigger_name = trigger_name
             self.trigger.process_name = process_name
-            self.trigger.next_run = next_run
             self.trigger.process_path = path
             self.trigger.process_args = args
             self.trigger.is_git_repo = is_git
             self.trigger.is_blocking = is_blocking
 
-            if self.trigger_type == TriggerType.SINGLE:
+            if isinstance(self.trigger, SingleTrigger):
                 self.trigger.next_run = next_run
-            elif self.trigger_type == TriggerType.SCHEDULED:
+            elif isinstance(self.trigger, ScheduledTrigger):
                 self.trigger.cron_expr = cron_expr
                 self.trigger.next_run = next_run
-            elif self.trigger_type == TriggerType.QUEUE:
+            elif isinstance(self.trigger, QueueTrigger):
                 self.trigger.queue_name = queue_name
                 self.trigger.min_batch_size = min_batch_size
 
@@ -199,6 +199,9 @@ class TriggerPopup():
         self.trigger_tab.update()
 
     async def _delete_trigger(self):
+        if not self.trigger:
+            return
+
         if await generic_popups.question_popup(f"Delete trigger '{self.trigger.trigger_name}'?", "Delete", "Cancel", color1='red'):
             db_util.delete_trigger(self.trigger.id)
             ui.notify("Trigger deleted", type='positive')
@@ -206,11 +209,20 @@ class TriggerPopup():
             self.trigger_tab.update()
 
     def _disable_trigger(self):
-        db_util.set_trigger_status(self.trigger.id, TriggerStatus.PAUSED)
+        if not self.trigger:
+            return
+
+        if self.trigger.process_status == TriggerStatus.RUNNING:
+            db_util.set_trigger_status(self.trigger.id, TriggerStatus.PAUSING)
+        else:
+            db_util.set_trigger_status(self.trigger.id, TriggerStatus.PAUSED)
         ui.notify("Trigger status set to 'Paused'.", type='positive')
         self.trigger_tab.update()
 
     def _enable_trigger(self):
+        if not self.trigger:
+            return
+
         db_util.set_trigger_status(self.trigger.id, TriggerStatus.IDLE)
         ui.notify("Trigger status set to 'Idle'.", type='positive')
         self.trigger_tab.update()

OpenOrchestrator/orchestrator/tabs/constants_tab.py

@@ -38,7 +38,7 @@ class ConstantTab():
         """Callback for when a row is clicked in the table."""
         row = event.args[1]
         name = row['Credential Name']
-        credential = db_util.get_credential(name)
+        credential = db_util.get_credential(name, False)
         CredentialPopup(self, credential)
 
     def update(self):

OpenOrchestrator/orchestrator/tabs/logging_tab.py

@@ -4,16 +4,17 @@ in Orchestrator."""
 from nicegui import ui
 
 from OpenOrchestrator.database import db_util
+from OpenOrchestrator.database.logs import LogLevel
 from OpenOrchestrator.orchestrator.datetime_input import DatetimeInput
 
 
-COLUMNS = (
+COLUMNS = [
     {'name': "Log Time", 'label': "Log Time", 'field': "Log Time", 'align': 'left', 'sortable': True},
     {'name': "Process Name", 'label': "Process Name", 'field': "Process Name", 'align': 'left'},
     {'name': "Level", 'label': "Level", 'field': "Level", 'align': 'left'},
     {'name': "Message", 'label': "Message", 'field': "Message", 'align': 'left', ':format': 'value => value.length < 100 ? value : value.substring(0, 100)+"..."'},
     {'name': "ID", 'label': "ID", 'field': "ID", 'headerClasses': 'hidden', 'classes': 'hidden'}
-)
+]
 
 
 # pylint: disable-next=too-few-public-methods
@@ -41,7 +42,7 @@ class LoggingTab():
         from_date = self.from_input.get_datetime()
         to_date = self.to_input.get_datetime()
         process_name = self.process_input.value if self.process_input.value != 'All' else None
-        level = self.level_input.value if self.level_input.value != "All" else None
+        level = LogLevel(self.level_input.value) if self.level_input.value != "All" else None
         limit = self.limit_input.value
 
         logs = db_util.get_logs(0, limit=limit, from_date=from_date, to_date=to_date, log_level=level, process_name=process_name)

OpenOrchestrator/orchestrator/tabs/queue_tab.py

@@ -5,17 +5,19 @@ from nicegui import ui
 
 from OpenOrchestrator.database import db_util
 from OpenOrchestrator.database.queues import QueueStatus
+from OpenOrchestrator.orchestrator.datetime_input import DatetimeInput
 
 
-QUEUE_COLUMNS = (
+QUEUE_COLUMNS = [
     {'name': "Queue Name", 'label': "Queue Name", 'field': "Queue Name", 'align': 'left', 'sortable': True},
     {'name': "New", 'label': "New", 'field': "New", 'align': 'left', 'sortable': True},
     {'name': "In Progress", 'label': "In Progress", 'field': "In Progress", 'align': 'left', 'sortable': True},
     {'name': "Done", 'label': "Done", 'field': "Done", 'align': 'left', 'sortable': True},
-    {'name': "Failed", 'label': "Failed", 'field': "Failed", 'align': 'left', 'sortable': True}
-)
+    {'name': "Failed", 'label': "Failed", 'field': "Failed", 'align': 'left', 'sortable': True},
+    {'name': "Abandoned", 'label': "Abandoned", 'field': "Abandoned", 'align': 'left', 'sortable': True}
+]
 
-ELEMENT_COLUMNS = (
+ELEMENT_COLUMNS = [
     {'name': "Reference", 'label': "Reference", 'field': "Reference", 'align': 'left', 'sortable': True},
     {'name': "Status", 'label': "Status", 'field': "Status", 'align': 'left', 'sortable': True},
     {'name': "Data", 'label': "Data", 'field': "Data", 'align': 'left', 'sortable': True},
@@ -25,7 +27,7 @@ ELEMENT_COLUMNS = (
     {'name': "End Date", 'label': "End Date", 'field': "End Date", 'align': 'left', 'sortable': True},
     {'name': "Created By", 'label': "Created By", 'field': "Created By", 'align': 'left', 'sortable': True},
     {'name': "ID", 'label': "ID", 'field': "ID", 'align': 'left', 'sortable': True}
-)
+]
 
 
 # pylint: disable-next=too-few-public-methods
@@ -33,7 +35,7 @@ class QueueTab():
     """The 'Queues' tab object. It contains tables and buttons for dealing with queues."""
     def __init__(self, tab_name: str) -> None:
         with ui.tab_panel(tab_name):
-            self.queue_table = ui.table(title="Queues", columns=QUEUE_COLUMNS, rows=[], row_key='Queue Name', pagination=50).classes("w-full")
+            self.queue_table = ui.table(title="Queues", columns=QUEUE_COLUMNS, rows=[], row_key='Queue Name', pagination={'rowsPerPage': 50, 'sortBy': 'Queue Name'}).classes("w-full")
             self.queue_table.on("rowClick", self._row_click)
 
     def update(self):
@@ -48,7 +50,8 @@ class QueueTab():
                 "New": count.get(QueueStatus.NEW, 0),
                 "In Progress": count.get(QueueStatus.IN_PROGRESS, 0),
                 "Done": count.get(QueueStatus.DONE, 0),
-                "Failed": count.get(QueueStatus.FAILED, 0)
+                "Failed": count.get(QueueStatus.FAILED, 0),
+                "Abandoned": count.get(QueueStatus.ABANDONED, 0),
             }
             rows.append(row)
 
@@ -68,7 +71,8 @@ class QueuePopup():
 
         with ui.dialog(value=True).props('full-width full-height') as dialog, ui.card():
             with ui.row().classes("w-full"):
-                self._create_column_filter()
+                self.from_input = DatetimeInput("From Date", on_change=self._update, allow_empty=True).style('margin-left: 1rem')
+                self.to_input = DatetimeInput("To Date", on_change=self._update, allow_empty=True)
 
                 self.limit_select = ui.select(
                     options=[100, 200, 500, 1000, "All"],
@@ -76,9 +80,10 @@ class QueuePopup():
                     value=100,
                     on_change=self._update).classes("w-24")
 
-                ui.switch("Dense", on_change=lambda e: self._dense_table(e.value))
-
                 ui.space()
+
+                ui.switch("Dense", on_change=lambda e: self._dense_table(e.value))
+                self._create_column_filter()
                 ui.button(icon='refresh', on_click=self._update)
                 ui.button(icon="close", on_click=dialog.close)
             with ui.scroll_area().classes("h-full"):
@@ -111,6 +116,9 @@ class QueuePopup():
         if limit == 'All':
             limit = 1_000_000_000
 
-        queue_elements = db_util.get_queue_elements(self.queue_name, limit=limit)
+        from_date = self.from_input.get_datetime()
+        to_date = self.to_input.get_datetime()
+
+        queue_elements = db_util.get_queue_elements(self.queue_name, limit=limit, from_date=from_date, to_date=to_date)
         rows = [element.to_row_dict() for element in queue_elements]
         self.table.update_rows(rows)

OpenOrchestrator/orchestrator/tabs/settings_tab.py

@@ -10,8 +10,8 @@ from OpenOrchestrator.common.connection_frame import ConnectionFrame
 # pylint: disable-next=too-few-public-methods
 class SettingsTab():
     """The settings tab object for Orchestrator."""
-    def __init__(self, tab: ui.tab) -> None:
-        with ui.tab_panel(tab):
+    def __init__(self, tab_name: str) -> None:
+        with ui.tab_panel(tab_name):
             conn_frame = ConnectionFrame()
             with ui.row().classes("w-full"):
                 self.key_button = ui.button("Generate Key", on_click=conn_frame.new_key)

OpenOrchestrator/orchestrator/tabs/trigger_tab.py

@@ -7,9 +7,7 @@ from OpenOrchestrator.database import db_util
 from OpenOrchestrator.database.triggers import SingleTrigger, ScheduledTrigger, QueueTrigger, TriggerType
 from OpenOrchestrator.orchestrator.popups.trigger_popup import TriggerPopup
 
-COLUMNS = ("Trigger Name", "Type", "Status", "Process Name", "Last Run", "Next Run", "ID")
-
-COLUMNS = (
+COLUMNS = [
     {'name': "Trigger Name", 'label': "Trigger Name", 'field': "Trigger Name", 'align': 'left', 'sortable': True},
     {'name': "Type", 'label': "Type", 'field': "Type", 'align': 'left', 'sortable': True},
     {'name': "Status", 'label': "Status", 'field': "Status", 'align': 'left', 'sortable': True},
@@ -17,7 +15,7 @@ COLUMNS = (
     {'name': "Last Run", 'label': "Last Run", 'field': "Last Run", 'align': 'left', 'sortable': True},
     {'name': "Next_Run", 'label': "Next Run", 'field': "Next Run", 'align': 'left', 'sortable': True},
     {'name': "ID", 'label': "ID", 'field': "ID", 'align': 'left', 'sortable': True}
-)
+]
 
 
 # pylint disable-next=too-few-public-methods
@@ -30,9 +28,8 @@ class TriggerTab():
                 ui.button("New Scheduled Trigger", icon="add", on_click=lambda e: TriggerPopup(self, TriggerType.SCHEDULED))
                 ui.button("New Queue Trigger", icon="add", on_click=lambda e: TriggerPopup(self, TriggerType.QUEUE))
 
-            self.trigger_table = ui.table(COLUMNS, [], title="Triggers", pagination=50, row_key='ID').classes("w-full")
+            self.trigger_table = ui.table(COLUMNS, [], title="Triggers", pagination={'rowsPerPage': 50, 'sortBy': 'Trigger Name'}, row_key='ID').classes("w-full")
             self.trigger_table.on('rowClick', self._row_click)
-
             self.add_column_colors()
 
     def _row_click(self, event):
@@ -61,7 +58,7 @@ class TriggerTab():
             "body-cell-Status",
             '''
             <q-td key="Status" :props="props">
-                <q-badge v-if="{Running: 'green', Failed: 'red'}[props.value]" :color="{Running: 'green', Failed: 'red'}[props.value]">
+                <q-badge v-if="{Running: 'green', Pausing: 'orange', Failed: 'red'}[props.value]" :color="{Running: 'green', Pausing: 'orange', Failed: 'red'}[props.value]">
                     {{props.value}}
                 </q-badge>
                 <p v-else>

OpenOrchestrator/orchestrator_connection/connection.py

@@ -3,6 +3,8 @@ The easiest way to create an OrchestratorConnection object is to call the
 class method create_connection_from_args."""
 
 import sys
+from datetime import datetime
+
 from OpenOrchestrator.common import crypto_util
 from OpenOrchestrator.database import db_util
 from OpenOrchestrator.database.queues import QueueElement, QueueStatus
@@ -105,7 +107,7 @@ class OrchestratorConnection:
         """
         db_util.update_credential(credential_name, new_username, new_password)
 
-    def create_queue_element(self, queue_name: str, reference: str = None, data: str = None, created_by: str = None) -> QueueElement:
+    def create_queue_element(self, queue_name: str, reference: str | None = None, data: str | None = None, created_by: str | None = None) -> QueueElement:
         """Adds a queue element to the given queue.
 
         Args:
@@ -119,8 +121,8 @@ class OrchestratorConnection:
         """
         return db_util.create_queue_element(queue_name, reference, data, created_by)
 
-    def bulk_create_queue_elements(self, queue_name: str, references: tuple[str], data: tuple[str],
-                                   created_by: str = None) -> None:
+    def bulk_create_queue_elements(self, queue_name: str, references: tuple[str | None, ...], data: tuple[str | None, ...],
+                                   created_by: str | None = None) -> None:
         """Insert multiple queue elements into a queue in an optimized manner.
         The lengths of both 'references' and 'data' must be equal to the number of elements to insert.
 
@@ -135,7 +137,7 @@ class OrchestratorConnection:
         """
         db_util.bulk_create_queue_elements(queue_name, references, data, created_by)
 
-    def get_next_queue_element(self, queue_name: str, reference: str = None,
+    def get_next_queue_element(self, queue_name: str, reference: str | None = None,
                                set_status: bool = True) -> QueueElement | None:
         """Gets the next queue element from the given queue that has the status 'new'.
 
@@ -150,8 +152,8 @@ class OrchestratorConnection:
         """
         return db_util.get_next_queue_element(queue_name, reference, set_status)
 
-    def get_queue_elements(self, queue_name: str, reference: str = None, status: QueueStatus = None,
-                           offset: int = 0, limit: int = 100) -> tuple[QueueElement]:
+    def get_queue_elements(self, queue_name: str, reference: str | None = None, status: QueueStatus | None = None,
+                           offset: int = 0, limit: int = 100, from_date: datetime | None = None, to_date: datetime | None = None) -> tuple[QueueElement, ...]:
         """Get multiple queue elements from a queue. The elements are ordered by created_date.
 
         Args:
@@ -164,12 +166,12 @@ class OrchestratorConnection:
         Returns:
             tuple[QueueElement]: A tuple of queue elements.
         """
-        return db_util.get_queue_elements(queue_name, reference, status, offset, limit)
+        return db_util.get_queue_elements(queue_name, reference, status, from_date, to_date, offset, limit)
 
-    def set_queue_element_status(self, element_id: str, status: QueueStatus, message: str = None) -> None:
+    def set_queue_element_status(self, element_id: str, status: QueueStatus, message: str | None = None) -> None:
         """Set the status of a queue element.
         If the new status is 'in progress' the start date is noted.
-        If the new status is 'Done' or 'Failed' the end date is noted.
+        If the new status is 'Done', 'Failed' or 'Abandoned' the end date is noted.
 
         Args:
             element_id: The id of the queue element to change status on.

OpenOrchestrator/scheduler/connection_frame.py

@@ -91,6 +91,6 @@ class ConnectionFrame(ttk.Frame):
         """Creates a new encryption key and inserts it
         into the key entry.
         """
-        key = crypto_util.generate_key()
+        key = crypto_util.generate_key().decode()
         self.key_entry.delete(0, 'end')
         self.key_entry.insert(0, key)

OpenOrchestrator/scheduler/runner.py

@@ -16,7 +16,7 @@ class Job():
     """An object that holds information about a running job."""
     process: subprocess.Popen
     trigger: Trigger
-    process_folder: str
+    process_folder: str | None
 
 
 def poll_triggers(app) -> Job | None:
@@ -180,7 +180,7 @@ def end_job(job: Job) -> None:
     """Mark a job as ended in the triggers table
     in the database.
     If it's a single trigger it's marked as 'Done'
-    else it's marked as 'Idle'.
+    else it's marked as 'Idle' or 'Paused'.
 
     Args:
         job: The job whose trigger to mark as ended.
@@ -188,11 +188,12 @@ def end_job(job: Job) -> None:
     if isinstance(job.trigger, SingleTrigger):
         db_util.set_trigger_status(job.trigger.id, TriggerStatus.DONE)
 
-    elif isinstance(job.trigger, ScheduledTrigger):
-        db_util.set_trigger_status(job.trigger.id, TriggerStatus.IDLE)
-
-    elif isinstance(job.trigger, QueueTrigger):
-        db_util.set_trigger_status(job.trigger.id, TriggerStatus.IDLE)
+    elif isinstance(job.trigger, (ScheduledTrigger, QueueTrigger)):
+        current_status = db_util.get_trigger(job.trigger.id).process_status
+        if current_status == TriggerStatus.PAUSING:
+            db_util.set_trigger_status(job.trigger.id, TriggerStatus.PAUSED)
+        elif current_status == TriggerStatus.RUNNING:
+            db_util.set_trigger_status(job.trigger.id, TriggerStatus.IDLE)
 
     if job.process_folder:
         clear_folder(job.process_folder)

{OpenOrchestrator-1.2.0.dist-info → openorchestrator-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: OpenOrchestrator
-Version: 1.2.0
+Version: 1.3.1
 Summary: A package containing OpenOrchestrator and OpenOrchestrator Scheduler
 Author-email: ITK Development <itk-rpa@mkb.aarhus.dk>
 Project-URL: Homepage, https://github.com/itk-dev-rpa/OpenOrchestrator
@@ -11,13 +11,13 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cryptography >=41.0.3
-Requires-Dist: croniter >=1.4.1
-Requires-Dist: SQLAlchemy >=2.0.22
-Requires-Dist: pyodbc >=4.0.39
-Requires-Dist: nicegui ==1.4.12
+Requires-Dist: cryptography>=41.0.3
+Requires-Dist: cronsim>=2.6
+Requires-Dist: SQLAlchemy>=2.0.22
+Requires-Dist: pyodbc>=4.0.39
+Requires-Dist: nicegui==1.4.12
 Provides-Extra: dev
-Requires-Dist: pylint ; extra == 'dev'
+Requires-Dist: pylint; extra == "dev"
 
 # OpenOrchestrator