wolfhece 2.2.37__py3-none-any.whl → 2.2.39__py3-none-any.whl

wolfhece/hydrology/read.py

@@ -13,8 +13,7 @@ import os
 import logging
 from datetime import datetime as date
 from datetime import timezone
-from struct import unpack, calcsize, unpack_from
-from pathlib import Path
+from struct import unpack, calcsize, unpack_from, pack
 
 
 # Constants
@@ -145,12 +144,16 @@ def read_bin(path, fileName, format="", nbBytes=[], uniform_format=-1, hydro=Fal
             all_bytes = file.read()
         nbL = int.from_bytes(all_bytes[:4], byteorder='little', signed=True)
         nbC = int.from_bytes(all_bytes[4:8], byteorder='little', signed=True)
-        Data = unpack(format*nbL, all_bytes[8:])
+        z = all_bytes[8:8+nbL*calcsize(format)]
+        flat_data = unpack(format[0] + format[1:]*nbL, z)
+        data = [list(flat_data[i * (nbC+1) : (i + 1) * (nbC+1)]) for i in range(nbL)]
+        # data = np.array(flat_data, dtype=np.float64).reshape(nbL, nbC+1)
     else:
-        Data = read_bin_old(path, fileName, nbBytes=nbBytes, uniform_format=uniform_format, hydro=hydro)
+        data = read_bin_old(path, fileName, nbBytes=nbBytes, uniform_format=uniform_format, hydro=hydro)
 
 
-    return Data
+    return data
+
 
 
 def read_binary_file(path, fileName, format="", buffer_size=-1, init_offset=8):
@@ -196,6 +199,8 @@ def read_binary_file(path, fileName, format="", buffer_size=-1, init_offset=8):
                 file.seek(offset - len(buffer), 1)
                 # break
 
+        #print(f"Number of values read: {len(values_list)} / {nbL}")
+
     return values_list
 
 
@@ -321,3 +326,58 @@ def check_path(fileName:str, prefix:str="", applyCWD:bool=True) -> tuple[bool, s
         return info, fileName
 
     return info, os.path.normpath(finalName)
+
+
+def write_binary_file(path:str, fileName:str, data:list, format:str=""):
+    if not data:
+        raise ValueError("Data cannot be empty")
+
+    if format == "":
+        # Default format
+        format = "<bbhbbbd"
+    elif "<" not in format:
+        logging.warning("Format should start with '<' if you are on Windows.")
+
+    nbL = len(data)
+    nbC = len(format.replace("<", "")) - 1
+
+    with open(os.path.join(path, fileName), 'wb') as file:
+        # Write header: number of rows and columns as 4-byte little-endian signed integers
+        file.write(nbL.to_bytes(4, byteorder='little', signed=True))
+        file.write(nbC.to_bytes(4, byteorder='little', signed=True))
+
+        # Write the data rows
+        for row in data:
+            if len(row) != nbC+1:
+                raise ValueError(f"Each row must have {nbC} values according to the format.")
+            binary_row = pack(format, *row)
+            file.write(binary_row)
+
+
+def read_txt_file(path:str, fileName:str, sep:str="\t", header:int=2) -> tuple[np.array, np.array]:
+    """
+    Read a text file and return the data as two numpy arrays.
+
+    Args:
+        path (str): The path to the text file.
+        fileName (str): The name of the text file.
+        sep (str): The separator used in the text file. Default is tab.
+        header (int): The number of header lines to skip. Default is 0.
+
+    Returns:
+        tuple: A tuple containing two numpy arrays: time and values.
+    """
+    data = np.loadtxt(os.path.join(path, fileName), delimiter=sep, skiprows=header)
+    # time = data[:, :-1]
+    # values = data[:, -1]
+
+    return data
+
+
+def write_txt_file(path:str, fileName:str, data:np.array, sep:str="\t", header:str=None, format:list=['%d']*6+['%.15f']) -> None:
+
+    if header is None:
+        header = f"{data.shape[0]:d}\n{data.shape[1]:d}"
+        
+    full_name = os.path.join(path, fileName)
+    np.savetxt(full_name, data, header=header, fmt=format, comments='',delimiter=sep)

wolfhece/hydrometry/kiwis.py

@@ -424,7 +424,7 @@ class hydrometry():
             self.get_groups()
             self.save_struct()
         except Exception as e:
-            print('Error in hydrometry init :', e)
+            logging.error('Error in hydrometry init :', e)
             self.realstations = None
             pass
 
@@ -547,6 +547,9 @@ class hydrometry():
 
     def _get_sites_pythonlist(self):
         """ Obtention des sites en liste python """
+        if self.sites is None:
+            logging.warning('No sites available - Please check the hydrometry instance')
+            return []
 
         list_name_code = [curname+' --- '+curno  for curname,curno in zip(self.sites[kiwis_site_fields.site_name.value].values,self.sites[kiwis_site_fields.site_no.value].values)]
         return list_name_code
@@ -649,7 +652,7 @@ class hydrometry():
             return ([],[],[])
         else:
             return ([curname + ' - ' + str(curid) for curname, curid in zip(stations_r[station_fields.STATION_NAME.value].values,
-                                                                            stations_r[station_fields.STATION_ID.value].values)],
+                                                                            stations_r[station_fields.STATION_NO.value].values)],
                     stations_r[station_fields.STATION_LOCAL_X.value].values,
                     stations_r[station_fields.STATION_LOCAL_Y.value].values)
 
@@ -941,12 +944,16 @@ class hydrometry():
         elif stationcode!='':
             id=self.get_stationid(code=stationcode)
 
-        json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList)
-                                 +'&station_id='+str(id)
-                                 +'&format=json'
-                                 ,verify=True,
-                                 headers=self._header,
-                                 timeout=TIMEOUT).json()
+        try:
+            json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList)
+                                    +'&station_id='+str(id)
+                                    +'&format=json'
+                                    ,verify=True,
+                                    headers=self._header,
+                                    timeout=TIMEOUT).json()
+        except requests.exceptions.RequestException as e:
+            logging.error(f"Error fetching timeseries list: {e}")
+            return id, None
 
         try:
             if json_data[0] == 'No matches.':
@@ -1041,7 +1048,7 @@ class hydrometry():
         if timezone=='Europe/Brussels' or timezone=='local':
             timezone=''
 
-        nb = (todate - fromdate).days*24 * (3600/interval)
+        nb = int((todate - fromdate).days*24 * (3600/interval))
         cursec = interval
         # id = ''
         if ts_id == '':
@@ -1105,8 +1112,8 @@ class hydrometry():
             curend = curfrom+timedelta(seconds=200000 * cursec)
             locts=[]
             while curfrom<todate:
-                print(curfrom, curend)
-                tmpts = self.timeseries(stationname, stationcode, dir, curfrom, curend, ts_name, ts_id, timezone=timezone)
+                logging.info('Getting data from {0} to {1}'.format(curfrom, curend))
+                tmpts = self.timeseries(stationname, stationcode, dir = dir, fromdate= curfrom, todate= curend, ts_name= ts_name, ts_id= ts_id, timezone=timezone)
                 if len(tmpts)>0:
                     locts.append(tmpts)
 
@@ -1115,22 +1122,31 @@ class hydrometry():
                 if curend>todate:
                     curend=todate
 
+            if len(locts)==0:
+                logging.warning('No data found for timeseries {0} for station {1} ({2}) between {3} and {4}'.format(ts_name, stationname, stationcode, fromdate, todate))
+                return pd.DataFrame()
+
             return pd.concat(locts)
         else:
-            json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValues)
-                                    +"&"+urllib.parse.urlencode({
-                                    "ts_id":str(ts_id),
-                                    "from":fromdate.strftime("%Y-%m-%dT%H:%M:%S"),
-                                    "to":todate.strftime("%Y-%m-%dT%H:%M:%S"),
-                                    # "format":"json",
-                                    "timezone":timezone})
-                                    ,verify=True,
-                                    headers=self._header,
-                                    timeout=TIMEOUT).json()
+            try:
+                json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValues)
+                                        +"&"+urllib.parse.urlencode({
+                                        "ts_id":str(ts_id),
+                                        "from":fromdate.strftime("%Y-%m-%dT%H:%M:%S"),
+                                        "to":todate.strftime("%Y-%m-%dT%H:%M:%S"),
+                                        # "format":"json",
+                                        "timezone":timezone})
+                                        ,verify=True,
+                                        headers=self._header,
+                                        timeout=TIMEOUT).json()
 
-            df = pd.DataFrame(json_data[0]['data'], columns = json_data[0]['columns'].split(','))
-            df.set_index('Timestamp', inplace = True)
-            df.index = pd.to_datetime(df.index,format="%Y-%m-%dT%H:%M:%S.%f%z")
+                df = pd.DataFrame(json_data[0]['data'], columns = json_data[0]['columns'].split(','))
+                df.set_index('Timestamp', inplace = True)
+                df.index = pd.to_datetime(df.index,format="%Y-%m-%dT%H:%M:%S.%f%z")
+
+            except Exception as e:
+                logging.error('Error in timeseries :', e)
+                return pd.DataFrame()
 
         return df.squeeze()
 
@@ -1210,8 +1226,8 @@ class hydrometry():
             curend = curfrom+timedelta(seconds=200000 * cursec)
             locts=[]
             while curfrom<todate:
-                print(curfrom, curend)
-                locts.append(self.timeseries(stationname,stationcode,dir,curfrom,curend,ts_name,ts_id))
+                logging.info('Getting data from {0} to {1}'.format(curfrom, curend))
+                locts.append(self.timeseries(stationname,stationcode, dir = dir, fromdate= curfrom, todate= curend, ts_name= ts_name, ts_id= ts_id))
                 curfrom = curend
                 curend = curfrom+timedelta(seconds=200000 * cursec)
                 if curend>todate:

wolfhece/hydrometry/kiwis_gui.py

@@ -274,6 +274,10 @@ class hydrometry_gui(wx.Frame):
         """
         to_exclude = ['alarm', 'batterie']
 
+        if len(self.listbox2.GetSelections())==0:
+            logging.error(_('No station selected'))
+            return
+
         #treat only the first one if multiple selections
         stationname, stationcode = self._getname_code_fromindex(self.listbox2.GetSelections()[0])
 
@@ -584,11 +588,12 @@ class hydrometry_gui(wx.Frame):
         if stationname is None:
             return
 
-        for curdata, curname in zip(data,tsname):
+        for curdata, curname in zip(data, tsname):
             if curdata is not None:
                 if len(curdata)>1:
                     curdata.to_csv('{}-{}.csv'.format(stationcode,curname), date_format="%Y%m%d%H%M%S%z", sep=";")
-                    if datumsizebv[0]!='':
+
+                    if datumsizebv[0]!='' and 'hauteur' in curname.lower():
                         curdata:pd.Series
                         zdata = curdata.copy()
                         zdata +=  float(datumsizebv[0])