update to use blend in forecast/all (#265)

openclimatefix · Aug 17, 2023 · d8808cd · d8808cd
1 parent ce4de9c
commit d8808cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ uvicorn[standard]
 pydantic
 numpy
 requests
-nowcasting_datamodel==1.5.8
+nowcasting_datamodel==1.5.10
 nowcasting_dataset==3.7.12
 sqlalchemy
 psycopg2-binary

diff --git a/src/database.py b/src/database.py
@@ -104,7 +104,7 @@ def get_forecasts_from_database(
             preload_children=True,
             historic=True,
             include_national=False,
-            model_name="cnn",
+            model_name="blend",
         )
 
         logger.debug(f"Found {len(forecasts)} forecasts from database")
@@ -120,7 +120,7 @@ def get_forecasts_from_database(
             start_created_utc=yesterday_start_datetime,
             start_target_time=yesterday_start_datetime,
             preload_children=True,
-            model_name="cnn",
+            model_name="blend",
         )
 
     # change to pydantic objects

diff --git a/src/tests/test_gsp.py b/src/tests/test_gsp.py
@@ -40,7 +40,7 @@ def test_read_latest_one_gsp(db_session, api_client):
 def test_read_latest_all_gsp(db_session, api_client):
     """Check main solar/GB/gsp/forecast/all route works"""
 
-    model = get_model(session=db_session, name="cnn", version="0.0.1")
+    model = get_model(session=db_session, name="blend", version="0.0.1")
 
     forecasts = make_fake_forecasts(
         gsp_ids=list(range(0, 10)),
@@ -91,7 +91,7 @@ def test_read_latest_gsp_id_equal_to_total(db_session, api_client):
 def test_read_latest_all_gsp_normalized(db_session, api_client):
     """Check main solar/GB/gsp/forecast/all normalized route works"""
 
-    model = get_model(session=db_session, name="cnn", version="0.0.1")
+    model = get_model(session=db_session, name="blend", version="0.0.1")
 
     forecasts = make_fake_forecasts(
         gsp_ids=list(range(0, 10)),
@@ -116,7 +116,7 @@ def test_read_latest_all_gsp_normalized(db_session, api_client):
 def test_read_latest_all_gsp_historic(db_session, api_client):
     """Check main solar/GB/gsp/forecast/all historic route works"""
 
-    model = get_model(session=db_session, name="cnn", version="0.0.1")
+    model = get_model(session=db_session, name="blend", version="0.0.1")
 
     forecasts = make_fake_forecasts(
         gsp_ids=list(range(0, 10)),