pylantir 0.0.8__tar.gz → 0.0.9__tar.gz

{pylantir-0.0.8 → pylantir-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pylantir
-Version: 0.0.8
+Version: 0.0.9
 Summary: Python - DICOM Modality WorkList
 Author-email: Milton Camacho <miltoncamachoicc@gmail.com>
 Requires-Python: >=3.11.1
@@ -31,7 +31,7 @@ Requires-Dist: flake8-formatter_junit_xml ; extra == "test"
 Requires-Dist: flake8 ; extra == "test"
 Requires-Dist: flake8-pyproject ; extra == "test"
 Requires-Dist: pre-commit==3.3.1 ; extra == "test"
-Requires-Dist: pylint==2.17.4 ; extra == "test"
+Requires-Dist: pylint==3.3.6 ; extra == "test"
 Requires-Dist: pylint_junit ; extra == "test"
 Requires-Dist: pytest-cov==4.0.0 ; extra == "test"
 Requires-Dist: pytest-mock<3.10.1 ; extra == "test"

{pylantir-0.0.8 → pylantir-0.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name =  "pylantir"
-version = "0.0.8"
+version = "0.0.9"
 authors = [
     {name = "Milton Camacho", email = "miltoncamachoicc@gmail.com"},
 ]
@@ -50,7 +50,7 @@ test = [
     "flake8",
     "flake8-pyproject",
     "pre-commit==3.3.1",
-    "pylint==2.17.4",
+    "pylint==3.3.6",
     "pylint_junit",
     "pytest-cov==4.0.0",
     "pytest-mock<3.10.1",

{pylantir-0.0.8 → pylantir-0.0.9}/src/pylantir/models.py

@@ -37,7 +37,10 @@ class WorklistItem(Base):
     procedure_description = Column(String(200))
     protocol_name = Column(String(100))
     station_name = Column(String(100))
-    hisris_coding_designator = Column(String(100))
+    try:
+        hisris_coding_designator = Column(String(100))
+    except:
+        lgr.warning("Could not get hisris_coding_designator check models.py ")
     performed_procedure_step_status = Column(String, default="SCHEDULED")
 
 

{pylantir-0.0.8 → pylantir-0.0.9}/src/pylantir/redcap_to_db.py

@@ -107,6 +107,7 @@ def sync_redcap_to_db(
 
     if not redcap2wl:
         lgr.error("No field mapping (redcap2wl) provided for syncing.")
+        return
 
     session = Session()
 
@@ -133,7 +134,8 @@ def sync_redcap_to_db(
         ses_id = record.get("mri_instance")
 
         PatientName = f"cpip-id-{study_id}^fa-{family_id}"
-        PatientID = f"sub-{study_id}_ses-{ses_id}_fam-{family_id}_site-{site_id}"
+        PatientID = f"sub_{study_id}_ses_{ses_id}_fam_{family_id}_site_{site_id}"
+        PatientID_ = f"sub-{study_id}_ses-{ses_id}_fam-{family_id}_site-{site_id}"
 
         if not PatientID:
             lgr.warning("Skipping record due to missing Study ID.")
@@ -149,8 +151,18 @@ def sync_redcap_to_db(
             .first()
         )
 
+        existing_entry_ = (
+            session.query(WorklistItem)
+            .filter_by(patient_id=PatientID_)
+            .first()
+        )
         if existing_entry:
             logging.debug(f"Updating existing worklist entry for PatientID {PatientID}")
+        elif existing_entry_:
+            logging.debug(f"Updating existing worklist entry for PatientID {PatientID_}")
+            existing_entry = existing_entry_
+
+        if existing_entry:
             existing_entry.patient_name = PatientName
             existing_entry.patient_id = PatientID
             existing_entry.patient_birth_date = record.get("youth_dob_y", "19000101")