PVNet 2.1.26__tar.gz → 2.1.28__tar.gz

{PVNet-2.1.26 → PVNet-2.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 2.1.26
+Version: 2.1.28
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org

{PVNet-2.1.26 → PVNet-2.1.28}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 2.1.26
+Version: 2.1.28
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org

PVNet-2.1.28/pvnet/__init__.py

@@ -0,0 +1,2 @@
+"""PVNet"""
+__version__ = "2.1.28"

{PVNet-2.1.26 → PVNet-2.1.28}/pvnet/app.py

@@ -15,6 +15,7 @@ import fsspec
 import numpy as np
 import pandas as pd
 import torch
+import typer
 import xarray as xr
 from nowcasting_datamodel.connection import DatabaseConnection
 from nowcasting_datamodel.models import (
@@ -63,16 +64,13 @@ all_gsp_ids = list(range(1, 318))
 batch_size = 10
 
 # Huggingfacehub model repo and commit for PVNet (GSP-level model)
-model_name = os.getenv("APP_MODEL", default="openclimatefix/pvnet_v2")
-model_version = os.getenv("APP_MODEL_VERSION", default="96ac8c67fa8663844ddcfa82aece51ef94f34453")
+default_model_name = "openclimatefix/pvnet_v2"
+default_model_version = "96ac8c67fa8663844ddcfa82aece51ef94f34453"
 
 # Huggingfacehub model repo and commit for PVNet summation (GSP sum to national model)
 # If summation_model_name is set to None, a simple sum is computed instead
-summation_model_name = os.getenv("APP_SUMMATION_MODEL", default="openclimatefix/pvnet_v2_summation")
-summation_model_version = os.getenv(
-    "APP_SUMMATION_MODEL", default="4a145d74c725ffc72f482025d3418659a6869c94"
-)
-
+default_summation_model_name = "openclimatefix/pvnet_v2_summation"
+default_summation_model_version = "4a145d74c725ffc72f482025d3418659a6869c94"
 
 model_name_ocf_db = "pvnet_v2"
 use_adjuster = os.getenv("USE_ADJUSTER", "True").lower() == "true"
@@ -214,6 +212,14 @@ def app(
     logger.info(f"Using `pvnet` library version: {pvnet.__version__}")
     logger.info(f"Using {num_workers} workers")
 
+    # Allow environment overwrite of model
+    model_name = os.getenv("APP_MODEL", default=default_model_name)
+    model_version = os.getenv("APP_MODEL_VERSION", default=default_model_version)
+    summation_model_name = os.getenv("APP_SUMMATION_MODEL", default=default_summation_model_name)
+    summation_model_version = os.getenv(
+        "APP_SUMMATION_MODEL", default=default_summation_model_version
+    )
+
     # ---------------------------------------------------------------------------
     # 0. If inference datetime is None, round down to last 30 minutes
     if t0 is None:
@@ -506,4 +512,4 @@ def app(
 
 
 if __name__ == "__main__":
-    2  # typer.run(app)
+    typer.run(app)

PVNet-2.1.26/pvnet/__init__.py

@@ -1,2 +0,0 @@
-"""PVNet"""
-__version__ = "2.1.26"