Remove python_object_to_scalar_value code

Author: kosiew

src/config.rs

@@ -18,7 +18,6 @@
 use pyo3::prelude::*;
 use pyo3::types::*;
 
-use datafusion::common::ScalarValue;
 use datafusion::config::ConfigOptions;
 
 use crate::errors::PyDataFusionResult;

src/dataframe.rs

@@ -26,7 +26,7 @@ use arrow::ffi_stream::FFI_ArrowArrayStream;
 use datafusion::arrow::datatypes::Schema;
 use datafusion::arrow::pyarrow::{PyArrowType, ToPyArrow};
 use datafusion::arrow::util::pretty;
-use datafusion::common::{ScalarValue, UnnestOptions};
+use datafusion::common::UnnestOptions;
 use datafusion::config::{CsvOptions, TableParquetOptions};
 use datafusion::dataframe::{DataFrame, DataFrameWriteOptions};
 use datafusion::datasource::TableProvider;
@@ -884,234 +884,3 @@ async fn collect_record_batches_to_display(
 
     Ok((record_batches, has_more))
 }
-
-/// Convert a Python value to a DataFusion ScalarValue
-fn python_value_to_scalar_value(value: &PyObject, py: Python) -> PyDataFusionResult<ScalarValue> {
-    if value.is_none(py) {
-        let msg = "Cannot use None as fill value";
-        return Err(PyDataFusionError::Common(msg.to_string()));
-    }
-
-    // Convert PyObject to PyAny for easier extraction
-    let py_any: &PyAny = value.as_ref(py);
-
-    // Try extracting different types in sequence
-    if let Some(scalar) = try_extract_numeric(value, py) {
-        return Ok(scalar);
-    }
-
-    if let Ok(val) = value.extract::<bool>(py) {
-        return Ok(ScalarValue::Boolean(Some(val)));
-    }
-
-    if let Ok(val) = value.extract::<String>(py) {
-        return Ok(ScalarValue::Utf8(Some(val)));
-    }
-
-    if let Some(scalar) = try_extract_datetime(value, py) {
-        return Ok(scalar);
-    }
-
-    if let Some(scalar) = try_extract_date(value, py) {
-        return Ok(scalar);
-    }
-
-    // Fallback to string representation
-    try_convert_to_string(value, py)
-}
-
-/// Try to extract numeric types from a Python object
-fn try_extract_numeric(value: &PyObject, py: Python) -> Option<ScalarValue> {
-    // Integer types
-    if let Ok(val) = value.extract::<i64>(py) {
-        return Some(ScalarValue::Int64(Some(val)));
-    } else if let Ok(val) = value.extract::<i32>(py) {
-        return Some(ScalarValue::Int32(Some(val)));
-    } else if let Ok(val) = value.extract::<i16>(py) {
-        return Some(ScalarValue::Int16(Some(val)));
-    } else if let Ok(val) = value.extract::<i8>(py) {
-        return Some(ScalarValue::Int8(Some(val)));
-    }
-
-    // Unsigned integer types
-    if let Ok(val) = value.extract::<u64>(py) {
-        return Some(ScalarValue::UInt64(Some(val)));
-    } else if let Ok(val) = value.extract::<u32>(py) {
-        return Some(ScalarValue::UInt32(Some(val)));
-    } else if let Ok(val) = value.extract::<u16>(py) {
-        return Some(ScalarValue::UInt16(Some(val)));
-    } else if let Ok(val) = value.extract::<u8>(py) {
-        return Some(ScalarValue::UInt8(Some(val)));
-    }
-
-    // Float types
-    if let Ok(val) = value.extract::<f64>(py) {
-        return Some(ScalarValue::Float64(Some(val)));
-    } else if let Ok(val) = value.extract::<f32>(py) {
-        return Some(ScalarValue::Float32(Some(val)));
-    }
-
-    None
-}
-
-/// Try to extract datetime from a Python object
-fn try_extract_datetime(value: &PyObject, py: Python) -> Option<ScalarValue> {
-    let datetime_cls = py
-        .import("datetime")
-        .and_then(|m| m.getattr("datetime"))
-        .ok()?;
-
-    let any: PyAny = value.extract(py).ok()?;
-
-    if any.is_instance(datetime_cls).ok()? {
-        let dt = any.cast_as::<pyo3::types::PyDateTime>(py).ok()?;
-
-        // Extract datetime components
-        let year = dt.get_year() as i32;
-        let month = dt.get_month() as u8;
-        let day = dt.get_day() as u8;
-        let hour = dt.get_hour() as u8;
-        let minute = dt.get_minute() as u8;
-        let second = dt.get_second() as u8;
-        let micro = dt.get_microsecond() as u32;
-
-        // Convert to timestamp
-        let ts = date_to_timestamp(year, month, day, hour, minute, second, micro * 1000).ok()?;
-        return Some(ScalarValue::TimestampNanosecond(Some(ts), None));
-    }
-
-    None
-}
-
-/// Try to extract date from a Python object
-fn try_extract_date(value: &PyObject, py: Python) -> Option<ScalarValue> {
-    // Import datetime module once
-    let datetime_mod = py.import("datetime").ok()?;
-    let date_cls = datetime_mod.getattr("date").ok()?;
-    let datetime_cls = datetime_mod.getattr("datetime").ok()?;
-
-    // convert your PyObject into a &PyAny
-    let any: PyAny = value.extract(py).ok()?;
-
-    // Is it a date?
-    if any.is_instance(date_cls).ok()? {
-        // But not a datetime (we assume you handled datetimes elsewhere)
-        if any.is_instance(datetime_cls).ok()? {
-            return None;
-        }
-
-        // Downcast into the PyDate type
-        let dt: &PyDate = any.downcast().ok()?;
-
-        // Pull out year/month/day
-        let year = dt.get_year() as i32;
-        let month = dt.get_month() as u8;
-        let day = dt.get_day() as u8;
-
-        // Convert to your internal Date32
-        let days = date_to_days_since_epoch(year, month, day).ok()?;
-        return Some(ScalarValue::Date32(Some(days)));
-    }
-
-    None
-}
-
-/// Try to convert a Python object to string
-fn try_convert_to_string(value: &PyObject, py: Python) -> PyDataFusionResult<ScalarValue> {
-    // Try to convert arbitrary Python object to string by using str()
-    let str_result = value.call_method0(py, "str")?.extract::<String>(py);
-    match str_result {
-        Ok(string_value) => Ok(ScalarValue::Utf8(Some(string_value))),
-        Err(_) => {
-            let msg = "Could not convert Python object to string";
-            Err(PyDataFusionError::Common(msg.to_string()))
-        }
-    }
-}
-
-/// Helper function to convert date components to timestamp in nanoseconds
-fn date_to_timestamp(
-    year: i32,
-    month: u8,
-    day: u8,
-    hour: u8,
-    minute: u8,
-    second: u8,
-    nano: u32,
-) -> Result<i64, String> {
-    // This is a simplified implementation
-    // For production code, consider using a more complete date/time library
-
-    // Number of days in each month (non-leap year)
-    const DAYS_IN_MONTH: [u8; 12] = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-
-    // Validate inputs
-    if month < 1 || month > 12 {
-        return Err("Invalid month".to_string());
-    }
-
-    let max_days = if month == 2 && is_leap_year(year) {
-        29
-    } else {
-        DAYS_IN_MONTH[(month - 1) as usize]
-    };
-
-    if day < 1 || day > max_days {
-        return Err("Invalid day".to_string());
-    }
-
-    if hour > 23 || minute > 59 || second > 59 {
-        return Err("Invalid time".to_string());
-    }
-
-    // Calculate days since epoch
-    let days = date_to_days_since_epoch(year, month, day)?;
-
-    // Convert to seconds and add time components
-    let seconds =
-        days as i64 * 86400 + (hour as i64) * 3600 + (minute as i64) * 60 + (second as i64);
-
-    // Convert to nanoseconds
-    Ok(seconds * 1_000_000_000 + nano as i64)
-}
-
-/// Helper function to check if a year is a leap year
-fn is_leap_year(year: i32) -> bool {
-    (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)
-}
-
-/// Helper function to convert date to days since Unix epoch (1970-01-01)
-fn date_to_days_since_epoch(year: i32, month: u8, day: u8) -> Result<i32, String> {
-    // This is a simplified implementation to calculate days since epoch
-    if year < 1970 {
-        return Err("Dates before 1970 not supported in this implementation".to_string());
-    }
-
-    let mut days = 0;
-
-    // Add days for each year since 1970
-    for y in 1970..year {
-        days += if is_leap_year(y) { 366 } else { 365 };
-    }
-
-    // Add days for each month in the current year
-    for m in 1..month {
-        days += match m {
-            1 | 3 | 5 | 7 | 8 | 10 | 12 => 31,
-            4 | 6 | 9 | 11 => 30,
-            2 => {
-                if is_leap_year(year) {
-                    29
-                } else {
-                    28
-                }
-            }
-            _ => return Err("Invalid month".to_string()),
-        };
-    }
-
-    // Add days in current month
-    days += day as i32 - 1; // Subtract 1 because we're counting from the start of the month
-
-    Ok(days)
-}