cg 83.15.1__py3-none-any.whl → 83.15.3__py3-none-any.whl

cg/__init__.py

@@ -1,2 +1,2 @@
 __title__ = "cg"
-__version__ = "83.15.1"
+__version__ = "83.15.3"

cg/exc.py

@@ -348,6 +348,13 @@ class CaseNotConfiguredError(CgError):
     """Exception raised when a case is being run without a configuration."""
 
 
+class CaseWorkflowMismatchError(CgError):
+    """
+    Exception raised when a case is being run with a workflow different from the one specified
+    for it in the database.
+    """
+
+
 class MissingConfigFilesError(CgError):
     """Exception raised when a case is being run with missing configuration files."""
 
@@ -356,5 +363,9 @@ class SeqeraError(CgError):
     """Exception raised when receiving an unexpected response from Seqera platform"""
 
 
+class MultipleCaptureKitsError(CgError):
+    """Exception raised when multiple capture kits are found where only one is expected."""
+
+
 class ApplicationDoesNotHaveHiFiYieldError(CgError):
     """Exception raised when application does not have HiFi yield set."""

cg/services/analysis_starter/analysis_starter.py

@@ -4,7 +4,7 @@ from subprocess import CalledProcessError
 from requests import HTTPError
 
 from cg.constants import Workflow
-from cg.exc import AnalysisNotReadyError, SeqeraError
+from cg.exc import AnalysisNotReadyError, CaseWorkflowMismatchError, SeqeraError
 from cg.services.analysis_starter.configurator.abstract_model import CaseConfig
 from cg.services.analysis_starter.configurator.configurator import Configurator
 from cg.services.analysis_starter.input_fetcher.input_fetcher import InputFetcher
@@ -51,6 +51,7 @@ class AnalysisStarter:
     def start(self, case_id: str, **flags) -> None:
         """Fetches raw data, generates configuration files and runs the specified case."""
         LOG.info(f"Starting case {case_id}")
+        self._ensure_case_matches_workflow(case_id)
         self.tracker.ensure_analysis_not_ongoing(case_id)
         self.input_fetcher.ensure_files_are_ready(case_id)
         case_config: CaseConfig = self.configurator.configure(case_id=case_id, **flags)
@@ -58,6 +59,7 @@ class AnalysisStarter:
 
     def run(self, case_id: str, **flags) -> None:
         """Run a case using an assumed existing configuration."""
+        self._ensure_case_matches_workflow(case_id)
         self.tracker.ensure_analysis_not_ongoing(case_id)
         case_config: CaseConfig = self.configurator.get_config(case_id=case_id, **flags)
         self._run_and_track(case_id=case_id, case_config=case_config)
@@ -70,3 +72,11 @@ class AnalysisStarter:
         except (CalledProcessError, HTTPError, SeqeraError) as exception:
             self.tracker.set_case_as_not_running(case_id)
             raise exception
+
+    def _ensure_case_matches_workflow(self, case_id: str) -> None:
+        case: Case = self.store.get_case_by_internal_id_strict(case_id)
+        if case.data_analysis != self.workflow:
+            raise CaseWorkflowMismatchError(
+                f"Case {case_id} is assigned to workflow {case.data_analysis}, "
+                f"not {self.workflow}."
+            )

cg/services/analysis_starter/configurator/implementations/balsamic.py

@@ -2,8 +2,9 @@ import logging
 from pathlib import Path
 from typing import cast
 
+from cg.apps.lims.api import LimsAPI
 from cg.constants.priority import SlurmQos
-from cg.exc import CaseNotConfiguredError
+from cg.exc import CaseNotConfiguredError, MultipleCaptureKitsError
 from cg.meta.workflow.fastq import BalsamicFastqHandler
 from cg.models.cg_config import BalsamicConfig
 from cg.services.analysis_starter.configurator.configurator import Configurator
@@ -11,6 +12,7 @@ from cg.services.analysis_starter.configurator.file_creators.balsamic_config imp
     BalsamicConfigFileCreator,
 )
 from cg.services.analysis_starter.configurator.models.balsamic import BalsamicCaseConfig
+from cg.store.models import Case
 from cg.store.store import Store
 
 LOG = logging.getLogger(__name__)
@@ -22,6 +24,7 @@ class BalsamicConfigurator(Configurator):
         config: BalsamicConfig,
         config_file_creator: BalsamicConfigFileCreator,
         fastq_handler: BalsamicFastqHandler,
+        lims_api: LimsAPI,
         store: Store,
     ):
         self.store: Store = store
@@ -35,9 +38,11 @@ class BalsamicConfigurator(Configurator):
 
         self.fastq_handler: BalsamicFastqHandler = fastq_handler
         self.config_file_creator: BalsamicConfigFileCreator = config_file_creator
+        self.lims_api = lims_api
 
     def configure(self, case_id: str, **flags) -> BalsamicCaseConfig:
         LOG.info(f"Configuring case {case_id}")
+        self._ensure_consistent_capture_kits(case_id)
         self.fastq_handler.link_fastq_files(case_id)
         fastq_path: Path = self.fastq_handler.get_fastq_dir(case_id)
         self.config_file_creator.create(case_id=case_id, fastq_path=fastq_path, **flags)
@@ -61,6 +66,16 @@ class BalsamicConfigurator(Configurator):
     def _get_sample_config_path(self, case_id: str) -> Path:
         return Path(self.root_dir, case_id, f"{case_id}.json")
 
+    def _ensure_consistent_capture_kits(self, case_id):
+        case: Case = self.store.get_case_by_internal_id_strict(case_id)
+        capture_kits: set[str | None] = {
+            self.lims_api.capture_kit(sample.internal_id) for sample in case.samples
+        }
+        if len(capture_kits) > 1:
+            raise MultipleCaptureKitsError(
+                f"Multiple capture kits found for {case_id}: {capture_kits}"
+            )
+
     def _ensure_required_config_files_exist(self, config: BalsamicCaseConfig) -> None:
         if not config.sample_config.exists():
             raise CaseNotConfiguredError(

cg/services/analysis_starter/factories/configurator_factory.py

@@ -228,6 +228,7 @@ class ConfiguratorFactory:
                 status_db=self.store,
             ),
             config=self.cg_config.balsamic,
+            lims_api=self.lims_api,
             store=self.store,
         )
 

{cg-83.15.1.dist-info → cg-83.15.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cg
-Version: 83.15.1
+Version: 83.15.3
 Summary: Clinical Genomics command center
 Requires-Python: >=3.11,<3.13
 Classifier: Programming Language :: Python

{cg-83.15.1.dist-info → cg-83.15.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cg/__init__.py,sha256=8ACeYoaEs1BYFgYUmNeRwB0QUDpYryqJO79lU4ZH59A,41
+cg/__init__.py,sha256=wv-WioAcstp0tI-e4BA-fOP5yyUjNNdpVHMGeppa8R0,41
 cg/apps/__init__.py,sha256=pYf0vxo4iYQqURzFRYzqpOCdV8Cm9MWx0GHvJOz0EMg,315
 cg/apps/coverage/__init__.py,sha256=dJtsmNf8tODE2-VEomMIoYA7ugLYZAk_upsfOQCZeF8,27
 cg/apps/coverage/api.py,sha256=e_ozC3QeNKoEfpjjMaL-XjeBLtz-JySWccrtw0E9mLM,2940
@@ -225,7 +225,7 @@ cg/constants/slurm.py,sha256=_Y_InISKpGKT-oVMnES7k7Csz2G1l52MNtJwBZm0prI,313
 cg/constants/subject.py,sha256=EE26Emu6T3_HWvsWeuI5GRGGIvB0BwCjN53KHrsr18U,577
 cg/constants/symbols.py,sha256=c06D1mYFWstZbVEgiby2lUNriswUPVRU5TnSSy889tY,71
 cg/constants/tb.py,sha256=UJHdsu109oR_zxvQrko9SqFANiSUn_UJTw5BFebWcds,621
-cg/exc.py,sha256=IYYRa6saq17OT8pA_PBdiorf2XyXTaxNV20JBkdx8QE,8418
+cg/exc.py,sha256=Omvtdskjyby9ISEV5mM27Aku82XM77I_eIYbiQaKV1I,8736
 cg/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cg/io/api.py,sha256=WaiompYmK4bkl94fZkGzP2CTsQPmHaTSvy0oD0SKw4s,1037
 cg/io/controller.py,sha256=4TTHm9fNY7Ti3S0r-uhxB3oycJ-Ni5Y44lFj5Yvl3_I,2978
@@ -515,7 +515,7 @@ cg/server/utils.py,sha256=fL5ZFlr2V-F3bbjPUi3LDxRuFK7UdN8jCp3txDvs0dE,227
 cg/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cg/services/analysis_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cg/services/analysis_service/analysis_service.py,sha256=vqT_f83Bf1hZ69HvfXwbR5FNqjh67nYTndWE0Rlr030,2041
-cg/services/analysis_starter/analysis_starter.py,sha256=r2fH5AXhVW8Pt1zHgAE2x6HegNgcZRPmXc5GpNNL3c8,3010
+cg/services/analysis_starter/analysis_starter.py,sha256=B6ZPOSVorkKDZwm1JZxTUKxwrFf7gns_T_eeMBLwGss,3509
 cg/services/analysis_starter/configurator/abstract_model.py,sha256=S1g5VZJ_cnM8QdDe3AeHlUqq8iO9Fykp8Q80X2_6PvM,374
 cg/services/analysis_starter/configurator/configurator.py,sha256=ZgELQu9dQPt_42EwcEbLNPsvaLP58xOrfAVSXFiTZSA,943
 cg/services/analysis_starter/configurator/extensions/nallo.py,sha256=lsqFyzbdUmOgAuB_OKM-Zeyzq1cNiaekjwD5icY1_Nk,1111
@@ -544,7 +544,7 @@ cg/services/analysis_starter/configurator/file_creators/nextflow/sample_sheet/rn
 cg/services/analysis_starter/configurator/file_creators/nextflow/sample_sheet/taxprofiler_sample_sheet_creator.py,sha256=dBbgE0TtZG3xNRrOkLbiGQdY2ZVfCKUsSL4jUOotNuo,1757
 cg/services/analysis_starter/configurator/file_creators/nextflow/sample_sheet/tomte_sample_sheet_creator.py,sha256=8OsMI7ZbcEHsPZAwbG1YRklINBISxsiyli5iaRspKYY,1488
 cg/services/analysis_starter/configurator/file_creators/nextflow/utils.py,sha256=Fr7s-_lo6UHwmmWt4peeW0eZBxB7KZcE_S2CykdIr1M,559
-cg/services/analysis_starter/configurator/implementations/balsamic.py,sha256=-5Omv61f20lQsVf5G_5NCwNPXn-BrRBdgu6XjfrrNUo,2894
+cg/services/analysis_starter/configurator/implementations/balsamic.py,sha256=YUvWwLZlNonqzFUxDKnMwIbtHcGMX1bekiVBR0manCk,3539
 cg/services/analysis_starter/configurator/implementations/microsalt.py,sha256=4bqeDS2LjV5Dl2cQkAb3FOTQ3uEoOXkSMyHP1lhkUKQ,3350
 cg/services/analysis_starter/configurator/implementations/mip_dna.py,sha256=dhzXUGNvFDpgHL-o2Fh24WlDHpJpVrk0bKRrIbm4Ik8,5073
 cg/services/analysis_starter/configurator/implementations/nextflow.py,sha256=hNbFybR1PdpZyasNMMWmVfSRQuLR1NT26dEo8lYldD4,6947
@@ -553,7 +553,7 @@ cg/services/analysis_starter/configurator/models/microsalt.py,sha256=PvwYS9sL1hh
 cg/services/analysis_starter/configurator/models/mip_dna.py,sha256=-9wiSIPeqp7McCnS_MWYS7DqkAoB0BEXVVYGnov1QUg,1156
 cg/services/analysis_starter/configurator/models/nextflow.py,sha256=Ug-Kj179TW5hnaCBPJFu9rigbBnmFYSfv02kkItmn2o,610
 cg/services/analysis_starter/constants.py,sha256=69R7TyZWXQlDMowpV87faHcY7zpH5KTTjHLViYadeo8,268
-cg/services/analysis_starter/factories/configurator_factory.py,sha256=2K3vTqNd-6eZCeajTZ3PsOuik9CUSfrksKulQ7es_jE,12259
+cg/services/analysis_starter/factories/configurator_factory.py,sha256=CB9iyjaH43cEMQb9_Q9JdHGbLvodEwhhXKZatZhkcEI,12295
 cg/services/analysis_starter/factories/starter_factory.py,sha256=hhM-5pRgklJiQ-vZYEyD0bwZ_v1IcybMfVCeKC_ySR8,6138
 cg/services/analysis_starter/input_fetcher/implementations/bam_fetcher.py,sha256=ttpexbRji6VjlxYi_ayevfjNAtgkV25OQbAV7fagKYA,2530
 cg/services/analysis_starter/input_fetcher/implementations/fastq_fetcher.py,sha256=P2NVYgjLNwnmRsebuVVMUA4_ks-1wx2ALfHBxoucmUg,9676
@@ -923,7 +923,7 @@ cg/utils/flask/enum.py,sha256=xwNVtFPkSzoloJctLHu7obRyxcng1GJrhkeYkqwf9tw,1052
 cg/utils/mapping.py,sha256=oZpZW2kgsbtAP2FZ7RtRPELiEE1zZk_nAGisHGtCOUo,491
 cg/utils/time.py,sha256=_VOglhrFEZ5cwHK1U1g36SdwzB7UvV-Nvlt4ymuZUho,1501
 cg/utils/utils.py,sha256=RciI_UhWcnG_pMZrmQZ1ZYb-O1N0DweTYMmhE0SIRgQ,1410
-cg-83.15.1.dist-info/METADATA,sha256=tIIqVq7JGccOTUpRusR2vHoN8WBQJWunoqbXS4IWrZQ,4940
-cg-83.15.1.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-cg-83.15.1.dist-info/entry_points.txt,sha256=q5f47YQQGltzK_xnIq1mDopRXXEItr85Xe1BCtG-Wts,39
-cg-83.15.1.dist-info/RECORD,,
+cg-83.15.3.dist-info/METADATA,sha256=K9yyPr_YAzs94GM0SsE9un_FRwjmtkggZjBGalpq_r4,4940
+cg-83.15.3.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+cg-83.15.3.dist-info/entry_points.txt,sha256=q5f47YQQGltzK_xnIq1mDopRXXEItr85Xe1BCtG-Wts,39
+cg-83.15.3.dist-info/RECORD,,