diff --git a/eva_assembly_ingestion/assembly_ingestion_job.py b/eva_assembly_ingestion/assembly_ingestion_job.py index 6270d28..4307be2 100644 --- a/eva_assembly_ingestion/assembly_ingestion_job.py +++ b/eva_assembly_ingestion/assembly_ingestion_job.py @@ -171,6 +171,7 @@ def process_one_assembly(self, source_assembly, instance, resume): remapping_log = os.path.join(assembly_directory, 'remapping_process.log') remap_cluster_config_file = os.path.join(assembly_directory, 'remap_cluster_config.yaml') + remapping_required = self.check_remapping_required(source_assembly) remap_cluster_config = { 'taxonomy_id': self.taxonomy, 'source_assembly_accession': source_assembly, @@ -183,7 +184,7 @@ def process_one_assembly(self, source_assembly, instance, resume): 'clustering_properties': clustering_template_file, 'clustering_instance': instance, 'remapping_config': cfg.config_file, - 'remapping_required': self.check_remapping_required(source_assembly) + 'remapping_required': remapping_required } for part in ['executable', 'nextflow', 'jar']: @@ -210,7 +211,10 @@ def process_one_assembly(self, source_assembly, instance, resume): finally: os.chdir(curr_working_dir) self.set_status_end(source_assembly) - self.count_variants_from_logs(assembly_directory, source_assembly) + if remapping_required: + self.count_variants_from_logs(assembly_directory, source_assembly) + else: + self.info(f"No remapping required. Skipping variant counts from logs") def check_remapping_required(self, source_assembly): return source_assembly != self.target_assembly