Separate launcher cache from workflows (#5019)

* adds launcher attribute for `cacheless_attributes`

* uses `cacheless_attributes` for form editor and workflow submission

* prevents workflow runs from writing new caches

Author: Bubballoo3

apps/dashboard/app/models/launcher.rb

@@ -7,7 +7,7 @@ class Launcher
 
   class ClusterNotFound < StandardError; end
 
-  attr_reader :title, :id, :created_at, :project_dir, :smart_attributes
+  attr_reader :title, :id, :created_at, :project_dir, :cacheless_attributes, :smart_attributes
 
   class << self
     def launchers_dir(project_dir)
@@ -78,14 +78,20 @@ def initialize(opts = {})
     add_required_fields(**sm_opts)
     # add defaults if it's a brand new launcher with only title and directory.
     add_default_fields(**sm_opts) if opts.size <= 2
+
+    # we generate two sets of attributes here depending on whether we want the initial
+    # form values to come from the form defaults or from the cache.
+    @cacheless_attributes = build_smart_attributes(**sm_opts, use_cache: false)
     @smart_attributes = build_smart_attributes(**sm_opts)
   end
 
-  def build_smart_attributes(form: [], attributes: {})
+  def build_smart_attributes(form: [], attributes: {}, use_cache: true)
     form.map do |form_item_id|
       attrs = attributes[form_item_id.to_sym].to_h.symbolize_keys
-      cache_value = cached_values[form_item_id]
-      attrs[:value] = cache_value if cache_value.present?
+      if use_cache
+        cache_value = cached_values[form_item_id]
+        attrs[:value] = cache_value if cache_value.present?
+      end
       SmartAttributes::AttributeFactory.build(form_item_id, attrs)
     end
   end
@@ -190,7 +196,7 @@ def update(params)
     update_attributes(params)
   end
 
-  def submit(options)
+  def submit(options, write_cache: true)
     cluster_id =  if options.has_key?(:auto_batch_clusters)
                     options[:auto_batch_clusters]
                   else
@@ -206,7 +212,7 @@ def submit(options)
       adapter.submit(job_script, **dependency_helper(options))
     end
     update_job_log(job_id, cluster_id.to_s)
-    write_job_options_to_cache(options)
+    write_job_options_to_cache(options) if write_cache
 
     job_id
   rescue StandardError => e

apps/dashboard/app/models/workflow.rb

@@ -154,7 +154,7 @@ def submit(attributes = {})
       begin
         jobs = dependent_launchers.map { |id| job_id_hash.dig(id, :job_id) }.compact
         opts = submit_launcher_params(launcher, jobs).to_h.symbolize_keys
-        job_id = launcher.submit(opts)
+        job_id = launcher.submit(opts, write_cache: false)
         if job_id.nil?
           Rails.logger.warn("Launcher #{id} with opts #{opts} did not return a job ID.")
         else
@@ -174,11 +174,11 @@ def submit(attributes = {})
   end
 
   def submit_launcher_params(launcher, dependent_jobs)
-    launcher_data = launcher.smart_attributes.each_with_object({}) do |attr, hash|
+    launcher_data = launcher.cacheless_attributes.each_with_object({}) do |attr, hash|
       hash[attr.id.to_s] = attr.opts[:value]
     end
     launcher_data["afterok"] = Array(dependent_jobs)
     launcher_data
   end
 
-end
+end

apps/dashboard/app/views/launchers/edit.html.erb

@@ -3,7 +3,7 @@
 <%= javascript_include_tag 'launcher_edit', nonce: true %>
 
 <%= bootstrap_form_for(@launcher, url: save_project_launcher_path, html: { autocomplete: "off" }) do |f| %>
-  <% @launcher.smart_attributes.each do |attrib| %>
+  <% @launcher.cacheless_attributes.each do |attrib| %>
     <%# TODO generate render_format %>
     <%= create_editable_widget(f, attrib, format: nil) %>
   <% end %>