windborne 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

windborne/utils.py

@@ -1,5 +1,6 @@
 from .config import CLIENT_ID, API_KEY
 
+import os
 import requests
 import jwt
 import time
@@ -58,6 +59,20 @@ def make_api_request(url, params=None, return_type=None):
         print("--------------------------------------")
         print("To get an API key, email data@windbornesystems.com.")
         exit(91)
+    # Check if credentials are swapped
+    elif len(CLIENT_ID) in [32, 35]:
+        print("Your Client ID and API Key are swapped.")
+        print("--------------------------------------")
+        print("Swap them or modify them accordingly to get access to WindBorne API.")
+        print("--------------------------------------")
+        print("You may refer to https://windbornesystems.com/docs/api/cli#introduction\n"
+              "for instructions on how to set your credentials as environment variables for CLI and Code usage\n\n"
+              "and to https://windbornesystems.com/docs/api/pip_data#introduction\n"
+              "for instruction on how to set your credentials for code usage.")
+        print("--------------------------------------")
+        print(f"Current Client ID: {CLIENT_ID}")
+        print(f"Current API Key: {API_KEY}")
+        exit(95)
 
     # Validate WB_CLIENT_ID format
     if not (is_valid_uuid_v4(CLIENT_ID) or is_valid_client_id_format(CLIENT_ID)):
@@ -263,6 +278,11 @@ def save_csv_json(save_to_file, response, csv_data_key=None):
         response (dict or list): The response data to save.
         csv_data_key (str, optional): Key to extract data for CSV. Defaults to None.
     """
+    # Create directory path if it doesn't exist
+    directory = os.path.dirname(save_to_file)
+    if directory and not os.path.isdir(directory):
+        os.makedirs(directory, exist_ok=True)
+
     if '.' not in save_to_file:
         print("You have to provide a file type for your filename.")
         print("Supported formats:")
@@ -317,7 +337,7 @@ def save_csv_json(save_to_file, response, csv_data_key=None):
         print("Unsupported file format. Please use either .json or .csv.")
         exit(4)
 
-def convert_to_netcdf(data, curtime, output_filename=None):
+def convert_to_netcdf(data, curtime, output_filename):
     # This module outputs data in netcdf format for the WMO ISARRA program.  The output format is netcdf
     #   and the style (variable names, file names, etc.) are described here:
     #  https://github.com/synoptic/wmo-uasdc/tree/main/raw_uas_to_netCDF
@@ -342,11 +362,16 @@ def convert_to_netcdf(data, curtime, output_filename=None):
 
     # Convert dictionary to list for DataFrame
     data_list = []
-    for obs_id, obs_data in data.items():
-        # Convert 'None' strings to None type
-        clean_data = {k: None if v == 'None' else v for k, v in obs_data.items()}
-
-        data_list.append(clean_data)
+    if isinstance(data, dict):
+        # If input is dictionary, convert to list
+        for obs_id, obs_data in data.items():
+            clean_data = {k: None if v == 'None' else v for k, v in obs_data.items()}
+            data_list.append(clean_data)
+    else:
+        # If input is already a list
+        for obs_data in data:
+            clean_data = {k: None if v == 'None' else v for k, v in obs_data.items()}
+            data_list.append(clean_data)
 
     # Put the data in a panda dataframe in order to easily push to xarray then netcdf output
     df = pd.DataFrame(data_list)
@@ -362,16 +387,16 @@ def convert_to_netcdf(data, curtime, output_filename=None):
 
     # Build the filename and save some variables for use later
     mt = datetime.fromtimestamp(curtime, tz=timezone.utc)
+
+    is_multi_mission = True
+
     # Handle dropsondes
     mission_name = str(df['mission_name'].iloc[0]) if (not df.empty and not pd.isna(df['mission_name'].iloc[0])) else ' '
+    # Dropsondes name is ''
+    if mission_name == ' ':
+        is_multi_mission = False
 
-    is_multi_mission = False
-
-    if output_filename:
-        output_file = output_filename
-        is_multi_mission = True  # we should calculate this directly, rather than relying on the filename
-    else:
-        output_file = f"WindBorne_{mission_name}_{mt.year:04d}-{mt.month:02d}-{mt.day:02d}_{mt.hour:02d}.nc"
+    output_file = output_filename
 
     # Derived quantities calculated here:
 
@@ -476,8 +501,7 @@ def convert_to_netcdf(data, curtime, output_filename=None):
     }
     ds['mission_name'].attrs = {
         'long_name': 'Mission name',
-        'description': 'Which balloon collected the data',
-        '_FillValue': ''
+        'description': 'Which balloon collected the data'
     }
 
     # Add Global Attributes synonymous across all UASDC providers
@@ -553,7 +577,7 @@ def format_little_r(observations):
     """
     little_r_records = []
 
-    for obs_id, point in observations:
+    for point in observations:
         # Observation time
         observation_time = datetime.fromtimestamp(point['timestamp'], tz=timezone.utc)
 

{windborne-1.0.5.dist-info → windborne-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: windborne
-Version: 1.0.5
+Version: 1.0.7
 Summary: A Python library for interacting with WindBorne Data and Forecasts API
 Author-email: WindBorne Systems <data@windbornesystems.com>
 Classifier: Programming Language :: Python :: 3

windborne-1.0.7.dist-info/RECORD

@@ -0,0 +1,11 @@
+windborne/__init__.py,sha256=aDFnZEPGmulZ-VVAVD-0maK3UFeLl9PxUyxp_qZ85Gk,1894
+windborne/cli.py,sha256=Qp6wu3ZbXwnpmHa3odr0sjIJ3DOhtraQblUGwKWEKWc,36416
+windborne/config.py,sha256=FYIBRiIuii5igAFQlOsHUa6u2i1kKnO1yZE7QfQJvUg,1688
+windborne/data_api.py,sha256=TtOgzD-ONRFswPbAIiMaCANp_IaP4g8OvNExqZ_81iA,63414
+windborne/forecasts_api.py,sha256=AYuhFRls_XvzuNB55NF0w3y-_ocYwPxmI6C1lIyFkgM,16865
+windborne/utils.py,sha256=cpQZ79EB8T0Cy5ygwHsbTEE4XjQ0xYX_sN-Ags8AYJw,39718
+windborne-1.0.7.dist-info/METADATA,sha256=R6AQZUik0LbU1ofYCGFYL8dWWLyzoIoLhyW3TVrP_Ng,1264
+windborne-1.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+windborne-1.0.7.dist-info/entry_points.txt,sha256=j_YrqdCDrCd7p5MIwQ2BYwNXEi95VNANzLRJmcXEg1U,49
+windborne-1.0.7.dist-info/top_level.txt,sha256=PE9Lauriu5S5REf7JKhXprufZ_V5RiZ_TnfnrLGJrmE,10
+windborne-1.0.7.dist-info/RECORD,,

windborne-1.0.5.dist-info/RECORD

@@ -1,11 +0,0 @@
-windborne/__init__.py,sha256=Dv2RK6qcZa3YDrTo_W_N9YROKOQV1_HFa0OWnZSBKAc,1783
-windborne/cli.py,sha256=ZNqeIlWqlKE4iCo8kptUH6Wbish0T8O7-Hljt-gEi9Q,31031
-windborne/config.py,sha256=FYIBRiIuii5igAFQlOsHUa6u2i1kKnO1yZE7QfQJvUg,1688
-windborne/data_api.py,sha256=dnF54sLPYRU5dect3WxmonbHKUjihfE9dVdpaT-fylk,35560
-windborne/forecasts_api.py,sha256=AYuhFRls_XvzuNB55NF0w3y-_ocYwPxmI6C1lIyFkgM,16865
-windborne/utils.py,sha256=UwcuMu2yj5lOR0G-LWSLcsyn024IHP83tkX9WEokTMY,38600
-windborne-1.0.5.dist-info/METADATA,sha256=ICGFlsRSW6BP3u4bG6GYYFDYhhzIH5VJiDW6xyw0h2k,1264
-windborne-1.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-windborne-1.0.5.dist-info/entry_points.txt,sha256=j_YrqdCDrCd7p5MIwQ2BYwNXEi95VNANzLRJmcXEg1U,49
-windborne-1.0.5.dist-info/top_level.txt,sha256=PE9Lauriu5S5REf7JKhXprufZ_V5RiZ_TnfnrLGJrmE,10
-windborne-1.0.5.dist-info/RECORD,,