cdiscbuilder 1.1.6__py3-none-any.whl → 1.1.8__py3-none-any.whl

cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py

@@ -430,15 +430,28 @@ class SQLDerivation(BaseDerivation):
                 if target_col in subject_data.columns and date_col in subject_data.columns:
                     # Get target date (should be same for all rows of this subject)
                     target_date = subject_data[target_col][0]
-
+                    
+                    # Skip if target date is null
+                    if target_date is None:
+                        result_list.append(subject_data[source_col][0])
+                        continue
+                    
                     # Calculate date differences and find closest
-                    # Handle partial dates by using strptime with appropriate format
+                    # Handle multiple formats: "YYYY-MM-DD HH:MM:SS", "YYYY-MM-DDTHH:MM:SS" (ISO), or "YYYY-MM-DD"
+                    # We convert everything to Datetime for precision comparison (ms level)
+                    def parse_to_datetime(expr: pl.Expr) -> pl.Expr:
+                        return (
+                            expr.str.strptime(pl.Datetime, "%Y-%m-%d %H:%M:%S", strict=False)
+                            .fill_null(expr.str.strptime(pl.Datetime, "%Y-%m-%dT%H:%M:%S", strict=False))
+                            .fill_null(expr.str.strptime(pl.Date, "%Y-%m-%d", strict=False).cast(pl.Datetime))
+                        )
+
                     with_diff = subject_data.with_columns(
                         (
-                            pl.col(date_col).str.strptime(pl.Date, "%Y-%m-%d", strict=False)
-                            - pl.lit(target_date).str.strptime(pl.Date, "%Y-%m-%d", strict=False)
+                            parse_to_datetime(pl.col(date_col))
+                            - parse_to_datetime(pl.lit(target_date))
                         )
-                        .dt.total_days()
+                        .dt.total_milliseconds()
                         .abs()
                         .alias("date_diff")
                     )

{cdiscbuilder-1.1.6.dist-info → cdiscbuilder-1.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdiscbuilder
-Version: 1.1.6
+Version: 1.1.8
 Summary: A package to convert ODM XML to SDTM/ADaM Datasets
 Author-email: Ming-Chun Chen <hellomingchun@gmail.com>
 Requires-Python: >=3.8

{cdiscbuilder-1.1.6.dist-info → cdiscbuilder-1.1.8.dist-info}/RECORD

@@ -7,7 +7,7 @@ cdiscbuilder/adam/adam_derivation/engine.py,sha256=5Wk_tc3c6nRKBiiL5gE7YXxvdPgXV
 cdiscbuilder/adam/adam_derivation/derivations/__init__.py,sha256=iu7xzlQF_uK_5nwYw5ovEsBDNdaX0S8oVFYYxcxheTc,213
 cdiscbuilder/adam/adam_derivation/derivations/base.py,sha256=thbi0UD17Z8hUA5G6np_wWDcFth-UmoY7moS2KzvIps,1242
 cdiscbuilder/adam/adam_derivation/derivations/function_derivation.py,sha256=mPBet5JR10RS9euaS9ZLE1GCMRS3Grp9Gc3hdiQOVDI,7167
-cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py,sha256=hQZnLX9khF9aagSck4W5gaW5ZQnoLwSESWaJ5SOpzb0,22711
+cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py,sha256=7vdi7qisIN4U3dft9AoPYkpUDlikR9bWu5ziTSdSCx8,23476
 cdiscbuilder/adam/adam_derivation/functions/__init__.py,sha256=Cv4pLpgHTr9i2zf7owbpZwMyxm8JLFmX4J31dvX0jYg,1773
 cdiscbuilder/adam/adam_derivation/functions/get_bmi.py,sha256=RR1lQpRSDO4cEkhxjnPutAy_xfVvfEwmhYR90XK2eMM,229
 cdiscbuilder/adam/adam_derivation/loaders/__init__.py,sha256=eUnUKzyahIaLIqjn39sYzXvzPpfabZoipkPdQ5mA9IE,116
@@ -49,9 +49,9 @@ cdiscbuilder/sdtm/loader/load.py,sha256=30x9fAEjnuRq313SRq9I7mBwrWl4sEhiKkmrr9x1
 cdiscbuilder/sdtm/loader/tests/__init__.py,sha256=ujCd31KMb52gvkWkVBBogLBda3aiRmbqS0nRS-yTnk0,69
 cdiscbuilder/sdtm/loader/tests/test_load.py,sha256=yrXFQlzH_EkN6HxJc7ItFie8xqwrs2XxwNu2wGaxjok,11180
 cdiscbuilder/tlf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdiscbuilder-1.1.6.dist-info/licenses/LICENSE,sha256=Da4Pm8tEdB1ycKkAkF2EwfHd-8l0wrJ_uwejzfBRHFE,1092
-cdiscbuilder-1.1.6.dist-info/METADATA,sha256=zjbMazHB2HkB-jeFFWsMAZlAhXmB3PgJN18Zn9_u36M,356
-cdiscbuilder-1.1.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-cdiscbuilder-1.1.6.dist-info/entry_points.txt,sha256=KsuiJD4hsfjRqDkdvWgLFPeQCz7QBl73RA665BmF0Pw,53
-cdiscbuilder-1.1.6.dist-info/top_level.txt,sha256=3x5ENgnXBENgXKp5Zsht_4_OmA5wLVvDuk0UEkYOGNw,13
-cdiscbuilder-1.1.6.dist-info/RECORD,,
+cdiscbuilder-1.1.8.dist-info/licenses/LICENSE,sha256=Da4Pm8tEdB1ycKkAkF2EwfHd-8l0wrJ_uwejzfBRHFE,1092
+cdiscbuilder-1.1.8.dist-info/METADATA,sha256=QL7D5R3de5fOEIAAyXSlET9qmuZh4CboDPNr0rDSVzI,356
+cdiscbuilder-1.1.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cdiscbuilder-1.1.8.dist-info/entry_points.txt,sha256=KsuiJD4hsfjRqDkdvWgLFPeQCz7QBl73RA665BmF0Pw,53
+cdiscbuilder-1.1.8.dist-info/top_level.txt,sha256=3x5ENgnXBENgXKp5Zsht_4_OmA5wLVvDuk0UEkYOGNw,13
+cdiscbuilder-1.1.8.dist-info/RECORD,,