src/vipscore_common/data_utils.py

@@ -67,7 +67,7 @@ def get_dataframe_from_weather_observations(weather_observations: list, timezone
 def get_result_list_from_dataframe(df: DataFrame):
     """
     Create a list of VIPS Result objects from a dataframe
-    Requires timeseries as index and a column named WARNING_STATUS with INT values ranging from 0-4 (see Result class)
+    Requires timeseries as index and a column named WARNING_STATUS with INT values ranging from 0-4 (see entities.Result class)
     """
     result_list = []
     dictframe = df.to_dict(orient="index")

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")
@@ -73,8 +73,11 @@ class Result(BaseModel):
 
 class ModelConfiguration(BaseModel):
     """All the input data for the model."""
-    model_id: constr(min_length=10, max_length=10)
-    config_parameters: dict
+    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: