OpenOrchestrator 1.3.0__tar.gz → 1.3.1__tar.gz

{openorchestrator-1.3.0 → openorchestrator-1.3.1}/OpenOrchestrator/database/db_util.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from typing import TypeVar, ParamSpec
 from uuid import UUID
 
-from croniter import croniter  # type: ignore
+from cronsim import CronSim
 from sqlalchemy import Engine, create_engine, select, insert, desc
 from sqlalchemy import exc as alc_exc
 from sqlalchemy import func as alc_func
@@ -619,7 +619,7 @@ def begin_scheduled_trigger(trigger_id: UUID | str) -> bool:
 
         trigger.process_status = TriggerStatus.RUNNING
         trigger.last_run = datetime.now()
-        trigger.next_run = croniter(trigger.cron_expr, datetime.now()).get_next(datetime)
+        trigger.next_run = next(CronSim(trigger.cron_expr, datetime.now()))
 
         session.commit()
         return True

{openorchestrator-1.3.0 → openorchestrator-1.3.1}/OpenOrchestrator/orchestrator/popups/trigger_popup.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from datetime import datetime
 
 from nicegui import ui
-from croniter import croniter, CroniterBadCronError  # type: ignore
+from cronsim import CronSim, CronSimError
 
 from OpenOrchestrator.orchestrator.datetime_input import DatetimeInput
 from OpenOrchestrator.database import db_util
@@ -75,9 +75,9 @@ 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}
@@ -118,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

{openorchestrator-1.3.0 → openorchestrator-1.3.1}/OpenOrchestrator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: OpenOrchestrator
-Version: 1.3.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
@@ -12,7 +12,7 @@ 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: cronsim>=2.6
 Requires-Dist: SQLAlchemy>=2.0.22
 Requires-Dist: pyodbc>=4.0.39
 Requires-Dist: nicegui==1.4.12

{openorchestrator-1.3.0 → openorchestrator-1.3.1}/OpenOrchestrator.egg-info/requires.txt

@@ -1,5 +1,5 @@
 cryptography>=41.0.3
-croniter>=1.4.1
+cronsim>=2.6
 SQLAlchemy>=2.0.22
 pyodbc>=4.0.39
 nicegui==1.4.12

{openorchestrator-1.3.0 → openorchestrator-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: OpenOrchestrator
-Version: 1.3.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
@@ -12,7 +12,7 @@ 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: cronsim>=2.6
 Requires-Dist: SQLAlchemy>=2.0.22
 Requires-Dist: pyodbc>=4.0.39
 Requires-Dist: nicegui==1.4.12

{openorchestrator-1.3.0 → openorchestrator-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenOrchestrator"
-version = "1.3.0"
+version = "1.3.1"
 authors = [
   { name="ITK Development", email="itk-rpa@mkb.aarhus.dk" },
 ]
@@ -18,7 +18,7 @@ classifiers = [
 ]
 dependencies = [
     "cryptography >= 41.0.3",
-    "croniter >= 1.4.1",
+    "cronsim >= 2.6",
     "SQLAlchemy >= 2.0.22",
     "pyodbc >= 4.0.39",
     "nicegui == 1.4.12"