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

epyt_flow/EPANET/EPANET/SRC_engines/smatrix.c

@@ -1,7 +1,7 @@
 /*
  ******************************************************************************
  Project:      OWA EPANET
- Version:      2.3
+ Version:      2.2
  Module:       smatrix.c
  Description:  solves a sparse set of linear equations
  Authors:      see AUTHORS
@@ -48,8 +48,8 @@ static int     paralink(Network *, Smatrix *, int, int, int k);
 static void    xparalinks(Network *);
 static int     reordernodes(Project *);
 static int     factorize(Project *);
-static int     growlist(Project *, int, int *);
-static int     newlink(Project *, Padjlist, int *);
+static int     growlist(Project *, int);
+static int     newlink(Project *, Padjlist);
 static int     linked(Network *, int, int);
 static int     addlink(Network *, int, int, int);
 static int     storesparse(Project *, int);
@@ -443,8 +443,8 @@ int factorize(Project *pr)
     Padjlist alink;
 
     // Find degree of each junction node
-    int *degree = (int *)calloc(net->Nnodes + 1, sizeof(int));
-    if (degree == NULL) return 101;
+    sm->Degree = (int *)calloc(net->Nnodes + 1, sizeof(int));
+    if (sm->Degree == NULL) return 101;
 
     // NOTE: For purposes of node re-ordering, Tanks (nodes with
     //       indexes above Njuncs) have zero degree of adjacency.
@@ -453,7 +453,7 @@ int factorize(Project *pr)
     {
         for (alink = net->Adjlist[k]; alink != NULL; alink = alink->next)
         {
-            if (alink->node > 0) degree[k]++;
+            if (alink->node > 0) sm->Degree[k]++;
         }
     }
 
@@ -463,19 +463,19 @@ int factorize(Project *pr)
     for (k = 1; k <= net->Njuncs; k++)          // Examine each junction
     {
         knode = sm->Order[k];                   // Re-ordered index
-        if (!growlist(pr, knode, degree))               // Augment adjacency list
+        if (!growlist(pr, knode))               // Augment adjacency list
         {
             errcode = 101;
             break;
         }
-        degree[knode] = 0;                  // In-activate node
+        sm->Degree[knode] = 0;                  // In-activate node
     }
-    free(degree);
+    free(sm->Degree);
     return errcode;
 }
 
 
-int  growlist(Project *pr, int knode, int *degree)
+int  growlist(Project *pr, int knode)
 /*
 **--------------------------------------------------------------
 ** Input:   knode = node index
@@ -496,10 +496,10 @@ int  growlist(Project *pr, int knode, int *degree)
     for (alink = net->Adjlist[knode]; alink != NULL; alink = alink -> next)
     {
         node = alink->node;                   // End node of connecting link
-        if (node > 0 && degree[node] > 0) // End node is active
+        if (node > 0 && sm->Degree[node] > 0) // End node is active
         {
-            degree[node]--;           // Reduce degree of adjacency
-            if (!newlink(pr, alink, degree))      // Add to adjacency list
+            sm->Degree[node]--;           // Reduce degree of adjacency
+            if (!newlink(pr, alink))      // Add to adjacency list
             {
                 return 0;
             }
@@ -509,7 +509,7 @@ int  growlist(Project *pr, int knode, int *degree)
 }
 
 
-int  newlink(Project *pr, Padjlist alink, int *degree)
+int  newlink(Project *pr, Padjlist alink)
 /*
 **--------------------------------------------------------------
 ** Input:   alink = element of node's adjacency list
@@ -533,7 +533,7 @@ int  newlink(Project *pr, Padjlist alink, int *degree)
 
         // If jnode still active, and inode not connected to jnode,
         // then add a new connection between inode and jnode.
-        if (jnode > 0 && degree[jnode] > 0)  // jnode still active
+        if (jnode > 0 && sm->Degree[jnode] > 0)  // jnode still active
         {
             if (!linked(net, inode, jnode))      // inode not linked to jnode
             {
@@ -545,8 +545,8 @@ int  newlink(Project *pr, Padjlist alink, int *degree)
                 // reflect the new connection.
                 if (!addlink(net, inode, jnode, sm->Ncoeffs)) return 0;
                 if (!addlink(net, jnode, inode, sm->Ncoeffs)) return 0;
-                degree[inode]++;
-                degree[jnode]++;
+                sm->Degree[inode]++;
+                sm->Degree[jnode]++;
             }
         }
     }
@@ -651,7 +651,7 @@ int  sortsparse(Smatrix *sm, int n)
 /*
 **--------------------------------------------------------------
 ** Input:   n = number of rows in solution matrix
-** Output:  returns error code
+** Output:  returns eror code
 ** Purpose: puts row indexes in ascending order in NZSUB
 **--------------------------------------------------------------
 */
@@ -834,7 +834,7 @@ int  linsolve(Smatrix *sm, int n)
       }
    }      // next j
 
-   // Forward substitution
+   // Foward substitution
    for (j = 1; j <= n; j++)
    {
       bj = B[j]/Aii[j];

epyt_flow/EPANET/EPANET/SRC_engines/text.h

@@ -1,13 +1,13 @@
 /*
  ******************************************************************************
  Project:      OWA EPANET
- Version:      2.3
+ Version:      2.2
  Module:       text.h
  Description:  string constants used throughout EPANET
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 03/10/2025
+ Last Updated: 07/15/2019
  ******************************************************************************
 */
 
@@ -40,7 +40,6 @@
 #define   w_FCV         "FCV"
 #define   w_TCV         "TCV"
 #define   w_GPV         "GPV"
-#define   w_PCV         "PCV"
 
 #define   w_OPEN        "OPEN"
 #define   w_CLOSED      "CLOSED"
@@ -52,6 +51,9 @@
 #define   w_IS          "IS"
 #define   w_NOT         "NOT"
 
+#define   w_ADD         "ADD"
+#define   w_MULTIPLY    "MULT"
+
 #define   w_LIMITING    "LIMIT"
 #define   w_ORDER       "ORDER"
 #define   w_GLOBAL      "GLOB"
@@ -84,14 +86,11 @@
 #define   w_MLD         "MLD"
 #define   w_CMH         "CMH"
 #define   w_CMD         "CMD"
-#define   w_CMS         "CMS"
 #define   w_SI          "SI"
 
 #define   w_PSI         "PSI"
 #define   w_KPA         "KPA"
 #define   w_METERS      "METERS"
-#define   w_BAR         "BAR"
-#define   w_FEET        "FEET"
 
 #define   w_ELEV        "ELEV"
 #define   w_DEMAND      "DEMAND"
@@ -131,8 +130,6 @@
 #define   w_SEGMENTS    "SEGM"
 #define   w_TOLERANCE   "TOLER"
 #define   w_EMITTER     "EMIT"
-#define   w_BACKFLOW    "BACK"
-#define   w_ALLOWED     "ALLOW"
 
 #define   w_PRICE       "PRICE"
 #define   w_DMNDCHARGE  "DEMAN"
@@ -153,9 +150,6 @@
 #define   w_REQUIRED    "REQ"
 #define   w_EXPONENT    "EXP"
 
-#define   w_AREA        "AREA"
-#define   w_EXPAN       "EXPAN"
-
 #define   w_SECONDS     "SEC"
 #define   w_MINUTES     "MIN"
 #define   w_HOURS       "HOU"
@@ -198,7 +192,6 @@
 #define   w_THEN        "THEN"
 #define   w_ELSE        "ELSE"
 #define   w_PRIORITY    "PRIO"
-#define   w_DISABLED    "DISABLED"
 
 // ------ Input File Section Names ------------------------
 
@@ -214,7 +207,6 @@
 #define   s_DEMANDS     "[DEMANDS]"
 #define   s_SOURCES     "[SOURCES]"
 #define   s_EMITTERS    "[EMITTERS]"
-#define   s_LEAKAGE     "[LEAKAGE]"
 #define   s_PATTERNS    "[PATTERNS]"
 #define   s_CURVES      "[CURVES]"
 #define   s_QUALITY     "[QUALITY]"
@@ -242,7 +234,6 @@
 #define   u_IMGD        "Imgd"
 #define   u_LPS         "L/s"
 #define   u_LPM         "Lpm"
-#define   u_CMS         "m3/s"
 #define   u_CMH         "m3/h"
 #define   u_CMD         "m3/d"
 #define   u_MLD         "ML/d"
@@ -272,8 +263,6 @@
 #define   c_PUMP        "PUMP"
 #define   c_EFFIC       "EFFIC"
 #define   c_VOLUME      "VOLUME"
-#define   c_VALVE       "VALVE"
-#define   c_GENERIC     "GENERIC"
 
 //------- Text Phrases ------------------------------------
 

epyt_flow/EPANET/EPANET/SRC_engines/types.h

@@ -1,13 +1,13 @@
 /*
  ******************************************************************************
  Project:      OWA EPANET
- Version:      2.3
+ Version:      2.2
  Module:       types.h
  Description:  symbolic constants and data types used throughout EPANET
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 04/19/2025
+ Last Updated: 10/29/2019
  ******************************************************************************
 */
 
@@ -31,7 +31,7 @@ typedef  int          INT4;
    Various constants
 ----------------------------------------------
 */
-#define   CODEVERSION        20300
+#define   CODEVERSION        20200
 #define   MAGICNUMBER        516114521
 #define   ENGINE_VERSION     201   // Used for binary hydraulics file
 #define   EOFMARK            0x1A  // Use 0x04 for UNIX systems
@@ -48,9 +48,6 @@ typedef  int          INT4;
 #define   BIG       1.E10
 #define   TINY      1.E-6
 #define   MISSING   -1.E10     // Missing value indicator
-#define   SET_CLOSED -1.E10    // Link set closed indicator
-#define   SET_OPEN    1.E10    // Link set open indicator
-
 #define   DIFFUS    1.3E-8     // Diffusivity of chlorine
                                // @ 20 deg C (sq ft/sec)
 #define   VISCOS    1.1E-5     // Kinematic viscosity of water
@@ -74,7 +71,6 @@ typedef  int          INT4;
 #define   IMGDperCFS  0.5382
 #define   LPSperCFS   28.317
 #define   LPMperCFS   1699.0
-#define   CMSperCFS   0.028317
 #define   CMHperCFS   101.94
 #define   CMDperCFS   2446.6
 #define   MLDperCFS   2.4466
@@ -83,7 +79,6 @@ typedef  int          INT4;
 #define   MperFT      0.3048
 #define   PSIperFT    0.4333
 #define   KPAperPSI   6.895
-#define   BARperPSI   0.068948
 #define   KWperHP     0.7457
 #define   SECperDAY   86400
 
@@ -150,8 +145,7 @@ typedef enum {
   PBV,           // pressure breaker valve
   FCV,           // flow control valve
   TCV,           // throttle control valve
-  GPV,           // general purpose valve
-  PCV            // positional control valve
+  GPV            // general purpose valve
 } LinkType;
 
 typedef enum {
@@ -172,8 +166,7 @@ typedef enum {
   PUMP_CURVE,    // pump curve
   EFFIC_CURVE,   // efficiency curve
   HLOSS_CURVE,   // head loss curve
-  GENERIC_CURVE, // generic curve
-  VALVE_CURVE    // positional valve loss curve
+  GENERIC_CURVE  // generic curve
 } CurveType;
 
 typedef enum {
@@ -232,17 +225,13 @@ typedef enum {
   LPM,           // liters per minute
   MLD,           // megaliters per day
   CMH,           // cubic meters per hour
-  CMD,           // cubic meters per day
-  CMS            // cubic meters per second
+  CMD            // cubic meters per day
 } FlowUnitsType;
 
 typedef enum {
   PSI,           // pounds per square inch
   KPA,           // kiloPascals
-  METERS,        // meters
-  BAR,           // bar
-  FEET,          // feet
-  DEFAULTUNIT    // default based on unit system (SI or US)
+  METERS         // meters
 } PressureUnitsType;
 
 typedef enum {
@@ -298,7 +287,7 @@ typedef enum {
   _VALVES, _CONTROLS, _RULES, _DEMANDS, _SOURCES, _EMITTERS,
   _PATTERNS, _CURVES, _QUALITY, _STATUS, _ROUGHNESS, _ENERGY,
   _REACTIONS, _MIXING, _REPORT, _TIMES, _OPTIONS,
-    _COORDS, _VERTICES, _LABELS, _BACKDROP, _TAGS, _LEAKAGE, _END
+    _COORDS, _VERTICES, _LABELS, _BACKDROP, _TAGS, _END
 } SectionType;
 
 typedef enum {
@@ -366,8 +355,6 @@ typedef struct             // Energy Usage Object
   double KwHrs;            // total kw-hrs consumed
   double MaxKwatts;        // max. kw consumed
   double TotalCost;        // total pumping cost
-  double CurrentPower;     // current pump power (kw)
-  double CurrentEffic;     // current pump efficiency
 } Senergy;
 
 struct Ssource             // Water Quality Source Object
@@ -402,7 +389,6 @@ typedef struct             // Node Object
   int      ResultIndex;    // saved result index
   NodeType Type;           // node type
   char     *Comment;       // node comment
-  char     *Tag;           // optional category tag                                                   
 } Snode;
 
 typedef struct             // Link Object
@@ -412,22 +398,18 @@ typedef struct             // Link Object
   int      N2;             // end node index
   double   Diam;           // diameter
   double   Len;            // length
-  double   Kc;             // pipe roughness, pump speed, valve setting
+  double   Kc;             // roughness
   double   Km;             // minor loss coeff.
   double   Kb;             // bulk react. coeff.
   double   Kw;             // wall react. coef.
   double   R;              // flow resistance
   double   Rc;             // reaction coeff.
-  double   LeakArea;       // leak area (sq mm per 100 pipe length units
-  double   LeakExpan;      // leak expansion (sq mm per unit of head)
   LinkType Type;           // link type
-  StatusType InitStatus;   // initial status
-  double     InitSetting;  // initial setting
+  StatusType Status;       // initial status
   Pvertices  Vertices;     // internal vertex coordinates
   int      Rpt;            // reporting flag
   int      ResultIndex;    // saved result index
   char     *Comment;       // link comment
-  char     *Tag;           // optional category tag                                                   
 } Slink;
 
 typedef struct             // Tank Object
@@ -446,7 +428,7 @@ typedef struct             // Tank Object
   int     Pat;             // fixed grade time pattern
   int     Vcurve;          // volume v. elev. curve index
   MixType MixModel;        // type of mixing model
-  double  V1frac;          // mixing compartment fraction
+  double  V1max;           // mixing compartment size
   int     CanOverflow;     // tank can overflow or not
 } Stank;
 
@@ -471,7 +453,6 @@ typedef struct             // Pump Object
 typedef struct             // Valve Object
 {
   int Link;                // link index of valve
-  int Curve;               // positional loss coeff. curve
 } Svalve;
 
 typedef struct             // Control Statement
@@ -483,7 +464,6 @@ typedef struct             // Control Statement
     double      Setting;   // new link setting
     StatusType  Status;    // new link status
     ControlType Type;      // control type
-    int         isEnabled; // control enabled?
 } Scontrol;
 
 typedef struct             // Field Object of Report Table
@@ -535,7 +515,6 @@ typedef struct                 // Control Rule Structure
 {
     char     label[MAXID+1];   // rule label
     double   priority;         // priority level
-    int      isEnabled;        // is the rule enabled?
     Spremise *Premises;        // list of premises
     Saction  *ThenActions;     // list of THEN actions
     Saction  *ElseActions;     // list of ELSE actions
@@ -556,29 +535,8 @@ typedef struct                 // Mass Balance Components
     double    reacted;         // mass reacted in system
     double    final;           // final mass in system
     double    ratio;           // ratio of mass added to mass lost
-    int       segCount;        // total number of pipe segments used                       
 } SmassBalance;
 
-typedef struct
-{
-    double    totalInflow;
-    double    totalOutflow;
-    double    consumerDemand;
-    double    emitterDemand;
-    double    leakageDemand;
-    double    deficitDemand;
-    double    storageDemand;
-    double    ratio;
-} SflowBalance;    
-
-typedef struct                 // Node Leakage Object
-{
-  double qfa;                  // fixed area leakage flow
-  double qva;                  // variable area leakage flow
-  double cfa;                  // fixed area leakage coeff.
-  double cva;                  // variable area leakage coeff.
-} Sleakage;
-
 /*
 ------------------------------------------------------
   Wrapper Data Structures
@@ -613,7 +571,8 @@ typedef struct {
     ErrTok,                // Index of error-producing token
     Unitsflag,             // Unit system flag
     Flowflag,              // Flow units flag
-    Pressflag;             // Pressure units flag
+    Pressflag,             // Pressure units flag
+    DefPat;                // Default demand pattern
 
   Spattern *PrevPat;       // Previous pattern processed
   Scurve   *PrevCurve;     // Previous curve processed
@@ -669,10 +628,7 @@ typedef struct {
     Rpt2Fname[MAXFNAME+1], // Secondary report file name
     DateStamp[26];         // Current date & time
 
-    SField   Field[MAXVAR];  // Output reporting fields
-
-    void (*reportCallback)(void*,void*,const char*); // user-supplied reporting callback
-    void *reportCallbackUserData;  // user-supplied reporting context
+  SField   Field[MAXVAR];  // Output reporting fields
 
 } Report;
 
@@ -732,6 +688,7 @@ typedef struct {
     *XLNZ,       // Start position of each column in NZSUB
     *NZSUB,      // Row index of each coeff. in each column
     *LNZ,        // Position of each coeff. in Aij array
+    *Degree,     // Number of links adjacent to each node
     *link,       // Array used by linear eqn. solver
     *first;      // Array used by linear eqn. solver
 
@@ -742,11 +699,9 @@ typedef struct {
 
   double
     *NodeHead,             // Node hydraulic heads
-    *NodeDemand,           // Node total demand (consumer + emitter + leakage)
-    *FullDemand,           // Required consumer demand
-    *DemandFlow,           // Demand flow from nodes
-    *EmitterFlow,          // Emitter flow from nodes
-    *LeakageFlow,          // Leakage flow from nodes
+    *NodeDemand,           // Node demand + emitter flows
+    *DemandFlow,           // Work array of demand flows
+    *EmitterFlow,          // Emitter outflows
     *LinkFlow,             // Link flows
     *LinkSetting,          // Link settings
     Htol,                  // Hydraulic head tolerance
@@ -773,18 +728,15 @@ typedef struct {
     MaxHeadError,          // Max. error for link head loss
     MaxFlowChange,         // Max. change in link flow
     DemandReduction,       // % demand reduction at pressure deficient nodes
-    LeakageLoss,           // % system leakage loss
     RelaxFactor,           // Relaxation factor for flow updating
     *P,                    // Inverse of head loss derivatives
     *Y,                    // Flow correction factors
     *Xflow;                // Inflow - outflow at each node
 
   int
-    DefPat,                // Default demand pattern
     Epat,                  // Energy cost time pattern
     DemandModel,           // Fixed or pressure dependent
     Formflag,              // Head loss formula flag
-    EmitBackFlag,          // Emitter backflow flag
     Iterations,            // Number of hydraulic trials taken
     MaxIter,               // Max. hydraulic trials allowed
     ExtraIter,             // Extra hydraulic trials
@@ -792,18 +744,12 @@ typedef struct {
     MaxCheck,              // Hydraulic trials limit on status checks
     OpenHflag,             // Hydraulic system opened flag
     Haltflag,              // Flag to halt simulation
-    DeficientNodes,        // Number of pressure deficient nodes
-    HasLeakage;            // TRUE if project has non-zero leakage parameters
-    
-  Sleakage *Leakage;       // Array of node leakage parameters
+    DeficientNodes;        // Number of pressure deficient nodes
 
   StatusType
     *LinkStatus,           // Link status
     *OldStatus;            // Previous link/tank status
 
-  SflowBalance
-    FlowBalance;           // Flow balance components
-
   Smatrix smatrix;         // Sparse matrix storage
 
 } Hydraul;

epyt_flow/EPANET/compile_linux.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 mkdir -p "../customlibs/"
-gcc -w -O3 -march=native -shared -Wl,-soname,libepanet2_2.so -fPIC -o "../customlibs/libepanet2_2.so" EPANET/SRC_engines/*.c -IEPANET/SRC_engines/include EPANET/SRC_engines/util/*.c -IEPANET/SRC_engines/util/ -lc -lm -pthread
+gcc -w -O3 -march=native -shared -Wl,-soname,libepanet2_2.so -fPIC -o "../customlibs/libepanet2_2.so" EPANET/SRC_engines/*.c -IEPANET/SRC_engines/include -lc -lm -pthread
 gcc -w -O3 -march=native -fPIC -shared -Wl,-soname,libepanetmsx2_2_0.so -o "../customlibs/libepanetmsx2_2_0.so" -fopenmp -Depanetmsx_EXPORTS -IEPANET-MSX/Src/include -IEPANET/SRC_engines/include EPANET-MSX/Src/*.c -Wl,-rpath=. "../customlibs/libepanet2_2.so" -lm -lgomp -lpthread

epyt_flow/EPANET/compile_macos.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 mkdir -p "../customlibs/"
-gcc-15 -w -O3 -march=native -dynamiclib -fPIC -install_name libepanet2_2.dylib -o "../customlibs/libepanet2_2.dylib" EPANET/SRC_engines/*.c -IEPANET/SRC_engines/include EPANET/SRC_engines/util/*.c -IEPANET/SRC_engines/util/ -lc -lm -pthread
+gcc-15 -w -O3 -march=native -dynamiclib -fPIC -install_name libepanet2_2.dylib -o "../customlibs/libepanet2_2.dylib" EPANET/SRC_engines/*.c -IEPANET/SRC_engines/include -lc -lm -pthread
 gcc-15 -w -O3 -march=native -dynamiclib -fPIC -install_name libepanetmsx2_2_0.dylib -o "../customlibs/libepanetmsx2_2_0.dylib" -fopenmp -Depanetmsx_EXPORTS -IEPANET-MSX/Src/include -IEPANET/SRC_engines/include EPANET-MSX/Src/*.c -L'../customlibs' -lepanet2_2 -lm -lgomp -lpthread

epyt_flow/VERSION

@@ -1 +1 @@
-0.14.1
+0.14.2

epyt_flow/simulation/scada/scada_data.py

@@ -167,7 +167,7 @@ class ScadaData(Serializable):
             raise TypeError("'sensor_readings_time' must be an instance of 'numpy.ndarray' " +
                             f"but not of '{type(sensor_readings_time)}'")
         if warnings_code is None:
-            warnings_code = [0] * len(sensor_readings_time)
+            warnings_code = np.array([0] * len(sensor_readings_time))
         else:
             if not isinstance(warnings_code, np.ndarray):
                 raise TypeError("'warnings_code' must be an instance of 'numpy.ndarray' " +

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.1.dist-info → epyt_flow-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: epyt-flow
-Version: 0.14.1
+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