Merge pull request #374 from agoenergy/develop

release

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.1
+current_version = 0.4.2
 commit = True
 tag = True
 

.github/workflows/publish.yaml

@@ -23,4 +23,4 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: wingechr/ptx-boa:0.4.1
+          tags: wingechr/ptx-boa:0.4.2

.streamlit/config.toml

@@ -6,7 +6,7 @@
     font="sans serif"
 
 [logger]
-    level="INFO"
+    level="WARNING"
 
 [browser]
     gatherUsageStats = false

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.10-slim
-LABEL version="0.4.1"
+LABEL version="0.4.2"
 
 RUN apt-get update
 RUN apt-get install -y git

README.md

@@ -61,7 +61,7 @@ pytest
 # connect to server
 ssh ptxboa
 # pull latest image from dockerhub
-VERSION=0.4.1
+VERSION=0.4.2
 docker pull wingechr/ptx-boa:$VERSION
 # stop and delete the currently running container "app"
 docker stop app

ptxboa/__init__.py

@@ -2,8 +2,14 @@
 """Common Paths and settings."""
 import logging
 import os
+import warnings
 from pathlib import Path
 
+# disable warnings for loading networks
+
+warnings.filterwarnings("ignore", category=DeprecationWarning)
+
+
 IS_TEST = "PYTEST_CURRENT_TEST" in os.environ  # TODO unused
 KEY_SEPARATOR = ","
 

ptxboa/api.py

@@ -286,7 +286,10 @@ def get_flh_opt_network(
             user_data=user_data,
             optimize_flh=True,
         )
-        hashsum = metadata["flh_opt_hash"]["hash_md5"]
+        hashsum = metadata.get("flh_opt_hash", {}).get("hash_md5")
+        if not hashsum:
+            return None
+
         data_handler = DataHandler(
             scenario, user_data, data_dir=self.data_dir, cache_dir=self.cache_dir
         )

ptxboa/api_optimize.py

@@ -75,7 +75,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         else:
             # move file to target
             os.rename(self.filepath_tmp, self.filepath)
-            logger.info(f"saved file {self.filepath}")
+            logger.debug(f"saved file {self.filepath}")
 
 
 class ProfilesHashes(metaclass=SingletonMeta):
@@ -92,7 +92,7 @@ def __init__(self, profiles_path):
     def _read_metadata(self, filename):
         """Read metadata json file."""
         filepath = f"{self.profiles_path}/{filename}"
-        logger.info(f"READ {filepath}")
+        logger.debug(f"READ {filepath}")
         with open(filepath, encoding="utf-8") as file:
             data = json.load(file)
         return data
@@ -362,18 +362,18 @@ def get_data(self, data: CalculateDataType) -> CalculateDataType:
             # load existing results
             opt_output_data = self._load(hash_filepath)
 
+        self._merge_data(data, opt_output_data)
+
         # also add flh_opt_hash if it exists so we can
         # retrieve the network later
         if use_cache:
-            opt_output_data["flh_opt_hash"] = {
+            data["flh_opt_hash"] = {
                 "hash_md5": hash_sum,
                 "filepath": hash_filepath,
             }
         else:
-            opt_output_data["flh_opt_hash"] = {
+            data["flh_opt_hash"] = {
                 "hash_md5": hash_sum,
             }
 
-        self._merge_data(data, opt_output_data)
-
         return data

ptxboa_streamlit.py

@@ -6,7 +6,7 @@
 >>> streamlit run  ptxboa_streamlit.py
 """
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 # TODO how do I use the treamlit logger?
 import logging