Refactor run_state in script automation (#754)

Author: amd-arsuresh

.github/workflows/build_wheel_off.yml

@@ -1,5 +1,6 @@
 name: Build wheel and release into PYPI (off now)
 
+
 on: 
   push:
     branches:

automation/script/cache_utils.py

@@ -219,10 +219,6 @@ def validate_cached_scripts(i, found_cached_scripts):
     if len(found_cached_scripts) > 0:
         for cached_script in found_cached_scripts:
             if is_cached_entry_valid(i, cached_script):
-                i['logger'].debug(
-                    i['recursion_spaces'] +
-                    f'  - Validated cached entry: {cached_script.path}'
-                )
                 valid.append(cached_script)
 
     return valid
@@ -301,10 +297,6 @@ def run_validate_cache_if_present(i, cached_script):
     '''
     import copy
 
-    i['logger'].debug(
-        i['recursion_spaces'] +
-        f'  - Validating cached entry: {cached_script.path}'
-    )
     os_info = i['self'].os_info
     # Bat extension for this host OS
     bat_ext = os_info['bat_ext']
@@ -314,6 +306,11 @@ def run_validate_cache_if_present(i, cached_script):
     if not os.path.exists(validate_script):
         return None
 
+    i['logger'].debug(
+        i['recursion_spaces'] +
+        f'  - Validating cached entry: {cached_script.path}'
+    )
+
     # reconstruct env/state from cached metadata
     env_tmp = copy.deepcopy(i['env'])
     state_tmp = copy.deepcopy(i['state'])
@@ -350,7 +347,7 @@ def run_validate_cache_if_present(i, cached_script):
             '',
             i['show_time'],
             i['extra_recursion_spaces'],
-            {}
+            i['run_state']
         )
         if r['return'] > 0:
             return None

automation/script/docker.py

@@ -49,13 +49,17 @@ def dockerfile(self_module, input_params):
     script_alias = metadata.get('alias', '')
     script_uid = metadata.get('uid', '')
 
-    run_state = {
-        'deps': [],
-        'fake_deps': [],
-        'parent': None,
+    if not hasattr(self_module, 'run_state'):
+        self_module.run_state = self_module.init_run_state(
+            input_params.get('run_state'))
+
+    run_state = self_module.run_state
+
+    run_state.update({
         'script_id': f"{script_alias},{script_uid}",
         'script_variation_tags': variation_tags
     }
+    )
 
     docker_settings = metadata.get('docker', {})
     docker_settings_default_env = docker_settings.get('default_env', {})
@@ -73,12 +77,6 @@ def dockerfile(self_module, input_params):
     # Update state with metadata and variations
     update_state_result = self_module.update_state_from_meta(
         metadata,
-        deps=[],
-        post_deps=[],
-        prehook_deps=[],
-        posthook_deps=[],
-        new_env_keys=[],
-        new_state_keys=[],
         run_state=run_state,
         i=input_params
     )
@@ -88,19 +86,13 @@ def dockerfile(self_module, input_params):
     update_variations_result = self_module._update_state_from_variations(
         input_params, metadata, variation_tags, metadata.get(
             'variations', {}),
-        deps=[],  # Add your dependencies if needed
-        post_deps=[],  # Add post dependencies if needed
-        prehook_deps=[],  # Add prehook dependencies if needed
-        posthook_deps=[],  # Add posthook dependencies if needed
-        new_env_keys_from_meta=[],  # Add keys from meta if needed
-        new_state_keys_from_meta=[],  # Add state keys from meta if needed
         run_state=run_state
     )
     if update_variations_result['return'] > 0:
         return update_variations_result
 
     # Set Docker-specific configurations
-    docker_settings = state_data['docker']
+    docker_settings = run_state['docker']
 
     if is_true(docker_settings.get('pass_docker_to_script', False)):
         input_params['docker'] = True
@@ -124,18 +116,13 @@ def dockerfile(self_module, input_params):
 
     update_state_result = self_module.update_state_from_meta(
         metadata,
-        deps=[],
-        post_deps=[],
-        prehook_deps=[],
-        posthook_deps=[],
-        new_env_keys=[],
-        new_state_keys=[],
         run_state=run_state,
         i=input_params
     )
     if update_state_result['return'] > 0:
         return update_state_result
-    docker_settings = state_data['docker']
+
+    docker_settings = run_state['docker']
 
     # Prune temporary environment variables
     run_command = copy.deepcopy(run_command_arc)
@@ -324,37 +311,33 @@ def docker_run(self_module, i):
     for key in docker_settings_default_env:
         env.setdefault(key, docker_settings_default_env[key])
 
-    self_module.state['docker'] = docker_settings
-    run_state = {
-        'deps': [], 'fake_deps': [], 'parent': None,
+    if not hasattr(self_module, 'run_state'):
+        self_module.run_state = self_module.init_run_state(
+            input_params.get('run_state'))
+
+    run_state = self_module.run_state
+
+    run_state['docker'] = docker_settings
+    run_state.update({
         'script_id': f"{script_alias},{script_uid}",
         'script_variation_tags': variation_tags,
         'file_path_env_keys': file_path_env_keys,
         'folder_path_env_keys': folder_path_env_keys
     }
+    )
 
     # Update state and handle variations
-    r = self_module.update_state_from_meta(meta, deps=[],
-                                           post_deps=[],
-                                           prehook_deps=[],
-                                           posthook_deps=[],
-                                           new_env_keys=[],
-                                           new_state_keys=[], run_state=run_state, i=i)
+    r = self_module.update_state_from_meta(meta, run_state=run_state, i=i)
     if r['return'] > 0:
         return r
 
     r = self_module._update_state_from_variations(
-        i, meta, variation_tags, variations, deps=[],
-        post_deps=[],
-        prehook_deps=[],
-        posthook_deps=[],
-        new_env_keys_from_meta=[],
-        new_state_keys_from_meta=[],
+        i, meta, variation_tags, variations,
         run_state=run_state)
     if r['return'] > 0:
         return r
 
-    docker_settings = self_module.state['docker']
+    docker_settings = self_module.run_state['docker']
 
     deps = docker_settings.get('deps', [])
     if deps:
@@ -367,12 +350,6 @@ def docker_run(self_module, i):
     # For updating meta from update_meta_if_env
     r = self_module.update_state_from_meta(
         meta,
-        deps=[],
-        post_deps=[],
-        prehook_deps=[],
-        posthook_deps=[],
-        new_env_keys=[],
-        new_state_keys=[],
         run_state=run_state,
         i=i)
     if r['return'] > 0: