epyt-flow 0.14.0__py3-none-any.whl → 0.14.2__py3-none-any.whl

epyt_flow/utils.py

@@ -6,6 +6,7 @@ import math
 import tempfile
 import zipfile
 from pathlib import Path
+import re
 import requests
 from tqdm import tqdm
 import numpy as np
@@ -344,6 +345,71 @@ def plot_timeseries_prediction(y: np.ndarray, y_pred: np.ndarray,
     return ax
 
 
+def download_from_gdrive_if_necessary(download_path: str, url: str, verbose: bool = True) -> None:
+    """
+    Downloads a file from a google drive repository if it does not already exist
+    in a given path.
+
+    Note that if the path (folder) does not already exist, it will be created.
+
+    Parameters
+    ----------
+    download_path : `str`
+        Local path to the file -- if this path does not exist, the file will be downloaded from
+        the provided 'url' and stored in 'download_dir'.
+    url : `str`
+        Web-URL of the google drive repository.
+    verbose : `bool`, optional
+        If True, a progress bar is shown while downloading the file.
+
+        The default is True.
+    """
+    folder_path = str(Path(download_path).parent.absolute())
+    create_path_if_not_exist(folder_path)
+
+    if not os.path.isfile(download_path):
+        session = requests.Session()
+
+        response = session.get(url)
+        html = response.text
+
+        def extract(pattern):
+            match = re.search(pattern, html)
+            return match.group(1) if match else None
+
+        file_id = extract(r'name="id" value="([^"]+)"')
+        file_confirm = extract(r'name="confirm" value="([^"]+)"')
+        file_uuid = extract(r'name="uuid" value="([^"]+)"')
+
+        if not all([file_id, file_confirm, file_uuid]):
+            raise SystemError("Failed to extract download parameters")
+
+        download_url = (
+            f"https://drive.usercontent.google.com/download"
+            f"?id={file_id}&export=download&confirm={file_confirm}&uuid={file_uuid}"
+        )
+
+        response = session.get(download_url, stream=True)
+
+        if response.status_code != 200:
+            raise SystemError(f"Failed to download -- {response.status_code}")
+
+        if verbose is True:
+            content_length = int(response.headers.get('content-length', 0))
+            with open(download_path, "wb") as file, tqdm(desc=download_path,
+                                                         total=content_length,
+                                                         ascii=True,
+                                                         unit='B',
+                                                         unit_scale=True,
+                                                         unit_divisor=1024) as progress_bar:
+                for data in response.iter_content(chunk_size=1024):
+                    size = file.write(data)
+                    progress_bar.update(size)
+        else:
+            with open(download_path, "wb") as f_out:
+                f_out.write(response.content)
+
+
 def download_if_necessary(download_path: str, url: str, verbose: bool = True,
                           backup_urls: list[str] = []) -> None:
     """

epyt_flow/visualization/visualization_utils.py

@@ -188,7 +188,8 @@ class JunctionObject:
 
         valid_params = {
             key: value for key, value in attributes.items()
-            if key in sig.parameters and value is not None
+            if key in sig.parameters and key not in ['vmin', 'vmax', 'cmap']
+            and value is not None
         }
 
         return valid_params
@@ -518,7 +519,8 @@ class EdgeObject:
 
         valid_params = {
             key: value for key, value in attributes.items()
-            if key in sig.parameters and value is not None
+            if key in sig.parameters and key not in ['vmin', 'vmax', 'cmap']
+            and value is not None
         }
 
         return valid_params

{epyt_flow-0.14.0.dist-info → epyt_flow-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: epyt-flow
-Version: 0.14.0
+Version: 0.14.2
 Summary: EPyT-Flow -- EPANET Python Toolkit - Flow
 Author-email: André Artelt <aartelt@techfak.uni-bielefeld.de>, "Marios S. Kyriakou" <kiriakou.marios@ucy.ac.cy>, "Stelios G. Vrachimis" <vrachimis.stelios@ucy.ac.cy>
 License-Expression: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: epyt>=1.2.1
+Requires-Dist: epyt>=1.2.2
 Requires-Dist: requests>=2.31.0
 Requires-Dist: scipy>=1.11.4
 Requires-Dist: u-msgpack-python>=2.8.0

{epyt_flow-0.14.0.dist-info → epyt_flow-0.14.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-epyt_flow/VERSION,sha256=BlWCZVqs1vyD_3QqVxXAS7Slc5W_PuRVl5j6QsLORYk,7
+epyt_flow/VERSION,sha256=IyzKFfnKsEU9gg0gZJBnV27BjSec47HcbSkx0etjhyE,7
 epyt_flow/__init__.py,sha256=wktX10SXX9GEamDUWR-tcm-8T4d5s6j6aPYr_x4EpOc,1768
 epyt_flow/serialization.py,sha256=uGGN1iZ21ek1u6Xzs4z2xum5Qt8554Wem-wEMGEaa7I,14574
-epyt_flow/topology.py,sha256=Ih6m_tMT1JlPOJv8rHDVBtNayFOarPyAmCbMyojJtQg,26037
-epyt_flow/utils.py,sha256=R_IE6uuTF2MRjUkgWDEa3xOYk8iorieHCqqQ0tDUZ40,17476
+epyt_flow/topology.py,sha256=FhkPa87vnVX_tQVOKumbRD6kMb3RpGgIdGfZdpmF1Bg,26396
+epyt_flow/utils.py,sha256=dCEx7FwgTmU8T-ajI-abbrLzJu8llhgn0QDewfTuqHk,20074
 epyt_flow/EPANET/compile_linux.sh,sha256=wcrDyiB8NkivmaC-X9FI2WxhY3IJqDLiyIbVTv2XEPY,489
 epyt_flow/EPANET/compile_macos.sh,sha256=JfXkCDe5OHhNXgukU13_ViCsD7KPV8qClzSXGLH1HVk,504
 epyt_flow/EPANET/EPANET/SRC_engines/AUTHORS,sha256=yie5yAsEEPY0984PmkSRUdqEU9rVvRSGGWmjxdwCYMU,925
@@ -90,7 +90,7 @@ epyt_flow/data/benchmarks/leakdb.py,sha256=IEP6-bx9il65kX5mlGK1M9cevQPvAwLaDxg9Y
 epyt_flow/data/benchmarks/leakdb_data.py,sha256=FNssgMkC1wqWVlaOrrihr4Od9trEZY7KeK5KuBeRMvM,507058
 epyt_flow/data/benchmarks/water_usage.py,sha256=RiLGLof1HT0luwn7_dG11_nP5U5r9B3L8vDLuwsIKTM,4962
 epyt_flow/gym/__init__.py,sha256=gDIP9VGjKraajsJo6MnPN-TaEUTLnnJNj2c_7jrb8Bg,36
-epyt_flow/gym/scenario_control_env.py,sha256=0ZaZr-fApW_0z9NdgggB2ejUJfPPXb08CljgBnqiOqQ,12635
+epyt_flow/gym/scenario_control_env.py,sha256=0VT7B1xP-YGYN_eZqY0yHIgzh3u_OZEBhT5B_4fSteY,13655
 epyt_flow/rest_api/__init__.py,sha256=4HilmXhdh6H56UHJBB2WUSULlEBUDnI1FPTP11ft3HE,126
 epyt_flow/rest_api/base_handler.py,sha256=HDLXrMXqgWvxWAsB-3G4plyTyCv27_eBbq4eRl_FeBo,2609
 epyt_flow/rest_api/res_manager.py,sha256=j6-3FUBZNLKM9bCsIDZzSytfDYJbDLRwjn1mIPstTqI,2342
@@ -108,7 +108,7 @@ epyt_flow/rest_api/scenario/uncertainty_handlers.py,sha256=Pdo2YmiawOqKXWcLs2P-l
 epyt_flow/simulation/__init__.py,sha256=nihvZ8O2rJjYQkv7JhtVMqNacO5bA38VtS8Y_0BWrVQ,129
 epyt_flow/simulation/parallel_simulation.py,sha256=ph4KXw9jCt-hiJFJbmC6fNvEsrbQoWV-tFKE5-qSfoQ,6523
 epyt_flow/simulation/scenario_config.py,sha256=uHHwwzCRwooVdODxDNoCOUgfrlol1K-TS8P8_Ja9Coc,30435
-epyt_flow/simulation/scenario_simulator.py,sha256=pEHpV_HJkgwPmnPlvBzJCAXaTNIBBRIVmTdkopcgxEc,165155
+epyt_flow/simulation/scenario_simulator.py,sha256=V5WIs5fvDHRKPq9bq3p2XVLo0Lm3G2EgKfU8wYXTD98,165399
 epyt_flow/simulation/sensor_config.py,sha256=AGAIC5vqcu2UZsglSCwv2pvZ3E0kbTtdaqtFPEMBwSw,94262
 epyt_flow/simulation/backend/__init__.py,sha256=tkJb2NB_hruTv39sYHAq9ffazyA-UzZzFmiy2nYVTqA,23
 epyt_flow/simulation/backend/my_epyt.py,sha256=9zcHUo-shPuUNewsuxFpbBgtAbbTu7ppSaK6x4Xgt50,34414
@@ -116,27 +116,27 @@ epyt_flow/simulation/events/__init__.py,sha256=gv8ZcvwjJN0Z5MwRXEOVFRNq4X5NPyyqX
 epyt_flow/simulation/events/actuator_events.py,sha256=gNOIZL9WNiIhEANi8yEyGxKx4vSMBZiRpiSJ4BbDL60,8171
 epyt_flow/simulation/events/event.py,sha256=kARPV20XCAl6zxnJwI9U7ICtZUPACO_rgAmtHm1mGCs,2603
 epyt_flow/simulation/events/leakages.py,sha256=pFSbOiKeGeHPZhLAgo2DFFI1QYImd7m167lMW6B-n-U,17838
-epyt_flow/simulation/events/quality_events.py,sha256=b0tClag6ln0eJtEfJ-HTvkD5nn7bjmyS-x_b1bfeqGQ,8053
-epyt_flow/simulation/events/sensor_faults.py,sha256=XX6k-GJh9RWZ4x54eGj9um-Ir9Eq41tY_9pRSCeYeqc,8447
+epyt_flow/simulation/events/quality_events.py,sha256=XALoRlkVYZ36sBiV8fBxpII7mvyxO9eC0Beq4Xl9IxI,8047
+epyt_flow/simulation/events/sensor_faults.py,sha256=RFR8LjePkDEkCgENHEgCGT7iKYYtr_qq87-IIwN6ezg,8423
 epyt_flow/simulation/events/sensor_reading_attack.py,sha256=2E8q6yWnLxeLgYxW0MHw0GSjlUDjIIZ2GybVRLA7FJQ,7967
 epyt_flow/simulation/events/sensor_reading_event.py,sha256=OWMRWPsvgMgaynMayJ-hQotP9zV5sDIYrOfY0fOCuvc,7586
-epyt_flow/simulation/events/system_event.py,sha256=IGypfTL-miosmwKd4DGTYvByyBcl8__0Asiifw-SzUQ,2606
+epyt_flow/simulation/events/system_event.py,sha256=plnHp53Xnua5QMmSwrKsU6aP-omrTRCh1tGZLvNX6xI,2603
 epyt_flow/simulation/scada/__init__.py,sha256=pfJhg-tM5DaiZTXs0_1qJsY2R6Py_LwSz6BUFJexfQM,150
 epyt_flow/simulation/scada/complex_control.py,sha256=p2ehLyScJbj2jbyevXf7T3Ot8jnBYWgRR3Cz-m3boB0,22107
 epyt_flow/simulation/scada/custom_control.py,sha256=QzkKcn7t53GcTaRofRDbY-HErcDReMF4utWkck6bN60,4681
-epyt_flow/simulation/scada/scada_data.py,sha256=fzcy35rSwoTcIsZpda9JOU17SpR-cV4DZ1tb6qFGpEc,203267
+epyt_flow/simulation/scada/scada_data.py,sha256=kkqb8iDWtoRYEkCoJ9Jy3kCi9vEQmM7bh028cUMX36o,203284
 epyt_flow/simulation/scada/scada_data_export.py,sha256=WNAFn_WNfzYAEFbl2Al-cOIx-A0ozY4AI60-i_qEHdc,11643
 epyt_flow/simulation/scada/simple_control.py,sha256=wUsxsrgqmYxXR93_atcKbV9E-t3hgqj60ZeTvoBBnoQ,12215
 epyt_flow/uncertainty/__init__.py,sha256=ZRjuJL9rDpWVSdPwObPxFpEmMTcgAl3VmPOsS6cIyGg,89
-epyt_flow/uncertainty/model_uncertainty.py,sha256=Bfc9OgecJbX2qOiANhTSKdK_m95aRuXkIGyc22b8d30,41183
+epyt_flow/uncertainty/model_uncertainty.py,sha256=tCkETlCL__T5yXUDbM9_3l-kXxCHwV4OKTLeYpSbIY0,47343
 epyt_flow/uncertainty/sensor_noise.py,sha256=-AnBfuW1VAx7Ya-q_gJ9bAr7Kx6pzP_y0PvNeuRjXIg,6477
 epyt_flow/uncertainty/uncertainties.py,sha256=QBRbI3zIzkeFScyYD5Dy0TBxuL9jPV4SnVU8QwOrJq8,20495
 epyt_flow/uncertainty/utils.py,sha256=K-ZhyO6Bg7UmNPgpfND0JLa_wRwyrtUUgGTWyWwy-fo,8029
 epyt_flow/visualization/__init__.py,sha256=uQ7lO6AsgLc88X48Te3QhBQY-iDKGvdPtxKCl4b-Mfw,70
 epyt_flow/visualization/scenario_visualizer.py,sha256=vkP0J_OfjvePUz_HehXJkH4CGKR3chAHe_UTx4hQ6XI,57860
-epyt_flow/visualization/visualization_utils.py,sha256=l-EQ9UlY9MDBcOhK-uUZ9c-tX9emVqlo4xSqR-Sg17M,27525
-epyt_flow-0.14.0.dist-info/licenses/LICENSE,sha256=YRJC2kcAhMlpEeHwUF0lzE-GRXLFyAjXNErI8L5UwYk,1071
-epyt_flow-0.14.0.dist-info/METADATA,sha256=M7BM9VPwrVrFRzuBSVAFnimiOoPsCgjbiGiAjeSFw-A,9713
-epyt_flow-0.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-epyt_flow-0.14.0.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
-epyt_flow-0.14.0.dist-info/RECORD,,
+epyt_flow/visualization/visualization_utils.py,sha256=-_Hs3FKQz--iVJ10ZeEv1Co9OSbayZmHjxyhKsnzalE,27629
+epyt_flow-0.14.2.dist-info/licenses/LICENSE,sha256=YRJC2kcAhMlpEeHwUF0lzE-GRXLFyAjXNErI8L5UwYk,1071
+epyt_flow-0.14.2.dist-info/METADATA,sha256=P3IAnVg0LiPBE2I2zfOlLGudlNwQzLjERE3vMH1TIPg,9713
+epyt_flow-0.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+epyt_flow-0.14.2.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
+epyt_flow-0.14.2.dist-info/RECORD,,