Fix validation for dates from datetime strings (#110)

Signed-off-by: Pascal Tomecek <[email protected]>

Author: ptomecek

ccflow/tests/test_context.py

@@ -54,11 +54,13 @@ def test_date_validation(self):
         self.assertEqual(TypeAdapter(DateContext).validate_python(str(date.today())), c)
         self.assertEqual(TypeAdapter(DateContext).validate_python("0d"), c)
         self.assertEqual(TypeAdapter(DateContext).validate_python("-1d"), c1)
-        self.assertRaises(ValueError, TypeAdapter(DateContext).validate_python, "foo")
+        self.assertRaises(ValidationError, TypeAdapter(DateContext).validate_python, "foo")
+        self.assertRaises(ValidationError, TypeAdapter(DateContext).validate_python, None)
 
-        # Test validation from datetime (not normally allowed by pydantic)
+    def test_date_from_datetime_validation(self):
         dt = datetime(2022, 1, 1, 12, tzinfo=timezone.utc)
         self.assertEqual(TypeAdapter(DateContext).validate_python(dt), DateContext(date=dt.date()))
+        self.assertEqual(TypeAdapter(DateContext).validate_python(dt.isoformat()), DateContext(date=dt.date()))
 
     def test_datetime_validation(self):
         dt = datetime(2022, 1, 1, 12, 0, tzinfo=timezone.utc)

ccflow/tests/test_validators.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import date, timedelta
+from datetime import date, datetime, timedelta
 from unittest import TestCase
 
 from ccflow.validators import eval_or_load_object, load_object, normalize_date, str_to_log_level
@@ -12,10 +12,17 @@ class A:
 class TestValidators(TestCase):
     def test_normalize_date(self):
         c = date.today()
+        self.assertEqual(normalize_date(c), c)
         self.assertEqual(normalize_date("0d"), c)
         c1 = date.today() - timedelta(1)
         self.assertEqual(normalize_date("-1d"), c1)
 
+        self.assertEqual(normalize_date(datetime.now()), c)
+        self.assertEqual(normalize_date(datetime.now().isoformat()), c)
+
+        self.assertEqual(normalize_date("foo"), "foo")
+        self.assertEqual(normalize_date(None), None)
+
     def test_load_object(self):
         self.assertEqual(load_object("ccflow.tests.test_validators.A"), A)
         self.assertIsNone(load_object(None))

ccflow/validators.py

@@ -5,10 +5,12 @@
 from typing import Any, Dict, Optional
 
 import pandas as pd
-from pydantic import ValidationError
+from pydantic import TypeAdapter, ValidationError
 
 from .exttypes import PyObjectPath
 
+_DatetimeAdapter = TypeAdapter(datetime)
+
 
 def normalize_date(v: Any) -> Any:
     """Validator that will convert string offsets to date based on today, and convert datetime to date."""
@@ -18,8 +20,14 @@ def normalize_date(v: Any) -> Any:
             return timestamp.date()
         except ValueError:
             pass
-    if isinstance(v, datetime):
-        return v.date()
+    # Convert from anything that can be converted to a datetime to a date via datetime
+    # This is not normally allowed by pydantic.
+    try:
+        v = _DatetimeAdapter.validate_python(v)
+        if isinstance(v, datetime):
+            return v.date()
+    except ValidationError:
+        pass
     return v