covjsonkit 0.2.16__tar.gz → 0.2.18__tar.gz

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: covjsonkit
-Version: 0.2.16
+Version: 0.2.18
 Home-page: https://github.com/ecmwf/covjsonkit
 Author: ECMWF
 Author-email: James.Hawkes@ecmwf.int, Adam.Warde@ecmwf.int, Mathilde.Leuridan@ecmwf.int

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/decoder/BoundingBox.py

@@ -8,6 +8,7 @@ except ImportError:
 import xarray as xr
 from scipy.spatial import cKDTree
 
+from ..encoder.encoder import sort_step_values
 from .decoder import Decoder
 
 
@@ -177,7 +178,7 @@ class BoundingBox(Decoder):
 
         datetimes = sorted(list(set(datetimes)))
         numbers = sorted(list(set(numbers)))
-        steps = sorted(list(set(steps)))
+        steps = sort_step_values(list(set(steps)))
 
         new_values = {}
         for parameter in values.keys():

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/decoder/Circle.py

@@ -1,5 +1,6 @@
 import xarray as xr
 
+from ..encoder.encoder import sort_step_values
 from .decoder import Decoder
 
 
@@ -119,7 +120,7 @@ class Circle(Decoder):
 
         datetimes = sorted(list(set(datetimes)))
         numbers = sorted(list(set(numbers)))
-        steps = sorted(list(set(steps)))
+        steps = sort_step_values(list(set(steps)))
 
         new_values = {}
         for parameter in values.keys():

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/decoder/Path.py

@@ -1,5 +1,6 @@
 import xarray as xr
 
+from ..encoder.encoder import sort_step_values
 from .decoder import Decoder
 
 
@@ -117,7 +118,7 @@ class Path(Decoder):
 
         datetimes = list(set(datetimes))
         numbers = list(set(numbers))
-        steps = list(set(steps))
+        steps = sort_step_values(list(set(steps)))
 
         new_values = {}
         for parameter in values.keys():

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/decoder/VerticalProfile.py

@@ -3,6 +3,7 @@ from datetime import timedelta
 
 import xarray as xr
 
+from ..encoder.encoder import parse_step_string, sort_step_values
 from .decoder import Decoder
 
 
@@ -157,7 +158,7 @@ class VerticalProfile(Decoder):
 
             nums = list(set(num))
             datetime = list(set(datetime))
-            steps = list(set(steps))
+            steps = sort_step_values(list(set(steps)))
 
             for parameter in self.parameters:
                 if len(param_values[parameter]) <= domain_idx:
@@ -176,7 +177,7 @@ class VerticalProfile(Decoder):
                                 param_values[parameter][domain_idx][i][j].append([])
                             for coverage in self.covjson["coverages"]:
                                 new_step = (
-                                    dt.fromisoformat(date.replace("Z", "")) + timedelta(hours=int(step))
+                                    dt.fromisoformat(date.replace("Z", "")) + timedelta(hours=parse_step_string(step))
                                 ).isoformat() + "Z"
                                 if (
                                     coverage["mars:metadata"]["number"] == num

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/BoundingBox.py

@@ -3,7 +3,7 @@ import time
 
 import pandas as pd
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class BoundingBox(Encoder):
@@ -107,7 +107,7 @@ class BoundingBox(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         dv_dict[dv] = dataset[dv].sel(number=num, steps=step, datetimes=datetime).values.tolist()
@@ -196,7 +196,7 @@ class BoundingBox(Encoder):
                 for step in val_dict.keys():
                     mm = mars_metadata.copy()
                     mm["number"] = num
-                    mm["step"] = step
+                    mm["step"] = normalize_step_value(step)
                     mm["Forecast date"] = date
                     self.add_coverage(mm, coords[date], val_dict[step])
 

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Circle.py

@@ -1,6 +1,6 @@
 import logging
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class Circle(Encoder):
@@ -104,7 +104,7 @@ class Circle(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         dv_dict[dv] = dataset[dv].sel(number=num, steps=step, datetimes=datetime).values.tolist()
@@ -194,7 +194,7 @@ class Circle(Encoder):
                 for step in val_dict.keys():
                     mm = mars_metadata.copy()
                     mm["number"] = num
-                    mm["step"] = step
+                    mm["step"] = normalize_step_value(step)
                     mm["Forecast date"] = date
                     self.add_coverage(mm, coords[date], val_dict[step])
 

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Frame.py

@@ -1,6 +1,6 @@
 import logging
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class Frame(Encoder):
@@ -104,7 +104,7 @@ class Frame(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         dv_dict[dv] = dataset[dv].sel(number=num, steps=step, datetimes=datetime).values.tolist()
@@ -189,7 +189,7 @@ class Frame(Encoder):
                 for step in val_dict.keys():
                     mm = mars_metadata.copy()
                     mm["number"] = num
-                    mm["step"] = step
+                    mm["step"] = normalize_step_value(step)
                     mm["Forecast date"] = date
                     self.add_coverage(mm, coords[date], val_dict[step])
 

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Grid.py

@@ -1,9 +1,10 @@
 import logging
 import time
+from datetime import timedelta
 
 import pandas as pd
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class Grid(Encoder):
@@ -105,7 +106,7 @@ class Grid(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         nested_list = dataset[dv].sel(datetimes=datetime, number=num, steps=step).values.tolist()
@@ -181,11 +182,13 @@ class Grid(Encoder):
         logging.debug("The range_dict created was: %s", range_dict)  # noqa: E501
 
         coordinates = {}
-        coordinates["t"] = list(fields["step"])
+        coordinates["t"] = [int(s.total_seconds() // 3600) if isinstance(s, timedelta) else s for s in fields["step"]]
 
         for date in coords.keys():
             coordinates[date] = {}
-            coordinates[date]["t"] = list(fields["step"])
+            coordinates[date]["t"] = [
+                int(s.total_seconds() // 3600) if isinstance(s, timedelta) else s for s in fields["step"]
+            ]
             coordinates[date]["levelist"] = list(fields["levels"])
             coordinates[date]["latitude"] = []
             coordinates[date]["longitude"] = []
@@ -211,7 +214,7 @@ class Grid(Encoder):
                         val_dict[para].extend(combined_dict[date][num][para][step])
                 mm = mars_metadata.copy()
                 mm["number"] = num
-                mm["step"] = step
+                mm["step"] = normalize_step_value(step)
                 mm["Forecast date"] = date
                 self.add_coverage(mm, coordinates[date], val_dict)
 

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Path.py

@@ -1,6 +1,6 @@
 import logging
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class Path(Encoder):
@@ -104,7 +104,7 @@ class Path(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         dv_dict[dv] = dataset[dv].sel(number=num, steps=step, datetimes=datetime).values.tolist()

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Position.py

@@ -196,11 +196,14 @@ class Position(Encoder):
                                 new_date = pd.Timestamp(date).strftime(date_format)
                                 start_time = datetime.strptime(new_date, date_format)
                                 # add current date to list by converting it to iso format
-                                try:
-                                    int(step)
-                                except ValueError:
-                                    step = step[0]
-                                stamp = start_time + timedelta(hours=int(step))
+                                if isinstance(step, timedelta):
+                                    stamp = start_time + step
+                                else:
+                                    try:
+                                        int(step)
+                                    except ValueError:
+                                        step = step[0]
+                                    stamp = start_time + timedelta(hours=int(step))
                                 coordinates[date][i]["t"].append(stamp.isoformat() + "Z")
                             break
                         break

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Shapefile.py

@@ -1,6 +1,6 @@
 import logging
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class Shapefile(Encoder):
@@ -104,7 +104,7 @@ class Shapefile(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         dv_dict[dv] = dataset[dv].sel(number=num, steps=step, datetimes=datetime).values.tolist()
@@ -189,7 +189,7 @@ class Shapefile(Encoder):
                 for step in val_dict.keys():
                     mm = mars_metadata.copy()
                     mm["number"] = num
-                    mm["step"] = step
+                    mm["step"] = normalize_step_value(step)
                     mm["Forecast date"] = date
                     self.add_coverage(mm, coords[date], val_dict[step])
 

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/VerticalProfile.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta
 
 import pandas as pd
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class VerticalProfile(Encoder):
@@ -106,7 +106,7 @@ class VerticalProfile(Encoder):
                     for metadata in dataset.attrs:
                         mars_metadata[metadata] = dataset.attrs[metadata]
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
 
                     self.add_coverage(
                         mars_metadata,

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/Wkt.py

@@ -4,7 +4,7 @@ import time
 
 import pandas as pd
 
-from .encoder import Encoder
+from .encoder import Encoder, normalize_step_value
 
 
 class Wkt(Encoder):
@@ -108,7 +108,7 @@ class Wkt(Encoder):
                     dv_dict = {}
                     mars_metadata = {metadata: dataset.attrs[metadata] for metadata in dataset.attrs}
                     mars_metadata["number"] = int(num)
-                    mars_metadata["step"] = int(step)
+                    mars_metadata["step"] = normalize_step_value(step)
                     mars_metadata["Forecast date"] = str(datetime)
                     for dv in dataset.data_vars:
                         dv_dict[dv] = dataset[dv].sel(number=num, steps=step, datetimes=datetime).values.tolist()
@@ -198,7 +198,7 @@ class Wkt(Encoder):
                 for step in val_dict.keys():
                     mm = mars_metadata.copy()
                     mm["number"] = num
-                    mm["step"] = step
+                    mm["step"] = normalize_step_value(step)
                     mm["Forecast date"] = date
                     self.add_coverage(mm, coords[date], val_dict[step])
 

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit/encoder/encoder.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from datetime import timedelta
 from typing import Any
 
+import numpy as np
 import orjson
 import pandas as pd
 from covjson_pydantic.coverage import CoverageCollection
@@ -11,6 +13,170 @@ from covjson_pydantic.domain import DomainType
 from covjsonkit.param_db import get_param_ids, get_params, get_units
 
 
+def timedelta_to_step_string(td: timedelta) -> str:
+    """
+    Convert a timedelta object to a step string in the format 'XhYm'.
+
+    Args:
+        td: timedelta object representing the step
+
+    Returns:
+        String in format 'Xh', 'Ym', or 'XhYm' depending on the timedelta value
+
+    Examples:
+        timedelta(hours=13) -> "13h"
+        timedelta(hours=13, minutes=30) -> "13h30m"
+        timedelta(minutes=30) -> "30m"
+        timedelta(hours=0, minutes=0) -> "0h"
+    """
+    total_seconds = int(td.total_seconds())
+    hours = total_seconds // 3600
+    minutes = (total_seconds % 3600) // 60
+
+    if hours > 0 and minutes > 0:
+        return f"{hours}h{minutes}m"
+    elif hours > 0:
+        return f"{hours}h"
+    elif minutes > 0:
+        return f"{minutes}m"
+    else:
+        return "0h"
+
+
+def parse_step_string(step_str: str) -> float:
+    """
+    Parse a step string in format 'XhYm' and return total hours as float.
+
+    Args:
+        step_str: Step string in format 'Xh', 'Ym', or 'XhYm'
+
+    Returns:
+        Total hours as a float value
+
+    Examples:
+        parse_step_string("13h") -> 13.0
+        parse_step_string("13h30m") -> 13.5
+        parse_step_string("30m") -> 0.5
+        parse_step_string("0h") -> 0.0
+    """
+    if isinstance(step_str, (int, float)):
+        return float(step_str)
+
+    step_str = str(step_str)
+    hours = 0.0
+    minutes = 0.0
+
+    # Parse hours
+    if "h" in step_str:
+        parts = step_str.split("h")
+        hours = float(parts[0])
+        step_str = parts[1] if len(parts) > 1 else ""
+
+    # Parse minutes
+    if "m" in step_str and step_str:
+        minutes = float(step_str.replace("m", ""))
+
+    return hours + (minutes / 60.0)
+
+
+def sort_step_values(steps: list) -> list:
+    """
+    Sort a list of step values that might be in various formats.
+
+    Args:
+        steps: List of step values (strings like "13h30m", integers, or floats)
+
+    Returns:
+        Sorted list of step values in their original format
+
+    Examples:
+        sort_step_values(["13h30m", "12h", "14h"]) -> ["12h", "13h30m", "14h"]
+    """
+    # Create tuples of (original_value, numeric_value) for sorting
+    step_tuples = [(step, parse_step_string(step)) for step in steps]
+    # Sort by numeric value
+    step_tuples.sort(key=lambda x: x[1])
+    # Return original values in sorted order
+    return [step[0] for step in step_tuples]
+
+
+def normalize_step_value(step):
+    """
+    Normalize a step value from various formats, preserving integers when possible.
+
+    Handles:
+    - timedelta objects (datetime.timedelta) - converts to int if whole hours, else string "XhYm"
+    - numpy.timedelta64 objects - converts to int if whole hours, else string "XhYm"
+    - integers - returns as-is (legacy compatibility)
+    - floats - converts to int if whole hours, else string "XhYm"
+    - strings - returns as-is if already in correct format
+
+    Args:
+        step: Step value in various formats
+
+    Returns:
+        Integer for whole hour values, string in 'XhYm' format for sub-hourly values
+
+    Examples:
+        normalize_step_value(timedelta(hours=13, minutes=30)) -> "13h30m"
+        normalize_step_value(timedelta(hours=13)) -> 13
+        normalize_step_value(13) -> 13
+        normalize_step_value(13.5) -> "13h30m"
+        normalize_step_value("13h30m") -> "13h30m"
+    """
+    # If it's already a string, return as-is (assumes it's already in correct format)
+    if isinstance(step, str):
+        return step
+
+    # If it's a timedelta or pd.Timedelta, check if it has sub-hourly components
+    if isinstance(step, (timedelta, pd.Timedelta)):
+        if isinstance(step, pd.Timedelta):
+            td = step.to_pytimedelta()
+        else:
+            td = step
+
+        total_seconds = int(td.total_seconds())
+        hours = total_seconds // 3600
+        minutes = (total_seconds % 3600) // 60
+
+        # If there are minutes, return string format
+        if minutes > 0:
+            return timedelta_to_step_string(td)
+        # Otherwise return integer hours
+        return hours
+
+    # If it's a numpy timedelta64, convert to Python timedelta first
+    if isinstance(step, np.timedelta64):
+        td = pd.Timedelta(step).to_pytimedelta()
+        total_seconds = int(td.total_seconds())
+        hours = total_seconds // 3600
+        minutes = (total_seconds % 3600) // 60
+
+        if minutes > 0:
+            return timedelta_to_step_string(td)
+        return hours
+
+    # If it's an integer, return as-is (legacy compatibility)
+    if isinstance(step, (int, np.integer)):
+        return int(step)
+
+    # If it's a float, check if it has fractional hours
+    if isinstance(step, (float, np.floating)):
+        hours = int(step)
+        total_minutes = int(step * 60)
+        minutes = total_minutes % 60
+
+        if minutes > 0:
+            if hours > 0:
+                return f"{hours}h{minutes}m"
+            else:
+                return f"{minutes}m"
+        return hours
+
+    # Fallback: convert to string
+    return str(step)
+
+
 class Encoder(ABC):
     def __init__(self, type, domaintype):
         """
@@ -176,7 +342,15 @@ class Encoder(ABC):
         def handle_non_leaf_node(child):
             non_leaf_axes = ["latitude", "longitude", "param", date_key]
             if child.axis.name not in non_leaf_axes:
-                mars_metadata[child.axis.name] = child.values[0]
+                val = child.values[0]
+                if isinstance(val, np.datetime64):
+                    val = str(val)
+                elif isinstance(val, timedelta):
+                    val = timedelta_to_step_string(val)
+                elif child.axis.name == "step":
+                    # Step is not a timedelta! Need to normalize it
+                    val = normalize_step_value(val)
+                mars_metadata[child.axis.name] = val
 
         def handle_specific_axes(child):
             if child.axis.name == "latitude":
@@ -272,7 +446,15 @@ class Encoder(ABC):
         def handle_non_leaf_node_step(child):
             non_leaf_axes = ["latitude", "longitude", "param", "date", "time"]
             if child.axis.name not in non_leaf_axes:
-                mars_metadata[child.axis.name] = child.values[0]
+                val = child.values[0]
+                if isinstance(val, np.datetime64):
+                    val = str(val)
+                elif isinstance(val, timedelta):
+                    val = timedelta_to_step_string(val)
+                elif child.axis.name == "step":
+                    # Step is not a timedelta! Need to normalize it
+                    val = normalize_step_value(val)
+                mars_metadata[child.axis.name] = val
 
         def handle_specific_axes_step(child):
             if child.axis.name == "latitude":
@@ -441,7 +623,10 @@ class Encoder(ABC):
         def handle_non_leaf_node_month(child):
             non_leaf_axes = ["latitude", "longitude", "param", "year", "month"]
             if child.axis.name not in non_leaf_axes:
-                mars_metadata[child.axis.name] = child.values[0]
+                val = child.values[0]
+                if isinstance(val, np.datetime64):
+                    val = str(val)
+                mars_metadata[child.axis.name] = val
 
         def handle_specific_axes_month(child):
             if child.axis.name == "latitude":

covjsonkit-0.2.18/covjsonkit/version.py

@@ -0,0 +1 @@
+__version__ = "0.2.18"

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: covjsonkit
-Version: 0.2.16
+Version: 0.2.18
 Home-page: https://github.com/ecmwf/covjsonkit
 Author: ECMWF
 Author-email: James.Hawkes@ecmwf.int, Adam.Warde@ecmwf.int, Mathilde.Leuridan@ecmwf.int

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/covjsonkit.egg-info/SOURCES.txt

@@ -62,6 +62,7 @@ docs/images/ECMWF_logo.svg.png
 docs/images/Logo_Destination_Earth_Colours.png
 scripts/generate_param_db.py
 tests/conftest.py
+tests/geojsontest.py
 tests/requirements_test.txt
 tests/test_decoder_bounding_box.py
 tests/test_decoder_frame.py

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/pyproject.toml

@@ -8,7 +8,7 @@ markers = ["data: uses test data (deselect with '-m \"not data\"')",]
 
 [project]
 name = "covjsonkit"
-version = "0.2.16"
+version = "0.2.18"
 dependencies = [
     "pandas<3",
     "orjson",

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/tests/conftest.py

@@ -6,7 +6,7 @@ from polytope_feature.datacube.tensor_index_tree import TensorIndexTree
 
 REFORECAST_METADATA_BASE = {
     "class": "ce",
-    "date": np.datetime64("2024-03-01"),
+    "date": "2024-03-01",
     "domain": "g",
     "expver": "4321",
     "levtype": "sfc",

covjsonkit-0.2.18/tests/geojsontest.py

@@ -0,0 +1,16 @@
+import json
+import os
+
+from covjsonkit.api import Covjsonkit
+
+current_dir = os.path.dirname(__file__)
+timeseries = os.path.join(current_dir, "data/test_timeseries_coverage.json")
+with open(timeseries, "r") as f:
+    timeseries = json.load(f)
+
+
+cov = Covjsonkit().decode(timeseries)
+ts = cov.to_geojson()
+print(ts)
+assert ts["type"] == "FeatureCollection"
+assert len(ts["features"]) == 16

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/tests/test_encoder_bounding_box_from_polytope.py

@@ -22,7 +22,7 @@ COMPOSITE_TWO_POINTS = {
 
 EXPECTED_REFORECAST_METADATA = {
     "class": "ce",
-    "date": np.datetime64("2024-03-01"),
+    "date": "2024-03-01",
     "domain": "g",
     "expver": "4321",
     "levtype": "sfc",

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/tests/test_encoder_position_from_polytope.py

@@ -130,7 +130,7 @@ class TestPositionFromPolytopeReforecast:
 
         shared_metadata = {
             "class": "ce",
-            "date": np.datetime64("2024-03-01"),
+            "date": "2024-03-01",
             "Forecast date": "2025-07-14T06:00:00Z",
             "domain": "g",
             "expver": "4321",
@@ -168,7 +168,7 @@ class TestPositionFromPolytopeReforecast:
 
         shared_metadata = {
             "class": "ce",
-            "date": np.datetime64("2024-03-01"),
+            "date": "2024-03-01",
             "domain": "g",
             "expver": "4321",
             "levtype": "sfc",

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/tests/test_encoder_time_series_from_polytope.py

@@ -1,4 +1,8 @@
+import json
+
 import numpy as np
+import orjson
+import pytest
 from conftest import chain, make_leaf, make_point, node, tip
 from polytope_feature.datacube.tensor_index_tree import TensorIndexTree
 
@@ -29,7 +33,7 @@ def hdate_branch(hdate, lat, lon, result):
 
 EXPECTED_HDATE_METADATA = {
     "class": "ce",
-    "date": np.datetime64("2024-03-01"),
+    "date": "2024-03-01",
     "domain": "g",
     "expver": "4321",
     "levtype": "sfc",
@@ -199,12 +203,13 @@ class TestTimeseriesFromPolytope:
 
 
 class TestTimeseriesFromPolytopeReforecast:
-    def test_single_point(self):
+    @pytest.mark.parametrize("date", [np.datetime64("2024-03-01"), np.datetime64("2024-03-01T00:00:00")])
+    def test_single_point(self, date):
         # 1 hdate (with time pre-merged by polytope-mars), 1 point
         tree = chain(
             TensorIndexTree(),
             node("class", ("ce",)),
-            node("date", (np.datetime64("2024-03-01"),)),
+            node("date", (date,)),
             hdate_branch(np.datetime64("2025-07-14T06:00:00"), 51.5, 6.5, [42.17]),
         )
 
@@ -231,7 +236,11 @@ class TestTimeseriesFromPolytopeReforecast:
             }
         }
 
-        assert cov["mars:metadata"] == {"Forecast date": "2025-07-14T06:00:00Z", **EXPECTED_HDATE_METADATA}
+        assert cov["mars:metadata"] == {
+            "Forecast date": "2025-07-14T06:00:00Z",
+            **EXPECTED_HDATE_METADATA,
+            "date": date.astype(str),
+        }
 
     def test_multiple_times(self):
         # 2 hdate values (pre-merged times from same day), 1 point → 2 coverages
@@ -453,3 +462,33 @@ class TestTimeseriesFromPolytopeReforecast:
             assert cov["domain"]["axes"]["t"]["values"] == t
             assert cov["ranges"]["dis06"]["values"] == vals
             assert cov["mars:metadata"] == {"Forecast date": fc_date, **EXPECTED_HDATE_METADATA}
+
+    @pytest.mark.parametrize(
+        "json_module,date", [(json, np.datetime64("2024-03-01")), (orjson, np.datetime64("2024-03-01T00:00:00"))]
+    )
+    def test_reforecast_covjson_is_json_serialisable(self, json_module, date):
+        """CoverageJSON produced by from_polytope_reforecast must be serialisable
+        with both stdlib json and orjson (i.e. no numpy.datetime64 left in the
+        mars:metadata dict — regression test for the date axis leak)."""
+        tree = chain(
+            TensorIndexTree(),
+            node("class", ("ce",)),
+            node("date", (date,)),
+            hdate_branch(np.datetime64("2025-07-14T06:00:00"), 51.5, 6.5, [42.17]),
+        )
+
+        covjson = Covjsonkit().encode("CoverageCollection", "PointSeries").from_polytope_reforecast(tree)
+
+        # stdlib json.dumps must not raise TypeError
+        serialised = json_module.dumps(covjson)
+
+        # The 'date' value in mars:metadata must be a plain string, not numpy.datetime64
+        for cov in covjson["coverages"]:
+            date_val = cov["mars:metadata"].get("date")
+            assert not isinstance(
+                date_val, np.datetime64
+            ), f"mars:metadata['date'] is still a numpy.datetime64: {date_val!r}"
+
+        # Round-trip through the JSON module to ensure it can be deserialised back to a dict
+        deserialised = json_module.loads(serialised)
+        assert deserialised == covjson

{covjsonkit-0.2.16 → covjsonkit-0.2.18}/tests/test_encoder_vertical_profile_from_polytope.py

@@ -200,7 +200,7 @@ class TestVerticalProfileFromPolytopeReforecast:
 
     EXPECTED_REFORECAST_METADATA = {
         "class": "ce",
-        "date": np.datetime64("2024-03-01"),
+        "date": "2024-03-01",
         "domain": "g",
         "expver": "4321",
         "levtype": "pl",

covjsonkit-0.2.16/covjsonkit/version.py

@@ -1 +0,0 @@
-__version__ = "0.2.16"