Refactored config. parsing; Added support for v1.8

Author: JainTwinkle

utils/ray-res-config.py

@@ -8,7 +8,7 @@
 from parse import *
 from optparse import OptionParser
 
-versions_list=['1.0.0', '1.1.0','1.2.0','1.3.0','1.4.0','1.4.1','1.5.0', '1.6.0', '1.7.0']
+versions_list=['1.0.0', '1.1.0','1.2.0','1.3.0','1.4.0','1.4.1','1.5.0', '1.6.0', '1.7.0', '1.8.0']
 
 res_modes_list=['relaxed', 'recommended', 'strict', 'custom']
 
@@ -57,7 +57,7 @@ def dump_conf(ray_version, res_mode, overwrite, dirname='configs'):
     if (not os.path.exists(file_path)) or overwrite:
         fd = open(file_path, "w+")
         fd.write("# please edit value_for_this_mode to change any configuration\n")
-        yaml.dump(Ray_conf[ray_version], fd)
+        yaml.dump(Ray_conf[ray_version],  fd, width=float('inf'))
 
 # Que: is dumping in json format better or YAML?
 def read_conf(ray_version, res_mode, dirname='configs/'):
@@ -82,43 +82,59 @@ def read_conf(ray_version, res_mode, dirname='configs/'):
         print(exception)
 
 
-def put_conf(ray_version, conf_name, conf_type, conf_default, conf_env):
+def put_conf(ray_version, conf_name, conf_type, conf_default, conf_env, conf_str):
     # Ray_conf[version][conf_name][type/default/env]
     Ray_conf[ray_version][conf_name] = dict()
     Ray_conf[ray_version][conf_name]['type'] = conf_type
     Ray_conf[ray_version][conf_name]['default'] = conf_default
     Ray_conf[ray_version][conf_name]['value_for_this_mode'] = conf_default
     Ray_conf[ray_version][conf_name]['env'] = conf_env
+    Ray_conf[ray_version][conf_name]['config_string'] = conf_str
+
+# parse env. variable from config string
+def get_env(conf_default):
+    conf_env = ""
+    if 'getenv' in conf_default:
+        _,conf_env,_ = parse('{}etenv("{}"){}', conf_default)
+    return conf_env
+
+# get the default value of the configuration
+def get_default(conf_default, conf_type):
+    if 'env_' in conf_default:
+        _, conf_default = parse('{}, {})', conf_default)
+    elif '?' in conf_default:
+        if_str, true_str, false_str = parse('{} ? {} : {})', conf_default)
+        if '!=' in if_str:
+            conf_default = false_str
+        else:
+            conf_default = true_str
+    elif 'std::string' in conf_default:
+        is_eq, conf_default = parse('{} std::string("{}"))', conf_default)
+        # if the condition is != (not equal) then Ray expect the opposite value
+        if is_eq[-2:] == "!=":
+            if conf_type == "bool":
+                conf_default = str(not int(conf_default))
+    else:
+        print ("Unable to parse string %s" % conf_default)
+        sys.exit(-1)
+
+    return conf_default
 
 def parse_ray_config(ray_version, sig_str, is_multiline):
     # print("In parse_ray_config: %s" % sig_str)
     conf_type, conf_name, conf_default = parse("RAY_CONFIG({}, {}, {}", sig_str)
 
     # replace if default has comment in it
     conf_default = re.sub('(?:/\*(.*?)\*/)', '', conf_default)
-    conf_env = ''
+    conf_str = ''
     if  is_multiline:
-        # get the default value and associated env variable
-        if '?' in conf_default:
-            # TODO: make the parsing conditions more general
-            if 'RAY_preallocate_plasma_memory' in conf_default and ray_version in ['1.5.0', '1.6.0', '1.7.0']:
-                conf_env = 'RAY_preallocate_plasma_memory'
-                _, conf_default = parse('{}: {})', conf_default)
-            elif 'getenv' in conf_default:
-                conf_env,_,conf_default = parse('getenv("{}"){}: {})', conf_default)
-            else:
-                print(conf_default)
-                _, conf_env,_, conf_default = parse('{} ? {} : {}("{}"))', conf_default)
-        elif 'getenv' in conf_default:
-            _, conf_env, is_eq, _, conf_default = parse('{} getenv("{}") {} std::{}("{}"))', conf_default)
-            if is_eq == "!=" and conf_type == "bool":
-                conf_default = str(not int(conf_default))
-        elif 'env_' in conf_default:
-            _, conf_env, conf_default = parse('{}("{}", {})', conf_default)
+        conf_str = conf_default[:-1]
+        conf_env = get_env(conf_default)
+        conf_default = get_default(conf_default, conf_type)
     conf_default = conf_default.rstrip(')')
     # print(conf_type, conf_name, conf_default, conf_env)
     # Access values like this: Ray_conf[ray_version][conf_name][type/default/env]
-    put_conf(ray_version, conf_name, conf_type, conf_default, conf_env)
+    put_conf(ray_version, conf_name, conf_type, conf_default, conf_env, conf_str)
 
 # for multi-line signatures
 def is_balanced_parenthesis(str_list):
@@ -330,15 +346,15 @@ def main(argv):
     if opts.lists:
         print_ray_versions_and_modes()
         sys.exit(0)
-    
+
     # validate ray version; print list of supported versions if input is invalid
     if opts.ray_version not in versions_list:
         print_colored(FAIL, "Ray version %s not supported!" % opts.ray_version)
         print_ray_versions_and_modes()
         sys.exit(1)
 
     # validate resiliency profile/mode input (case insensitive)
-    # print list of supported versions and modes if input is unsupported 
+    # print list of supported versions and modes if input is unsupported
     if opts.res_mode.lower() not in res_modes_list:
         print_colored(FAIL, "Resiliency profile %s not supported!" % opts.res_mode)
         print_ray_versions_and_modes()