Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing query logic & order of operations for automated AnnData DE jobs (SCP-5946) #2213

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Fixing query logic & order of operations for automated AnnData DE jobs (SCP-5946) #2213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/models/ingest_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,9 @@ def set_study_state_after_ingest
when :image_pipeline
set_has_image_cache
when :ingest_anndata
set_anndata_file_info
launch_anndata_subparse_jobs if study_file.is_viz_anndata?
launch_differential_expression_jobs if study_file.is_viz_anndata?
set_anndata_file_info
end
set_study_initialized
end
Expand Down Expand Up @@ -741,10 +741,10 @@ def create_differential_expression_results
Rails.logger.info "Creating differential expression result object for annotation: #{annotation_identifier}"
cluster = ClusterGroup.find_by(study_id: study.id, study_file_id: study_file.id, name: params_object.cluster_name)
matrix_url = params_object.matrix_file_path
matrix_filename = matrix_url.split("gs://#{study.bucket_id}/").last
matrix_file = StudyFile.where(study: study, 'expression_file_info.is_raw_counts' => true).any_of(
{ upload_file_name: matrix_filename }, { remote_location: matrix_filename }
).first
bucket_path = matrix_url.split("gs://#{study.bucket_id}/").last
matrix_file = StudyFile.where(
study:, :upload_file_name.in => [bucket_path, bucket_path.split('/').last]
).detect(&:is_raw_counts_file?)
de_result = DifferentialExpressionResult.find_or_initialize_by(
study: study, cluster_group: cluster, cluster_name: cluster.name,
annotation_name: params_object.annotation_name, annotation_scope: params_object.annotation_scope,
Expand Down
Loading