add model to adjuster (#167)

* add model to adjuster

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add migration

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: peterdudfield

nowcasting_datamodel/fake.py

@@ -280,6 +280,8 @@ def make_fake_me_latest(session: Session):
         gsp_id=0, session=session, installed_capacity_mw=14000, label=national_gb_label
     )
 
+    model = get_model(session=session, name="fake_model", version="0.1.2")
+
     session.add_all([location, datetime_interval, metric])
 
     metric_values = []
@@ -294,6 +296,7 @@ def make_fake_me_latest(session: Session):
                 datetime_interval=datetime_interval,
                 metric=metric,
                 location=location,
+                model=model,
             )
             metric_values.append(m)
 

nowcasting_datamodel/migrations/forecast/versions/37c68fd8e65c_.py

@@ -0,0 +1,33 @@
+"""
+
+Add model_id in mertric_value
+
+Revision ID: 37c68fd8e65c
+Revises: 489955d7a5a0
+Create Date: 2023-04-14 15:05:00.205258
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "37c68fd8e65c"
+down_revision = "489955d7a5a0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():  # noqa
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("metric_value", sa.Column("model_id", sa.Integer(), nullable=True))
+    op.create_index(op.f("ix_metric_value_model_id"), "metric_value", ["model_id"], unique=False)
+    op.create_foreign_key(None, "metric_value", "model", ["model_id"], ["id"])
+    # ### end Alembic commands ###
+
+
+def downgrade():  # noqa
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, "metric_value", type_="foreignkey")
+    op.drop_index(op.f("ix_metric_value_model_id"), table_name="metric_value")
+    op.drop_column("metric_value", "model_id")
+    # ### end Alembic commands ###

nowcasting_datamodel/models/metric.py

@@ -145,6 +145,10 @@ class MetricValueSQL(Base_Forecast, CreatedMixin):
     datetime_interval = relationship("DatetimeIntervalSQL", back_populates="metric_value")
     datetime_interval_id = Column(Integer, ForeignKey("datetime_interval.id"), index=True)
 
+    # many (metric values) to one (model)
+    model = relationship("MLModelSQL", back_populates="metric_value")
+    model_id = Column(Integer, ForeignKey("model.id"), index=True)
+
 
 class MetricValue(EnhancedBaseModel):
     """Location that the forecast is for"""

nowcasting_datamodel/models/models.py

@@ -39,6 +39,7 @@ class MLModelSQL(Base_Forecast):
     version = Column(String)
 
     forecast = relationship("ForecastSQL", back_populates="model")
+    metric_value = relationship("MetricValueSQL", back_populates="model")
 
 
 class MLModel(EnhancedBaseModel):

nowcasting_datamodel/read/read_metric.py

@@ -5,10 +5,11 @@
 """
 import logging
 from datetime import datetime
-from typing import List
+from typing import List, Optional
 
 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__)
@@ -94,7 +95,7 @@ def get_datetime_interval(
 
 
 def read_latest_me_national(
-    session: Session, metric_name: str = "Half Hourly ME"
+    session: Session, metric_name: str = "Half Hourly ME", model_name: Optional[str] = None
 ) -> List[MetricValueSQL]:
     """
     Get the latest me for the national forecast
@@ -103,9 +104,12 @@ def read_latest_me_national(
 
     :param session: database sessions
     :param metric_name: metric name, defaulted to "Half Hourly ME"
+    :param model_name: model name, defaulted to None
     :return: list of MetricValueSQL for ME for each 'time_of_day' and 'forecast_horizon_minutes'
     """
 
+    logger.debug(f"Reading latest {metric_name=} for {model_name=}")
+
     # start main query
     query = session.query(MetricValueSQL)
     query = query.join(MetricSQL)
@@ -121,6 +125,10 @@ def read_latest_me_national(
         MetricValueSQL.created_utc.desc(),
     )
 
+    if model_name is not None:
+        query = query.join(MLModelSQL)
+        query = query.filter(MLModelSQL.name == model_name)
+
     # get all results
     metric_values = query.all()
 

nowcasting_datamodel/save/adjust.py

@@ -44,11 +44,12 @@ def add_adjust_to_national_forecast(forecast: ForecastSQL, session):
     :return:
     """
 
-    # get the target time for the first forecast
+    # get the target time and model name
     datetime_now = forecast.forecast_values[0].target_time
+    model_name = forecast.model.name
 
     # 1. read metric values
-    latest_me = read_latest_me_national(session=session)
+    latest_me = read_latest_me_national(session=session, model_name=model_name)
     assert len(latest_me) > 0
 
     # 2. filter value down to now onwards