Merge commit 'd086b2f0cd181b1636d3d707f7317f4f95878726'

Author: peterdudfield

nowcasting_datamodel/models/metric.py

@@ -151,8 +151,6 @@ class MetricValueSQL(Base_Forecast, CreatedMixin):
     model_id = Column(Integer, ForeignKey("model.id"), index=True)
 
 
-
-
 class MetricValue(EnhancedBaseModel):
     """Location that the forecast is for"""
 

nowcasting_datamodel/read/blend/blend.py

@@ -5,10 +5,11 @@
 3. blends them together
 
 """
-import logging
+
 from datetime import datetime
 from typing import List, Optional
 
+import structlog
 from sqlalchemy.orm.session import Session
 
 from nowcasting_datamodel.models.forecast import ForecastValue, ForecastValueSevenDaysSQL
@@ -23,7 +24,7 @@
 )
 from nowcasting_datamodel.read.read import get_forecast_values, get_forecast_values_latest
 
-logger = logging.getLogger(__name__)
+logger = structlog.stdlib.get_logger()
 
 
 def get_blend_forecast_values_latest(

nowcasting_datamodel/read/blend/utils.py

@@ -1,13 +1,13 @@
 """Utils for blending forecasts together"""
-import logging
 from datetime import datetime, timedelta, timezone
 from typing import List, Union
 
 import pandas as pd
+import structlog
 
 from nowcasting_datamodel.models import ForecastValue
 
-logger = logging.getLogger(__name__)
+logger = structlog.stdlib.get_logger()
 
 
 def check_forecast_created_utc(forecast_values_all_model) -> List[Union[str, List[ForecastValue]]]:

nowcasting_datamodel/read/blend/weights.py

@@ -1,12 +1,12 @@
 """Functions to make weights for blending"""
-import logging
 from datetime import datetime, timedelta, timezone
 from typing import List, Optional
 
 import numpy as np
 import pandas as pd
+import structlog
 
-logger = logging.getLogger(__name__)
+logger = structlog.stdlib.get_logger()
 
 default_weights = [
     {

nowcasting_datamodel/read/read_metric.py

@@ -9,7 +9,6 @@
 
 from sqlalchemy.orm.session import Session
 
-from nowcasting_datamodel.models import MLModelSQL
 from nowcasting_datamodel.models.metric import DatetimeIntervalSQL, MetricSQL, MetricValueSQL
 
 logger = logging.getLogger(__name__)

requirements.txt

@@ -6,3 +6,4 @@ numpy
 alembic
 click
 freezegun
+structlog