cicada 0.5.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

cicada/cli.py

@@ -3,6 +3,7 @@
 import argparse
 import sys
 import inspect
+from pkg_resources import get_distribution
 
 from cicada.lib import utils
 
@@ -15,6 +16,8 @@ from cicada.commands import exec_schedule
 from cicada.commands import spread_schedules
 from cicada.commands import archive_schedule_log
 from cicada.commands import ping_slack
+from cicada.commands import list_schedules
+from cicada.commands import delete_schedule
 
 
 @utils.named_exception_handler("Cicada")
@@ -32,6 +35,9 @@ class Cicada:
             "spread_schedules",
             "archive_schedule_log",
             "ping_slack",
+            "list_schedule_ids",
+            "delete_schedule",
+            "version",
         ]
 
         parser = argparse.ArgumentParser(
@@ -239,6 +245,39 @@ class Cicada:
         args = parser.parse_args(sys.argv[2:])
         ping_slack.main(args.text)
 
+    @staticmethod
+    def list_schedule_ids():
+        """List schedule ids of all schedules"""
+        parser = argparse.ArgumentParser(
+            allow_abbrev=False,
+            add_help=True,
+            prog=inspect.stack()[0][3],
+            description="List schedule ids of all schedules",
+        )
+        if len(sys.argv) >= 3:
+            parser.print_help(sys.stdout)
+            sys.exit(0)
+        list_schedules.main()
+
+    @staticmethod
+    def delete_schedule():
+        """Delete a schedule using schedule_id"""
+        parser = argparse.ArgumentParser(
+            allow_abbrev=False,
+            add_help=True,
+            prog=inspect.stack()[0][3],
+            description="Delete a schedule using schedule_id",
+        )
+        parser.add_argument("--schedule_id", type=str, required=True, help="Id of the schedule")
+        # now that we're inside a subcommand, ignore the first TWO args
+        args = parser.parse_args(sys.argv[2:])
+        delete_schedule.main(args.schedule_id)
+
+    @staticmethod
+    def version():
+        """Return version of cicada package"""
+        print(get_distribution("cicada").version)
+
 
 def main():
     """Cicada agent CLI."""

cicada/commands/delete_schedule.py

@@ -0,0 +1,22 @@
+"""Delete a schedule using schedule_id."""
+
+import sys
+
+from tabulate import tabulate
+
+from cicada.lib import postgres
+from cicada.lib import scheduler
+from cicada.lib import utils
+
+
+@utils.named_exception_handler("delete_schedule")
+def main(schedule_id, dbname=None):
+    """Delete a schedule using schedule_id."""
+
+    db_conn = postgres.db_cicada(dbname)
+    db_cur = db_conn.cursor()
+    scheduler.delete_schedule(db_cur, str(schedule_id))
+    db_cur.close()
+    db_conn.close()
+
+    print("schedule_id '" + str(schedule_id) + "' is deleted!")

cicada/commands/exec_schedule.py

@@ -197,7 +197,6 @@ def main(schedule_id, dbname=None):
                         db_conn = postgres.db_cicada(dbname)
                         db_cur = db_conn.cursor()
                         if get_abort_running(db_cur, schedule_id):
-
                             # Terminate main process
                             returncode = -15
                             error_detail = "Cicada abort_running"

cicada/commands/list_schedules.py

@@ -0,0 +1,19 @@
+"""List all schedule ID's."""
+
+from tabulate import tabulate
+
+from cicada.lib import postgres
+from cicada.lib import scheduler
+from cicada.lib import utils
+
+
+@utils.named_exception_handler("list_schedule_ids")
+def main(dbname=None):
+    """Show all Cicada schedule ID's."""
+    db_conn = postgres.db_cicada(dbname)
+    db_cur = db_conn.cursor()
+    obj_schedules = scheduler.get_all_schedule_ids(db_cur)
+    db_cur.close()
+    db_conn.close()
+    print("")
+    print(tabulate(obj_schedules, headers=["Server ID", "Schedule ID", "Description"]))

cicada/commands/spread_schedules.py

@@ -93,7 +93,6 @@ def main(spread_details, dbname=None):
     last_week_schedules_by_load = get_last_week_schedules_by_load(db_cur, from_server_ids)
 
     for schedule_id in last_week_schedules_by_load:
-
         current_schedule_details = scheduler.get_schedule_details(db_cur, schedule_id)
         new_schedule_details = current_schedule_details.copy()
         new_schedule_details["server_id"] = valid_target_servers[next_enabled_server]

cicada/commands/upsert_schedule.py

@@ -28,7 +28,6 @@ def main(schedule_details, dbname=None):
     current_schedule_details = scheduler.get_schedule_details(db_cur, schedule_details["schedule_id"])
 
     if not current_schedule_details:
-
         if schedule_details["interval_mask"] is None:
             print("ERROR: interval_mask is required for new schedule")
             sys.exit(1)

cicada/lib/postgres.py

@@ -1,4 +1,5 @@
 """Backend PostgreSQL database library"""
+
 # 2015-07-01 Louis Pieterse
 
 import psycopg2
@@ -18,7 +19,7 @@ def db_cicada(dbname=None):
     user = definitions["db_cicada"]["user"]
     password = definitions["db_cicada"]["password"]
 
-    conn = psycopg2.connect(host=host, port=port, dbname=dbname, user=user, password=password)
+    conn = psycopg2.connect(host=host, port=port, dbname=dbname, user=user, password=password, sslmode="prefer")
     conn.autocommit = True
 
     return conn

cicada/lib/scheduler.py

@@ -25,7 +25,6 @@ def get_host_details():
         hostname = hostname[: hostname.find(".")]
 
     fqdn = socket.getfqdn()
-
     ip4_address = socket.gethostbyname(fqdn)
 
     host_details = {"hostname": hostname, "fqdn": fqdn, "ip4_address": ip4_address}
@@ -153,7 +152,7 @@ def insert_schedule_details(db_cur, schedule_details):
     if schedule_details["schedule_description"] is not None:
         sqlquery = sqlquery + " ,'" + str(schedule_details["schedule_description"]) + "'"
     if schedule_details["server_id"] is None:
-        sqlquery = sqlquery + " ,(SELECT MIN(server_id) FROM servers WHERE is_enabled=1)"
+        sqlquery = sqlquery + " ,(SELECT MAX(server_id) FROM servers WHERE is_enabled=1)"
     else:
         sqlquery = sqlquery + " ," + str(schedule_details["server_id"])
     if schedule_details["schedule_order"] is not None:
@@ -348,3 +347,17 @@ def get_all_schedules(db_cur, server_id, is_async):
                 obj_schedules.append(schedule_id)
 
     return obj_schedules
+
+
+def get_all_schedule_ids(db_cur):
+    sqlquery = "SELECT server_id, schedule_id, schedule_description from schedules"
+    db_cur.execute(sqlquery)
+    cur_schedules = db_cur
+
+    schedule_ids = cur_schedules.fetchall()
+    return schedule_ids
+
+
+def delete_schedule(db_cur, schedule_id):
+    sqlquery = f"DELETE from schedules WHERE schedule_id = '{schedule_id}'"
+    db_cur.execute(sqlquery)

{cicada-0.5.1.dist-info → cicada-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cicada
-Version: 0.5.1
+Version: 0.8.2
 Summary: Lightweight, agent-based, distributed scheduler
 Home-page: https://github.com/transferwise/cicada
 Author: Wise
@@ -8,19 +8,19 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3 :: Only
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: psycopg2-binary (==2.9.5)
-Requires-Dist: pyyaml (==6.0)
-Requires-Dist: croniter (==1.3.8)
-Requires-Dist: tabulate (==0.9.0)
-Requires-Dist: slack-sdk (==3.19.5)
-Requires-Dist: backoff (==2.2.1)
+Requires-Dist: psycopg2-binary ==2.9.*
+Requires-Dist: pyyaml ==6.0.*
+Requires-Dist: croniter ==2.0.*
+Requires-Dist: tabulate ==0.9.*
+Requires-Dist: slack-sdk ==3.30.*
+Requires-Dist: backoff ==2.2.*
 Provides-Extra: dev
-Requires-Dist: pytest (==7.2.0) ; extra == 'dev'
-Requires-Dist: pytest-cov (==4.0.0) ; extra == 'dev'
-Requires-Dist: pytest-mock (==3.10.0) ; extra == 'dev'
-Requires-Dist: black (==22.12.0) ; extra == 'dev'
-Requires-Dist: flake8 (==6.0.0) ; extra == 'dev'
-Requires-Dist: freezegun (==1.2.2) ; extra == 'dev'
+Requires-Dist: pytest ==8.2.* ; extra == 'dev'
+Requires-Dist: pytest-cov ==5.0.* ; extra == 'dev'
+Requires-Dist: pytest-mock ==3.14.* ; extra == 'dev'
+Requires-Dist: black ==24.4.* ; extra == 'dev'
+Requires-Dist: flake8 ==7.1.* ; extra == 'dev'
+Requires-Dist: freezegun ==1.5.* ; extra == 'dev'
 
 # Cicada scheduler
 

cicada-0.8.2.dist-info/RECORD

@@ -0,0 +1,24 @@
+cicada/__init__.py,sha256=3PATrC60ZHrUA8gAg8oiZGrtrQ7bWHp7VeYfp3pyaVg,30
+cicada/cli.py,sha256=-2XcWtwRIx8tb0cisdhBT6MFue8ANCOsVrQNIqme_9s,10148
+cicada/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cicada/commands/archive_schedule_log.py,sha256=S0qcFajRcwtXMlOTPkHduXqdHQspzM046UAQxN8oPVo,2231
+cicada/commands/delete_schedule.py,sha256=iNoE243gX9M3bBxOsgiusga5At5UnXIUpHkElsNz8-w,548
+cicada/commands/exec_schedule.py,sha256=ywQEPPBKjzUe2S6Di45F1Iir7TblJ4bnd3psP9oCKMQ,8868
+cicada/commands/exec_server_schedules.py,sha256=5TyDsQiUH9dx59GLO33aekSoUNO7g_HcHVvJW1yLjj8,1240
+cicada/commands/list_schedules.py,sha256=vzRQVAs2yzsuyGV9yeQEpgmvFL5zIZlyMT-jbR7AybA,545
+cicada/commands/list_server_schedules.py,sha256=-uxikgecitRh8YYe0WgL1AOLO6cfow1_lqmPeSVz4xE,1910
+cicada/commands/ping_slack.py,sha256=fHOK6QjD7FfP7xa-XYuEuYAF6U5iojQkAkf9Qd66vfs,211
+cicada/commands/register_server.py,sha256=OfOj72nqs0kMqzLKfscvRb8orWeuiYCke1-md0ng-nQ,656
+cicada/commands/show_schedule.py,sha256=fC7jRFN5xrhKEq-9N_evEdBavbS7KtQ5dfgg4IWAPl8,769
+cicada/commands/spread_schedules.py,sha256=N8ni0n9mFKenC4iiBgw7X9QPV3XZf9L0u5sKvUbajH8,4507
+cicada/commands/upsert_schedule.py,sha256=pacujqNF7lzgHCG9XR4JkSlitV1s99par9hA-dMul8o,3740
+cicada/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cicada/lib/postgres.py,sha256=DTPKRNYTi5yMC6xPPhX2l4U8hpSfTfciE77pfjd_H24,840
+cicada/lib/scheduler.py,sha256=oAidM2NgkOqQ6QzbAA2x-4lVA9K4pJMsPvm-hECgxo8,13201
+cicada/lib/utils.py,sha256=qlXe6DnKJTqrdWeIuj_0fEQ-VhMJSzentf28KV-7uOs,2247
+cicada-0.8.2.dist-info/LICENSE,sha256=jj_FHHgRjgQBUlPrrRsnr50zEOAhlg6gqU7mEqisyB0,10844
+cicada-0.8.2.dist-info/METADATA,sha256=iBxdfaTSf6akdljQvj3nAHNNjBQYAQd01YTqZ0LSs9E,5669
+cicada-0.8.2.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+cicada-0.8.2.dist-info/entry_points.txt,sha256=Dzf3ul9hWITR4nfTDyNCtFTcQOOE57mD1x2qVniUWdE,43
+cicada-0.8.2.dist-info/top_level.txt,sha256=xZCtaMDbCi2CKA5PExum99ZU54IJg5iognV-k44a1W0,7
+cicada-0.8.2.dist-info/RECORD,,

{cicada-0.5.1.dist-info → cicada-0.8.2.dist-info}/WHEEL

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

cicada-0.5.1.dist-info/RECORD

@@ -1,22 +0,0 @@
-cicada/__init__.py,sha256=3PATrC60ZHrUA8gAg8oiZGrtrQ7bWHp7VeYfp3pyaVg,30
-cicada/cli.py,sha256=DJlC7hWZeVO70gTMVR4tF7l42AswVZK1xoSG87nmkC0,8786
-cicada/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cicada/commands/archive_schedule_log.py,sha256=S0qcFajRcwtXMlOTPkHduXqdHQspzM046UAQxN8oPVo,2231
-cicada/commands/exec_schedule.py,sha256=Ou1YF-gmX58NIPECL71yGerFYD12545YpBVctnd8e-o,8869
-cicada/commands/exec_server_schedules.py,sha256=5TyDsQiUH9dx59GLO33aekSoUNO7g_HcHVvJW1yLjj8,1240
-cicada/commands/list_server_schedules.py,sha256=-uxikgecitRh8YYe0WgL1AOLO6cfow1_lqmPeSVz4xE,1910
-cicada/commands/ping_slack.py,sha256=fHOK6QjD7FfP7xa-XYuEuYAF6U5iojQkAkf9Qd66vfs,211
-cicada/commands/register_server.py,sha256=OfOj72nqs0kMqzLKfscvRb8orWeuiYCke1-md0ng-nQ,656
-cicada/commands/show_schedule.py,sha256=fC7jRFN5xrhKEq-9N_evEdBavbS7KtQ5dfgg4IWAPl8,769
-cicada/commands/spread_schedules.py,sha256=f1A8XlPMJjVVoyY-BkV59ecoyhOOsueQBuD77caea4o,4508
-cicada/commands/upsert_schedule.py,sha256=wsypHmTaFvldDqMeC7jiPJ0vcA106_56WDZRVMODt_4,3741
-cicada/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cicada/lib/postgres.py,sha256=OhZmr0w4B4ktV3Sev3ybr7l7mcG6XKhcvkwQT1IVwes,821
-cicada/lib/scheduler.py,sha256=qzh_Xx0l86B9GkXzWCnkIIGkdh9p2RmiKIoSS6s6auE,12808
-cicada/lib/utils.py,sha256=qlXe6DnKJTqrdWeIuj_0fEQ-VhMJSzentf28KV-7uOs,2247
-cicada-0.5.1.dist-info/LICENSE,sha256=jj_FHHgRjgQBUlPrrRsnr50zEOAhlg6gqU7mEqisyB0,10844
-cicada-0.5.1.dist-info/METADATA,sha256=Qx7VUcL1ckL3TGDOmu5hcpSYzc5RJ4G-55vM1c9X9lY,5692
-cicada-0.5.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-cicada-0.5.1.dist-info/entry_points.txt,sha256=Dzf3ul9hWITR4nfTDyNCtFTcQOOE57mD1x2qVniUWdE,43
-cicada-0.5.1.dist-info/top_level.txt,sha256=xZCtaMDbCi2CKA5PExum99ZU54IJg5iognV-k44a1W0,7
-cicada-0.5.1.dist-info/RECORD,,