schd 0.1.0__tar.gz → 0.1.2__tar.gz

schd-0.1.2/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: schd
+Version: 0.1.2
+Summary: UNKNOWN
+Home-page: https://github.com/kevenli/schd
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: ApacheV2
+Description: UNKNOWN
+Platform: UNKNOWN

schd-0.1.2/schd/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.1.2'

schd-0.1.2/schd/cmds/addtrigger.py

@@ -0,0 +1,34 @@
+import asyncio
+import logging
+import sys
+from .base import CommandBase
+from schd.schedulers.remote import RemoteApiClient
+from schd.config import SchdConfig
+
+
+class AddTriggerCommand(CommandBase):
+    def add_arguments(self, parser):
+        parser.add_argument('--base-url', type=str, required=False, help='Base URL of the remote scheduler API')
+        parser.add_argument('--worker-name', type=str, required=False, help='Name of the worker to register')
+        parser.add_argument('--job-name', type=str, required=True, help='Name of the job to register')
+        parser.add_argument('--on-worker-name', type=str, required=False, help='Name of the worker to register')
+        parser.add_argument('--on-job-name', type=str, required=True, help='Name of the job to register')
+        parser.add_argument('--on-job-status', type=str, required=True, help='Status of the job to register')
+
+    def run(self, args, config:SchdConfig=None):
+        remote_url = args.base_url or config.scheduler_remote_host
+        client = RemoteApiClient(remote_url)
+        worker_name = args.worker_name or config.worker_name
+        job_name = args.job_name
+        # if on_worker_name is not provided, use current worker name
+        on_worker_name = args.on_worker_name or worker_name
+        on_job_name = args.on_job_name
+        on_job_status = args.on_job_status
+        asyncio.run(client.add_trigger(
+            worker_name=worker_name,
+            job_name=job_name,
+            on_worker_name=on_worker_name,
+            on_job_name=on_job_name,
+            on_job_status=on_job_status,
+        ))
+        logging.info(f"Trigger added successfully for job '{job_name}'")

{schd-0.1.0 → schd-0.1.2}/schd/cmds/daemon.py

@@ -8,12 +8,10 @@ from schd import __version__  as schd_version
 
 class DaemonCommand(CommandBase):
     def add_arguments(self, parser):
-        parser.add_argument('--config', '-c')
         parser.add_argument('--logfile')
 
-    def run(self, args):
-        config_file = args.config
-        print(f'starting schd, {schd_version}, config_file={config_file}')
+    def run(self, args, config):
+        print(f'starting schd, {schd_version}')
 
         if args.logfile:
             log_stream = open(args.logfile, 'a', encoding='utf8')
@@ -23,4 +21,4 @@ class DaemonCommand(CommandBase):
             log_stream = sys.stdout
 
         logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s %(levelname)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', stream=log_stream)
-        asyncio.run(run_daemon(config_file))
+        asyncio.run(run_daemon(config))

{schd-0.1.0 → schd-0.1.2}/schd/cmds/schd.py

@@ -5,12 +5,14 @@ from schd.config import ConfigFileNotFound, read_config
 from schd import __version__ as schd_version
 from .daemon import DaemonCommand
 from .run import RunCommand
+from .addtrigger import AddTriggerCommand
 
 
 commands = {
     'daemon': DaemonCommand(),
     'run': RunCommand(),
     'jobs': JobsCommand(),
+    'addtrigger': AddTriggerCommand(),
 }
 
 def main():
@@ -18,7 +20,7 @@ def main():
     parser = argparse.ArgumentParser('schd')
     parser.add_argument('--version', action='store_true', default=False)
     parser.add_argument('--config')
-    sub_command_parsers = parser.add_subparsers(dest='cmd')
+    sub_command_parsers = parser.add_subparsers(dest='cmd', help='sub commands')
 
     for cmd, cmd_obj in commands.items():
         sub_command_parser = sub_command_parsers.add_parser(cmd)

{schd-0.1.0 → schd-0.1.2}/schd/cmds/scsendmail.py

@@ -53,11 +53,22 @@ def main():
             sys.exit(1)
 
     # Load config from environment or config file
-    schd_config = read_config(args.config)
-    logging.debug(schd_config.email)
-    service = EmailService.from_config(schd_config.email)
+    try:
+        schd_config = read_config(args.config)
+        email_config = schd_config.email
+    except ConfigFileNotFound:
+        if args.config:
+            print(f"Config file not found: {args.config}", file=sys.stderr)
+            return sys.exit(1)
+        
+        logging.warning("No config file found, using default email config")
+        # Use default email config if no config file is provided
+        email_config = EmailConfig.from_dict({})
+        
+    logging.debug(email_config)
+    service = EmailService.from_config(email_config)
 
-    to_emails = parse_recipients(args.recipients)
+    to_emails = parse_recipients(args.recipients) or [email_config.to_addr]
     cc_emails = parse_recipients(args.cc)
     bcc_emails = parse_recipients(args.bcc)
     attachments = args.attachments or []

{schd-0.1.0 → schd-0.1.2}/schd/config.py

@@ -120,9 +120,9 @@ class JobConfig(ConfigValue):
 @dataclass
 class SchdConfig(ConfigValue):
     jobs: Dict[str, JobConfig] = field(default_factory=dict)
-    scheduler_cls: str = 'LocalScheduler'
-    scheduler_remote_host: Optional[str] = None
-    worker_name: str = 'local'
+    scheduler_cls: str = field(metadata={'env_var': 'SCHD_SCHEDULER_CLS'}, default='LocalScheduler')
+    scheduler_remote_host: Optional[str] = field(metadata={'env_var': 'SCHD_SCHEDULER_REMOTE_HOST'}, default=None)
+    worker_name: str = field(metadata={'env_var': 'SCHD_WORKER_NAME'}, default='local')
     email: EmailConfig = field(default_factory=lambda: EmailConfig.from_dict({}))
 
     def __getitem__(self,key):

{schd-0.1.0 → schd-0.1.2}/schd/scheduler.py

@@ -262,16 +262,16 @@ class LocalScheduler:
 
 
 def build_scheduler(config:SchdConfig):
-    scheduler_cls = os.environ.get('SCHD_SCHEDULER_CLS') or config.scheduler_cls
+    scheduler_cls = config.scheduler_cls
     
     if scheduler_cls == 'LocalScheduler':
         scheduler = LocalScheduler(config)
     elif scheduler_cls == 'RemoteScheduler':
         logger.info('scheduler_cls: %s', scheduler_cls)
-        scheduler_remote_host = os.environ.get('SCHD_SCHEDULER_REMOTE_HOST') or config.scheduler_remote_host
+        scheduler_remote_host = config.scheduler_remote_host
         assert scheduler_remote_host, 'scheduler_remote_host cannot be none'
         logger.info('scheduler_remote_host: %s ', scheduler_remote_host)
-        worker_name = os.environ.get('SCHD_WORKER_NAME') or config.worker_name
+        worker_name = config.worker_name
         assert worker_name, 'worker_name cannot be none'
         logger.info('worker_name: %s ', worker_name)
         scheduler = RemoteScheduler(worker_name=worker_name, remote_host=scheduler_remote_host)
@@ -280,8 +280,7 @@ def build_scheduler(config:SchdConfig):
     return scheduler
 
 
-async def run_daemon(config_file=None):
-    config = read_config(config_file=config_file)
+async def run_daemon(config):
     scheduler = build_scheduler(config)
     await scheduler.init()
 
@@ -329,11 +328,12 @@ async def main():
     parser.add_argument('--logfile')
     parser.add_argument('--config', '-c')
     args = parser.parse_args()
-    config_file = args.config
 
     logging.basicConfig(level=logging.DEBUG)
 
-    print(f'starting schd, {schd_version}, config_file={config_file}')
+    config = read_config(args.config)
+    print(f'starting schd, {schd_version}')
+    
 
     if args.logfile:
         log_stream = open(args.logfile, 'a', encoding='utf8')
@@ -343,7 +343,7 @@ async def main():
         log_stream = sys.stdout
 
     logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s - %(levelname)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', stream=log_stream)
-    await run_daemon(config_file)
+    await run_daemon(config)
 
 
 if __name__ == '__main__':

{schd-0.1.0 → schd-0.1.2}/schd/schedulers/remote.py

@@ -79,6 +79,18 @@ class RemoteApiClient:
                     logger.info("Status: %d", resp.status)
                     logger.info("Response: %s", await resp.text())
 
+    async def add_trigger(self, worker_name, job_name, on_job_name, on_worker_name=None, on_job_status='ALL'):
+        url = urljoin(self._base_url, f'/api/workers/{worker_name}/jobs/{job_name}/triggers')
+        async with aiohttp.ClientSession() as session:
+            post_data={
+                'on_job_name': on_job_name,
+                'on_worker_name': on_worker_name,
+                'on_job_status': on_job_status
+            }
+            async with session.post(url, json=post_data) as response:
+                response.raise_for_status()
+                result = await response.json()
+                return result
 
 class RemoteScheduler:
     def __init__(self, worker_name:str, remote_host:str):

schd-0.1.2/schd.egg-info/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: schd
+Version: 0.1.2
+Summary: UNKNOWN
+Home-page: https://github.com/kevenli/schd
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: ApacheV2
+Description: UNKNOWN
+Platform: UNKNOWN

{schd-0.1.0 → schd-0.1.2}/schd.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ schd.egg-info/entry_points.txt
 schd.egg-info/requires.txt
 schd.egg-info/top_level.txt
 schd/cmds/__init__.py
+schd/cmds/addtrigger.py
 schd/cmds/base.py
 schd/cmds/daemon.py
 schd/cmds/jobs.py

{schd-0.1.0 → schd-0.1.2}/schd.egg-info/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 schd = schd.cmds.schd:main
 scsendmail = schd.cmds.scsendmail:main
+

{schd-0.1.0 → schd-0.1.2}/setup.py

@@ -7,7 +7,7 @@ def read_requirements():
 
 setup(
     name="schd",
-    version="0.1.0",
+    version="0.1.2",
     url="https://github.com/kevenli/schd",
     packages=find_packages(exclude=('tests', 'tests.*')),
     install_requires=['apscheduler<4.0', 'pyaml', 'aiohttp'],

schd-0.1.0/PKG-INFO

@@ -1,11 +0,0 @@
-Metadata-Version: 2.4
-Name: schd
-Version: 0.1.0
-Home-page: https://github.com/kevenli/schd
-License: ApacheV2
-Requires-Dist: apscheduler<4.0
-Requires-Dist: pyaml
-Requires-Dist: aiohttp
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist

schd-0.1.0/schd/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.1.0'

schd-0.1.0/schd.egg-info/PKG-INFO

@@ -1,11 +0,0 @@
-Metadata-Version: 2.4
-Name: schd
-Version: 0.1.0
-Home-page: https://github.com/kevenli/schd
-License: ApacheV2
-Requires-Dist: apscheduler<4.0
-Requires-Dist: pyaml
-Requires-Dist: aiohttp
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist