pypromice 1.4.1__py3-none-any.whl → 1.4.3__py3-none-any.whl

pypromice/process/resample.py

@@ -32,15 +32,44 @@ def resample_dataset(ds_h, t):
     ds_d : xarray.Dataset
         L3 AWS dataset resampled to the frequency defined by t
     '''
-    df_d = ds_h.to_dataframe().resample(t).mean()
+    # Convert dataset to DataFrame
+    df_d = ds_h.to_dataframe()
     
+    # Identify non-numeric columns
+    non_numeric_cols = df_d.select_dtypes(exclude=['number']).columns
+    
+    # Log a warning and drop non-numeric columns
+    if len(non_numeric_cols) > 0:
+        for col in non_numeric_cols:
+            unique_values = df_d[col].unique()
+            logger.warning(f"Dropping column '{col}' because it is of type '{df_d[col].dtype}' and contains unique values: {unique_values}")
+
+        df_d = df_d.drop(columns=non_numeric_cols)
+    # Resample the DataFrame
+    df_d = df_d.resample(t).mean()
+
     # taking the 10 min data and using it as instantaneous values:
-    if (t == '60min') and (ds_h.time.diff(dim='time').isel(time=0).dt.total_seconds() == 600):
+    is_10_minutes_timestamp = (ds_h.time.diff(dim='time') / np.timedelta64(1, 's') == 600)
+    if (t == '60min') and is_10_minutes_timestamp.any():
         cols_to_update = ['p_i', 't_i', 'rh_i', 'rh_i_cor', 'wspd_i', 'wdir_i','wspd_x_i','wspd_y_i']
+        timestamp_10min = ds_h.time.where(is_10_minutes_timestamp, drop=True).to_index()
+        timestamp_round_hour = df_d.index
+        timestamp_to_update = timestamp_round_hour.intersection(timestamp_10min)
+        
         for col in cols_to_update:
-            df_d[col] = ds_h.reindex(time=df_d.index)[col.replace('_i','_u')].values
+            if col not in df_d.columns:
+                df_d[col] = np.nan
+            else:
+                # if there are already instantaneous values in the dataset
+                # we want to keep them as they are
+                # removing timestamps where there is already t_i filled from a TX file
+                missing_instantaneous = ds_h.reindex(time=timestamp_to_update)[col].isnull()
+                timestamp_to_update = timestamp_to_update[missing_instantaneous]
+            df_d.loc[timestamp_to_update, col] = ds_h.reindex(
+                time= timestamp_to_update
+                )[col.replace('_i','_u')].values
             if col == 'p_i':
-                df_d[col] = df_d[col].values-1000
+                df_d.loc[timestamp_to_update, col] = df_d.loc[timestamp_to_update, col].values-1000
             
 
     # recalculating wind direction from averaged directional wind speeds

pypromice/tx/tx.py

@@ -894,10 +894,10 @@ def sortLines(in_file, out_file, replace_unsorted=True):                       #
             # out_f.write(headers)
             out_f.writelines(unique_lines)
     
-    # Replace input file with new sorted file
-    if replace_unsorted:
-        os.remove(in_file)
-        os.rename(out_file, in_file)
+        # Replace input file with new sorted file
+        if replace_unsorted:
+            os.remove(in_file)
+            os.rename(out_file, in_file)
 
 def addTail(in_file, out_dir, aws_name, header_names='', lines_limit=100):    
     '''Generate tails file from L0tx file

{pypromice-1.4.1.dist-info → pypromice-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypromice
-Version: 1.4.1
+Version: 1.4.3
 Summary: PROMICE/GC-Net data processing toolbox
 Home-page: https://github.com/GEUS-Glaciology-and-Climate/pypromice
 Author: GEUS Glaciology and Climate

{pypromice-1.4.1.dist-info → pypromice-1.4.3.dist-info}/RECORD

@@ -21,7 +21,7 @@ pypromice/process/get_l2tol3.py,sha256=4Qu2d5rT25H2dObyCc70ivtJg3vw6WA-hzI-kRD6y
 pypromice/process/join_l2.py,sha256=ifjuhFR9scVvZt3xuy-ELp-iRchxV1dEK9qJ4UNh5bE,4567
 pypromice/process/join_l3.py,sha256=nLLQbX0vuuvHET8r33ZAt5g1dtIk3foUJ9RZkwkEwE4,20158
 pypromice/process/load.py,sha256=iaFvJeaDanAA60caVj4BWupZpqgQNj3CiNU4csz9FdU,4585
-pypromice/process/resample.py,sha256=caOqcO3AQQ6ejEbVd2AcCKycQps7U0y6GKjLYzWfZnI,5714
+pypromice/process/resample.py,sha256=x0t9CE4YnwYMrn6wDRArhrQHqHOIJpYpTrgEcARUppo,7138
 pypromice/process/utilities.py,sha256=1pqSaF3bIbvRNtOjb25mbegHfuW9MY4KpCBDVXWyML8,1773
 pypromice/process/value_clipping.py,sha256=FkBiDT_HK_BDFiVjB7NdWH-_nab7vONG9LOd2PpEBI8,1573
 pypromice/process/write.py,sha256=fRCCK4g_W07M4EEsJErdTSN2Pldr9SLgqM2w_rsp2ZQ,16257
@@ -39,15 +39,14 @@ pypromice/resources/variables.csv,sha256=YyYng6ZL2eA0EIDdNAT8ACp6kg49R_38mTD5dWz
 pypromice/tx/__init__.py,sha256=-62bhHWJGfzFh5JwHcLqRj2jcGzmqzYOLWByhO706YY,30
 pypromice/tx/get_l0tx.py,sha256=b34-96KGshTyTN2tBFaAIBl7oZZzbRB_JR7sXtDNfXA,6957
 pypromice/tx/get_msg.py,sha256=OGS60OHjy4Wf8JExTfOdK-9xhjFdjhuChxoTSPe_MjI,3417
-pypromice/tx/get_watsontx.py,sha256=vFSuDs_vvkATe_6WCF8OLVsx7Wa-MxLATZRfP9qUZqI,5436
 pypromice/tx/payload_formats.csv,sha256=tzTTNuvmVwlwd7z3aF8A2dhjKNQ4lVumpnNBs3e3YeQ,7816
 pypromice/tx/payload_types.csv,sha256=C1-xCmHytAqqAzgzPwBLWqabzWu6s6tKAd8AjVd935s,457
-pypromice/tx/tx.py,sha256=TE5lKYMJF4hAhHrKjMyx1LZWpOHlwGJI9EdlPJrQITs,34251
+pypromice/tx/tx.py,sha256=mghUjwGqUKe_4JWuAEgWMyH4ME2QRufeMPPHoL72R08,34267
 pypromice/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypromice/utilities/git.py,sha256=7EUGjDs_VZucrckakXKyZEclDAZ_mKIxhTWzhopCIxM,1785
-pypromice-1.4.1.dist-info/LICENSE.txt,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-pypromice-1.4.1.dist-info/METADATA,sha256=znYJm-tDsyrWFwkvQ9xE2BEiN9ZofRxO5EtmBYeIhrQ,4762
-pypromice-1.4.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-pypromice-1.4.1.dist-info/entry_points.txt,sha256=ufX1npmY3nqMPtSVRKVxn3MhG9IyFHD5FjPZQcELVXo,618
-pypromice-1.4.1.dist-info/top_level.txt,sha256=cBdfwgSbWDQq3a07nKRjrfmLC7jdaYXs98GG58HpTks,10
-pypromice-1.4.1.dist-info/RECORD,,
+pypromice-1.4.3.dist-info/LICENSE.txt,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+pypromice-1.4.3.dist-info/METADATA,sha256=mMnZyZwB5jdkzlnxlj-2vxptCrrM1vUHk85tfObm90U,4762
+pypromice-1.4.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pypromice-1.4.3.dist-info/entry_points.txt,sha256=ufX1npmY3nqMPtSVRKVxn3MhG9IyFHD5FjPZQcELVXo,618
+pypromice-1.4.3.dist-info/top_level.txt,sha256=cBdfwgSbWDQq3a07nKRjrfmLC7jdaYXs98GG58HpTks,10
+pypromice-1.4.3.dist-info/RECORD,,

{pypromice-1.4.1.dist-info → pypromice-1.4.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pypromice/tx/get_watsontx.py

@@ -1,147 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Created on Fri Jul 22 16:20:09 2022
-
-Script to get L0tx transmission messages from the Watson River station using 
-the tx module
-
-@author: Penelope How, pho@geus.dk
-"""
-from argparse import ArgumentParser
-
-from configparser import ConfigParser
-import os, imaplib, email, re
-from glob import glob
-from datetime import datetime
-
-from pypromice.tx import getMail, L0tx, sortLines
-
-
-def parse_arguments_watson():
-    parser = ArgumentParser(description="AWS L0 transmission fetcher for Watson River measurements")       
-    parser.add_argument('-a', '--account', default=None, type=str, required=True, help='Email account .ini file')
-    parser.add_argument('-p', '--password', default=None, type=str, required=True, help='Email credentials .ini file')                      
-    parser.add_argument('-o', '--outpath', default=None, type=str, required=False, help='Path where to write output (if given)')           
-    parser.add_argument('-f', '--formats', default=None, type=str, required=False, help='Path to Payload format .csv file')
-    parser.add_argument('-t', '--types', default=None, type=str, required=False, help='Path to Payload type .csv file')  	
-    parser.add_argument('-u', '--uid', default=None, type=str, required=True, help='Last AWS uid .ini file')	        
-    args = parser.parse_args()
-    return args
-
-#------------------------------------------------------------------------------
-def get_watsontx():
-    """Executed from the command line"""
-    args = parse_arguments_watson()
-    
-     # Set payload formatter paths
-    formatter_file = args.formats
-    type_file = args.types
-
- 	# Set credential paths
-    accounts_file = args.account
-    credentials_file = args.password 
-
- 	# Set last aws uid path
- 	# last_uid = 1000000
-    uid_file = args.uid
-    
-    # Set last aws uid path
-    with open(uid_file, 'r') as last_uid_f:
-        last_uid = int(last_uid_f.readline())
-    
-    # Set output file directory
-    out_dir = args.outpath
-    if not os.path.exists(out_dir):
-        os.mkdir(out_dir)
-    
-#------------------------------------------------------------------------------
-    
-    # Define accounts and credentials ini file paths
-    accounts_ini = ConfigParser()
-    accounts_ini.read_file(open(accounts_file))
-    accounts_ini.read(credentials_file)
-                 
-    # Get credentials
-    account = accounts_ini.get('aws', 'account')
-    server = accounts_ini.get('aws', 'server')
-    port = accounts_ini.getint('aws', 'port')    
-    password = accounts_ini.get('aws', 'password')
-    if not password:
-        password = input('password for AWS email account: ')
-    print('AWS data from server %s, account %s' %(server, account))
-    
-#------------------------------------------------------------------------------
-    
-    # Log in to email server
-    mail_server = imaplib.IMAP4_SSL(server, port)
-    typ, accountDetails = mail_server.login(account, password)
-    if typ != 'OK':
-        print('Not able to sign in!')
-        raise
-        
-    # Grab new emails
-    result, data = mail_server.select(mailbox='"[Gmail]/All Mail"', 
-                                      readonly=True)
-    print('mailbox contains %s messages' %data[0])
-    
-#------------------------------------------------------------------------------
-    
-    # Get L0tx datalines from email transmissions
-    for uid, mail in getMail(mail_server, last_uid=last_uid):
-        message = email.message_from_string(mail)
-        try:
-            name = str(message.get_all('subject')[0])
-            d = datetime.strptime(message.get_all('date')[0], 
-                                  '%a, %d %b %Y %H:%M:%S %z')
-        except:
-            name=None
-            d=None
-        
-        if name and ('Watson' in name or 'GIOS' in name):
-            print(f'Watson/GIOS station message, {d.strftime("%Y-%m-%d %H:%M:%S")}')
-
-            l0 = L0tx(message, formatter_file, type_file, 
-                      sender_name=['emailrelay@konectgds.com','sbdservice'])
-            
-            if l0.msg: 
-                content, attachment = l0.getEmailBody()
-                attachment_name = str(attachment.get_filename())               
-                out_fn = re.sub(r'\d*\.dat$', '', attachment_name) + '.txt'
-                out_path = os.sep.join((out_dir, out_fn))
-        
-                print(f'Writing to {out_fn}')
-                print(l0.msg)
-            
-                with open(out_path, mode='a') as out_f:
-                    out_f.write(l0.msg + '\n')    
-    
-#------------------------------------------------------------------------------
-
-    # Sort L0tx files and add tails    
-    for f in glob(out_dir+'/*.txt'):
-        
-        # Sort lines in L0tx file and remove duplicates
-        in_dirn, in_fn = os.path.split(f)    
-        out_fn = 'sorted_' + in_fn
-        out_pn = os.sep.join((in_dirn, out_fn))
-        sortLines(f, out_pn)
-        
-    # Close mail server if open
-    if 'mail_server' in locals():
-        print(f'\nClosing {account}')
-        mail_server.close()
-        resp = mail_server.logout()
-        assert resp[0].upper() == 'BYE'
-    
-    # Write last aws uid to ini file
-    try:
-        with open(uid_file, 'w') as last_uid_f:
-            last_uid_f.write(uid)
-    except:
-        print(f'Could not write last uid {uid} to {uid_file}')
-         
-    print('Finished')
-        
-if __name__ == "__main__":  
-    get_watsontx()