goesgcp 2.0.6__tar.gz → 2.0.8__tar.gz

goesgcp-2.0.8/MANIFEST.in

@@ -0,0 +1,7 @@
+# C/cython source files
+include goesgcp/*
+include README.md
+include LICENSE
+include requirements.txt
+recursive-include goesgcp *.c
+include pyproject.toml

{goesgcp-2.0.6 → goesgcp-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: goesgcp
-Version: 2.0.6
+Version: 2.0.8
 Summary: A package to download and process GOES-16/17 data
 Home-page: https://github.com/helvecioneto/goesgcp
 Author: Helvecio B. L. Neto
@@ -12,9 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Software Development
-Classifier: Topic :: Utilities
+Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
+Classifier: Topic :: Scientific/Engineering :: GIS
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: google-cloud-storage
@@ -36,6 +35,7 @@ Dynamic: summary
 <!-- badges: start -->
 [![pypi](https://badge.fury.io/py/goesgcp.svg)](https://pypi.python.org/pypi/goesgcp)
 [![Downloads](https://img.shields.io/pypi/dm/goesgcp.svg)](https://pypi.python.org/pypi/goesgcp)
+[![Upload Python Package](https://github.com/helvecioneto/goesgcp/actions/workflows/python-publish.yml/badge.svg)](https://github.com/helvecioneto/goesgcp/actions/workflows/python-publish.yml)
 [![Contributors](https://img.shields.io/github/contributors/helvecioneto/goesgcp.svg)](https://github.com/helvecioneto/goesgcp/graphs/contributors)
 [![License](https://img.shields.io/pypi/l/goesgcp.svg)](https://github.com/helvecioneto/goesgcp/blob/main/LICENSE)
 <!-- badges: end -->
@@ -87,6 +87,7 @@ goesgcp [OPTIONS]
 | `--bt_hour`           | Hour of the day to download data (default: [0, 1, ..., 23]).              |
 | `--bt_minute`         | Minute of the hour to download data (default: [0, 15, 30, 45]).           |
 | `--save_format`       | Format for saving output files (default: `by_date`).                      |
+| `--remap`             | Remap the data based on file (This function are in development).          |
 
 #### Available GOES Products
 A comprehensive list of available GOES products can be found at the following link: [https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16](https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16)

{goesgcp-2.0.6 → goesgcp-2.0.8}/README.md

@@ -2,6 +2,7 @@
 <!-- badges: start -->
 [![pypi](https://badge.fury.io/py/goesgcp.svg)](https://pypi.python.org/pypi/goesgcp)
 [![Downloads](https://img.shields.io/pypi/dm/goesgcp.svg)](https://pypi.python.org/pypi/goesgcp)
+[![Upload Python Package](https://github.com/helvecioneto/goesgcp/actions/workflows/python-publish.yml/badge.svg)](https://github.com/helvecioneto/goesgcp/actions/workflows/python-publish.yml)
 [![Contributors](https://img.shields.io/github/contributors/helvecioneto/goesgcp.svg)](https://github.com/helvecioneto/goesgcp/graphs/contributors)
 [![License](https://img.shields.io/pypi/l/goesgcp.svg)](https://github.com/helvecioneto/goesgcp/blob/main/LICENSE)
 <!-- badges: end -->
@@ -53,6 +54,7 @@ goesgcp [OPTIONS]
 | `--bt_hour`           | Hour of the day to download data (default: [0, 1, ..., 23]).              |
 | `--bt_minute`         | Minute of the hour to download data (default: [0, 15, 30, 45]).           |
 | `--save_format`       | Format for saving output files (default: `by_date`).                      |
+| `--remap`             | Remap the data based on file (This function are in development).          |
 
 #### Available GOES Products
 A comprehensive list of available GOES products can be found at the following link: [https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16](https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16)

{goesgcp-2.0.6 → goesgcp-2.0.8}/goesgcp/main.py

@@ -2,6 +2,7 @@ import pathlib
 import shutil
 import time
 import xarray as xr
+import subprocess
 import argparse
 import sys
 import tqdm
@@ -269,8 +270,65 @@ def crop_reproject(args):
     output_file = f"{output_directory}{file.split('/')[-1]}"
     ds.to_netcdf(output_file, mode='w')
 
+    # Close the file
     ds.close()
 
+    return output_file
+
+
+
+def remap_file(args):
+    """ Remap the download file based on the input file. """
+
+    base_file, target_file, var_name, save_format, output = args
+
+    # Open the files
+    base_ds = xr.open_dataset(base_file, engine="netcdf4")
+
+    if save_format == 'by_date':
+        file_datetime = datetime.strptime(ds.time_coverage_start, 
+                                          "%Y-%m-%dT%H:%M:%S.%fZ")
+        year = file_datetime.strftime("%Y")
+        month = file_datetime.strftime("%m")
+        day = file_datetime.strftime("%d")
+        output_directory = f"{output}{year}/{month}/{day}/"
+    elif save_format == 'julian':
+        file_datetime = datetime.strptime(ds.time_coverage_start, 
+                                          "%Y-%m-%dT%H:%M:%S.%fZ")
+        year = file_datetime.strftime("%Y")
+        julian_day = file_datetime.timetuple().tm_yday
+        output_directory = f"{output}{year}/{julian_day}/"
+    else:
+        output_directory = output
+
+    # Create the output directory
+    pathlib.Path(output_directory).mkdir(parents=True, exist_ok=True)
+
+    output_file = f"{output_directory}{target_file.split('/')[-1]}"
+
+    # Add _ into output_file to prevent overwrite
+    output_file = output_file.replace(".nc", "_remap.nc")
+
+    # Run the cdo command
+    cdo_command = [
+        "cdo", "remapnn," + base_file, target_file, output_file
+    ]
+
+    try:
+        subprocess.run(cdo_command, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    except subprocess.CalledProcessError as e:
+        print(f"Error remapping file {target_file}: {e}")
+        pass
+
+    # Close the files
+    base_ds.close()
+
+    # Delete the target file
+    pathlib.Path(target_file).unlink()
+
+    # Rename the output file
+    pathlib.Path(output_file).rename(target_file)
+
 
 def process_file(args):
     """
@@ -278,7 +336,7 @@ def process_file(args):
     """
     
     bucket_name, blob_name, local_path, output_path, var_name, lat_min, lat_max, lon_min, lon_max, resolution, \
-    save_format, retries = args
+    save_format, retries, remap = args
 
     attempt = 0
     while attempt < retries:
@@ -300,7 +358,13 @@ def process_file(args):
                     log_file.write(f"Failed to download {blob_name} after {retries} attempts. Error: {e}\n")
 
     # Crop the file
-    crop_reproject((local_path, output_path, var_name, lat_min, lat_max, lon_min, lon_max, resolution, save_format))
+    output_file = crop_reproject((local_path, output_path, var_name,
+                                   lat_min, lat_max, lon_min, lon_max, resolution, save_format))
+
+    # Remap the file
+    if remap is not None:
+        # Remap the file
+        remap_file((remap, output_file, var_name, save_format, output_path))
 
     # Remove the local file
     pathlib.Path(local_path).unlink()
@@ -373,6 +437,9 @@ def main():
     parser.add_argument('--resolution', type=float, default=0.03208, help='Resolution of the output file')
     parser.add_argument('--output', type=str, default='output/', help='Path for saving output files')
 
+    # Remap
+    parser.add_argument('--remap', type=str, default=None, help='Give a input file to remap the output')
+
     # Other settings
     parser.add_argument('--parallel', type=lambda x: bool(strtobool(x)), default=True, help='Use parallel processing')
     parser.add_argument('--processes', type=int, default=4, help='Number of processes for parallel execution')
@@ -409,6 +476,7 @@ def main():
     bt_hour = args.bt_hour
     bt_min = args.bt_min
     save_format = args.save_format
+    remap = args.remap
 
 
     # Check mandatory arguments
@@ -466,7 +534,7 @@ def main():
         # Create a list of tasks
         tasks = [(bucket_name, file, f"tmp/{file.split('/')[-1]}", output_path, var_name, 
         lat_min, lat_max, lon_min, lon_max, resolution,
-        save_format, max_attempts) for file in files_list]
+        save_format, max_attempts, remap) for file in files_list]
 
         # Download files in parallel
         with Pool(processes=args.processes) as pool:
@@ -478,7 +546,7 @@ def main():
             local_path = f"tmp/{file.split('/')[-1]}"
             process_file((bucket_name, file, local_path, output_path, var_name,
             lat_min, lat_max, lon_min, lon_max, resolution,
-            save_format, max_attempts))
+            save_format, max_attempts, remap))
             loading_bar.update(1)
         loading_bar.close()
 

{goesgcp-2.0.6 → goesgcp-2.0.8}/goesgcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: goesgcp
-Version: 2.0.6
+Version: 2.0.8
 Summary: A package to download and process GOES-16/17 data
 Home-page: https://github.com/helvecioneto/goesgcp
 Author: Helvecio B. L. Neto
@@ -12,9 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Software Development
-Classifier: Topic :: Utilities
+Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
+Classifier: Topic :: Scientific/Engineering :: GIS
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: google-cloud-storage
@@ -36,6 +35,7 @@ Dynamic: summary
 <!-- badges: start -->
 [![pypi](https://badge.fury.io/py/goesgcp.svg)](https://pypi.python.org/pypi/goesgcp)
 [![Downloads](https://img.shields.io/pypi/dm/goesgcp.svg)](https://pypi.python.org/pypi/goesgcp)
+[![Upload Python Package](https://github.com/helvecioneto/goesgcp/actions/workflows/python-publish.yml/badge.svg)](https://github.com/helvecioneto/goesgcp/actions/workflows/python-publish.yml)
 [![Contributors](https://img.shields.io/github/contributors/helvecioneto/goesgcp.svg)](https://github.com/helvecioneto/goesgcp/graphs/contributors)
 [![License](https://img.shields.io/pypi/l/goesgcp.svg)](https://github.com/helvecioneto/goesgcp/blob/main/LICENSE)
 <!-- badges: end -->
@@ -87,6 +87,7 @@ goesgcp [OPTIONS]
 | `--bt_hour`           | Hour of the day to download data (default: [0, 1, ..., 23]).              |
 | `--bt_minute`         | Minute of the hour to download data (default: [0, 15, 30, 45]).           |
 | `--save_format`       | Format for saving output files (default: `by_date`).                      |
+| `--remap`             | Remap the data based on file (This function are in development).          |
 
 #### Available GOES Products
 A comprehensive list of available GOES products can be found at the following link: [https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16](https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16)

{goesgcp-2.0.6 → goesgcp-2.0.8}/goesgcp.egg-info/SOURCES.txt

@@ -1,11 +1,13 @@
 LICENSE
+MANIFEST.in
 README.md
+pyproject.toml
+requirements.txt
 setup.py
 goesgcp/__init__.py
 goesgcp/main.py
 goesgcp.egg-info/PKG-INFO
 goesgcp.egg-info/SOURCES.txt
 goesgcp.egg-info/dependency_links.txt
-goesgcp.egg-info/entry_points.txt
 goesgcp.egg-info/requires.txt
 goesgcp.egg-info/top_level.txt

goesgcp-2.0.8/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel", "numpy>=1.19.0", "Cython>=0.29.21"]
+build-backend = "setuptools.build_meta"

goesgcp-2.0.8/requirements.txt

@@ -0,0 +1,5 @@
+google-cloud-storage
+pyproj
+xarray
+netcdf4
+rioxarray

{goesgcp-2.0.6 → goesgcp-2.0.8}/setup.py

@@ -1,3 +1,4 @@
+
 import os
 
 try:
@@ -17,7 +18,7 @@ else:
 
 setup(
     name="goesgcp",
-    version='2.0.6',
+    version="2.0.8",
     author="Helvecio B. L. Neto",
     author_email="helvecioblneto@gmail.com",
     description="A package to download and process GOES-16/17 data",
@@ -34,13 +35,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
-        "Topic :: Scientific/Engineering",
-        "Topic :: Software Development",
-        "Topic :: Utilities",
-    ],
-    entry_points={
-        'console_scripts': [
-            'goesgcp=goesgcp.main:main',
-        ],
-    },
+	"Topic :: Scientific/Engineering :: Atmospheric Science",
+        "Topic :: Scientific/Engineering :: GIS"
+    ]
 )

goesgcp-2.0.6/goesgcp.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-goesgcp = goesgcp.main:main