eo-tides 0.7.4.dev7__py3-none-any.whl → 0.7.5.dev1__py3-none-any.whl

eo_tides/eo.py

@@ -58,7 +58,7 @@ def _standardise_inputs(
     """
 
     # If `data` is an xarray object, extract its GeoBox and time
-    if isinstance(data, (xr.DataArray, xr.Dataset)):
+    if isinstance(data, xr.DataArray | xr.Dataset):
         # Try to extract GeoBox
         try:
             gbox: GeoBox = data.odc.geobox
@@ -544,14 +544,13 @@ def pixel_tides(
     # Reproject into original high resolution grid
     if resample:
         print("Reprojecting tides into original resolution")
-        tides_highres = _pixel_tides_resample(
+        return _pixel_tides_resample(
             tides_lowres,
             gbox,
             resample_method,
             dask_chunks,
             dask_compute,
         )
-        return tides_highres
 
     print("Returning low resolution tide array")
     return tides_lowres

eo_tides/model.py

@@ -55,10 +55,7 @@ def _parallel_splits(
         raw_value = os.environ.get("CPU_GUARANTEE") or psutil.cpu_count(logical=False) or os.cpu_count() or 1
 
         # Convert to integer
-        if isinstance(raw_value, str):
-            parallel_max = int(float(raw_value))
-        else:
-            parallel_max = int(raw_value)
+        parallel_max = int(float(raw_value)) if isinstance(raw_value, str) else int(raw_value)
 
     # Calculate optimal number of splits based on constraints
     splits_by_size = total_points / min_points_per_split
@@ -66,8 +63,7 @@ def _parallel_splits(
     optimal_splits = min(splits_by_size, splits_by_cpu)
 
     # Convert to integer and ensure at least 1 split
-    final_split_count = int(max(1, optimal_splits))
-    return final_split_count
+    return int(max(1, optimal_splits))
 
 
 def _model_tides(
@@ -170,12 +166,7 @@ def _model_tides(
     hc = amp * np.exp(cph)
 
     # Compute delta times based on model
-    if pytmd_model.corrections in ("OTIS", "ATLAS", "TMD3", "netcdf"):
-        # Use delta time at 2000.0 to match TMD outputs
-        deltat = np.zeros_like(ts.tt_ut1)
-    else:
-        # Use interpolated delta times
-        deltat = ts.tt_ut1
+    deltat = np.zeros_like(ts.tt_ut1) if pytmd_model.corrections in ("OTIS", "ATLAS", "TMD3", "netcdf") else ts.tt_ut1
 
     # In "one-to-many" mode, extracted tidal constituents and timesteps
     # are repeated/multiplied out to match the number of input points and

eo_tides/stats.py

@@ -44,7 +44,7 @@ def _tide_statistics(obs_tides, all_tides, min_max_q=(0.0, 1.0), dim="time"):
     offset_high = offset_high_m / tr
 
     # Combine into a single dataset
-    stats_ds = xr.merge(
+    return xr.merge(
         [
             mot.rename("mot"),
             mat.rename("mat"),
@@ -61,8 +61,6 @@ def _tide_statistics(obs_tides, all_tides, min_max_q=(0.0, 1.0), dim="time"):
         compat="override",
     )
 
-    return stats_ds
-
 
 def _stats_plain_english(mot, mat, hot, hat, lot, lat, otr, tr, spread, offset_low, offset_high):
     # Plain text descriptors
@@ -568,7 +566,7 @@ def pixel_stats(
     # Reproject statistics into original high resolution grid
     if resample:
         print("Reprojecting statistics into original resolution")
-        stats_highres = _pixel_tides_resample(
+        return _pixel_tides_resample(
             stats_lowres,
             gbox,
             resample_method,
@@ -576,7 +574,6 @@ def pixel_stats(
             dask_compute,
             None,
         )
-        return stats_highres
 
     print("Returning low resolution statistics array")
     return stats_lowres

eo_tides/utils.py

@@ -7,7 +7,7 @@ import pathlib
 import textwrap
 import warnings
 from collections import Counter
-from typing import List, Union
+from typing import TypeAlias
 
 import numpy as np
 import odc.geo
@@ -21,7 +21,7 @@ from scipy.spatial import cKDTree as KDTree
 from tqdm import tqdm
 
 # Type alias for all possible inputs to "time" params
-DatetimeLike = Union[np.ndarray, pd.DatetimeIndex, pd.Timestamp, datetime.datetime, str, List[str]]
+DatetimeLike: TypeAlias = np.ndarray | pd.DatetimeIndex | pd.Timestamp | datetime.datetime | str | list[str]
 
 
 def _get_duplicates(array):
@@ -54,8 +54,7 @@ def _set_directory(
     directory = pathlib.Path(directory).expanduser()
     if not directory.exists():
         raise FileNotFoundError(f"No valid tide model directory found at path `{directory}`")
-    else:
-        return directory
+    return directory
 
 
 def _standardise_time(
@@ -161,7 +160,7 @@ def _standardise_models(
             raise ValueError(error_text)
 
         # Return set of all ensemble plus any other requested models
-        models_to_process = sorted(list(set(ensemble_models + [m for m in models_requested if m != "ensemble"])))
+        models_to_process = sorted(set(ensemble_models + [m for m in models_requested if m != "ensemble"]))
 
     # Otherwise, models to process are the same as those requested
     else:
@@ -271,7 +270,7 @@ def _clip_model_file(
         for i in ["lat_z", "lat_v", "lat_u", "con"]:
             try:
                 nc_clipped[i] = nc_clipped[i].isel(nx=0)
-            except:
+            except KeyError:
                 pass
 
     return nc_clipped
@@ -558,8 +557,7 @@ def list_models(
 
         if raise_error:
             raise Exception(warning_msg)
-        else:
-            warnings.warn(warning_msg, UserWarning)
+        warnings.warn(warning_msg, UserWarning)
 
     # Return list of available and supported models
     return available_models, supported_models

eo_tides/validation.py

@@ -164,7 +164,7 @@ def _load_gesla_dataset(site, path, na_value):
     )
 
     # Combine two date fields
-    gesla_df = (
+    return (
         gesla_df.assign(
             time=pd.to_datetime(gesla_df["date"] + " " + gesla_df["time"]),
             site_code=site,
@@ -173,8 +173,6 @@ def _load_gesla_dataset(site, path, na_value):
         .set_index("time")
     )
 
-    return gesla_df
-
 
 def _nearest_row(gdf, x, y, max_distance=None):
     # Create a point to find the nearest neighbor for
@@ -288,7 +286,7 @@ def load_gauge_gesla(
         site_code = [site_code] if not isinstance(site_code, list) else site_code
 
     # If x and y are tuples, use xy bounds to identify sites
-    elif isinstance(x, (tuple, list)) & isinstance(y, (tuple, list)):
+    elif isinstance(x, tuple | list) & isinstance(y, tuple | list):
         bbox = BoundingBox.from_xy(x, y)
         site_code = metadata_gdf.cx[bbox.left : bbox.right, bbox.top : bbox.bottom].index
 
@@ -317,7 +315,7 @@ def load_gauge_gesla(
     # Prepare times
     if time is None:
         time = ["1800", str(datetime.datetime.now().year)]
-    time = [time] if not isinstance(time, (list, tuple)) else time
+    time = [time] if not isinstance(time, list | tuple) else time
     start_time = _round_date_strings(time[0], round_type="start")
     end_time = _round_date_strings(time[-1], round_type="end")
 

{eo_tides-0.7.4.dev7.dist-info → eo_tides-0.7.5.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eo-tides
-Version: 0.7.4.dev7
+Version: 0.7.5.dev1
 Summary: Tide modelling tools for large-scale satellite earth observation analysis
 Project-URL: Homepage, https://GeoscienceAustralia.github.io/eo-tides/
 Project-URL: Repository, https://github.com/GeoscienceAustralia/eo-tides

eo_tides-0.7.5.dev1.dist-info/RECORD

@@ -0,0 +1,10 @@
+eo_tides/__init__.py,sha256=LLvX-IipE209LbYLObShRLO5vxQQYBaIP1d3TMHix24,1802
+eo_tides/eo.py,sha256=geXMd9roM7UmZCHK7l7bUUXai2pXGDJdzgAw4GBJ_58,23944
+eo_tides/model.py,sha256=SWqBr0ajin1gw37nYa8ukHHzeiebK5h8XvkXO9LMX4E,37480
+eo_tides/stats.py,sha256=lvl9-0k20ffLQh8Y1kAC_afhjQviK11_3_saRUtX3ws,23009
+eo_tides/utils.py,sha256=wfzJFjWrJVgN8TqRqvwE8Tbtb2WPUQRwmCsihb5j3jc,26625
+eo_tides/validation.py,sha256=6ugPwhNglIovOVTaozZnAiLaIBqU5acOiVmFPHvFDHE,12657
+eo_tides-0.7.5.dev1.dist-info/METADATA,sha256=J_kUz_LeKoKQdTA5xWQZ_lWe3DQI3S_Y6f4m7A8qpas,9235
+eo_tides-0.7.5.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+eo_tides-0.7.5.dev1.dist-info/licenses/LICENSE,sha256=owxWsXViCL2J6Ks3XYhot7t4Y93nstmXAT95Zf030Cc,11350
+eo_tides-0.7.5.dev1.dist-info/RECORD,,

eo_tides-0.7.4.dev7.dist-info/RECORD

@@ -1,10 +0,0 @@
-eo_tides/__init__.py,sha256=LLvX-IipE209LbYLObShRLO5vxQQYBaIP1d3TMHix24,1802
-eo_tides/eo.py,sha256=TuFt9SSiO9Z2o8Kr1g-wFPzofp0HTcgkfhT83zu03kc,23983
-eo_tides/model.py,sha256=jRx6HNgTbK0inNqOkVivr52jPMJPWZ85gJeLjY2Vfk8,37697
-eo_tides/stats.py,sha256=ELQpqIH86442IYgjrGrIK3mi0-pu2ZijFw53arA2FYg,23072
-eo_tides/utils.py,sha256=T19OuPLHzaUKcovCVGANvmOiRu-L8VuDXSTzmNlA6Bo,26647
-eo_tides/validation.py,sha256=paTewYzKf5m_HkSZUeBxbDQRz8WPJRtSyHjwo8lFtrc,12685
-eo_tides-0.7.4.dev7.dist-info/METADATA,sha256=hJeocsv1ThjgnxHqFFwL367_AtcB5mdi3ImRnIYwVak,9235
-eo_tides-0.7.4.dev7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-eo_tides-0.7.4.dev7.dist-info/licenses/LICENSE,sha256=owxWsXViCL2J6Ks3XYhot7t4Y93nstmXAT95Zf030Cc,11350
-eo_tides-0.7.4.dev7.dist-info/RECORD,,