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

cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py

@@ -63,7 +63,15 @@ class SQLDerivation(BaseDerivation):
         # We perform the cut logic by creating a temporary DataFrame with the series
         # and running the SQL generation logic on it.
         temp_col = "_val"
-        temp_df = pl.DataFrame({temp_col: series})
+        
+        # Cast to Float64 for numeric comparisons (handles string source data)
+        try:
+            numeric_series = series.cast(pl.Float64)
+        except Exception:
+            # If cast fails, try to keep as-is (maybe it's already numeric)
+            numeric_series = series
+            
+        temp_df = pl.DataFrame({temp_col: numeric_series})
         source = temp_col
         
         # Build CASE expression (logic lifted from original _derive_cut)
@@ -91,8 +99,14 @@ class SQLDerivation(BaseDerivation):
             elif condition.startswith(">=") and " and " in condition.lower():
                 parts = condition.split(" and ")
                 lower = parts[0].replace(">=", "").strip()
-                upper = parts[1].replace("<", "").strip()
-                case_parts.append(f"WHEN {source} >= {lower} AND {source} < {upper} THEN '{label}'")
+                upper_part = parts[1].strip()
+                # Handle both <= and < for upper bound
+                if "<=" in upper_part:
+                    upper = upper_part.replace("<=", "").strip()
+                    case_parts.append(f"WHEN {source} >= {lower} AND {source} <= {upper} THEN '{label}'")
+                else:
+                    upper = upper_part.replace("<", "").strip()
+                    case_parts.append(f"WHEN {source} >= {lower} AND {source} < {upper} THEN '{label}'")
             elif condition.startswith(">="):
                 value = condition[2:].strip()
                 case_parts.append(f"WHEN {source} >= {value} THEN '{label}'")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdiscbuilder
-Version: 1.1.8
+Version: 1.1.10
 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.8.dist-info → cdiscbuilder-1.1.10.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=7vdi7qisIN4U3dft9AoPYkpUDlikR9bWu5ziTSdSCx8,23476
+cdiscbuilder/adam/adam_derivation/derivations/sql_derivation.py,sha256=zAQtLlVasXpW_OIc4kNIYy0n3MerGWLZHoFYv7Nu648,24146
 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.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,,
+cdiscbuilder-1.1.10.dist-info/licenses/LICENSE,sha256=Da4Pm8tEdB1ycKkAkF2EwfHd-8l0wrJ_uwejzfBRHFE,1092
+cdiscbuilder-1.1.10.dist-info/METADATA,sha256=h2z5jttsHu_kiK74BtigJLWLehp9NupmmSycv5cQ2-Y,357
+cdiscbuilder-1.1.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cdiscbuilder-1.1.10.dist-info/entry_points.txt,sha256=KsuiJD4hsfjRqDkdvWgLFPeQCz7QBl73RA665BmF0Pw,53
+cdiscbuilder-1.1.10.dist-info/top_level.txt,sha256=3x5ENgnXBENgXKp5Zsht_4_OmA5wLVvDuk0UEkYOGNw,13
+cdiscbuilder-1.1.10.dist-info/RECORD,,