|
8 | 8 | from pydantic import ValidationError
|
9 | 9 | from typing_extensions import Literal
|
10 | 10 |
|
11 |
| -from cg.apps.demultiplex.sample_sheet.read_sample_sheet import ( |
12 |
| - get_sample_sheet_from_file, |
13 |
| - get_sample_type, |
14 |
| -) |
| 11 | +from cg.apps.demultiplex.sample_sheet.read_sample_sheet import get_sample_sheet_from_file |
15 | 12 | from cg.apps.demultiplex.sample_sheet.sample_models import (
|
16 |
| - FlowCellSample, |
17 | 13 | FlowCellSampleBcl2Fastq,
|
18 | 14 | FlowCellSampleBCLConvert,
|
19 | 15 | )
|
|
40 | 36 | Sequencers.NOVASEQ: RunParametersNovaSeq6000,
|
41 | 37 | Sequencers.NOVASEQX: RunParametersNovaSeqX,
|
42 | 38 | }
|
43 |
| -SAMPLE_MODEL_TO_BCL_CONVERTER: dict[Type[FlowCellSample], str] = { |
44 |
| - FlowCellSampleBCLConvert: BclConverter.BCLCONVERT, |
45 |
| - FlowCellSampleBcl2Fastq: BclConverter.BCL2FASTQ, |
46 |
| -} |
47 | 39 |
|
48 | 40 |
|
49 | 41 | class FlowCellDirectoryData:
|
@@ -221,16 +213,6 @@ def sample_sheet_exists(self) -> bool:
|
221 | 213 |
|
222 | 214 | def validate_sample_sheet(self) -> bool:
|
223 | 215 | """Validate if sample sheet is on correct format."""
|
224 |
| - sample_type_from_sample_sheet: Type[FlowCellSample] = get_sample_type( |
225 |
| - self.sample_sheet_path |
226 |
| - ) |
227 |
| - if SAMPLE_MODEL_TO_BCL_CONVERTER[sample_type_from_sample_sheet] != self.bcl_converter: |
228 |
| - LOG.warning( |
229 |
| - f"Detected {SAMPLE_MODEL_TO_BCL_CONVERTER[sample_type_from_sample_sheet]} sample " |
230 |
| - f"sheet for {self.bcl_converter} flow cell. " |
231 |
| - "Generate the correct sample sheet or use the correct bcl converter." |
232 |
| - ) |
233 |
| - return False |
234 | 216 | try:
|
235 | 217 | get_sample_sheet_from_file(self.sample_sheet_path)
|
236 | 218 | except (SampleSheetError, ValidationError) as error:
|
|
0 commit comments