accept +0000 format datetime (comes from requests)

Author: KatKatKateryna

models/ConfigData.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field, fields, is_dataclass
-from datetime import datetime, timezone
+from datetime import datetime
 from enum import Enum
 
 from .utils import update_dataclass_from_dict
@@ -9,6 +9,7 @@
     MetadataConfig,
     ResourceConfigTemplate,
 )
+from .top_level.utils import datetime_to_string
 from .top_level.utils import InlineList
 from .top_level.providers import ProviderTemplate
 from .top_level.providers.records import ProviderTypes
@@ -141,14 +142,6 @@ def all_missing_props(self):
             return self._all_missing_props
         return []
 
-    def datetime_to_string(self, data: datetime):
-        # normalize to UTC and format with Z
-        if data.tzinfo is None:
-            data = data.replace(tzinfo=timezone.utc)
-        else:
-            data = data.astimezone(timezone.utc)
-        return data.strftime("%Y-%m-%dT%H:%M:%SZ")
-
     def asdict_enum_safe(self, obj, datetime_to_str=False):
         """Overwriting dataclass 'asdict' fuction to replace Enums with strings."""
         if is_dataclass(obj):
@@ -177,7 +170,7 @@ def asdict_enum_safe(self, obj, datetime_to_str=False):
             }
         else:
             if isinstance(obj, datetime) and datetime_to_str:
-                return self.datetime_to_string(obj)
+                return datetime_to_string(obj)
             else:
                 return obj
 

models/top_level/utils.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timezone
 from enum import Enum
+import re
 
 STRING_SEPARATOR = " | "
 
@@ -64,3 +65,49 @@ def to_iso8601(dt: datetime) -> str:
         dt = dt.astimezone(timezone.utc)
 
     return dt.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+
+def datetime_to_string(data: datetime):
+    # normalize to UTC and format with Z
+    if data.tzinfo is None:
+        data = data.replace(tzinfo=timezone.utc)
+    else:
+        data = data.astimezone(timezone.utc)
+    return data.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+
+def datetime_from_string(value: str) -> datetime | None:
+    """
+    Parse common ISO8601 datetime strings and return a timezone-aware datetime.
+    Accepts:
+      - 2025-12-17T12:34:56Z
+      - 2025-12-17T12:34:56+02:00
+      - 2025-12-17T12:34:56+0200
+    If no timezone is present, returns a UTC-aware datetime (assumption).
+    Returns None if parsing fails.
+    """
+    if not isinstance(value, str):
+        return None
+
+    s = value.strip()
+    # quick normalization: trailing Z -> +00:00
+    if s.endswith("Z"):
+        s = s[:-1] + "+00:00"
+
+    # normalize +0200 -> +02:00
+    s = re.sub(r"([+-]\d{2})(\d{2})$", r"\1:\2", s)
+
+    # Try stdlib first (requires offset with colon to return aware dt)
+    try:
+        dt = datetime.fromisoformat(s)
+    except Exception:
+        dt = None
+
+    if dt is None:
+        return None
+
+    # If dt is naive, assume UTC
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone.utc)
+
+    return dt

models/utils.py

@@ -4,7 +4,11 @@
 from types import UnionType
 from typing import Any, get_origin, get_args, Union, get_type_hints
 
-from .top_level.utils import InlineList, get_enum_value_from_string
+from .top_level.utils import (
+    InlineList,
+    get_enum_value_from_string,
+    datetime_from_string,
+)
 
 
 def update_dataclass_from_dict(
@@ -67,12 +71,7 @@ def update_dataclass_from_dict(
                     if (datetime in args or expected_type is datetime) and isinstance(
                         new_value, str
                     ):
-                        try:
-                            new_value = datetime.strptime(
-                                new_value, "%Y-%m-%dT%H:%M:%SZ"
-                            )
-                        except:
-                            pass
+                        new_value = datetime_from_string(new_value)
 
                     # Exception: remap str to Enum
                     elif isinstance(expected_type, type) and issubclass(
@@ -294,11 +293,10 @@ def _is_instance_of_type(value, expected_type) -> bool:
 
     # Exception: try cast str to datetime manually
     if expected_type is datetime:
-        try:
-            datetime.strptime(value, "%Y-%m-%dT%H:%M:%SZ")
+        if datetime_from_string(value) is not None:
             return True
-        except:
-            pass
+        else:
+            return False
 
     # Fallback for normal types
     return isinstance(value, expected_type)