pycontrails 0.54.9__cp313-cp313-macosx_11_0_arm64.whl → 0.54.10__cp313-cp313-macosx_11_0_arm64.whl

pycontrails/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.54.9'
-__version_tuple__ = version_tuple = (0, 54, 9)
+__version__ = version = '0.54.10'
+__version_tuple__ = version_tuple = (0, 54, 10)

pycontrails/core/models.py

@@ -543,7 +543,7 @@ class Model(ABC):
 
         See Also
         --------
-        - :meth:`eval`
+        eval
         """
         self.source = self._get_source(source)
 
@@ -744,8 +744,8 @@ class Model(ABC):
 
         See Also
         --------
-        - get_source_param
-        - GeoVectorDataset.get_data_or_attr
+        get_source_param
+        pycontrails.core.vector.GeoVectorDataset.get_data_or_attr
         """
         marker = self.__marker
 
@@ -805,8 +805,8 @@ class Model(ABC):
 
         See Also
         --------
-        - get_data_param
-        - GeoVectorDataset.get_data_or_attr
+        get_data_param
+        pycontrails.core.vector.GeoVectorDataset.get_data_or_attr
         """
         return self.get_data_param(self.source, key, default, set_attr=set_attr)
 

pycontrails/datalib/goes.py

@@ -59,6 +59,22 @@ DEFAULT_CHANNELS = "C11", "C14", "C15"
 #: See `GOES ABI scan information <https://www.goes-r.gov/users/abiScanModeInfo.html>`_.
 GOES_SCAN_MODE_CHANGE = datetime.datetime(2019, 4, 2, 16)
 
+#: The date at which GOES-19 data started being available. This is used to
+#: determine the source (GOES-16 or GOES-19) of requested. In particular,
+#: Mesoscale images are only available for GOES-East from GOES-19 after this date.
+#: See the `NOAA press release <https://www.noaa.gov/news-release/noaas-goes-19-satellite-now-operational-providing-critical-new-data-to-forecasters>`_.
+GOES_16_19_SWITCH_DATE = datetime.datetime(2025, 4, 4)
+
+#: The GCS bucket for GOES-East data before ``GOES_16_19_SWITCH_DATE``.
+GOES_16_BUCKET = "gcp-public-data-goes-16"
+
+#: The GCS bucket for GOES-West data. Note that GOES-17 has degraded data quality
+#: and is not recommended for use. This bucket isn't used by the ``GOES`` handler by default.
+GOES_18_BUCKET = "gcp-public-data-goes-18"
+
+#: The GCS bucket for GOES-East data after ``GOES_16_19_SWITCH_DATE``.
+GOES_19_BUCKET = "gcp-public-data-goes-19"
+
 
 class GOESRegion(enum.Enum):
     """GOES Region of interest.
@@ -187,7 +203,7 @@ def gcs_goes_path(
     time: datetime.datetime,
     region: GOESRegion,
     channels: str | Iterable[str] | None = None,
-    bucket: str = "gcp-public-data-goes-16",
+    bucket: str | None = None,
     fs: gcsfs.GCSFileSystem | None = None,
 ) -> list[str]:
     """Return GCS paths to GOES data at the given time for the given region and channels.
@@ -208,6 +224,12 @@ def gcs_goes_path(
         set ``channels=("C11", "C14", "C15")``. For the true color scheme,
         set ``channels=("C01", "C02", "C03")``. By default, the channels
         required by the SEVIRI ash color scheme are used.
+    bucket : str | None
+        GCS bucket for GOES data. If None, the bucket is automatically
+        set to ``GOES_16_BUCKET`` if ``time`` is before
+        ``GOES_16_19_SWITCH_DATE`` and ``GOES_19_BUCKET`` otherwise.
+    fs : gcsfs.GCSFileSystem | None
+        GCS file system instance. If None, a default anonymous instance is created.
 
     Returns
     -------
@@ -236,6 +258,11 @@ def gcs_goes_path(
     >>> pprint(paths)
     ['gcp-public-data-goes-16/ABI-L2-CMIPM/2023/093/02/OR_ABI-L2-CMIPM1-M6C01_G16_s20230930211249_e20230930211309_c20230930211386.nc']
 
+    >>> t = datetime.datetime(2025, 5, 4, 3, 2)
+    >>> paths = gcs_goes_path(t, GOESRegion.M2, channels="C01")
+    >>> pprint(paths)
+    ['gcp-public-data-goes-19/ABI-L2-CMIPM/2025/124/03/OR_ABI-L2-CMIPM2-M6C01_G19_s20251240302557_e20251240303014_c20251240303092.nc']
+
     """
     time = _check_time_resolution(time, region)
     year = time.strftime("%Y")
@@ -247,7 +274,10 @@ def gcs_goes_path(
     product_name = "CMIP"  # Cloud and Moisture Imagery
     product = f"{sensor}-{level}-{product_name}{region.name[0]}"
 
-    bucket = bucket.removeprefix("gs://")
+    if bucket is None:
+        bucket = GOES_16_BUCKET if time < GOES_16_19_SWITCH_DATE else GOES_19_BUCKET
+    else:
+        bucket = bucket.removeprefix("gs://")
 
     path_prefix = f"gs://{bucket}/{product}/{year}/{yday}/{hour}/"
 
@@ -267,7 +297,13 @@ def gcs_goes_path(
             time_str = f"{time_str[:-1]}6"
 
     name_prefix = f"OR_{product[:-1]}{region.name}-{mode}"
-    name_suffix = f"_G16_s{time_str}*"
+
+    try:
+        satellite_number = int(bucket[-2:])  # 16 or 18 or 19 -- this may fail for custom buckets
+    except (ValueError, IndexError) as exc:
+        msg = f"Bucket name {bucket} does not end with a valid satellite number."
+        raise ValueError(msg) from exc
+    name_suffix = f"_G{satellite_number}_s{time_str}*"
 
     channels = _parse_channels(channels)
 
@@ -323,8 +359,12 @@ class GOES:
     cachestore : cache.CacheStore | None
         Cache store for GOES data. If None, data is downloaded directly into
         memory. By default, a :class:`cache.DiskCacheStore` is used.
-    goes_bucket : str = "gcp-public-data-goes-16"
-        GCP bucket for GOES data. AWS access is not supported.
+    goes_bucket : str | None = None
+        GCP bucket for GOES data. If None, the bucket is automatically
+        set to ``GOES_16_BUCKET`` if the requested time is before
+        ``GOES_16_19_SWITCH_DATE`` and ``GOES_19_BUCKET`` otherwise.
+        The satellite number used for filename construction is derived from the
+        last two characters of this bucket name.
 
     See Also
     --------
@@ -396,7 +436,7 @@ class GOES:
         region: GOESRegion | str = GOESRegion.F,
         channels: str | Iterable[str] | None = None,
         cachestore: cache.CacheStore | None = __marker,  # type: ignore[assignment]
-        goes_bucket: str = "gcp-public-data-goes-16",
+        goes_bucket: str | None = None,
     ) -> None:
         self.region = _parse_region(region)
         self.channels = _parse_channels(channels)
@@ -435,7 +475,7 @@ class GOES:
             List of GCS paths to GOES data.
         """
         channels = channels or self.channels
-        return gcs_goes_path(time, self.region, channels, self.goes_bucket)
+        return gcs_goes_path(time, self.region, channels, bucket=self.goes_bucket, fs=self.fs)
 
     def _lpaths(self, time: datetime.datetime) -> dict[str, str]:
         """Construct names for local netcdf files using the :attr:`cachestore`.

pycontrails/models/dry_advection.py

@@ -217,6 +217,8 @@ class DryAdvection(models.Model):
         - ``age``: Age of plume.
         - ``waypoint``: Identifier for each waypoint.
 
+        If ``flight_id`` is present in :attr:`source`, it is retained.
+
         If `"azimuth"` is present in :attr:`source`, `source.attrs`, or :attr:`params`,
         the following variables will also be added:
 
@@ -236,6 +238,9 @@ class DryAdvection(models.Model):
         self.source.setdefault("waypoint", np.arange(self.source.size))
 
         columns = ["longitude", "latitude", "level", "time", "age", "waypoint"]
+        if "flight_id" in self.source:
+            columns.append("flight_id")
+
         azimuth = self.get_source_param("azimuth", set_attr=False)
         if azimuth is None:
             # Early exit for pointwise only simulation
@@ -541,6 +546,10 @@ def _evolve_one_step(
         }
     )
 
+    flight_id = vector.get("flight_id")
+    if flight_id is not None:
+        out["flight_id"] = flight_id
+
     azimuth = vector.get("azimuth")
     if azimuth is None:
         # Early exit for "pointwise only" simulation

{pycontrails-0.54.9.dist-info → pycontrails-0.54.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.54.9
+Version: 0.54.10
 Summary: Python library for modeling aviation climate impacts
 Author-email: "Contrails.org" <py@contrails.org>
 License: Apache-2.0

{pycontrails-0.54.9.dist-info → pycontrails-0.54.10.dist-info}/RECORD

@@ -1,14 +1,14 @@
-pycontrails-0.54.9.dist-info/RECORD,,
-pycontrails-0.54.9.dist-info/WHEEL,sha256=L5Eaum8RAP3CnlNesOFDJ9YoX04m9XjiUO2FNAPrGbM,136
-pycontrails-0.54.9.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.9.dist-info/METADATA,sha256=GXkDhEy_CnY9nb15RugHFjlcep4jTGWxbUWvEP1JDQ4,9131
-pycontrails-0.54.9.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.54.9.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
-pycontrails/_version.py,sha256=l1wvNNahe7IMIrSdzQJEux_vCx8lrDFKSfZfunCXM84,513
+pycontrails-0.54.10.dist-info/RECORD,,
+pycontrails-0.54.10.dist-info/WHEEL,sha256=VIOxLMMkshvS_PbEukmsYu1sg_oxjW5SBJ1JnbuDdDk,136
+pycontrails-0.54.10.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.54.10.dist-info/METADATA,sha256=6_jv8g-Jc_JE5J9qHUY3iv9S2ZrggE_4zOg-7nbtJ98,9132
+pycontrails-0.54.10.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.54.10.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails/_version.py,sha256=XWNQstht0_G88RBCuMbHwa-c0eQNLQAijV1bVbgzzW8,515
 pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/vector.py,sha256=N-3VhPaUEyFSJWjplMKFcv9GLvEqAibKn1zqJWuNZQU,73601
-pycontrails/core/models.py,sha256=z_U39b4Mx7ZIqnqMKgQEV5mB1NIZDnOnB52MBMc2zp8,43815
+pycontrails/core/models.py,sha256=gpG0hnXZox5caojierunxKkgFLQt-6nHRhzQZJKNrzo,43845
 pycontrails/core/interpolation.py,sha256=wovjj3TAf3xonVxjarclpvZLyLq6N7wZQQXsI9hT3YA,25713
 pycontrails/core/fleet.py,sha256=0hi_N4R93St-7iD29SE0EnadpBEl_p9lSGtDwpWvGkk,16704
 pycontrails/core/flight.py,sha256=QZTGeZVnZ14UUWHSqgCSU49g_EGQZel-hzKwm_9dcFY,80653
@@ -16,14 +16,14 @@ pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
 pycontrails/core/polygon.py,sha256=EmfHPj0e58whsHvR-3YvDgMWkvMFgp_BgwaoG8IZ4n0,18044
 pycontrails/core/cache.py,sha256=IIyx726zN7JzNSKV0JJDksMI9OhCLdnJShmBVStRqzI,28154
 pycontrails/core/__init__.py,sha256=p0O09HxdeXU0X5Z3zrHMlTfXa92YumT3fJ8wJBI5ido,856
-pycontrails/core/rgi_cython.cpython-313-darwin.so,sha256=VekV4ZsmzFH8b11W10UojEbuZXOPj0IhJ8FwHLB4DGk,311488
+pycontrails/core/rgi_cython.cpython-313-darwin.so,sha256=wys6Uo9rG1wwigoPqXOHGsMsMbzmi-Y-1VhxMYP2dPQ,297728
 pycontrails/core/flightplan.py,sha256=xgyYLi36OlNKtIFuOHaifcDM6XMBYTyMQlXAtfd-6Js,7519
 pycontrails/core/met.py,sha256=4XQAJrKWBN0SZQSeBpMUnkLn87vYpn2VMiY3dQyFRIw,103992
 pycontrails/core/aircraft_performance.py,sha256=Kk_Rb61jDOWPmCQHwn2jR5vMPmB8b3aq1iTWfiUMj9U,28232
 pycontrails/core/airports.py,sha256=ubYo-WvxKPd_dUcADx6yew9Tqh1a4VJDgX7aFqLYwB8,6775
 pycontrails/core/met_var.py,sha256=lAbp3cko_rzMk_u0kq-F27sUXUxUKikUvCNycwp9ILY,12020
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
-pycontrails/datalib/goes.py,sha256=6yGmtdKMAuEsMhgrprHxVCOz2mWoiZTYHpO-WrmK804,31919
+pycontrails/datalib/goes.py,sha256=4bKtu1l3IVsjKv7mLAWhStRzOVaY9Wi_cZxvL_g-V3w,34081
 pycontrails/datalib/landsat.py,sha256=r6366rEF7fOA7mT5KySCPGJplgGE5LvBw5fMqk-U1oM,19697
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=hYSxIlQnyJHqtHWlKn73HOK_1pm-_IbGebmkHnh4UcA,17172
@@ -64,7 +64,7 @@ pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOd
 pycontrails/models/issr.py,sha256=AYLYLHxtG8je5UG6x1zLV0ul89MJPqe5Xk0oWIyZ7b0,7378
 pycontrails/models/sac.py,sha256=lV1Or0AaLxuS1Zo5V8h5c1fkSKC-hKEgiFm7bmmusWw,15946
 pycontrails/models/accf.py,sha256=egdBa4_G3BUaoUQYWvVlTlAIWpLEuNdtCxlK3eckLOc,13599
-pycontrails/models/dry_advection.py,sha256=FqUvRFbnwe4esHBYDayn3iu7R2UUuaQwY8x2oToxNI0,19164
+pycontrails/models/dry_advection.py,sha256=BlOQeap3rXKRhRlvhFfpOLIX3bFgYE_bJg2LlPRHIas,19424
 pycontrails/models/pcr.py,sha256=ZzbEuTOuDdUmmL5T3Wk3HL-O8XzX3HMnn98WcPbASaU,5348
 pycontrails/models/emissions/__init__.py,sha256=CZB2zIkLUI3NGNmq2ddvRYjEtiboY6PWJjiEiXj_zII,478
 pycontrails/models/emissions/ffm2.py,sha256=mAvBHnp-p3hIn2fjKGq50eaMHi0jcb5hA5uXbJGeE9I,12068

{pycontrails-0.54.9.dist-info → pycontrails-0.54.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: false
 Tag: cp313-cp313-macosx_11_0_arm64
 Generator: delocate 0.13.0