satkit 0.24.2__tar.gz → 0.24.3__tar.gz

{satkit-0.24.2 → satkit-0.24.3}/Cargo.lock

@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "bit-vec"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+checksum = "72503af1e72be411d74ca45cd6b309878fcb35354e252fc2a3a8bda3a97082a0"
 dependencies = [
  "borsh",
  "serde",
@@ -129,7 +129,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn 3.0.10",
 ]
 
 [[package]]
@@ -158,9 +158,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375989decec1a0fa424442bed520fa12ede43a48475ce8c7417d2c69b32b5f6b"
+checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -306,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f97d3416d5337d15c4b0d78c8c91df922ca143f57ec20e2d1c188333047ef04"
+checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64"
 dependencies = [
  "cfg-if",
 ]
@@ -435,9 +435,9 @@ checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "flate2"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
+checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -609,9 +609,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4"
 
 [[package]]
 name = "jni"
@@ -986,7 +986,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 3.0.9",
+ "syn 3.0.10",
 ]
 
 [[package]]
@@ -998,7 +998,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn 3.0.10",
 ]
 
 [[package]]
@@ -1228,9 +1228,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.15.1"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96"
+checksum = "102f35f7de7b06d8c61f1cff6592f5253e0dea431c74867aad5dfd70f44663fb"
 dependencies = [
  "zeroize",
 ]
@@ -1302,7 +1302,7 @@ dependencies = [
 
 [[package]]
 name = "satkit"
-version = "0.24.2"
+version = "0.24.3"
 dependencies = [
  "anyhow",
  "approx",
@@ -1325,7 +1325,7 @@ dependencies = [
 
 [[package]]
 name = "satkit-python"
-version = "0.24.2"
+version = "0.24.3"
 dependencies = [
  "anyhow",
  "log",
@@ -1418,7 +1418,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn 3.0.10",
 ]
 
 [[package]]
@@ -1498,9 +1498,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.9"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
+checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1543,7 +1543,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn 3.0.10",
 ]
 
 [[package]]
@@ -1558,18 +1558,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
+checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.25.17+spec-1.1.0"
+version = "0.25.19+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c"
+checksum = "dd43688c4858d7264ae1cf9a9f874a67c3feb74a883b1cd7bebd6a4ea8307218"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1717,7 +1717,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.9",
+ "syn 3.0.10",
  "wasm-bindgen-shared",
 ]
 
@@ -1742,18 +1742,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a"
+checksum = "293198dcebfb821155b5092ab94b5a82ff180eddd7241df3bd6e66a4ffd1a585"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171"
+checksum = "7265c9301c16a8711c992c2d8da90ee77ef54b1ed51482d6dfeb00dc756b1297"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -1932,9 +1932,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
+checksum = "8c3b93199df0ab874cdf0c6a94f0a0dc3423fe41f1cafb62b8bd7b1deb277aef"
 dependencies = [
  "memchr",
 ]

{satkit-0.24.2 → satkit-0.24.3}/Cargo.toml

@@ -3,7 +3,7 @@ members = [".", "python"]
 
 [package]
 name = "satkit"
-version = "0.24.2"
+version = "0.24.3"
 edition = "2021"
 description = "Satellite Toolkit"
 readme = "README.md"

{satkit-0.24.2 → satkit-0.24.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satkit
-Version: 0.24.2
+Version: 0.24.3
 Summary: Satellite Orbital Dynamics Toolkit
 Author-email: Steven Michael <ssmichael@gmail.com>
 Maintainer-email: Steven Michael <ssmichael@gmail.com>

{satkit-0.24.2 → satkit-0.24.3}/pyproject.toml

@@ -9,7 +9,7 @@ requires-python = ">= 3.11"
 authors = [{ name = "Steven Michael", email = "ssmichael@gmail.com" }]
 maintainers = [{ name = "Steven Michael", email = "ssmichael@gmail.com" }]
 readme = "README.md"
-version = "0.24.2"
+version = "0.24.3"
 license = "MIT OR Apache-2.0"
 description = "Satellite Orbital Dynamics Toolkit"
 keywords = [

{satkit-0.24.2 → satkit-0.24.3}/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "satkit-python"
-version = "0.24.2"
+version = "0.24.3"
 edition = "2021"
 publish = false
 

{satkit-0.24.2 → satkit-0.24.3}/python/satkit/__init__.pyi

@@ -30,6 +30,7 @@ __all__ = [
     "density",
     "solarsystem",
     "TLE",
+    "TLEWarning",
     "itrfcoord",
     "geodetic",
     "kepler",

{satkit-0.24.2 → satkit-0.24.3}/python/satkit/_types.py

@@ -32,7 +32,8 @@ class OMMDict(TypedDict, total=False):
     as strings in its JSON; :func:`sgp4` accepts either), ``EPOCH`` as an
     RFC 3339 string, absent optional fields omitted, and every key that is not
     a CCSDS field (Space-Track's ``OBJECT_TYPE``, ``RCS_SIZE``, ``LAUNCH_DATE``,
-    ``TLE_LINE1``, ...; XML ``USER_DEFINED`` parameters) kept verbatim.
+    ``TLE_LINE1``, ...; XML ``USER_DEFINED`` parameters; extra CSV columns, as
+    strings) kept verbatim.
     """
 
     CCSDS_OMM_VERS: str

{satkit-0.24.2 → satkit-0.24.3}/python/satkit/satkit.pyi

@@ -11,7 +11,7 @@ import numpy as np
 import datetime
 
 from collections.abc import Sequence
-from typing import Any, ClassVar, Optional, TypeAlias, Union, final, overload
+from typing import Any, ClassVar, Literal, Optional, TypeAlias, Union, final, overload
 from typing_extensions import deprecated
 
 from ._types import OMMDict
@@ -40,6 +40,13 @@ TimeArrayLike: TypeAlias = (
 )
 TimeInput: TypeAlias = "TimeScalar | TimeArrayLike"
 
+class TLEWarning(UserWarning):
+    """Warning for a TLE record skipped by a loader called with ``on_error="warn"``
+
+    The message is the one ``on_error="raise"`` raises as ``RuntimeError``: it gives
+    the input line the record starts on, its satellite and what failed to parse.
+    """
+
 @final
 class TLE:
     """Two-Line Element Set (TLE) representing a satellite ephemeris
@@ -73,12 +80,18 @@ class TLE:
     """
 
     @staticmethod
-    def from_file(filename: str, *, check_checksum: bool = False) -> list[TLE]:
+    def from_file(
+        filename: str,
+        *,
+        check_checksum: bool = False,
+        on_error: Literal["raise", "warn", "skip"] = "raise",
+    ) -> list[TLE]:
         """Load TLEs from a text file, parsed as :meth:`TLE.from_lines` does
 
         Args:
             filename (str): name of the text file holding the TLE lines
             check_checksum (bool, optional): as in :meth:`TLE.from_lines`
+            on_error (str, optional): as in :meth:`TLE.from_lines`
 
         Returns:
             list[TLE]: one TLE per element set in the file
@@ -97,7 +110,12 @@ class TLE:
         ...
 
     @staticmethod
-    def from_lines(lines: Sequence[str], *, check_checksum: bool = False) -> list[TLE]:
+    def from_lines(
+        lines: Sequence[str],
+        *,
+        check_checksum: bool = False,
+        on_error: Literal["raise", "warn", "skip"] = "raise",
+    ) -> list[TLE]:
         """Load TLEs from a list of lines
 
         :meth:`TLE.from_file` and :meth:`TLE.from_url` parse their text the
@@ -109,20 +127,48 @@ class TLE:
                 e.g. list or tuple)
             check_checksum (bool, optional): also verify the checksum digit
                 (column 69) of every data line. Default False.
+            on_error (str, optional): what to do with a record that fails to
+                parse: ``"raise"`` (default) raises ``RuntimeError`` at the
+                first one; ``"warn"`` leaves it out and emits a
+                :class:`TLEWarning` with the same message; ``"skip"`` leaves
+                it out silently
 
         Returns:
-            list[TLE]: one TLE per element set, even if there is only one
+            list[TLE]: one TLE per element set, even if there is only one.
+            With ``on_error="warn"`` or ``"skip"``, one per element set that
+            parsed, which is an empty list if none did.
 
         Raises:
-            ValueError: if the lines hold no TLEs
-            RuntimeError: if a record fails to parse (or, with
-                ``check_checksum``, has a wrong checksum); the message gives
-                the line the record starts on and its satellite
+            ValueError: if the lines hold no TLEs, or ``on_error`` is not one
+                of the three values
+            RuntimeError: with ``on_error="raise"``, if a record fails to
+                parse (or, with ``check_checksum``, has a wrong checksum); the
+                message gives the line the record starts on and its satellite
+
+        Example:
+            ```python
+            import warnings
+
+            lines = [
+                "1 25544U 98067A   21264.51782528  .00002893  00000-0  58680-4 0  9991",
+                "2 25544  51.6442 208.5856 0001458  47.2277  50.1624 15.48919419302878",
+                # A letter O in the epoch day
+                "1 49140U 21082L   24O30.39663557  .00000076  00000-0  14180-4 0  9995",
+                "2 49140  70.0008  34.1139 0002663 260.3521  99.7337 14.98327656131736",
+            ]
+            with warnings.catch_warnings(record=True) as skipped:
+                warnings.simplefilter("always")
+                tles = satkit.TLE.from_lines(lines, on_error="warn")
+            print(len(tles), len(skipped))
+            # 1 1
+            ```
         """
         ...
 
     @staticmethod
-    def from_url(url: str) -> list[TLE]:
+    def from_url(
+        url: str, *, on_error: Literal["raise", "warn", "skip"] = "raise"
+    ) -> list[TLE]:
         """Load TLEs from a URL, parsing the response as :meth:`TLE.from_lines` does
 
         Works with any URL that returns plain-text TLE data.
@@ -4897,7 +4943,9 @@ def propagate(
 def omm_from_url(url: str) -> list[OMMDict]:
     """Load OMM(s) from a URL as a list of dictionaries
 
-    Fetches the content at the given URL and auto-detects JSON vs XML format.
+    Fetches the content at the given URL and auto-detects the format (JSON,
+    XML or CSV), as :func:`omm_from_text` does. A CelesTrak GP query with no
+    ``FORMAT`` answers in CSV.
     Returns a list of dictionaries that can be passed directly to :func:`sgp4`.
 
     Args:
@@ -4922,11 +4970,13 @@ def omm_from_url(url: str) -> list[OMMDict]:
     ...
 
 def omm_from_file(filename: str) -> list[OMMDict]:
-    """Load OMM(s) from a JSON or XML file as a list of dictionaries
+    """Load OMM(s) from a JSON, XML or CSV file as a list of dictionaries
 
-    The format is detected from the content, not the file extension: a file
-    starting with ``[`` or ``{`` is JSON (one message or an array of them), one
-    starting with ``<`` is a CCSDS NDM/XML document. KVN is not supported.
+    The format is detected from the content, not the file extension, as
+    :func:`omm_from_text` does: a file starting with ``[`` or ``{`` is JSON
+    (one message or an array of them), one starting with ``<`` is a CCSDS
+    NDM/XML document, and one whose first line holds a comma is a CSV table.
+    KVN is not supported.
 
     Args:
         filename (str): path to the file
@@ -4945,11 +4995,18 @@ def omm_from_file(filename: str) -> list[OMMDict]:
     ...
 
 def omm_from_text(text: str) -> list[OMMDict]:
-    """Parse OMM(s) from JSON or XML text as a list of dictionaries
+    """Parse OMM(s) from JSON, XML or CSV text as a list of dictionaries
 
     Text starting with ``[`` or ``{`` is parsed as JSON (one message or an
-    array of them), text starting with ``<`` as a CCSDS NDM/XML document.
-    KVN is not supported.
+    array of them), text starting with ``<`` as a CCSDS NDM/XML document, and
+    text whose first line holds a comma as CSV. KVN is not supported.
+
+    The CSV form is a header row of OMM keywords and one row per message, as
+    CelesTrak (its default for GP queries) and Space-Track serve it. Fields
+    may be quoted and columns may come in any order. An empty cell is an
+    absent field, except ``OBJECT_NAME`` and ``OBJECT_ID``, which stay empty
+    strings; columns that are not OMM fields are kept as strings (``None``
+    where empty).
 
     Args:
         text (str): the document
@@ -4957,6 +5014,11 @@ def omm_from_text(text: str) -> list[OMMDict]:
     Returns:
         list[OMMDict]: one dictionary per message (see :class:`OMMDict`)
 
+    Raises:
+        RuntimeError: if the text is none of the three formats or is
+            malformed; for CSV the message gives the line of the bad row, and
+            a table with no ``EPOCH`` or ``MEAN_MOTION`` column is refused
+
     Example:
         ```python
         import satkit as sk

{satkit-0.24.2 → satkit-0.24.3}/python/satkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satkit
-Version: 0.24.2
+Version: 0.24.3
 Summary: Satellite Orbital Dynamics Toolkit
 Author-email: Steven Michael <ssmichael@gmail.com>
 Maintainer-email: Steven Michael <ssmichael@gmail.com>

{satkit-0.24.2 → satkit-0.24.3}/python/satkit.egg-info/SOURCES.txt

@@ -101,6 +101,7 @@ src/lpephem/mod.rs
 src/lpephem/moon.rs
 src/lpephem/planets.rs
 src/lpephem/sun.rs
+src/omm/csv.rs
 src/omm/error.rs
 src/omm/mod.rs
 src/omm/xml.rs

{satkit-0.24.2 → satkit-0.24.3}/python/src/lib.rs

@@ -173,6 +173,7 @@ pub fn satkit(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<pyconsts::Consts>()?;
     m.add_class::<SolarSystem>()?;
     m.add_class::<pytle::PyTLE>()?;
+    m.add("TLEWarning", m.py().get_type::<pytle::TLEWarning>())?;
     m.add_class::<pytlefitstatus::PyTleFitStatus>()?;
 
     m.add_class::<PyGeodet>()?;

{satkit-0.24.2 → satkit-0.24.3}/python/src/pyomm.rs

@@ -206,7 +206,9 @@ fn omms_to_pylist(py: Python<'_>, omms: &[OMM]) -> PyResult<Py<PyAny>> {
 
 /// Load OMM(s) from a URL as a list of dictionaries
 ///
-/// Fetches the content at the given URL and auto-detects JSON vs XML format.
+/// Fetches the content at the given URL and auto-detects the format (JSON,
+/// XML or CSV), as ``omm_from_text`` does. A CelesTrak GP query with no
+/// ``FORMAT`` answers in CSV.
 /// Returns a list of dictionaries that can be passed directly to ``satkit.sgp4()``.
 ///
 /// Args:
@@ -230,13 +232,14 @@ pub fn omm_from_url(py: Python<'_>, url: String) -> Result<Py<PyAny>> {
     Ok(omms_to_pylist(py, &omms)?)
 }
 
-/// Load OMM(s) from a JSON or XML file as a list of dictionaries
+/// Load OMM(s) from a JSON, XML or CSV file as a list of dictionaries
 ///
-/// The format is detected from the content, not the file extension.
+/// The format is detected from the content, not the file extension, as
+/// ``omm_from_text`` does.
 ///
 /// Args:
 ///     filename (str): Path to a file holding one OMM or an array of them
-///         (JSON), or a CCSDS NDM/XML document
+///         (JSON), a CCSDS NDM/XML document, or a CSV table
 ///
 /// Returns:
 ///     list[dict]: One dict per message, see ``satkit.OMMDict``
@@ -246,16 +249,23 @@ pub fn omm_from_file(py: Python<'_>, filename: String) -> Result<Py<PyAny>> {
     Ok(omms_to_pylist(py, &omms)?)
 }
 
-/// Parse OMM(s) from JSON or XML text as a list of dictionaries
+/// Parse OMM(s) from JSON, XML or CSV text as a list of dictionaries
 ///
 /// Text starting with ``[`` or ``{`` is parsed as JSON, text starting with
-/// ``<`` as XML.
+/// ``<`` as XML, and text whose first line holds a comma as CSV: a header
+/// row of OMM keywords and one row per message, as CelesTrak and Space-Track
+/// serve it. KVN is not supported.
 ///
 /// Args:
-///     text (str): One OMM or an array of them (JSON), or a CCSDS NDM/XML document
+///     text (str): One OMM or an array of them (JSON), a CCSDS NDM/XML
+///         document, or a CSV table
 ///
 /// Returns:
 ///     list[dict]: One dict per message, see ``satkit.OMMDict``
+///
+/// Raises:
+///     RuntimeError: if the text is none of the three formats or is
+///         malformed; for CSV the message gives the line of the bad row
 #[pyfunction]
 pub fn omm_from_text(py: Python<'_>, text: String) -> Result<Py<PyAny>> {
     let omms = py.detach(|| OMM::from_text(&text))?;