Merge branch 'main' into issue/speed-up-gsp-read

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.3.20
+current_version = 2.3.21
 message = Bump version: {current_version} → {new_version} [skip ci]
 
 [bumpversion:file:pvnet_app/__init__.py]

Dockerfile

@@ -19,11 +19,7 @@ COPY data/ app/data/
 # Install requirements
 RUN conda install python=3.10
 RUN conda install -c conda-forge xesmf esmpy h5py -y
-RUN pip install torch==2.2.0 --index-url https://download.pytorch.org/whl/cpu
-RUN pip install git+https://github.com/SheffieldSolar/PV_Live-API#pvlive_api
-
-# install cpu torch
-RUN pip install torch==2.2.0 torchvision --index-url https://download.pytorch.org/whl/cpu
+RUN pip install torch==2.4.0 --index-url https://download.pytorch.org/whl/cpu
 
 # Change to app folder
 WORKDIR /app

pvnet_app/__init__.py

@@ -1,2 +1,2 @@
 """PVNet App"""
-__version__ = "2.3.20"
+__version__ = "2.3.21"

pvnet_app/forecast_compiler.py

@@ -72,15 +72,15 @@ def __init__(
         logger.info(f"Loading model: {model_name} - {model_version}")
 
         self.model = PVNetBaseModel.from_pretrained(
-            model_name,
+            model_id=model_name,
             revision=model_version,
         ).to(device)
 
         if summation_name is None:
             self.summation_model = None
         else:
             self.summation_model = SummationBaseModel.from_pretrained(
-                summation_name,
+                model_id=summation_name,
                 revision=summation_version,
             ).to(device)
 

requirements.txt

@@ -1,11 +1,11 @@
 pydantic
 requests<2.32.0
-pytorch-lightning==2.1.3
-torch[cpu]==2.2.0
-PVNet-summation==0.3.0
-pvnet==3.0.47
-ocf_datapipes==3.3.35
-nowcasting_datamodel>=1.5.52
+pytorch-lightning==2.3.3
+torch[cpu]==2.4.0
+PVNet-summation==0.3.2
+pvnet==3.0.50
+ocf_datapipes==3.3.39
+nowcasting_datamodel>=1.5.45
 fsspec[s3]
 xarray
 zarr
@@ -16,4 +16,5 @@ pytest
 pytest-cov
 typer
 testcontainers
-xesmf
+xesmf==0.8.7
+huggingface-hub==0.24.1