@@ -15,7 +15,7 @@ class IngestJob
1515 # valid ingest actions to perform
1616 VALID_ACTIONS = %i[
1717 ingest_expression ingest_cluster ingest_cell_metadata ingest_anndata ingest_differential_expression ingest_subsample
18- ingest_dot_plot_genes differential_expression render_expression_arrays
18+ ingest_dot_plot_genes differential_expression
1919 ] . freeze
2020
2121 # Mappings between actions & models (for cleaning up data on re-parses)
@@ -31,14 +31,14 @@ class IngestJob
3131 # non-standard job actions where data is not being read from a file to insert into MongoDB
3232 # these jobs usually process files and write objects back to the bucket, and as such have special pre/post-processing
3333 # steps that need to be accounted for
34- SPECIAL_ACTIONS = %i[ differential_expression render_expression_arrays image_pipeline ] . freeze
34+ SPECIAL_ACTIONS = %i[ differential_expression ] . freeze
3535
3636 # main processes that extract or ingest data for core visualizations (scatter, violin, dot, etc)
3737 CORE_ACTIONS = %w[ ingest_anndata ingest_expression ingest_cell_metadata ingest_cluster ]
3838
3939 # jobs that need parameters objects in order to launch correctly
4040 PARAMS_OBJ_REQUIRED = %i[
41- differential_expression render_expression_arrays image_pipeline ingest_anndata ingest_dot_plot_genes
41+ differential_expression ingest_anndata ingest_dot_plot_genes
4242 ] . freeze
4343
4444 # Name of pipeline submission running in GCP (from [BatchApiClient#run_job])
@@ -525,10 +525,6 @@ def set_study_state_after_ingest
525525 create_differential_expression_results
526526 when :ingest_differential_expression
527527 create_author_differential_expression_results
528- when :render_expression_arrays
529- launch_image_pipeline_job
530- when :image_pipeline
531- set_has_image_cache
532528 when :ingest_anndata
533529 set_anndata_file_info
534530 launch_anndata_subparse_jobs if study_file . is_viz_anndata?
@@ -817,19 +813,6 @@ def read_differential_expression_manifest(info_obj, cluster)
817813 raw_manifest . read . split ( "\n " ) . map { |line | line . split ( "\t " ) }
818814 end
819815
820- # launch an image pipeline job once :render_expression_arrays completes
821- def launch_image_pipeline_job
822- Rails . logger . info "Launching image_pipeline job in #{ study . accession } for cluster file: #{ study_file . name } "
823- ImagePipelineService . run_image_pipeline_job ( study , study_file , user :, data_cache_perftime : get_total_runtime_ms )
824- end
825-
826- # set flags to denote when a cluster has image data
827- def set_has_image_cache
828- Rails . logger . info "Setting image_pipeline flags in #{ study . accession } for cluster: #{ study_file . name } "
829- cluster_group = ClusterGroup . find_by ( study_id : study . id , study_file_id : study_file . id )
830- cluster_group . update ( has_image_cache : true ) if cluster_group . present?
831- end
832-
833816 # preprocess all dot plot gene entries for a qualifying study
834817 # will check feature flag first to allow for selective automation & runtime configuration
835818 def launch_dot_plot_preprocess_job
@@ -1066,14 +1049,6 @@ def get_job_analytics
10661049 if params_object . de_type == 'pairwise'
10671050 job_props . merge! ( { pairwiseGroups : [ params_object . group1 , params_object . group2 ] } )
10681051 end
1069- when :image_pipeline
1070- data_cache_perftime = params_object . data_cache_perftime
1071- job_props . merge! (
1072- {
1073- 'perfTime:dataCache' => data_cache_perftime ,
1074- 'perfTime:full' => data_cache_perftime + job_perftime
1075- }
1076- )
10771052 when :ingest_anndata
10781053 job_props . merge! (
10791054 {
@@ -1291,16 +1266,6 @@ def generate_success_email_array
12911266 if params_object . de_type == 'pairwise'
12921267 message << "Pairwise selections: #{ params_object . group1 } vs. #{ params_object . group2 } "
12931268 end
1294- when :render_expression_arrays
1295- matrix_name = params_object . matrix_file_path . split ( '/' ) . last
1296- matrix = study . expression_matrices . find_by ( name : matrix_name )
1297- genes = Gene . where ( study_id : study . id , study_file_id : matrix . id ) . count
1298- message << "Image Pipeline data pre-rendering completed for \" #{ params_object . cluster_name } \" "
1299- message << "Gene-level files created: #{ genes } "
1300- when :image_pipeline
1301- complete_pipeline_runtime = TimeDifference . between ( *get_image_pipeline_timestamps ) . humanize
1302- message << "Image Pipeline image rendering completed for \" #{ params_object . cluster } \" "
1303- message << "Complete runtime (data cache & image rendering): #{ complete_pipeline_runtime } "
13041269 when :ingest_dot_plot_genes
13051270 cluster_group = params_object . cluster_group
13061271 genes = DotPlotGene . where ( study :, study_file :, cluster_group :) . count
0 commit comments