added python handler, and reworked handler and conductor event/job discovery to be more modular

core/correctness/validation.py

@@ -12,12 +12,15 @@ from typing import Any, _SpecialForm, Union, Tuple, get_origin, get_args
 
 from core.correctness.vars import VALID_PATH_CHARS, get_not_imp_msg, \
     EVENT_TYPE, EVENT_PATH, JOB_EVENT, JOB_TYPE, JOB_ID, JOB_PATTERN, \
-    JOB_RECIPE, JOB_RULE, JOB_STATUS, JOB_CREATE_TIME
+    JOB_RECIPE, JOB_RULE, JOB_STATUS, JOB_CREATE_TIME, EVENT_RULE
 
 # Required keys in event dict
 EVENT_KEYS = {
     EVENT_TYPE: str,
-    EVENT_PATH: str
+    EVENT_PATH: str,
+    # TODO sort this
+    # Should be a Rule but can't import here due to circular dependencies
+    EVENT_RULE: Any
 }
 
 # Required keys in job dict

core/correctness/vars.py

@@ -41,9 +41,11 @@ SHA256 = "sha256"
 # meow events
 EVENT_TYPE = "event_type"
 EVENT_PATH = "event_path"
-WATCHDOG_TYPE = "watchdog"
+EVENT_RULE = "rule"
+
+# watchdog events
+EVENT_TYPE_WATCHDOG = "watchdog"
 WATCHDOG_BASE = "monitor_base"
-WATCHDOG_RULE = "rule_name"
 WATCHDOG_HASH = "file_hash"
 
 # inotify events
@@ -77,7 +79,7 @@ DIR_EVENTS = [
 
 # meow jobs
 JOB_TYPE = "job_type"
-PYTHON_TYPE = "python"
+JOB_TYPE_PYTHON = "python"
 PYTHON_FUNC = "func"
 PYTHON_EXECUTION_BASE = "exection_base"
 PYTHON_OUTPUT_DIR = "output_dir"