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

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/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.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.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
@@ -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
 

{OpenOrchestrator-1.3.0.dist-info → openorchestrator-1.3.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ OpenOrchestrator/common/crypto_util.py,sha256=VJ7fgxyjrW-bGQmsGVKXLUk98pcZGXG4fa
 OpenOrchestrator/common/datetime_util.py,sha256=4I70tz6WZGZ3xdxodJhdHJID14Y9myJTShFArOWCSpA,534
 OpenOrchestrator/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OpenOrchestrator/database/constants.py,sha256=ik6lY6IR8EOyKEg-N70X-0U654i3nFb3u-XWhqbUbJU,2404
-OpenOrchestrator/database/db_util.py,sha256=2M2j47LLj6OymS1J3Zw4q6b7xfgUzEhlcoVQbTpFuiE,28768
+OpenOrchestrator/database/db_util.py,sha256=YI6QU61LVm-WkMtLlHPDZMFkXsApRiEtD7jShDN9J8E,28736
 OpenOrchestrator/database/logs.py,sha256=h2BztjmDRhj8TACYN3LK5c9hIqn5xCs9m_LDUdYYHEk,1623
 OpenOrchestrator/database/queues.py,sha256=GYrTktg-RiHef-nFAXGAR9Ne0MIiRipxkAXv-CGc0_Q,2292
 OpenOrchestrator/database/triggers.py,sha256=cO3-dq5-Ib4P_F6p5EgU02XgaRaiIgs6CKqsY0SnDBk,4028
@@ -18,7 +18,7 @@ OpenOrchestrator/orchestrator/popups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 OpenOrchestrator/orchestrator/popups/constant_popup.py,sha256=58Yhyz7dW0I_1Vly0U54NEpwWHhEmwLr34z2nUpQAgs,3435
 OpenOrchestrator/orchestrator/popups/credential_popup.py,sha256=4uY4mhD-EGOnOCu9GN4JPecoCbKj067kdSs1kMutpv8,3909
 OpenOrchestrator/orchestrator/popups/generic_popups.py,sha256=wV5isJrwFGUBpDhDpuOzzURwU4NTp4l5mzMDg-KebKw,1061
-OpenOrchestrator/orchestrator/popups/trigger_popup.py,sha256=adCKg-nnUYq_1WWdJK0SI6mZhekYuUD-0VaaQZMgK1E,10063
+OpenOrchestrator/orchestrator/popups/trigger_popup.py,sha256=4cnZxzXieb473H4zqH37TvTsXyj0Bk2YwPURIcrVL_w,10034
 OpenOrchestrator/orchestrator/tabs/constants_tab.py,sha256=dSnfWbZeCndsd8vzVEyRJFEyEUPnP-RAY2YwCCi7Omw,2485
 OpenOrchestrator/orchestrator/tabs/logging_tab.py,sha256=kLl2QplqGEkvWwmXlr3wfZEFf-XXqctOeQN8hcpMBQw,3589
 OpenOrchestrator/orchestrator/tabs/queue_tab.py,sha256=ZjN_rWUZ99alunztxEMMI-OYIYvzMlulwmzuMoO2wlU,5820
@@ -32,8 +32,8 @@ OpenOrchestrator/scheduler/connection_frame.py,sha256=Ufltek3jyX0Fm20A5JxSGQPuft
 OpenOrchestrator/scheduler/run_tab.py,sha256=QP-hoZEJAI5A-T7kV1lFCftpTm_e_R3T8I2Fg9BHxnA,5779
 OpenOrchestrator/scheduler/runner.py,sha256=5F9eGlo8AsUx8WgeGxCe4k33NBPUzpsqTnVRS7_NaGQ,8348
 OpenOrchestrator/scheduler/settings_tab.py,sha256=AQxt5HxPn4sLfj-6GwyAQ8ffJ35D0PHLBVoi8W3tu2A,613
-OpenOrchestrator-1.3.0.dist-info/LICENSE,sha256=4-Kjm-gkbiOLCBYMzsVJZEepdsm2vk8QesNOASvi9mg,1068
-OpenOrchestrator-1.3.0.dist-info/METADATA,sha256=esgDD3fPQSnTXFRZMfDlg1kq18WpFr5ihCJtjVG-bhY,1938
-OpenOrchestrator-1.3.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-OpenOrchestrator-1.3.0.dist-info/top_level.txt,sha256=2btKMQESHuRC_ICbCjHTHH_-us2G7CyeskeaSTTL07Y,17
-OpenOrchestrator-1.3.0.dist-info/RECORD,,
+openorchestrator-1.3.1.dist-info/LICENSE,sha256=4-Kjm-gkbiOLCBYMzsVJZEepdsm2vk8QesNOASvi9mg,1068
+openorchestrator-1.3.1.dist-info/METADATA,sha256=bUdhPWKlsWDPn9DBm1ekvZMJ-QPly4hDrPNB2OIBdX8,1929
+openorchestrator-1.3.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+openorchestrator-1.3.1.dist-info/top_level.txt,sha256=2btKMQESHuRC_ICbCjHTHH_-us2G7CyeskeaSTTL07Y,17
+openorchestrator-1.3.1.dist-info/RECORD,,

{OpenOrchestrator-1.3.0.dist-info → openorchestrator-1.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any