ECOv003-L2T-STARS 1.1.0__tar.gz → 1.3.0__tar.gz

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Checkout repository
@@ -32,3 +32,8 @@ jobs:
       - name: Run tests
         run: |
           pytest
+        env:
+          PYTHONPATH: .
+          EARTHDATA_USERNAME: ${{ secrets.EARTHDATA_USERNAME }}
+          EARTHDATA_PASSWORD: ${{ secrets.EARTHDATA_PASSWORD }}
+          SKIP_EARTHDATA_LOGIN: "true"

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/ECOv003_DL.py

@@ -265,33 +265,33 @@ class ECOv003DLConfig(ECOSTRESSRunConfig):
             runconfig = read_runconfig(filename)
 
             # Validate and extract working directory
-            if "StaticAuxiliaryFileGroup" not in runconfig:
-                raise MissingRunConfigValue(f"missing StaticAuxiliaryFileGroup in ECOv003_DL run-config: {filename}")
-            if "ECOv003_DL_WORKING" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "StaticAncillaryFileGroup" not in runconfig:
+                raise MissingRunConfigValue(f"missing StaticAncillaryFileGroup in ECOv003_DL run-config: {filename}")
+            if "ECOv003_DL_WORKING" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"missing StaticAuxiliaryFileGroup/ECOv003_DL_WORKING in ECOv003_DL run-config: {filename}")
-            working_directory = abspath(runconfig["StaticAuxiliaryFileGroup"]["ECOv003_DL_WORKING"])
+                    f"missing StaticAncillaryFileGroup/ECOv003_DL_WORKING in ECOv003_DL run-config: {filename}")
+            working_directory = abspath(runconfig["StaticAncillaryFileGroup"]["ECOv003_DL_WORKING"])
             logger.info(f"working directory: {cl.dir(working_directory)}")
 
             # Validate and extract L2T STARS sources directory
-            if "L2T_STARS_SOURCES" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_SOURCES" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"missing StaticAuxiliaryFileGroup/L2T_STARS_SOURCES in ECOv003_DL run-config: {filename}")
-            L2T_STARS_sources_directory = abspath(runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_SOURCES"])
+                    f"missing StaticAncillaryFileGroup/L2T_STARS_SOURCES in ECOv003_DL run-config: {filename}")
+            L2T_STARS_sources_directory = abspath(runconfig["StaticAncillaryFileGroup"]["L2T_STARS_SOURCES"])
             logger.info(f"L2T STARS sources directory: {cl.dir(L2T_STARS_sources_directory)}")
 
             # Validate and extract L2T STARS indices directory
-            if "L2T_STARS_INDICES" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_INDICES" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"missing StaticAuxiliaryFileGroup/L2T_STARS_INDICES in ECOv003_DL run-config: {filename}")
-            L2T_STARS_indices_directory = abspath(runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_INDICES"])
+                    f"missing StaticAncillaryFileGroup/L2T_STARS_INDICES in ECOv003_DL run-config: {filename}")
+            L2T_STARS_indices_directory = abspath(runconfig["StaticAncillaryFileGroup"]["L2T_STARS_INDICES"])
             logger.info(f"L2T STARS indices directory: {cl.dir(L2T_STARS_indices_directory)}")
 
             # Validate and extract L2T STARS model directory
-            if "L2T_STARS_MODEL" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_MODEL" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"missing StaticAuxiliaryFileGroup/L2T_STARS_MODEL in ECOv003_DL run-config: {filename}")
-            L2T_STARS_model_directory = abspath(runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_MODEL"])
+                    f"missing StaticAncillaryFileGroup/L2T_STARS_MODEL in ECOv003_DL run-config: {filename}")
+            L2T_STARS_model_directory = abspath(runconfig["StaticAncillaryFileGroup"]["L2T_STARS_MODEL"])
             logger.info(f"L2T STARS model directory: {cl.dir(L2T_STARS_model_directory)}")
 
             # Validate ProductPathGroup

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/ECOv003_DL.xml

@@ -28,7 +28,7 @@
             <element>L2T_LSTE_filename1</element>
         </vector>
     </group>
-    <group name="StaticAuxiliaryFileGroup">
+    <group name="StaticAncillaryFileGroup">
         <scalar name="ECOv003_DL_WORKING">working_directory</scalar>
         <scalar name="L2T_STARS_SOURCES">L2T_STARS_sources_directory</scalar>
         <scalar name="L2T_STARS_INDICES">L2T_STARS_indices_directory</scalar>

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/ECOv003_L2T_STARS.xml

@@ -22,7 +22,7 @@
         <scalar name="L2T_LSTE">L2T_LSTE_filename</scalar>
         <scalar name="L2T_STARS_PRIOR">prior_L2T_STARS_filename</scalar>
     </group>
-    <group name="StaticAuxiliaryFileGroup">
+    <group name="StaticAncillaryFileGroup">
         <scalar name="L2T_STARS_MODEL">model_directory</scalar>
         <scalar name="L2T_STARS_INDICES">indices_directory</scalar>
         <scalar name="L2T_STARS_SOURCES">sources_directory</scalar>

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/L2TSTARSConfig.py

@@ -37,48 +37,50 @@ class L2TSTARSConfig(ECOSTRESSRunConfig):
         # Read the run-config XML into a dictionary
         runconfig = self.read_runconfig(filename)
 
+        # reverting to StaticAncillaryFileGroup for now instead of StaticAuxiliaryFileGroup
+
         try:
-            # Validate and extract working directory from StaticAuxiliaryFileGroup
-            if "StaticAuxiliaryFileGroup" not in runconfig:
+            # Validate and extract working directory from StaticAncillaryFileGroup
+            if "StaticAncillaryFileGroup" not in runconfig:
                 raise MissingRunConfigValue(
-                    f"Missing StaticAuxiliaryFileGroup in L2T_STARS run-config: {filename}"
+                    f"Missing StaticAncillaryFileGroup in L2T_STARS run-config: {filename}"
                 )
-            if "L2T_STARS_WORKING" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_WORKING" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"Missing StaticAuxiliaryFileGroup/L2T_STARS_WORKING in L2T_STARS run-config: {filename}"
+                    f"Missing StaticAncillaryFileGroup/L2T_STARS_WORKING in L2T_STARS run-config: {filename}"
                 )
             self.working_directory = abspath(
-                runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_WORKING"]
+                runconfig["StaticAncillaryFileGroup"]["L2T_STARS_WORKING"]
             )
             logger.info(f"Working directory: {cl.dir(self.working_directory)}")
 
             # Validate and extract sources directory
-            if "L2T_STARS_SOURCES" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_SOURCES" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"Missing StaticAuxiliaryFileGroup/L2T_STARS_SOURCES in L2T_STARS run-config: {filename}"
+                    f"Missing StaticAncillaryFileGroup/L2T_STARS_SOURCES in L2T_STARS run-config: {filename}"
                 )
             self.sources_directory = abspath(
-                runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_SOURCES"]
+                runconfig["StaticAncillaryFileGroup"]["L2T_STARS_SOURCES"]
             )
             logger.info(f"Sources directory: {cl.dir(self.sources_directory)}")
 
             # Validate and extract indices directory
-            if "L2T_STARS_INDICES" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_INDICES" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"Missing StaticAuxiliaryFileGroup/L2T_STARS_INDICES in L2T_STARS run-config: {filename}"
+                    f"Missing StaticAncillaryFileGroup/L2T_STARS_INDICES in L2T_STARS run-config: {filename}"
                 )
             self.indices_directory = abspath(
-                runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_INDICES"]
+                runconfig["StaticAncillaryFileGroup"]["L2T_STARS_INDICES"]
             )
             logger.info(f"Indices directory: {cl.dir(self.indices_directory)}")
 
             # Validate and extract model directory
-            if "L2T_STARS_MODEL" not in runconfig["StaticAuxiliaryFileGroup"]:
+            if "L2T_STARS_MODEL" not in runconfig["StaticAncillaryFileGroup"]:
                 raise MissingRunConfigValue(
-                    f"Missing StaticAuxiliaryFileGroup/L2T_STARS_MODEL in L2T_STARS run-config: {filename}"
+                    f"Missing StaticAncillaryFileGroup/L2T_STARS_MODEL in L2T_STARS run-config: {filename}"
                 )
             self.model_directory = abspath(
-                runconfig["StaticAuxiliaryFileGroup"]["L2T_STARS_MODEL"]
+                runconfig["StaticAncillaryFileGroup"]["L2T_STARS_MODEL"]
             )
             logger.info(f"Model directory: {cl.dir(self.model_directory)}")
 

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/L2T_STARS.py

@@ -60,6 +60,7 @@ def L2T_STARS(
     remove_posterior: bool = True,
     threads: Union[int, str] = "auto",
     num_workers: int = 4,
+    overwrite: bool = False, # New parameter for overwriting existing files
 ) -> int:
     """
     ECOSTRESS Collection 3 L2T_STARS PGE (Product Generation Executive).
@@ -98,6 +99,8 @@ def L2T_STARS(
                                             Defaults to "auto".
         num_workers (int, optional): Number of Julia workers for distributed processing.
                                      Defaults to 4.
+        overwrite (bool, optional): If True, existing output files will be overwritten.
+                                    Defaults to False.
 
     Returns:
         int: An exit code indicating the success or failure of the PGE execution.
@@ -127,11 +130,17 @@ def L2T_STARS(
         L2T_STARS_browse_filename = runconfig.L2T_STARS_browse_filename
         logger.info(f"Browse filename: " + cl.file(L2T_STARS_browse_filename))
 
-        # Check if the final product already exists to avoid reprocessing
-        if exists(L2T_STARS_zip_filename) and exists(L2T_STARS_browse_filename):
+        # Check if the final product already exists and 'overwrite' is not enabled
+        if not overwrite and exists(L2T_STARS_zip_filename) and exists(L2T_STARS_browse_filename):
             logger.info(f"Found existing L2T STARS file: {L2T_STARS_zip_filename}")
             logger.info(f"Found existing L2T STARS preview: {L2T_STARS_browse_filename}")
+            logger.info("Overwrite option is not enabled, skipping reprocessing.")
             return SUCCESS_EXIT_CODE
+        elif overwrite and exists(L2T_STARS_zip_filename) and exists(L2T_STARS_browse_filename):
+            logger.info(f"Found existing L2T STARS file: {L2T_STARS_zip_filename}")
+            logger.info(f"Found existing L2T STARS preview: {L2T_STARS_browse_filename}")
+            logger.info("Overwrite option is enabled, proceeding with reprocessing.")
+
 
         logger.info(f"Working directory: {cl.dir(working_directory)}")
         logger.info(f"Log file: {cl.file(log_filename)}")
@@ -232,12 +241,17 @@ def L2T_STARS(
         VNP43NRT_products_directory = join(sources_directory, DEFAULT_VNP43NRT_PRODUCTS_DIRECTORY)
         logger.info(f"VNP43NRT products directory: {cl.dir(VNP43NRT_products_directory)}")
 
-        # Re-check for existing product (double-check in case another process created it)
-        if exists(L2T_STARS_zip_filename):
+        # Re-check for existing product (double-check in case another process created it) with overwrite option
+        if not overwrite and exists(L2T_STARS_zip_filename):
             logger.info(
-                f"Found L2T STARS product zip: {cl.file(L2T_STARS_zip_filename)}"
+                f"Found L2T STARS product zip: {cl.file(L2T_STARS_zip_filename)}. Overwrite is False, returning."
             )
             return exit_code
+        elif overwrite and exists(L2T_STARS_zip_filename):
+            logger.info(
+                f"Found L2T STARS product zip: {cl.file(L2T_STARS_zip_filename)}. Overwrite is True, proceeding."
+            )
+
 
         # Initialize HLS data connection
         logger.info(f"Connecting to CMR Search server: {CMR_SEARCH_URL}")
@@ -245,7 +259,7 @@ def L2T_STARS(
             HLS_connection = HLS2CMR(
                 working_directory=working_directory,
                 download_directory=HLS_download_directory,
-                products_directory=HLS_products_directory,
+                # products_directory=HLS_products_directory,
                 target_resolution=target_resolution,
             )
         except CMRServerUnreachable as e:

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/LPDAAC/LPDAACDataPool.py

@@ -1,6 +1,5 @@
-import base64
+import netrc
 import hashlib
-import json
 import logging
 import os
 import posixpath
@@ -11,24 +10,27 @@ from datetime import date
 from fnmatch import fnmatch
 from http.cookiejar import CookieJar
 from os import makedirs, remove
-from os.path import abspath
 from os.path import dirname
 from os.path import exists
 from os.path import getsize
 from os.path import isdir
 from os.path import join
+from os.path import abspath
+from os.path import expanduser
 from time import sleep
 from typing import List, OrderedDict
-import netrc
+
 import requests
 import xmltodict
 from bs4 import BeautifulSoup
 from dateutil import parser
-from pycksum import cksum
+from ..cksum import cksum
 
 import colored_logging as cl
 
-from ECOv003_exit_codes import *
+
+class DownloadFailed(Exception):
+    pass
 
 CONNECTION_CLOSE = {
     "Connection": "close",
@@ -54,10 +56,10 @@ class LPDAACServerUnreachable(ConnectionError):
 class LPDAACDataPool:
     logger = logging.getLogger(__name__)
     DEFAULT_CHUNK_SIZE = 2 ** 20
-    DATE_REGEX = re.compile('^(19|20)\d\d[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$')
+    DATE_REGEX = re.compile(r'^(19|20)\d\d[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$')
     DEFAULT_REMOTE = DEFAULT_REMOTE
 
-    def __init__(self, username: str = None, password: str = None, remote: str = None, offline_ok: bool = False):
+    def __init__(self, username: str = None, password: str = None, remote: str = None, offline_ok: bool = True):
         if remote is None:
             remote = DEFAULT_REMOTE
 
@@ -66,15 +68,14 @@ class LPDAACDataPool:
                 netrc_file = netrc.netrc()
                 username, _, password = netrc_file.authenticators("urs.earthdata.nasa.gov")
             except Exception as e:
-                logger.exception(e)
                 logger.warning("netrc credentials not found for urs.earthdata.nasa.gov")
 
         if username is None or password is None:
             if not "LPDAAC_USERNAME" in os.environ or not "LPDAAC_PASSWORD" in os.environ:
-                raise RuntimeError("Missing environment variable 'LPDAAC_USERNAME' or 'LPDAAC_PASSWORD'")
-
-            username = os.environ["LPDAAC_USERNAME"]
-            password = os.environ["LPDAAC_PASSWORD"]
+                logger.warning("missing environment variable 'LPDAAC_USERNAME' or 'LPDAAC_PASSWORD'")
+            else:
+                username = os.environ["LPDAAC_USERNAME"]
+                password = os.environ["LPDAAC_PASSWORD"]
 
         self._remote = remote
         self._username = username
@@ -86,14 +87,15 @@ class LPDAACDataPool:
 
         self._listings = {}
 
-        try:
-            self._authenticate()
-            self._check_remote()
-        except Exception as e:
-            if self.offline_ok:
-                logger.warning("unable to connect to LP-DAAC data pool")
-            else:
-                raise e
+        if not self.offline_ok:
+            try:
+                self._authenticate()
+                self._check_remote()
+            except Exception as e:
+                if self.offline_ok:
+                    logger.warning("unable to connect to LP-DAAC data pool")
+                else:
+                    raise e
 
     def _authenticate(self):
         try:
@@ -128,7 +130,7 @@ class LPDAACDataPool:
                 raise ConnectionError(message)
 
     def _check_remote(self):
-        logger.info(f"checking URL: {cl.URL(self.remote)}")
+        logger.debug(f"checking URL: {cl.URL(self.remote)}")
 
         try:
             response = requests.head(self.remote, headers=CONNECTION_CLOSE)
@@ -145,7 +147,7 @@ class LPDAACDataPool:
                 raise LPDAACServerUnreachable(message)
 
         if status == 200:
-            logger.info(
+            logger.debug(
                 "remote verified with status " + cl.val(200) +
                 " in " + cl.time(f"{duration:0.2f}") +
                 " seconds: " + cl.URL(self.remote))
@@ -307,7 +309,7 @@ class LPDAACDataPool:
         else:
             metadata_filename = f"{download_location}.xml"
 
-        makedirs(dirname(metadata_filename), exist_ok=True)
+        makedirs(abspath(dirname(expanduser(metadata_filename))), exist_ok=True)
 
         if XML_retries is None:
             XML_retries = XML_RETRIES
@@ -325,8 +327,8 @@ class LPDAACDataPool:
 
         while XML_retries > 0:
             XML_retries -= 1
-            command = f"wget -nc -c --user {self._username} --password {self._password} -O {metadata_filename} {metadata_URL}"
-            logger.info(command)
+            command = f"wget -nc -c --user {self._username} --password {self._password} -O {abspath(expanduser(metadata_filename))} {metadata_URL}"
+            # logger.info(command)
             os.system(command)
 
             if not exists(metadata_filename):
@@ -350,12 +352,12 @@ class LPDAACDataPool:
                 continue
 
             try:
-                with open(metadata_filename, "r") as file:
+                with open(abspath(expanduser(metadata_filename)), "r") as file:
                     metadata = xmltodict.parse(file.read())
             except Exception as e:
                 logger.warning(e)
                 logger.warning(f"unable to parse metadata file: {metadata_filename}")
-                os.remove(metadata_filename)
+                os.remove(abspath(expanduser(metadata_filename)))
                 logger.warning(f"waiting {XML_timeout_seconds} for retry")
                 sleep(XML_timeout_seconds)
                 continue
@@ -372,7 +374,7 @@ class LPDAACDataPool:
 
         logger.info(
             f"metadata retrieved {checksum_type} checksum: {cl.val(remote_checksum)} size: {cl.val(remote_filesize)} URL: {cl.URL(metadata_URL)}")
-        makedirs(dirname(filename), exist_ok=True)
+        makedirs(abspath(dirname(expanduser(filename))), exist_ok=True)
         logger.info(f"downloading {cl.URL(URL)} -> {cl.file(filename)}")
 
         # Use a temporary file for downloading
@@ -382,8 +384,8 @@ class LPDAACDataPool:
             download_retries -=1
 
             try:
-                if exists(temporary_filename):
-                    temporary_filesize = self.get_local_filesize(temporary_filename)
+                if exists(abspath(expanduser(temporary_filename))):
+                    temporary_filesize = self.get_local_filesize(abspath(expanduser(temporary_filename)))
 
                     if temporary_filesize > remote_filesize:
                         logger.warning(
@@ -391,11 +393,11 @@ class LPDAACDataPool:
                         remove(temporary_filename)
 
                     elif temporary_filesize == remote_filesize:
-                        local_checksum = self.get_local_checksum(temporary_filename, checksum_type=checksum_type)
+                        local_checksum = self.get_local_checksum(abspath(expanduser(temporary_filename)), checksum_type=checksum_type)
 
                         if local_checksum == remote_checksum:
                             try:
-                                shutil.move(temporary_filename, filename)
+                                shutil.move(abspath(expanduser(temporary_filename)), abspath(expanduser(filename)))
                             except Exception as e:
                                 if exists(filename):
                                     logger.warning(f"unable to move temporary file: {temporary_filename}")
@@ -408,27 +410,27 @@ class LPDAACDataPool:
                         else:
                             logger.warning(
                                 f"removing corrupted file with local checksum {local_checksum} and remote checksum {remote_checksum}: {temporary_filename}")
-                            remove(temporary_filename)
+                            remove(abspath(expanduser(temporary_filename)))
                     else:
                         logger.info(f"resuming incomplete download: {cl.file(temporary_filename)}")
 
-                command = f"wget -nc -c --user {self._username} --password {self._password} -O {temporary_filename} {URL}"
-                logger.info(command)
+                command = f"wget -nc -c --user {self._username} --password {self._password} -O {abspath(expanduser(temporary_filename))} {URL}"
+                # logger.info(command)
                 os.system(command)
 
-                if not exists(temporary_filename):
+                if not exists(abspath(expanduser(temporary_filename))):
                     raise ConnectionError(f"unable to download URL: {URL}")
 
-                local_filesize = self.get_local_filesize(temporary_filename)
-                local_checksum = self.get_local_checksum(temporary_filename, checksum_type=checksum_type)
+                local_filesize = self.get_local_filesize(abspath(expanduser(temporary_filename)))
+                local_checksum = self.get_local_checksum(abspath(expanduser(temporary_filename)), checksum_type=checksum_type)
 
                 if local_filesize != remote_filesize or local_checksum != remote_checksum:
-                    os.remove(temporary_filename)
+                    os.remove(abspath(expanduser(temporary_filename)))
                     raise ConnectionError(
                         f"removing corrupted file with local filesize {local_filesize} remote filesize {remote_filesize} local checksum {local_checksum} remote checksum {remote_checksum}: {temporary_filename}")
 
                 # Download successful, rename the temporary file to its proper name
-                shutil.move(temporary_filename, filename)
+                shutil.move(abspath(expanduser(temporary_filename)), abspath(expanduser(filename)))
 
                 logger.info(
                     f"successful download with filesize {cl.val(local_filesize)} checksum {cl.val(local_checksum)}: {cl.file(filename)}")

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/VIIRS/VNP09GA.py

@@ -24,10 +24,11 @@ from modland import generate_modland_grid
 
 from ECOv003_exit_codes import *
 
+from ..login import login
 from ..daterange import get_date
 from ..LPDAAC.LPDAACDataPool import RETRIES
 from .VIIRSDataPool import VIIRSGranule
-from .VIIRS_CMR_LOGIN import CMRServerUnreachable, VIIRS_CMR_login
+from ..exceptions import *
 
 NDVI_COLORMAP = LinearSegmentedColormap.from_list(
     name="NDVI",
@@ -1019,7 +1020,8 @@ def latest_datetime(date_in: Union[date, str]) -> datetime:
     return parser.parse(f"{date_string}T23:59:59Z")
 
 
-VIIRS_FILENAME_REGEX = re.compile("^VNP09GA\.[^.]+\.([^.]+)\.002\.\d+\.h5$")
+VIIRS_FILENAME_REGEX = re.compile(r"^VNP09GA\.[^.]+\.([^.]+)\.002\.\d+\.h5$")
+
 def modland_tile_from_filename(filename: str) -> str:
     match = VIIRS_FILENAME_REGEX.match(filename)
     if match is None:
@@ -1121,7 +1123,7 @@ class VNP09GA:
         self.products_directory = products_directory
         self.mosaic_directory = mosaic_directory
 
-        self.auth = VIIRS_CMR_login()
+        self.auth = login()
 
     def add_granules(self, granules: List[earthaccess.search.DataGranule]):
         data = pd.DataFrame([

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/__init__.py

@@ -1,3 +1,3 @@
 from .version import __version__, __author__
-from .ECOv003_L2T_STARS import *
+from .main import *
 from .ECOv003_DL import *

ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/cksum.py

@@ -0,0 +1,66 @@
+"""
+Pure Python implementation of POSIX cksum algorithm.
+
+This module provides a replacement for the pycksum package that is compatible
+with Python 3.12 and later versions.
+"""
+
+
+def cksum(data_or_file):
+    """
+    Calculate POSIX cksum checksum for data or file-like object.
+    
+    Args:
+        data_or_file: Either bytes data or a file-like object opened in binary mode
+        
+    Returns:
+        int: The POSIX cksum checksum value
+    """
+    # Handle file-like objects
+    if hasattr(data_or_file, 'read'):
+        data = data_or_file.read()
+    else:
+        data = data_or_file
+    
+    # Ensure we have bytes
+    if isinstance(data, str):
+        data = data.encode('utf-8')
+    
+    # Initialize CRC with 0
+    crc = 0
+    
+    # Process each byte of data
+    for byte in data:
+        # XOR the byte with the current CRC (shifted left 8 bits) 
+        crc ^= byte << 24
+        
+        # Process 8 bits
+        for _ in range(8):
+            if crc & 0x80000000:  # If MSB is set
+                crc = (crc << 1) ^ 0x04c11db7  # CRC-32 polynomial
+            else:
+                crc = crc << 1
+            crc &= 0xffffffff  # Keep it 32-bit
+    
+    # Append the length in bytes as a big-endian value
+    length = len(data)
+    length_bytes = []
+    while length > 0:
+        length_bytes.insert(0, length & 0xff)
+        length >>= 8
+    
+    # Process the length bytes
+    for byte in length_bytes:
+        crc ^= byte << 24
+        for _ in range(8):
+            if crc & 0x80000000:
+                crc = (crc << 1) ^ 0x04c11db7
+            else:
+                crc = crc << 1
+            crc &= 0xffffffff
+    
+    # Final XOR and return as signed 32-bit integer equivalent
+    result = crc ^ 0xffffffff
+    
+    # Convert to match expected return type (unsigned 32-bit integer)
+    return result

ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/exceptions.py

@@ -0,0 +1,2 @@
+class CMRServerUnreachable(Exception):
+    pass

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/generate_L2T_STARS_runconfig.py

@@ -246,4 +246,4 @@ def generate_L2T_STARS_runconfig(
         f"Finished generating L2T_STARS run-config for orbit {cl.val(orbit)} scene {cl.val(scene)} ({timer.tocvalue():.2f} seconds)"
     )
 
-    return
+    return runconfig_filename

ecov003_l2t_stars-1.1.0/ECOv003_L2T_STARS/install_STARS_jl.py → ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/install_STARSDataFusion_jl.py

@@ -3,11 +3,11 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-def install_STARS_jl(
-    github_URL: str = "https://github.com/STARS-Data-Fusion/STARS.jl",
+def install_STARSDataFusion_jl(
+    github_URL: str = "https://github.com/STARS-Data-Fusion/STARSDataFusion.jl",
     environment_name: str = "@ECOv003-L2T-STARS") -> subprocess.CompletedProcess:
     """
-    Installs the STARS.jl Julia package from GitHub into a specified Julia environment.
+    Installs the STARSDataFusion.jl Julia package from GitHub into a specified Julia environment.
 
     This function executes a Julia command to activate a given environment and
     then develops (installs in editable mode) the STARS.jl package from its
@@ -35,7 +35,7 @@ def install_STARS_jl(
 
     if result.returncode == 0:
         logger.info(
-            f"STARS.jl installed successfully in environment '{environment_name}'!"
+            f"STARSDataFusion.jl installed successfully in environment '{environment_name}'!"
         )
     else:
         logger.error("Error installing STARS.jl:")

ecov003_l2t_stars-1.1.0/ECOv003_L2T_STARS/instantiate_STARS_jl.py → ecov003_l2t_stars-1.3.0/ECOv003_L2T_STARS/instantiate_STARSDataFusion_jl.py

@@ -3,11 +3,11 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-def instantiate_STARS_jl(package_location: str) -> subprocess.CompletedProcess:
+def instantiate_STARSDataFusion_jl(package_location: str) -> subprocess.CompletedProcess:
     """
     Activates a Julia project at a given location and instantiates its dependencies.
 
-    This is necessary to ensure all required Julia packages for STARS.jl are
+    This is necessary to ensure all required Julia packages for STARSDataFusion.jl are
     downloaded and ready for use within the specified project environment.
 
     Args:
@@ -30,7 +30,7 @@ def instantiate_STARS_jl(package_location: str) -> subprocess.CompletedProcess:
 
     if result.returncode == 0:
         logger.info(
-            f"STARS.jl instantiated successfully in directory '{package_location}'!"
+            f"STARSDataFusion.jl instantiated successfully in directory '{package_location}'!"
         )
     else:
         logger.error("Error instantiating STARS.jl:")

{ecov003_l2t_stars-1.1.0 → ecov003_l2t_stars-1.3.0}/ECOv003_L2T_STARS/load_prior.py

@@ -1,6 +1,8 @@
 from os.path import exists
 import logging
 
+import colored_logging as cl
+
 from ECOv003_granules import L2TSTARS
 
 from .prior import Prior
@@ -235,12 +237,12 @@ def load_prior(
         L2T_STARS_prior_filename=L2T_STARS_prior_filename,
         prior_NDVI_filename=prior_NDVI_filename,
         prior_NDVI_UQ_filename=prior_NDVI_UQ_filename,
-        prior_NDVI_flag_filename=prior_NDVI_flag_filename,
+        # prior_NDVI_flag_filename=prior_NDVI_flag_filename,
         prior_NDVI_bias_filename=prior_NDVI_bias_filename,
         prior_NDVI_bias_UQ_filename=prior_NDVI_bias_UQ_filename,
         prior_albedo_filename=prior_albedo_filename,
         prior_albedo_UQ_filename=prior_albedo_UQ_filename,
-        prior_albedo_flag_filename=prior_albedo_flag_filename,
+        # prior_albedo_flag_filename=prior_albedo_flag_filename,
         prior_albedo_bias_filename=prior_albedo_bias_filename,
         prior_albedo_bias_UQ_filename=prior_albedo_bias_UQ_filename,
     )