openstudio-analysis 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d72e8dfafc808817e581a9588d84f195d3a1620e
-  data.tar.gz: e6865cde54c86323ea8219d9a62612029c877f43
+  metadata.gz: 5bbd17f5e35fe163f40dcb1463ffef3a0aa1b4b5
+  data.tar.gz: 9ef17193e46720f3310cb4a749798a6432f1fcb5
 SHA512:
-  metadata.gz: 4d0caeb82f7a1befc7d19bf9bdebbf3fb73975fabc74b831712483ac62def5f0147a251c7b0a273c619d09730e9dddc366c21ccbc8839b5b05fd4266693061da
-  data.tar.gz: 0bcd27e2443bcc8f576eba8ba2dab45534d28e2b6bff4749571374d74166e720ff33d34b9602620cdd99635e1fe6d7443d4d9f332b8ee182dbf4a6e75ed6e6e9
+  metadata.gz: 4a58cf740880709c0fe79cab4ed10d8f57a545503cddd7c7e56daaafac27090a1141f2340fe95aef3f3713f575939dbfa2dd77d6cdb360a7e8ffa7e4e31e63f1
+  data.tar.gz: ab4649f066903ce9f75254c269146bd393ad774202a2bf9848a341247dcdd3b30b9558634ccc9895200c344496b1a700f32e908a9b3ac55271f1581ac392f57f

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 OpenStudio Analysis Gem Change Log
 ==================================
 
-Unreleased
+Version 0.3.5
 --------------
+* Add delete_project method
+* Integration testing
+* Return status and filename of downlaoded files
+* Methods for removing models from the Excel translator
+* Return detailed analyses on a project
+* Download database
 
 Version 0.3.4
 -------------

data/README.md

@@ -1,6 +1,7 @@
 OpenStudio Analysis Gem
 =======================
-[![Build Status](https://travis-ci.org/NREL/OpenStudio-analysis-gem.svg?branch=deve)](https://travis-ci.org/NREL/OpenStudio-analysis-gem)
+[![Build Status](https://travis-ci.org/NREL/OpenStudio-analysis-gem.svg?branch=develop)](https://travis-ci.org/NREL/OpenStudio-analysis-gem) [![Dependency Status](https://www.versioneye.com/user/projects/540a2fe5ccc023dd23000002/badge.svg?style=flat)](https://www.versioneye.com/user/projects/540a2fe5ccc023dd23000002)
+
 The OpenStudio Analysis Gem is used to communicate files to the OpenStudio Distributed Analysis.
 
 The purpose of this gem is to generate the analysis.json file, analysis.zip, and communicate with the server to upload 

data/Rakefile

@@ -1,51 +1,54 @@
-require "bundler"
+require 'bundler'
 Bundler.setup
 
-require "rake"
-require "rspec/core/rake_task"
+require 'rake'
+require 'rspec/core/rake_task'
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "openstudio/analysis/version"
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'openstudio/analysis/version'
 
-task :gem => :build
-desc "build gem locally"
+task gem: :build
+desc 'build gem locally'
 task :build do
-  system "gem build openstudio-analysis.gemspec"
+  system 'gem build openstudio-analysis.gemspec'
 end
 
-desc "build and install gem locally"
-task :install => :build do
+desc 'build and install gem locally'
+task install: :build do
   system "gem install openstudio-analysis-#{OpenStudio::Analysis::VERSION}.gem --no-ri --no-rdoc"
 end
 
-desc "release gem (this builds, pushes to rubygems, and tags in github"
-task :release => :build do
+desc 'release gem (this builds, pushes to rubygems, and tags in github'
+task release: :build do
   # add catch if there are local changes not committed to crash
   system "git tag -a v#{OpenStudio::Analysis::VERSION} -m 'Tagging #{OpenStudio::Analysis::VERSION}'"
-  system "git push --tags"
+  system 'git push --tags'
   system "gem push openstudio-analysis-#{OpenStudio::Analysis::VERSION}.gem"
   system "rm openstudio-analysis-#{OpenStudio::Analysis::VERSION}.gem"
 end
 
-RSpec::Core::RakeTask.new("spec") do |spec|
+RSpec::Core::RakeTask.new('spec:unit') do |spec|
   spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList['spec/openstudio/**/*_spec.rb']
 end
 
-task :default => :spec
+RSpec::Core::RakeTask.new('spec:integration') do |spec|
+  spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
+  spec.pattern = FileList['spec/integration/**/*_spec.rb']
+end
+
+task default: 'spec:unit'
 
-desc "import files from other repos"
+desc 'import files from other repos'
 task :import_files do
   # tbd
 end
 
-desc "uninstall all openstudio-analysis gems"
+desc 'uninstall all openstudio-analysis gems'
 task :uninstall do
 
-  system "gem uninstall openstudio-analysis -a"
+  system 'gem uninstall openstudio-analysis -a'
 end
 
-desc "reinstall the gem (uninstall, build, and reinstall"
-task :reinstall => [:uninstall, :install]
-
-
+desc 'reinstall the gem (uninstall, build, and reinstall'
+task reinstall: [:uninstall, :install]

data/lib/openstudio/analysis/server_api.rb

@@ -6,7 +6,7 @@ module OpenStudio
       attr_reader :hostname
 
       def initialize(options = {})
-        defaults = {hostname: 'http://localhost:8080'}
+        defaults = { hostname: 'http://localhost:8080' }
         options = defaults.merge(options)
         @logger = Logger.new('faraday.log')
 
@@ -52,26 +52,39 @@ module OpenStudio
         ids.map { |project| project[:uuid] }
       end
 
+      def delete_project(id)
+        deleted = false
+        response = @conn.delete "/projects/#{id}.json"
+        if response.status == 204
+          puts "Successfully deleted project #{id}"
+          deleted = true
+        else
+          puts "ERROR deleting project #{id}"
+          deleted = false
+        end
+
+        deleted
+      end
+
       def delete_all
         ids = get_project_ids
-        puts "Deleting Projects #{ids}"
+        puts "deleting projects with IDs: #{ids}"
+        success = true
         ids.each do |id|
-          response = @conn.delete "/projects/#{id}.json"
-          if response.status == 204
-            puts "Successfully deleted project #{id}"
-          else
-            puts "ERROR deleting project #{id}"
-          end
+          r = delete_project id
+          success = false if r == false
         end
+
+        success
       end
 
       def new_project(options = {})
-        defaults = {project_name: "Project #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"}
+        defaults = { project_name: "Project #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}" }
         options = defaults.merge(options)
         project_id = nil
 
         # TODO: make this a display name and a machine name
-        project_hash = {project: {name: "#{options[:project_name]}"}}
+        project_hash = { project: { name: "#{options[:project_name]}" } }
 
         response = @conn.post do |req|
           req.url '/projects.json'
@@ -96,8 +109,6 @@ module OpenStudio
         analysis_ids = []
         response = @conn.get "/projects/#{project_id}.json"
         if response.status == 200
-          puts 'received the list of analyses for the project'
-
           analyses = JSON.parse(response.body, symbolize_names: true, max_nesting: false)
           if analyses[:analyses]
             analyses[:analyses].each do |analysis|
@@ -109,6 +120,16 @@ module OpenStudio
         analysis_ids
       end
 
+      def get_analyses_detailed(project_id)
+        analyses = nil
+        response = @conn.get "/projects/#{project_id}.json"
+        if response.status == 200
+          analyses = JSON.parse(response.body, symbolize_names: true, max_nesting: false)[:analyses]
+        end
+
+        analyses
+      end
+
       # return the entire analysis JSON
       def get_analysis(analysis_id)
         result = nil
@@ -136,8 +157,8 @@ module OpenStudio
       def get_analysis_status(analysis_id, analysis_type)
         status = nil
 
-        #sleep 2  # super cheesy---need to update how this works. Right now there is a good chance to get a
-                 # race condition when the analysis state changes.
+        # sleep 2  # super cheesy---need to update how this works. Right now there is a good chance to get a
+        # race condition when the analysis state changes.
         unless analysis_id.nil?
           resp = @conn.get "analyses/#{analysis_id}/status.json"
           if resp.status == 200
@@ -151,6 +172,25 @@ module OpenStudio
         status
       end
 
+      def get_analysis_status_and_json(analysis_id, analysis_type)
+        status = nil
+        j = nil
+
+        # sleep 2  # super cheesy---need to update how this works. Right now there is a good chance to get a
+        # race condition when the analysis state changes.
+        unless analysis_id.nil?
+          resp = @conn.get "analyses/#{analysis_id}/status.json"
+          if resp.status == 200
+            j = JSON.parse resp.body, symbolize_names: true
+            if j && j[:analysis] && j[:analysis][:analysis_type] == analysis_type
+              status = j[:analysis][:status]
+            end
+          end
+        end
+
+        [status, j]
+      end
+
       # return the data point results in JSON format
       def get_analysis_results(analysis_id)
         analysis = nil
@@ -163,53 +203,168 @@ module OpenStudio
         analysis
       end
 
-      def download_dataframe(analysis_id, format='rdata', save_directory=".")
-        # Set the export = true flag to retrieve all the variables for the export (not just the visualize variables)
-        response = @conn.get "/analyses/#{analysis_id}/download_data.#{format}?export=true"
+      def download_dataframe(analysis_id, format = 'rdata', save_directory = '.')
+        downloaded = false
+        file_path_and_name = nil
+
+        response = @conn.get do |r|
+          r.url "/analyses/#{analysis_id}/download_data.#{format}?export=true"
+          r.options.timeout = 3600 # 60 minutes
+        end
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
-          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
+          downloaded = true
+          file_path_and_name = "#{save_directory}/#{filename}"
+          puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
           if format == 'rdata'
-            File.open("#{save_directory}/#{filename}", 'wb') { |f| f << response.body }
+            File.open(file_path_and_name, 'wb') { |f| f << response.body }
           else
-            File.open("#{save_directory}/#{filename}", 'w') { |f| f << response.body }
+            File.open(file_path_and_name, 'w') { |f| f << response.body }
           end
         end
+
+        [downloaded, file_path_and_name]
       end
 
-      def download_variables(analysis_id, format='rdata', save_directory=".")
+      def download_variables(analysis_id, format = 'rdata', save_directory = '.')
+        downloaded = false
+        file_path_and_name = nil
+
         response = @conn.get "/analyses/#{analysis_id}/variables/download_variables.#{format}"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
-          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
+          downloaded = true
+          file_path_and_name = "#{save_directory}/#{filename}"
+          puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
           if format == 'rdata'
-            File.open("#{save_directory}/#{filename}", 'wb') { |f| f << response.body }
+            File.open(file_path_and_name, 'wb') { |f| f << response.body }
           else
-            File.open("#{save_directory}/#{filename}", 'w') { |f| f << response.body }
+            File.open(file_path_and_name, 'w') { |f| f << response.body }
           end
         end
+
+        [downloaded, file_path_and_name]
       end
 
-      def download_datapoint(datapoint_id, save_directory=".")
+      def download_datapoint(datapoint_id, save_directory = '.')
+        downloaded = false
+        file_path_and_name = nil
+
         response = @conn.get "/data_points/#{datapoint_id}/download"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
-          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
-          File.open("#{save_directory}/#{filename}", 'wb') { |f| f << response.body }
+          downloaded = true
+          file_path_and_name = "#{save_directory}/#{filename}"
+          puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
+          File.open(file_path_and_name, 'wb') { |f| f << response.body }
         end
+
+        [downloaded, file_path_and_name]
       end
 
-      def download_all_data_points(analysis_id, save_directory=".")
-        response = @conn.get "/analyses/#{analysis_id}/download_all_data_points"
+      # Download a MongoDB Snapshot.  This database can get large.  For 13,000 simulations with
+      # DEnCity reporting, the size is around 325MB
+      def download_database(save_directory = '.')
+        downloaded = false
+        file_path_and_name = nil
+
+        response = @conn.get do |r|
+          r.url  '/admin/backup_database?full_backup=true'
+          r.options.timeout = 3600 # 60 minutes
+        end
+
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
-          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
-          File.open("#{save_directory}/#{filename}", 'wb') { |f| f << response.body }
+          downloaded = true
+          file_path_and_name = "#{save_directory}/#{filename}"
+          puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
+          File.open(file_path_and_name, 'wb') { |f| f << response.body }
+        end
+
+        [downloaded, file_path_and_name]
+      end
+
+      def download_datapoint_reports(datapoint_id, save_directory = '.')
+        downloaded = false
+        file_path_and_name = nil
+
+        response = @conn.get "/data_points/#{datapoint_id}/download_reports"
+        if response.status == 200
+          filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+          downloaded = true
+          file_path_and_name = "#{save_directory}/#{filename}"
+          puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
+          File.open(file_path_and_name, 'wb') { |f| f << response.body }
+        end
+
+        [downloaded, file_path_and_name]
+      end
+
+      def download_datapoints_reports(analysis_id, save_directory = '.')
+        # get the list of all the datapoints
+        dps = get_datapoint_status(analysis_id)
+        dps.each do |dp|
+          if dp[:status] == 'completed'
+            download_datapoint_reports(dp[:_id], save_directory)
+          end
+        end
+      end
+
+      def download_datapoint_jsons(analysis_id, save_directory = '.')
+        # get the list of all the datapoints
+        dps = get_datapoint_status(analysis_id)
+        dps.each do |dp|
+          if dp[:status] == 'completed'
+            dp_h = get_datapoint(dp[:_id])
+            File.open("#{save_directory}/data_point_#{dp[:_id]}.json", 'w') { |f| f << JSON.pretty_generate(dp_h) }
+          end
+        end
+      end
+
+      def datapoint_dencity(datapoint_id)
+        # Return the JSON (Full) of the datapoint
+        data_point = nil
+
+        resp = @conn.get "/data_points/#{datapoint_id}/dencity.json"
+        if resp.status == 200
+          data_point = JSON.parse resp.body, symbolize_names: true
+        end
+
+        data_point
+      end
+
+      def analysis_dencity_json(analysis_id)
+        # Return the hash of the dencity format for the analysis
+        dencity = nil
+
+        resp = @conn.get "/analyses/#{analysis_id}/dencity.json"
+        if resp.status == 200
+          dencity = JSON.parse resp.body, symbolize_names: true
+        end
+
+        dencity
+      end
+
+      def download_dencity_json(analysis_id, save_directory = '.')
+        a_h = analysis_dencity_json(analysis_id)
+        if a_h
+          File.open("#{save_directory}/analysis_#{analysis_id}_dencity.json", 'w') { |f| f << JSON.pretty_generate(a_h) }
+        end
+      end
+
+      def download_datapoint_dencity_jsons(analysis_id, save_directory = '.')
+        # get the list of all the datapoints
+        dps = get_datapoint_status(analysis_id)
+        dps.each do |dp|
+          if dp[:status] == 'completed'
+            dp_h = datapoint_dencity(dp[:_id])
+            File.open("#{save_directory}/data_point_#{dp[:_id]}_dencity.json", 'w') { |f| f << JSON.pretty_generate(dp_h) }
+          end
         end
       end
 
       def new_analysis(project_id, options)
-        defaults = {analysis_name: nil, reset_uuids: false}
+        defaults = { analysis_name: nil, reset_uuids: false }
         options = defaults.merge(options)
 
         fail 'No project id passed' if project_id.nil?
@@ -249,7 +404,7 @@ module OpenStudio
           formulation_json[:analysis][:name] = "#{options[:analysis_name]}" unless options[:analysis_name].nil?
         else
           formulation_json = {
-              analysis: options
+            analysis: options
           }
           puts formulation_json
           analysis_id = UUID.new.generate
@@ -280,8 +435,11 @@ module OpenStudio
         if options[:upload_file]
           fail "upload file does not exist #{options[:upload_file]}" unless File.exist?(options[:upload_file])
 
-          payload = {file: Faraday::UploadIO.new(options[:upload_file], 'application/zip')}
-          response = @conn_multipart.post "analyses/#{analysis_id}/upload.json", payload
+          payload = { file: Faraday::UploadIO.new(options[:upload_file], 'application/zip') }
+          response = @conn_multipart.post "analyses/#{analysis_id}/upload.json", payload do |req|
+            req.options[:timeout] = 1800 # seconds
+          end
+
 
           if response.status == 201
             puts 'Successfully uploaded ZIP file'
@@ -294,7 +452,7 @@ module OpenStudio
       end
 
       def upload_datapoint(analysis_id, options)
-        defaults = {reset_uuids: false}
+        defaults = { reset_uuids: false }
         options = defaults.merge(options)
 
         fail 'No analysis id passed' if analysis_id.nil?
@@ -347,7 +505,7 @@ module OpenStudio
       end
 
       def run_analysis(analysis_id, options)
-        defaults = {analysis_action: 'start', without_delay: false}
+        defaults = { analysis_action: 'start', without_delay: false }
         options = defaults.merge(options)
 
         puts "Run analysis is configured with #{options.to_json}"
@@ -366,7 +524,7 @@ module OpenStudio
       end
 
       def kill_analysis(analysis_id)
-        analysis_action = {analysis_action: 'stop'}
+        analysis_action = { analysis_action: 'stop' }
 
         response = @conn.post do |req|
           req.url "analyses/#{analysis_id}/action.json"
@@ -430,37 +588,37 @@ module OpenStudio
       ## here are a bunch of runs that really don't belong here.
 
       # create a new analysis and run a single model
-      def run_single_model(formulation_filename, analysis_zip_filename)
+      def run_single_model(formulation_filename, analysis_zip_filename, run_data_point_filename = 'run_openstudio_workflow_monthly.rb')
         project_options = {}
         project_id = new_project(project_options)
 
         analysis_options = {
-            formulation_file: formulation_filename,
-            upload_file: analysis_zip_filename,
-            reset_uuids: true
+          formulation_file: formulation_filename,
+          upload_file: analysis_zip_filename,
+          reset_uuids: true
         }
         analysis_id = new_analysis(project_id, analysis_options)
 
         # Force this to run in the foreground for now until we can deal with checing the 'analysis state of various anlaysis'
         run_options = {
-            analysis_action: "start",
-            without_delay: true, # run this in the foreground
-            analysis_type: 'single_run',
-            allow_multiple_jobs: true,
-            use_server_as_worker: true,
-            simulate_data_point_filename: 'simulate_data_point.rb',
-            run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
+          analysis_action: 'start',
+          without_delay: true, # run this in the foreground
+          analysis_type: 'single_run',
+          allow_multiple_jobs: true,
+          use_server_as_worker: true,
+          simulate_data_point_filename: 'simulate_data_point.rb',
+          run_data_point_filename: run_data_point_filename
         }
         run_analysis(analysis_id, run_options)
 
         run_options = {
-            analysis_action: "start",
-            without_delay: false, # run in background
-            analysis_type: 'batch_run',
-            allow_multiple_jobs: true,
-            use_server_as_worker: true,
-            simulate_data_point_filename: 'simulate_data_point.rb',
-            run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
+          analysis_action: 'start',
+          without_delay: false, # run in background
+          analysis_type: 'batch_run',
+          allow_multiple_jobs: true,
+          use_server_as_worker: true,
+          simulate_data_point_filename: 'simulate_data_point.rb',
+          run_data_point_filename: run_data_point_filename
         }
         run_analysis(analysis_id, run_options)
 
@@ -468,25 +626,25 @@ module OpenStudio
       end
 
       # creates a new analysis and runs rgenoud optimization - number of generations isn't used right now
-      def run_rgenoud(formulation_filename, analysis_zip_filename, number_of_generations)
+      def run_rgenoud(formulation_filename, analysis_zip_filename, _number_of_generations)
         project_options = {}
         project_id = new_project(project_options)
 
         analysis_options = {
-            formulation_file: formulation_filename,
-            upload_file: analysis_zip_filename,
-            reset_uuids: true
+          formulation_file: formulation_filename,
+          upload_file: analysis_zip_filename,
+          reset_uuids: true
         }
         analysis_id = new_analysis(project_id, analysis_options)
 
         run_options = {
-            analysis_action: "start",
-            without_delay: false,
-            analysis_type: 'rgenoud',
-            allow_multiple_jobs: true,
-            use_server_as_worker: true,
-            simulate_data_point_filename: 'simulate_data_point.rb',
-            run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
+          analysis_action: 'start',
+          without_delay: false,
+          analysis_type: 'rgenoud',
+          allow_multiple_jobs: true,
+          use_server_as_worker: true,
+          simulate_data_point_filename: 'simulate_data_point.rb',
+          run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
         }
         run_analysis(analysis_id, run_options)
 
@@ -498,36 +656,78 @@ module OpenStudio
         project_id = new_project(project_options)
 
         analysis_options = {
-            formulation_file: formulation_filename,
-            upload_file: analysis_zip_filename,
-            reset_uuids: true
+          formulation_file: formulation_filename,
+          upload_file: analysis_zip_filename,
+          reset_uuids: true
         }
         analysis_id = new_analysis(project_id, analysis_options)
 
         run_options = {
-            analysis_action: "start",
-            without_delay: false,
-            analysis_type: 'lhs',
-            allow_multiple_jobs: true,
-            use_server_as_worker: true,
-            simulate_data_point_filename: 'simulate_data_point.rb',
-            run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
+          analysis_action: 'start',
+          without_delay: false,
+          analysis_type: 'lhs',
+          allow_multiple_jobs: true,
+          use_server_as_worker: true,
+          simulate_data_point_filename: 'simulate_data_point.rb',
+          run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
         }
         run_analysis(analysis_id, run_options)
 
         run_options = {
-            analysis_action: "start",
-            without_delay: false, # run in background
-            analysis_type: 'batch_run',
-            allow_multiple_jobs: true,
-            use_server_as_worker: true,
-            simulate_data_point_filename: 'simulate_data_point.rb',
-            run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
+          analysis_action: 'start',
+          without_delay: false, # run in background
+          analysis_type: 'batch_run',
+          allow_multiple_jobs: true,
+          use_server_as_worker: true,
+          simulate_data_point_filename: 'simulate_data_point.rb',
+          run_data_point_filename: 'run_openstudio_workflow_monthly.rb'
         }
         run_analysis(analysis_id, run_options)
 
         analysis_id
       end
+
+      def run_analysis_detailed(formulation_filename, analysis_zip_filename,
+                                analysis_type, allow_multiple_jobs, server_as_worker, run_data_point_filename)
+        project_options = {}
+        project_id = new_project(project_options)
+
+        analysis_options = {
+          formulation_file: formulation_filename,
+          upload_file: analysis_zip_filename,
+          reset_uuids: true
+        }
+        analysis_id = new_analysis(project_id, analysis_options)
+
+        server_as_worker = true if analysis_type == 'optim' || analysis_type == 'rgenoud'
+        run_options = {
+          analysis_action: 'start',
+          without_delay: false,
+          analysis_type: analysis_type,
+          allow_multiple_jobs: allow_multiple_jobs,
+          use_server_as_worker: server_as_worker,
+          simulate_data_point_filename: 'simulate_data_point.rb',
+          run_data_point_filename: run_data_point_filename
+        }
+        run_analysis(analysis_id, run_options)
+
+        # If the analysis is LHS, then go ahead and run batch run because there is
+        # no explicit way to tell the system to do it
+        if analysis_type == 'lhs' || analysis_type == 'preflight' || analysis_type == 'single_run'
+          run_options = {
+            analysis_action: 'start',
+            without_delay: false,
+            analysis_type: 'batch_run',
+            allow_multiple_jobs: allow_multiple_jobs,
+            use_server_as_worker: server_as_worker,
+            simulate_data_point_filename: 'simulate_data_point.rb',
+            run_data_point_filename: run_data_point_filename
+          }
+          run_analysis(analysis_id, run_options)
+        end
+
+        analysis_id
+      end
     end
   end
 end