Merge pull request #10 from simonsobs/refactor

remove old policy handlers and add rest handler

Author: guanyilun

.gitignore

@@ -8,3 +8,4 @@ build
 htmlcov
 pycache
 *.egg-info
+.env

requirements.txt

@@ -4,4 +4,5 @@ gunicorn
 numpy
 pyyaml
 pandas
-schedlib @ git+https://github.com/simonsobs/scheduler.git@v0.1.0
+python-dotenv
+requests

src/scheduler_server/app.py

@@ -6,12 +6,13 @@
 from datetime import datetime, timezone
 import json
 import traceback
+import dotenv
+dotenv.load_dotenv()
 
 from . import handler, utils
-from .configs import get_config
 
 import logging
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
 
 app = flask.Flask(__name__)
 
@@ -56,7 +57,10 @@ def schedule():
         return response
 
     # policy is a json string, so parse it now. The json
-    # has the form {"policy": "name", "preset": "config_preset_name", "config": {...}, }
+    # has the form {"policy": "name", "preset": "preset_name", "config": {...}, }
+    # preset represents a predefined set of config values which will be merged
+    # with the user config. If no preset is specified, the policy name is used.
+
     try:
         policy_dict = json.loads(policy)
     except json.JSONDecodeError:
@@ -69,25 +73,30 @@ def schedule():
 
     policy_name = policy_dict.get('policy', 'dummy')
     user_policy_config = policy_dict.get('config', {})
-    # unless specified, use policy_name to find default config for policy
-    config_preset_name = policy_dict.get('preset', policy_name)
+
+    # find if any config preset is specified
+    config_preset_name = policy_dict.get('preset', None)
 
     # check policy is supported
     if policy_name not in handler.HANDLERS:
         response = flask.jsonify({
             'status': 'error',
-            'message': f'Invalid policy {policy_name}'
+            'message': f'Unsupported policy {policy_name}'
         })
         response.status_code = 400
         return response
 
     try:
         # load policy config preset and merge with user config
-        policy_config = get_config(config_preset_name)
-        utils.nested_update(policy_config, user_policy_config, new_keys_allowed=True)
+        if config_preset_name is None:
+            policy_config = user_policy_config
+        else:
+            policy_config = get_preset_config(config_preset_name)
+            utils.nested_update(policy_config, user_policy_config, new_keys_allowed=True)
 
         # get scheduler commands
         commands = handler.get_handler(policy_name)(t0, t1, policy_config)
+
     except Exception as e:
         response = flask.jsonify({
             'status': 'error',
@@ -103,4 +112,31 @@ def schedule():
         'message': 'Success'
     })
     response.status_code = 200
-    return response
+    return response
+
+def get_preset_config(preset_name, default={}):
+    presets = {
+        'rest.satp1': {
+            'url': os.environ['NOCODB_SATP1_URL'],
+            'headers': {
+                'accept': 'application/json',
+                'xc-token': os.environ["NOCODB_TOKEN"],
+            },
+            'queries': {
+                'sort': '-from',
+                'fields': 'program,from,to,config,status'
+            }
+        },
+        'rest.satp3': {
+            'url': os.environ['NOCODB_SATP3_URL'],
+            'headers': {
+                'accept': 'application/json',
+                'xc-token': os.environ["NOCODB_TOKEN"],
+            },
+            'queries': {
+                'sort': '-from',
+                'fields': 'program,from,to,config,status'
+            }
+        }
+    }
+    return presets.get(preset_name, default)