Merge pull request #430 from douglasjacobsen/fix_modifier_builtins

Fix object usage from modifier builtins
GoogleCloudPlatform · Mar 6, 2024 · 918bf9e · 918bf9e
2 parents 211892d + 9690a4d
commit 918bf9e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/lib/ramble/ramble/application.py b/lib/ramble/ramble/application.py
@@ -735,12 +735,15 @@ def _get_executable_graph(self, workload_name):
         if namespace.executables in self.internals:
             exec_order = self.internals[namespace.executables]
 
+        builtin_objects = [self]
         all_builtins = [self.builtins]
         for mod_inst in self._modifier_instances:
+            builtin_objects.append(mod_inst)
             all_builtins.append(mod_inst.builtins)
 
         executable_graph = ramble.graphs.ExecutableGraph(exec_order, self.executables,
-                                                         all_builtins, self)
+                                                         builtin_objects, all_builtins,
+                                                         self)
 
         # Perform executable injection
         if namespace.executable_injection in self.internals:
@@ -872,7 +875,7 @@ def _define_commands(self, exec_graph):
 
             else:  # All Builtins
                 func = exec_node.attribute
-                func_cmds = func(self)
+                func_cmds = func()
                 for cmd in func_cmds:
                     self._command_list.append(self.expander.expand_var(cmd, exec_vars))
 

diff --git a/lib/ramble/ramble/graphs.py b/lib/ramble/ramble/graphs.py
@@ -231,7 +231,7 @@ class ExecutableGraph(AttributeGraph):
     node_type = 'command executable'
     supported_injection_orders = enum.Enum('supported_injection_orders', ['before', 'after'])
 
-    def __init__(self, exec_order, executables, builtin_groups, obj_inst):
+    def __init__(self, exec_order, executables, builtin_objects, builtin_groups, obj_inst):
         """Construct a new ExecutableGraph
 
         Executable graphs have node attributes that are either of type
@@ -241,8 +241,10 @@ def __init__(self, exec_order, executables, builtin_groups, obj_inst):
             exec_order (list(str)): List of executable names in execution order
             executables (dict): Dictionary of executable definitions.
                                 Keys are executable names, values are CommandExecutables
-            builtins (dict): Dictionary containing definitions of builtins. Keys are names
-                             values are configurations of builtins.
+            builtin_objects (list(object)): List of objects to associate with each builtin
+                                            group (in order)
+            builtins (list(dict)): List of dictionaries containing definitions of builtins.
+                                   Keys are names values are configurations of builtins.
             modifier_builtins (dict): Dictionary containing definitions of modifier builtins.
                                       Keys are names values are configurations of builtins.
                                       Modifier builtins are inserted between application builtins
@@ -260,11 +262,13 @@ def __init__(self, exec_order, executables, builtin_groups, obj_inst):
                 super().update_graph(exec_node)
 
         # Define nodes for builtins
-        for builtins in builtin_groups:
+        for builtin_obj, builtins in zip(builtin_objects, builtin_groups):
             for builtin, blt_conf in builtins.items():
                 self._builtin_dependencies[builtin] = blt_conf['depends_on'].copy()
-                exec_node = ramble.util.graph.GraphNode(builtin, blt_conf['function'],
-                                                        obj_inst=obj_inst)
+                blt_func = getattr(builtin_obj, blt_conf['name'])
+                exec_node = ramble.util.graph.GraphNode(builtin,
+                                                        attribute=blt_func,
+                                                        obj_inst=builtin_obj)
                 self.node_definitions[builtin] = exec_node
 
         dep_exec = None

diff --git a/lib/ramble/ramble/language/shared_language.py b/lib/ramble/ramble/language/shared_language.py
@@ -278,8 +278,7 @@ def _store_builtin(obj):
         obj.builtins[builtin_name] = {'name': name,
                                       'required': required,
                                       'injection_method': injection_method,
-                                      'depends_on': depends_on.copy(),
-                                      'function': getattr(obj, name)}
+                                      'depends_on': depends_on.copy()}
     return _store_builtin
 
 

diff --git a/var/ramble/repos/builtin.mock/modifiers/test-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/test-mod/modifier.py
@@ -40,5 +40,8 @@ class TestMod(BasicModifier):
 
     register_builtin('test_builtin', required=True, injection_method='append')
 
+    test_attr = 'test_value'
+
     def test_builtin(self):
-        return ['echo "fom_contextFOM_GOES_HERE" >> {analysis_log}']
+        return ['echo "fom_contextFOM_GOES_HERE" >> {analysis_log}',
+                f'echo "{self.test_attr}"' + ' >> {analysis_log}']