satkit 0.2.5__tar.gz → 0.2.6__tar.gz

{satkit-0.2.5 → satkit-0.2.6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "satkit"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 description = "Satellite Toolkit"
 readme = "README.md"

{satkit-0.2.5/python/satkit.egg-info → satkit-0.2.6}/PKG-INFO

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

{satkit-0.2.5 → satkit-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "satkit"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = ["numpy>=1.20.0"]
 requires-python = ">= 3.8"
 authors = [{ name = "Steven Michael", email = "ssmichael@gmail.com" }]
@@ -43,6 +43,9 @@ find = { where = ["python"] }
 
 [tool.cibuildwheel]
 build = ["cp312-*", "cp311-* cp310-* cp39-* cp38-*"]
+test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"
+skip = ["pp*", "*_i686", "*_s390x", "*_aarch64", "*_ppc64le", "*-musllinux*"]
+
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]
@@ -54,17 +57,15 @@ before-build = [
 ]
 environment = { PATH = "$PATH:$HOME/.cargo/bin" }
 # Skip trying to test arm64 builds on Intel Macs
-test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"
 test-requires = "pytest"
 test-command = [
-    "ASTRO_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
+    "SATKIT_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
 ]
 
 
 [tool.cibuildwheel.linux]
 environment = { PATH = "$PATH:$HOME/.cargo/bin" }
 archs = ["x86_64"]
-skip = ["pp*", "*_i686", "*_s390x", "*_aarch64", "*_ppc64le", "*-musllinux*"]
 before-build = [
     "pip install -U setuptools-rust",
     "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y",
@@ -72,7 +73,7 @@ before-build = [
 ]
 test-requires = "pytest"
 test-command = [
-    "ASTRO_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
+    "SATKIT_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
 ]
 
 [tool.cibuildwheel.windows]
@@ -85,14 +86,13 @@ before-build = [
     "rustup show",
 ]
 archs = ["AMD64"]
-skip = ["pp*"]
 test-requires = "pytest"
 before-test = [
-    "set ASTRO_DATA={package}\\astro-data",
+    "set SATKIT_DATA={package}\\astro-data",
     "set SATKIT_TESTVEC_ROOT={package}\\satkit-testvecs",
 ]
 test-command = [
-    "set ASTRO_DATA={package}\\astro-data&&set SATKIT_TESTVEC_ROOT={package}\\satkit-testvecs&&pytest {project}\\python\\test\\test.py",
+    "set SATKIT_DATA={package}\\astro-data&&set SATKIT_TESTVEC_ROOT={package}\\satkit-testvecs&&pytest {project}\\python\\test\\test.py",
 ]
 
 

{satkit-0.2.5 → satkit-0.2.6}/python/satkit/__init__.pyi

@@ -537,8 +537,8 @@ class timescale:
     are needed to compute precise rotations between various inertial and
     Earth-fixed coordinate frames
 
-    For details, see:
-    https://stjarnhimlen.se/comp/time.html
+    For an excellent overview, see:
+    https://spsweb.fltops.jpl.nasa.gov/portaldataops/mpg/MPG_Docs/MPG%20Book/Release/Chapter2-TimeScales.pdf
 
     # Options:
 

{satkit-0.2.5 → satkit-0.2.6}/python/satkit/frametransform/__init__.pyi

@@ -19,80 +19,125 @@ import satkit
 import datetime
 
 def gmst(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> float | npt.ArrayLike[np.float]:
     """
     Greenwich Mean Sidereal Time
-
+    
     Vallado algorithm 15:
-
-    GMST = 67310.5481 + (876600h + 8640184.812866) * tᵤₜ₁ * (0.983104 + tᵤₜ₁ * -6.2e-6)
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is float or numpy array of floats with GMST in radians matched element-wise
-    to the input times.
+    
+    GMST = 67310.5481 + (876600h + 8640184.812866) * tᵤₜ₁ * (0.983104 + tᵤₜ₁ * −6.2e−6)
+    
+    
+    # Arguments
+    
+      * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+              representing time at which to calculate output
+    
+    # Returns
+    
+    * Greenwich Mean Sideral Time, radians, at intput time(s)
+    
     """
 
 def gast(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> float | npt.ArrayLike[np.float]:
     """
-    Greenwich Apparent Sidereal Time
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is float or numpy array of floats with GAST in radians matched element-wise
-    to the input times.
+    Greenwich apparant sidereal time, radians
+    
+    # Arguments:
+    
+      * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+              representing time at which to calculate output
+    
+    # Returns:
+    
+     * Greenwich apparant sidereal time, radians, at input time(s)
+    
     """
 
 def earth_rotation_angle(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> float | npt.ArrayLike[np.float]:
     """
-    Earth rotation angle
-
-    See:
-    https://www.iers.org/SharedDocs/Publikationen/EN/IERS/Publications/tn/TechnNote36/tn36_043.pdf?__blob=publicationFile&v=1
-
+    Earth Rotation Angle
+    
+    See
+    [IERS Technical Note 36, Chapter 5](https://www.iers.org/SharedDocs/Publikationen/EN/IERS/Publications/tn/TechnNote36/tn36_043.pdf?__blob=publicationFile&v=1)
     Equation 5.15
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is float or numpy array of floats with Earth Rotation Angle in radians
-    matched element-wise to the input times.
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Earth rotation angle, in radians, at input time(s)
+    
+    # Calculation Details
+    
+    * Let t be UT1 Julian date
+    * let f be fractional component of t (fraction of day)
+    * ERA = 2𝜋 ((0.7790572732640 + f + 0.00273781191135448 * (t − 2451545.0))
+    
     """
 
 def qitrf2tirs(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
-    Rotation from International Terrestrial Reference Frame
-    (ITRF) to the Terrestrial Intermediate Reference System (TIRS)
-    represented as satkit.quaterinion object
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is satkit.quaternion or numpy array of satkit.quaternion representiong
-    rotations from itrf to tirs matched element-wise to the input times
+    Rotation from Terrestrial Intermediate Reference System to
+    Celestial Intermediate Reference Systems
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Quaternion representing rotation from TIRS to CIRS at input time(s)
+    
     """
 
 @typing.overload
-def qcirs2gcrf(tm: satkit.time) -> satkit.quaternion:
-    """
-    Rotate from Celestial Intermediate Reference System
+def qcirs2gcrf(tm: satkit.time | datetime.datetime) -> satkit.quaternion:
+    """  
+    Rotation from Celestial Intermediate Reference System
     to Geocentric Celestial Reference Frame
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Quaternion representing rotation from CIRS to GCRF at input time(s)
+    
     """
 
 @typing.overload
-def qcirs2gcrf(tm: npt.ArrayLike[satkit.time]) -> npt.ArrayLike[satkit.quaternion]:
+def qcirs2gcrf(tm: npt.ArrayLike[satkit.time] | npt.ArrayLike[datetime.datetime]) -> npt.ArrayLike[satkit.quaternion]:
     """
-    Rotate from Celestial Intermediate Reference System
+    Rotation from Celestial Intermediate Reference System
     to Geocentric Celestial Reference Frame
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Quaternion representing rotation from CIRS to GCRF at input time(s)
+    
     """
 
 def qtirs2cirs(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Rotation from Terrestrial Intermediate Reference System (TIRS)
@@ -106,7 +151,7 @@ def qtirs2cirs(
     """
 
 def qgcrf2itrf_approx(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing approximate rotation from the
@@ -128,7 +173,7 @@ def qgcrf2itrf_approx(
     """
 
 def qitrf2gcrf_approx(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing approximate rotation from the
@@ -175,7 +220,7 @@ def qgcrf2itrf(
     """
 
 def qitrf2gcrf(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing rotation from the
@@ -200,7 +245,7 @@ def qitrf2gcrf(
     """
 
 def qteme2itrf(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing rotation from the

{satkit-0.2.5 → satkit-0.2.6}/python/satkit/utils/__init__.pyi

@@ -52,7 +52,7 @@ def datadir() -> str:
 
     MacOS:
 
-    1. Directory pointed to by "ASTRO_DATA" environment variable
+    1. Directory pointed to by "SATKIT_DATA" environment variable
     2. $HOME/LIBRARY/Application\ Support/astro-data
     3. $HOME/.astro-data
     4. $HOME

{satkit-0.2.5 → satkit-0.2.6/python/satkit.egg-info}/PKG-INFO

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

{satkit-0.2.5 → satkit-0.2.6}/python/test/test.py

@@ -5,12 +5,50 @@ import numpy as np
 import math as m
 import os
 from sp3file import read_sp3file
-
+from datetime import datetime, timezone
 
 testvec_dir = os.getenv(
             "SATKIT_TESTVEC_ROOT", default="." + os.path.sep + "satkit-testvecs" + os.path.sep
         )
 
+class TestDateTime:
+    """
+    Check that function calls with satkit.time and datetime.datetime return 
+    the same result
+    """
+    def test_scalar_times(self):
+
+        # Create times and show that they are equal
+        tm1 = sk.time(2023, 3, 4, 12, 5, 6)
+        tm2 = datetime(2023, 3, 4, 12, 5, 6, tzinfo=timezone.utc)
+
+
+        assert(tm1.datetime() == tm2)
+        # Check that function calls work
+        # Pick gmst as the test function call for time
+        # it can be anything since under the hood the same function call is used
+        # to get time inputs for all python functions in package
+        g1 = sk.frametransform.gmst(tm1)
+        g2 = sk.frametransform.gmst(tm2)
+        assert g1 == pytest.approx(g2, rel=1e-10)
+
+    def test_list_times(self):
+        timearr = range(10)
+        tm1 = [sk.time(2023, 3, x+1, 12, 0, 0) for x in timearr]
+        tm2 = [datetime(2023, 3, x+1, 12, 0, 0, tzinfo=timezone.utc) for x in timearr]
+        g1 = sk.frametransform.gmst(tm1)
+        g2 = sk.frametransform.gmst(tm2)
+        assert g1 == pytest.approx(g2)
+
+    def test_numpy_times(self):
+        timearr = range(10)
+        tm1 = np.array([sk.time(2023, 3, x+1, 12, 0, 0) for x in timearr])
+        tm2 = np.array([datetime(2023, 3, x+1, 12, 0, 0, tzinfo=timezone.utc) for x in timearr])
+        g1 = sk.frametransform.gmst(tm1)
+        g2 = sk.frametransform.gmst(tm2)
+        assert g1 == pytest.approx(g2)   
+
+
 class TestTime:
     def test_mjd(self):
         """

{satkit-0.2.5 → satkit-0.2.6}/src/consts.rs

@@ -1,36 +1,36 @@
 #[allow(non_upper_case_globals)]
-///  WGS-84 semiparameter, in meters */
+///  WGS-84 semiparameter, in meters
 pub const WGS84_A: f64 = 6378137.0;
-///  WGS-84 flattening */
+///  WGS-84 flattening
 pub const WGS84_F: f64 = 0.003352810664747;
 /// WGS-84 Earth radius, meters
 pub const EARTH_RADIUS: f64 = WGS84_A;
-///  Gravitational parameter of Earth, m^3/s^2 */
+///  Gravitational parameter of Earth, m^3/s^2
 pub const MU_EARTH: f64 = 3.986004418E14;
-///  Gravitational parameter of Moon, m^3/s^2 */
+///  Gravitational parameter of Moon, m^3/s^2
 pub const MU_MOON: f64 = 4.9048695E12;
-///  Gravitational parameter of Sun, m^3/s^2 */
+///  Gravitational parameter of Sun, m^3/s^2
 pub const MU_SUN: f64 = 1.32712440018E20;
-///  Alternate name for gravitational parameter */
+///  Alternate name for gravitational parameter
 pub const GM: f64 = MU_EARTH;
-///  Earth rotation rate, radians / second */
+///  Earth rotation rate, radians / second
 pub const OMEGA_EARTH: f64 = 7.292115090E-5;
-///  speed of light, m/s */
+///  speed of light, m/s
 pub const C: f64 = 299792458.0;
-///  Astronomical unit, meters */
+///  Astronomical unit, meters
 pub const AU: f64 = 1.4959787069999998807907104492E11;
-///  Sun radius in meters */
+///  Sun radius in meters
 pub const SUN_RADIUS: f64 = 695500000.0;
-///  Moon radius, meters */
+///  Moon radius, meters
 pub const MOON_RADIUS: f64 = 1737400.0;
-///  Ratio of earth mass to moon mass */
+///  Ratio of earth mass to moon mass
 pub const EARTH_MOON_MASS_RATIO: f64 = 81.30056822149721540427;
-///  Geosynchronous Distance */
+///  Geosynchronous Distance
 pub const GEO_R: f64 = 42164172.58422766;
-///  JGM3 Gravitational parameter of Earth, m^3/s^2 */
+///  JGM3 Gravitational parameter of Earth, m^3/s^2
 pub const JGM3_MU: f64 = 0.3986004415E+15;
-///  JGM3 Semimajor axis of Earth, m */
+///  JGM3 Semimajor axis of Earth, m
 pub const JGM3_A: f64 = 0.6378136300E+07;
-///  JGM3 J2 term */
+///  JGM3 J2 term
 pub const JGM3_J2: f64 = -0.0010826360229829945;
 //jgm3_J2:f64 = -sqrt(5.) * -0.484169548456e-03;

{satkit-0.2.5 → satkit-0.2.6}/src/duration.rs

@@ -77,7 +77,9 @@ impl Duration {
         // e.g. if seconds = 59.999..., rather than round up and
         // display "seconds" in second field, show 0 and increment
         // minutes...
-        secs = secs + 5.0e-4;
+        if secs % 60.0  > 59.9995 {
+            secs = secs + 5.0e-4;
+        }
 
         if secs < 1.0 {
             format!("Duration: {}{:.3} microseconds", sign, (secs % 1.0) * 1.0e6)

{satkit-0.2.5 → satkit-0.2.6}/src/frametransform/mod.rs

@@ -59,6 +59,7 @@ pub fn gmst(tm: &AstroTime) -> f64 {
 }
 
 /// Equation of Equinoxes
+/// Equation of the equinoxes
 pub fn eqeq(tm: &AstroTime) -> f64 {
     let d: f64 = tm.to_mjd(Scale::TT) - 51544.5;
     let omega = PI / 180.0 * (125.04 - 0.052954 * d);

{satkit-0.2.5 → satkit-0.2.6}/src/pybindings/mod_utils.rs

@@ -54,11 +54,22 @@ fn update_datafiles(kwds: Option<&PyDict>) -> PyResult<()> {
     }
 }
 
-/// Return directory currently used to hold
-/// necessary data files for the directory
+/// Get directory where astronomy data is stored
 ///
-/// e.g., Earth Orientation Parameters, gravity coefficients,
-/// JPL Ephemeris, etc..
+/// Tries the following paths in order, and stops when the
+/// files are found
+///
+/// *  "SATKIT_DATA" environment variable
+/// *  ${HOME}/astro-data
+/// *  ${HOME}
+/// *  /usr/share/astro-data
+/// *  On Mac Only:
+///    * /Library/Application Support/astro-data
+///    * ${Home}/Library/Application Support/astro-data
+///
+/// Returns:
+///
+///  * string representing directory where files are stored
 ///
 #[pyfunction]
 fn datadir() -> PyResult<PyObject> {
@@ -76,6 +87,13 @@ fn githash() -> PyResult<String> {
     Ok(String::from(crate::utils::githash()))
 }
 
+// Version of satkit
+#[pyfunction]
+fn version() -> PyResult<String> {
+    Ok(String::from(crate::utils::gittag()))
+}
+
+
 #[pyfunction]
 fn dylib_path() -> PyResult<PyObject> {
     pyo3::Python::with_gil(|py| -> PyResult<PyObject> {
@@ -100,6 +118,7 @@ pub fn utils(_py: Python, m: &PyModule) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(update_datafiles, m)?)
         .unwrap();
     m.add_function(wrap_pyfunction!(githash, m)?).unwrap();
+    m.add_function(wrap_pyfunction!(version, m)?).unwrap();
     m.add_function(wrap_pyfunction!(build_date, m)?).unwrap();
     Ok(())
 }

{satkit-0.2.5 → satkit-0.2.6}/src/pybindings/pyastrotime.rs

@@ -2,7 +2,6 @@ use pyo3::prelude::*;
 use pyo3::types::timezone_utc;
 use pyo3::types::PyDateTime;
 use pyo3::types::PyTuple;
-use pyo3::types::PyTzInfo;
 
 use crate::astrotime::{self, AstroTime, Scale};
 
@@ -17,8 +16,8 @@ use numpy as np;
 /// are needed to compute precise rotations between various inertial and
 /// Earth-fixed coordinate frames
 ///
-/// For details, see:
-/// https://stjarnhimlen.se/comp/time.html
+/// For an excellent overview, see:
+/// https://spsweb.fltops.jpl.nasa.gov/portaldataops/mpg/MPG_Docs/MPG%20Book/Release/Chapter2-TimeScales.pdf
 ///
 /// UTC = Universal Time Coordinate
 /// TT = Terrestrial Time
@@ -327,10 +326,10 @@ impl PyAstroTime {
     fn datetime(&self, utc: bool) -> PyResult<PyObject> {
         pyo3::Python::with_gil(|py| -> PyResult<PyObject> {
             let timestamp: f64 = self.to_unixtime();
-            let mut tz: Option<&PyTzInfo> = Some(timezone_utc(py));
-            if utc == false {
-                tz = None;
-            }
+            let tz = match utc {
+                false => None,
+                true => Some(timezone_utc(py)),
+            };
             Ok(PyDateTime::from_timestamp(py, timestamp, tz)?.into_py(py))
         })
     }
@@ -636,13 +635,27 @@ impl ToTimeVec for &PyAny {
             let tm: PyAstroTime = self.extract().unwrap();
             Ok(vec![tm.inner.clone()])
         }
+        else if self.is_instance_of::<PyDateTime>() {
+            let dt: &PyDateTime = self.extract().unwrap();
+            Ok(vec![PyAstroTime::from_datetime(dt).unwrap().inner])
+        }
         // List case
         else if self.is_instance_of::<pyo3::types::PyList>() {
             match self.extract::<Vec<PyAstroTime>>() {
                 Ok(v) => Ok(v.iter().map(|x| x.inner).collect::<Vec<_>>()),
-                Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!(
-                    "Not a list of astro::AstroTime: {e}"
-                ))),
+                Err(e) => {
+                    match self.extract::<Vec<&PyDateTime>>() {
+                        Ok(v) => Ok(v.iter().map(|x| 
+                            PyAstroTime::from_datetime(x.extract().unwrap()).unwrap().inner)
+                            .collect::<Vec<_>>()),
+                        Err(e) => {
+                            Err(pyo3::exceptions::PyTypeError::new_err(format!(
+                                "Not a list of satkit.time or datetime.datetime: {e}"
+                            )))
+                        }
+                    }
+                }
+               
             }
         }
         // numpy array case
@@ -656,13 +669,18 @@ impl ToTimeVec for &PyAny {
                         .map(|p| -> Result<AstroTime, _> {
                             match p.extract::<PyAstroTime>(py) {
                                 Ok(v2) => Ok(v2.inner),
-                                Err(v2) => Err(v2),
+                                Err(_) => match p.extract::<&PyDateTime>(py) {
+                                    Ok(v3) => Ok(PyAstroTime::from_datetime(v3.extract().unwrap()).unwrap().inner),
+                                    Err(_) => Err(pyo3::exceptions::PyTypeError::new_err(format!(
+                                        "Input numpy array must contain satkit.time elements or datetime.datetime elements"
+                                    ))),
                             }
+                        }
                         })
                         .collect();
                     if !tmarray.is_ok() {
                         Err(pyo3::exceptions::PyRuntimeError::new_err(
-                            "Invalid AstroTime input",
+                            "Invalid satkit.time input",
                         ))
                     } else {
                         Ok(tmarray.unwrap())
@@ -670,12 +688,12 @@ impl ToTimeVec for &PyAny {
                 }),
 
                 Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!(
-                    "Invalid AstroTime input: {e}"
+                    "Invalid satkit.time or datetime.datetime input: {e}"
                 ))),
             }
         } else {
             Err(pyo3::exceptions::PyRuntimeError::new_err(
-                "Invalid AstroTime input",
+                "Invalid satkit.time or datetime.datetime input",
             ))
         }
     }

{satkit-0.2.5 → satkit-0.2.6}/src/pybindings/pyconsts.rs

@@ -18,7 +18,7 @@ impl Consts {
     /// WGS-84 Earth radius, meters
     const earth_radius: f64 = cconsts::EARTH_RADIUS;
 
-    ///  Gravitational parameter of Earth, m^3/s^2 */
+    ///  Gravitational parameter of Earth, m^3/s^2
     #[classattr]
     const mu_earth: f64 = cconsts::MU_EARTH;
     /// Gravitational parameter of moon, m^3/s^2