From 177c3d3285c6faab6842742641dc6a052039b24c Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 14 Feb 2023 14:46:36 +0100
Subject: [PATCH] Bugfix: enabling validTimeStart to be serialized
---
src/vipscore_common/entities.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/vipscore_common/entities.py b/src/vipscore_common/entities.py
index b40a0eb..767546a 100755
--- a/src/vipscore_common/entities.py
+++ b/src/vipscore_common/entities.py
@@ -25,7 +25,7 @@ along with VIPSCore-Python-Common. If not, see <http://www.nibio.no/licenses/>.
from datetime import datetime
from shapely.geometry import Point, Polygon
from pydantic import BaseModel, validator, constr, Field
-from typing import Any, Union, ClassVar, Optional
+from typing import Any, ClassVar, Optional
import pytz
class Result(BaseModel):
@@ -33,7 +33,7 @@ class Result(BaseModel):
Represents a set of DSS model result values for a given point in space (Point, Polygon, MultiPolygon) and time (Period or immediate)
"""
valid_time_start: datetime = Field(alias="validTimeStart")
- valid_time_end: Optional[datetime] = Field(alias="validTimeStart")
+ valid_time_end: Optional[datetime] = Field(alias="validTimeEnd")
valid_geometry: Optional[Any] = Field(alias="validGeometry")
warning_status: int = Field(alias="warningStatus")
all_values: dict = Field(alias="allValues")
@@ -76,6 +76,9 @@ class ModelConfiguration(BaseModel):
model_id: constr(min_length=10, max_length=10) = Field(alias="modelId")
config_parameters: dict = Field(alias="configParameters")
+ class Config:
+ allow_population_by_field_name = True
+
# Can we do this and still serialize the object??
def get_config_parameter_as_date(self, param_name: str, required=True) -> datetime:
"""
--
GitLab