[FIXUP] Accommodate schema changes

Author: knoepfel

phlex/app/load_module.cpp

@@ -79,22 +79,7 @@ namespace phlex::experimental {
     auto& creator =
       create_module.emplace_back(plugin_loader<detail::module_creator_t>(spec, "create_module"));
 
-    // Automatically specify the 'pymodule' Phlex plugin if the 'py' parameter is specified
-    if (auto const* py = raw_config.if_contains("py")) {
-      if (auto const* cpp = raw_config.if_contains("cpp")) {
-        std::string msg = fmt::format("Both 'cpp' and 'py' parameters specified in for {}", label);
-        if (auto const* cpp_value = cpp->if_string()) {
-          msg += fmt::format("\n  - cpp: {}", *cpp_value);
-        }
-        if (auto const* py_value = py->if_string()) {
-          msg += fmt::format("\n  - py: {}", *py_value);
-        }
-        throw std::runtime_error(msg);
-      }
-      raw_config["cpp"] = "pymodule";
-    }
-
-    configuration const config{raw_config};
+    configuration const config{adjusted_config};
     creator(g.module_proxy(config), config);
   }
 

plugins/python/src/pymodule.cpp

@@ -22,7 +22,7 @@ PHLEX_EXPERIMENTAL_REGISTER_ALGORITHMS(m, config)
 
   PyGILRAII g;
 
-  std::string modname = config.get<std::string>("pyplugin");
+  std::string modname = config.get<std::string>("py");
   PyObject* mod = PyImport_ImportModule(modname.c_str());
   if (mod) {
     PyObject* reg = PyObject_GetAttrString(mod, "PHLEX_EXPERIMENTAL_REGISTER_ALGORITHMS");

test/python/pyconfig.jsonnet

@@ -1,19 +1,18 @@
 {
   driver: {
-    plugin: 'generate_layers',
+    cpp: 'generate_layers',
     layers: {
       event: { parent: 'job', total: 10, starting_number: 1 }
     }
   },
   sources: {
     provider: {
-      plugin: 'cppsource4py',
+      cpp: 'cppsource4py',
     }
   },
   modules: {
     pyconfig: {
-      plugin: 'pymodule',
-      pyplugin: 'all_config',
+      py: 'all_config',
       input: ['i', 'j'],
       a_bool: false,
       an_int: -37,

test/python/pyfailure.jsonnet

@@ -1,19 +1,18 @@
 {
   driver: {
-    plugin: 'generate_layers',
+    cpp: 'generate_layers',
     layers: {
       event: { parent: 'job', total: 10, starting_number: 1 }
     }
   },
   sources: {
     provider: {
-      plugin: 'cppsource4py',
+      cpp: 'cppsource4py',
     }
   },
   modules: {
     pyadd: {
-      plugin: 'pymodule',
-      pyplugin: 'adder',
+      py: 'adder',
       #input: ['i', 'j'],   # commented out to cause a failure
       output: ['sum'],
     },

test/python/pyreduce.jsonnet

@@ -1,24 +1,22 @@
 {
   driver: {
-    plugin: 'generate_layers',
+    cpp: 'generate_layers',
     layers: {
       event: { parent: 'job', total: 10, starting_number: 1 }
     }
   },
   sources: {
     provider: {
-      plugin: 'cppsource4py',
+      cpp: 'cppsource4py',
     }
   },
   modules: {
     pyreduce: {
-      plugin: 'pymodule',
-      pyplugin: 'reducer',
+      py: 'reducer',
       input: ['i', 'j'],
     },
     pyverify: {
-      plugin: 'pymodule',
-      pyplugin: 'verify',
+      py: 'verify',
       input: ['sum'],
       sum_total: 4,
     },

test/python/pyvec.jsonnet

@@ -1,25 +1,23 @@
 {
   driver: {
-    plugin: 'generate_layers',
+    cpp: 'generate_layers',
     layers: {
       event: { parent: 'job', total: 10, starting_number: 1 }
     }
   },
   sources: {
     provider: {
-      plugin: 'cppsource4py',
+      cpp: 'cppsource4py',
     }
   },
   modules: {
     pysum: {
-      plugin: 'pymodule',
-      pyplugin: 'sumit',
+      py: 'sumit',
       input: ['i', 'j'],
       output: ['sum'],
     },
     pyverify: {
-      plugin: 'pymodule',
-      pyplugin: 'verify',
+      py: 'verify',
       input: ['sum'],
       sum_total: 1,
     },