Merge pull request #254 from phenobarbital/new-exports

using ciso for iso-formatted datetimes to avoid dropping timezone inf…

Author: phenobarbital

datamodel/converters.pyx

@@ -194,16 +194,17 @@ cpdef datetime.datetime to_datetime(object obj):
         except ValueError:
             pass
     try:
-        return rc.to_datetime(obj)
+        return ciso8601.parse_datetime(obj)
     except ValueError:
         pass
     try:
-        return ciso8601.parse_datetime(obj)
+        return rc.to_datetime(obj)
     except ValueError:
         raise ValueError(
             f"Can't convert invalid data *{obj}* to datetime"
         )
 
+
 cpdef object to_integer(object obj):
     """to_integer.
 

datamodel/rs_parsers/src/lib.rs

@@ -3,7 +3,7 @@ use pyo3::exceptions::PyValueError;
 use pyo3::PyTypeInfo;
 use pyo3::wrap_pyfunction;
 use pyo3::types::{PyDate, PyDateTime, PyAny, PyString, PyBool, PyBytes, PyInt, PyFloat, PyList};
-use chrono::{Datelike, Timelike, NaiveDate, NaiveDateTime, DateTime, Utc};
+use chrono::{Datelike, Timelike, NaiveDate, NaiveDateTime, DateTime};
 use speedate::Date as SpeeDate;
 use speedate::DateTime as SpeeDateTime;
 use uuid::Uuid;
@@ -66,7 +66,7 @@ fn to_list(py: Python, py_type: Py<PyAny>, input_list: Py<PyList>) -> PyResult<P
     let mut result_list: Vec<PyObject> = Vec::new();
 
     for item in input_list.iter() {
-        let converted_item = Python::with_gil(|py| {
+        let converted_item = Python::with_gil(|_py: Python<'_>| {
             let py_type = py_type.clone();
             let item_obj: PyObject = item.into();
             py_type.call1((item_obj,)).map(|obj| obj.into())
@@ -266,7 +266,6 @@ fn to_datetime(py: Python, input: &str, custom_format: Option<&str>) -> PyResult
         return Err(PyValueError::new_err("Input string is empty"));
     }
 
-    // Attempt parsing using Speedate
     // Attempt parsing using Speedate
     if let Ok(parsed_datetime) = SpeeDateTime::parse_str(input) {
         return Ok(PyDateTime::new(
@@ -282,14 +281,6 @@ fn to_datetime(py: Python, input: &str, custom_format: Option<&str>) -> PyResult
         )?.into());
     }
 
-    // Try parsing as ISO 8601 datetime with timezone.
-    if let Ok(datetime) = DateTime::parse_from_rfc3339(input) {
-        let datetime_utc = datetime.with_timezone(&Utc);
-        return Ok(
-            PyDateTime::from_timestamp(py, datetime_utc.timestamp() as f64, None,)?.into()
-        );
-    }
-
     // Define custom formats to try, including the optional format.
     let mut formats = vec![
         "%Y-%m-%d",             // ISO 8601 date

datamodel/version.py

@@ -6,7 +6,7 @@
     'simple library based on python +3.8 to use Dataclass-syntax'
     'for interacting with Data'
 )
-__version__ = '0.10.13'
+__version__ = '0.10.14'
 __copyright__ = 'Copyright (c) 2020-2024 Jesus Lara'
 __author__ = 'Jesus Lara'
 __author_email__ = 'jesuslarag@gmail.com'

examples/timezone.py

@@ -0,0 +1,14 @@
+from datetime import datetime
+from datamodel import BaseModel, Field
+
+
+class DateTest(BaseModel):
+    date_field: datetime = Field(required=True)
+
+
+if __name__ == '__main__':
+    data = {'date_field': "2025-03-24T11:10:22-05:00"}
+    date_test = DateTest(**data)
+    print(date_test.date_field)
+    print(date_test.to_dict())
+    print(date_test.to_json())