Merge pull request #5 from KatKatKateryna/kate/yaml_validation

Adjust datetime format on Save YAML

Author: doublebyte1

models/top_level/utils.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timezone
 from enum import Enum
 
 STRING_SEPARATOR = " | "
@@ -44,3 +45,17 @@ def bbox_from_list(raw_bbox_list: list):
         )
 
     return InlineList(list_bbox_val)
+
+
+def to_iso8601(dt: datetime) -> str:
+    """
+    Convert datetime to UTC ISO 8601 string, for both naive and aware datetimes.
+    """
+    if dt.tzinfo is None:
+        # Treat naive datetime as UTC
+        dt = dt.replace(tzinfo=timezone.utc)
+    else:
+        # Convert to UTC
+        dt = dt.astimezone(timezone.utc)
+
+    return dt.strftime("%Y-%m-%dT%H:%M:%SZ")

pygeoapi_config_dialog.py

@@ -22,6 +22,7 @@
  ***************************************************************************/
 """
 
+from datetime import datetime, timezone
 import os
 import yaml
 
@@ -96,14 +97,31 @@ def __init__(self, parent=None):
         self.ui_setter = UiSetter(self)
         self.data_from_ui_setter = DataSetterFromUi(self)
 
+        class CustomDumper(yaml.SafeDumper):
+            pass
+
+        self.dumper = CustomDumper
+
         # make sure InlineList is represented as a YAML sequence (e.g. for 'bbox')
-        yaml.add_representer(
+        self.dumper.add_representer(
             InlineList,
             lambda dumper, data: dumper.represent_sequence(
                 "tag:yaml.org,2002:seq", data, flow_style=True
             ),
         )
 
+        def represent_datetime_as_timestamp(dumper, 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)
+            value = data.strftime("%Y-%m-%dT%H:%M:%SZ")
+            # emit as YAML timestamp → plain scalar, no quotes
+            return dumper.represent_scalar("tag:yaml.org,2002:timestamp", value)
+
+        self.dumper.add_representer(datetime, represent_datetime_as_timestamp)
+
         # custom assignments
         self.model = QStringListModel()
         self.proxy = QSortFilterProxyModel()
@@ -145,6 +163,7 @@ def save_to_file(self):
                     yaml.dump(
                         self.config_data.asdict_enum_safe(self.config_data),
                         file,
+                        Dumper=self.dumper,
                         default_flow_style=False,
                         sort_keys=False,
                         allow_unicode=True,