satnogs-predict 0.4__tar.gz → 0.6__tar.gz

{satnogs_predict-0.4 → satnogs_predict-0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satnogs-predict
-Version: 0.4
+Version: 0.6
 Summary: A package for calculating passes and observation windows for satellites.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{satnogs_predict-0.4 → satnogs_predict-0.6}/docs/docs.md

@@ -9,8 +9,9 @@
   - [3.3 - Time Modeling](#33---time-modeling)
 - [4. Observation Windows \& samples](#4-observation-windows--samples)
   - [4.1 - Samples](#41---samples)
-  - [4.2 - Observation Windows](#42---observation-windows)
-  - [4.3 - Constraints](#43---constraints)
+  - [4.2 - Doppler correction](#42---doppler-correction)
+  - [4.3 - Observation Windows](#43---observation-windows)
+  - [4.4 - Constraints](#44---constraints)
 - [5. Planning](#5-planning)
   - [5.1 - Planning is implemented by providing a config class instance:](#51---planning-is-implemented-by-providing-a-config-class-instance)
   - [5.2 - Overlap Handling](#52---overlap-handling)
@@ -84,16 +85,25 @@ The top-level exports define the supported API contract.
 
 ## 3.1 - Satellite
 
-Represents orbital information, currently derived from TLE data.
-(In the future, more ways may be added.)
+Represents orbital information derived from TLE or OMM data.
 
 ```python
 satellite = Satellite.from_tle(
-    line0=tle['tle0'], line1=tle['tle1'], line2=tle['tle2'], identifier="XSKZ-5603-1870-9019-3066"
+    line0=tle['tle0'], line1=tle['tle1'], line2=tle['tle2']
 )
 ```
 
-The `identifier` is required. It is used both as part of the public model and as the key for the internal propagation cache.
+You can also create a satellite from an OMM element dictionary. The field names and
+values are passed through to Skyfield's `EarthSatellite.from_omm` support:
+
+```python
+satellite = Satellite.from_omm(
+    fields=omm_fields,
+)
+```
+
+The `identifier` is optional and defaults to a random UUID. Provide an explicit
+identifier when you need a stable public value or cache key.
 
 For testing or development, you can also generate a synthetic TLE:
 
@@ -119,12 +129,12 @@ station = Observer(
     lat_deg=37.983810,
     lon_deg=23.727539,
     elevation_meters=100,
-    horizon_deg=10.0,
-    identifier="360"
+    horizon_deg=10.0
 )
 ```
 
-The `identifier` is required here as well, and is also used by the internal propagation cache.
+The `identifier` is optional here as well and defaults to a random UUID. Provide one
+when you need a stable public value or cache key.
 
 
 ## 3.3 - Time Modeling
@@ -211,9 +221,24 @@ class RangeSample:
     range_rate: float
 ```
 
-`range_m` is the observer-to-satellite distance in meters, and `range_rate` is the radial velocity in meters per second.
+`range_m` is the observer-to-satellite distance in meters, and `range_rate` is the
+rate of change of that distance in meters per second.
+
+## 4.2 - Doppler correction
+
+Use `get_doppler_adjusted_frequency` to apply the Doppler correction to a
+base frequency:
+
+```python
+from satnogs_predict import get_doppler_adjusted_frequency
+
+adjusted_frequency_hz = get_doppler_adjusted_frequency(
+    range_rate_m_per_s=range_sample.range_rate,
+    frequency_hz=145_000_000.0,
+)
+```
 
-## 4.2 - Observation Windows
+## 4.3 - Observation Windows
 
 An observation window represents a pass or a subset of a pass.
 
@@ -257,7 +282,7 @@ If the window has an overlap with the provided already scheduled ranges, `overla
 
 Note: if a later constraint modifies the window length, `overlap_ratio` is currently not recalculated. It remains the value computed earlier during planning.
 
-## 4.3 - Constraints
+## 4.4 - Constraints
 
 When searching for observation windows (more on this below), certain constraints can be applied. Currently supported constraints are:
 

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict/__init__.py

@@ -4,6 +4,7 @@ from .core.engine import (
     find_observation_windows,
     get_altaz,
     get_and_validate_pass_from_range,
+    get_doppler_adjusted_frequency,
     get_range,
 )
 from .domain import *  # noqa: F401,F403
@@ -19,6 +20,7 @@ __all__ += [
     "find_observation_windows",
     "get_altaz",
     "get_and_validate_pass_from_range",
+    "get_doppler_adjusted_frequency",
     "get_range",
 ]
 __all__ += ["generate_fake_tle"]

satnogs_predict-0.6/src/satnogs_predict/core/__init__.py

@@ -0,0 +1,15 @@
+from .engine import (
+    find_observation_windows,
+    get_altaz,
+    get_and_validate_pass_from_range,
+    get_doppler_adjusted_frequency,
+    get_range,
+)
+
+__all__ = [
+    "find_observation_windows",
+    "get_altaz",
+    "get_and_validate_pass_from_range",
+    "get_doppler_adjusted_frequency",
+    "get_range",
+]

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict/core/engine.py

@@ -1,5 +1,7 @@
 from typing import Sequence
 
+from skyfield.constants import C  # type: ignore[import-untyped]
+
 from satnogs_predict.constraints.constraints import Constraint
 from satnogs_predict.domain.constraints import ConstraintAppliedResult, ConstraintContext
 from satnogs_predict.domain.geometry import GeometrySample, RangeSample
@@ -101,6 +103,21 @@ def get_range(satellite: Satellite, observer: Observer, instant: Instant) -> Ran
     return _propagation_get_range(satellite, observer, instant)
 
 
+def get_doppler_adjusted_frequency(range_rate_m_per_s: float, frequency_hz: float) -> float:
+    """
+    Return the Doppler-adjusted frequency in Hz.
+
+    Args:
+        range_rate_m_per_s: Range rate in meters per second. Positive values mean the
+            satellite is moving away from the observer.
+        frequency_hz: Nominal transmit or receive frequency in Hz.
+
+    Returns:
+        Doppler-corrected frequency
+    """
+    return frequency_hz * (1 - (range_rate_m_per_s / C))
+
+
 def get_and_validate_pass_from_range(
     satellite: Satellite,
     observer: Observer,

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict/domain/__init__.py

@@ -1,7 +1,7 @@
 from .constraints import ConstraintAppliedResult, ConstraintCheckFailedError, ConstraintContext
 from .geometry import GeometrySample, RangeSample
 from .observer import Observer
-from .orbit import TLE, Orbit, OrbitRepresentation, Satellite
+from .orbit import OMM, TLE, Orbit, OrbitRepresentation, Satellite
 from .planner import OverlapHandling, PlanningConfig
 from .time import (
     Duration,
@@ -17,6 +17,7 @@ __all__ = [
     "GeometrySample",
     "RangeSample",
     "Observer",
+    "OMM",
     "TLE",
     "OrbitRepresentation",
     "Orbit",

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict/domain/observer.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from uuid import uuid4
 
 from .validation import ensure_required_fields_not_none
 
@@ -13,7 +14,9 @@ class Observer:
     lon_deg: float
     elevation_meters: int
     horizon_deg: float
-    identifier: str
+    identifier: str = field(default_factory=lambda: str(uuid4()))
 
     def __post_init__(self) -> None:
+        if self.identifier is None:
+            object.__setattr__(self, "identifier", str(uuid4()))
         ensure_required_fields_not_none(self)

satnogs_predict-0.6/src/satnogs_predict/domain/orbit.py

@@ -0,0 +1,89 @@
+from __future__ import annotations
+
+from collections.abc import Mapping
+from dataclasses import dataclass, field
+from enum import IntEnum
+from uuid import uuid4
+
+from .validation import ensure_required_fields_not_none
+
+
+@dataclass(frozen=True, slots=True)
+class TLE:
+    line0: str
+    line1: str
+    line2: str
+
+    def __post_init__(self) -> None:
+        ensure_required_fields_not_none(self)
+
+    def to_list(self) -> list[str]:
+        return [self.line0, self.line1, self.line2]
+
+
+@dataclass(frozen=True, slots=True)
+class OMM:
+    fields: dict[str, str]
+
+    def __post_init__(self) -> None:
+        ensure_required_fields_not_none(self)
+
+    def to_dict(self) -> dict[str, str]:
+        return dict(self.fields)
+
+
+class OrbitRepresentation(IntEnum):
+    TLE = 0
+    OMM = 1
+
+
+@dataclass(frozen=True, slots=True)
+class Orbit:
+    representation: OrbitRepresentation
+    data: TLE | OMM
+
+    def __post_init__(self) -> None:
+        ensure_required_fields_not_none(self)
+
+    @classmethod
+    def from_omm(
+        cls,
+        fields: Mapping[str, str],
+    ):
+        return cls(representation=OrbitRepresentation.OMM, data=OMM(fields=dict(fields)))
+
+
+@dataclass(frozen=True, slots=True)
+class Satellite:
+    orbit: Orbit
+    identifier: str = field(default_factory=lambda: str(uuid4()))
+
+    def __post_init__(self) -> None:
+        if self.identifier is None:
+            object.__setattr__(self, "identifier", str(uuid4()))
+        ensure_required_fields_not_none(self)
+
+    @classmethod
+    def from_tle(
+        cls,
+        line0: str,
+        line1: str,
+        line2: str,
+        identifier: str | None = None,
+    ):
+        tle = TLE(line0=line0, line1=line1, line2=line2)
+        orbit = Orbit(representation=OrbitRepresentation.TLE, data=tle)
+        if identifier is None:
+            return cls(orbit=orbit)
+        return cls(orbit=orbit, identifier=identifier)
+
+    @classmethod
+    def from_omm(
+        cls,
+        fields: Mapping[str, str],
+        identifier: str | None = None,
+    ):
+        orbit = Orbit.from_omm(fields)
+        if identifier is None:
+            return cls(orbit=orbit)
+        return cls(orbit=orbit, identifier=identifier)

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict/propagation/propagator.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import cast
 
 from skyfield.api import Angle, EarthSatellite, Time, Topos, load  # type: ignore[import-untyped]
 from skyfield.searchlib import find_maxima  # type: ignore[import-untyped]
@@ -6,7 +7,7 @@ from skyfield.units import Distance, Velocity  # type: ignore[import-untyped]
 
 from satnogs_predict.domain.geometry import GeometrySample, RangeSample
 from satnogs_predict.domain.observer import Observer
-from satnogs_predict.domain.orbit import TLE, OrbitRepresentation, Satellite
+from satnogs_predict.domain.orbit import OMM, TLE, OrbitRepresentation, Satellite
 from satnogs_predict.domain.time import (
     Instant,
     TimeRange,
@@ -82,13 +83,16 @@ def _skyfield_sat_from_satellite(satellite: Satellite) -> EarthSatellite:
 
     match satellite.orbit.representation:
         case OrbitRepresentation.TLE:
-            tle: TLE = satellite.orbit.data
+            tle = cast(TLE, satellite.orbit.data)
             skyfield_sat = EarthSatellite(
                 tle.line1,
                 tle.line2,
                 satellite.identifier,
                 ts,
             )
+        case OrbitRepresentation.OMM:
+            omm = cast(OMM, satellite.orbit.data)
+            skyfield_sat = EarthSatellite.from_omm(ts, omm.to_dict())
         case _:
             raise ValueError("Unknown orbit representation")
 

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict/tle.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from datetime import datetime, timezone
 
-from skyfield.api import load  # type: ignore[import-untyped]
+from skyfield.api import load, wgs84  # type: ignore[import-untyped]
 
 from satnogs_predict.domain.orbit import TLE
 
@@ -67,7 +67,8 @@ def generate_fake_tle(
     skyfield_time = _ts.from_datetime(epoch)
 
     # Derived values
-    right_ascension = (skyfield_time.gmst * 15.0 + longitude) % 360.0
+    observer_location = wgs84.latlon(latitude, longitude)
+    right_ascension = (observer_location.lst_hours_at(skyfield_time) * 15.0) % 360.0
     mean_anomaly = latitude % 360.0
 
     epoch_year = epoch.year

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satnogs-predict
-Version: 0.4
+Version: 0.6
 Summary: A package for calculating passes and observation windows for satellites.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{satnogs_predict-0.4 → satnogs_predict-0.6}/src/satnogs_predict.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ tests/helpers.py
 tests/test_tle.py
 tests/constraints/test_constraints.py
 tests/core/test_engine.py
+tests/domain/test_observer.py
 tests/domain/test_orbit.py
 tests/domain/test_planner_domain.py
 tests/domain/test_required_fields.py

{satnogs_predict-0.4 → satnogs_predict-0.6}/tests/core/test_engine.py

@@ -272,6 +272,27 @@ class TestGetRange:
         }
 
 
+class TestGetDopplerAdjustedFrequency:
+    def test_given_zero_range_rate_when_getting_then_returns_nominal_frequency(self) -> None:
+        assert engine.get_doppler_adjusted_frequency(
+            range_rate_m_per_s=0.0, frequency_hz=145_000_000.0
+        ) == pytest.approx(145_000_000.0)
+
+    def test_given_receding_range_rate_when_getting_then_returns_lower_frequency(self) -> None:
+        assert engine.get_doppler_adjusted_frequency(
+            range_rate_m_per_s=2_997.92458,
+            frequency_hz=145_000_000.0,
+        ) == pytest.approx(144_998_550.0)
+
+    def test_given_approaching_range_rate_when_getting_then_returns_higher_frequency(
+        self,
+    ) -> None:
+        assert engine.get_doppler_adjusted_frequency(
+            range_rate_m_per_s=-2_997.92458,
+            frequency_hz=145_000_000.0,
+        ) == pytest.approx(145_001_450.0)
+
+
 class TestEnsureWindowRespectConstraints:
     def test_given_valid_and_rejected_windows_then_returns_expected(self, monkeypatch) -> None:
         thepass = window_seconds(0, 10)

satnogs_predict-0.6/tests/domain/test_observer.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from uuid import UUID
+
+from satnogs_predict.domain.observer import Observer
+
+
+class TestObserver:
+    def test_given_no_identifier_when_created_then_generates_identifier(self) -> None:
+        observer = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=0.0,
+        )
+
+        assert UUID(observer.identifier)
+
+    def test_given_none_identifier_when_created_then_generates_identifier(self) -> None:
+        observer = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=0.0,
+            identifier=None,  # type: ignore[arg-type]
+        )
+
+        assert UUID(observer.identifier)
+
+    def test_given_no_identifier_when_created_twice_then_generates_unique_identifiers(self) -> None:
+        first = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=0.0,
+        )
+        second = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=0.0,
+        )
+
+        assert first.identifier != second.identifier

satnogs_predict-0.6/tests/domain/test_orbit.py

@@ -0,0 +1,146 @@
+from __future__ import annotations
+
+from uuid import UUID
+
+from satnogs_predict.domain.orbit import OMM, TLE, Orbit, OrbitRepresentation, Satellite
+from tests.helpers import next_satellite_identifier
+
+OMM_FIELDS = {
+    "OBJECT_NAME": "ISS (ZARYA)",
+    "NORAD_CAT_ID": "25544",
+    "OBJECT_ID": "1998-067A",
+    "CLASSIFICATION_TYPE": "U",
+    "EPHEMERIS_TYPE": "0",
+    "ELEMENT_SET_NO": "999",
+    "REV_AT_EPOCH": "54773",
+    "EPOCH": "2026-01-13T05:00:55.753",
+    "MEAN_MOTION": "15.49269250",
+    "ECCENTRICITY": "0.0007741",
+    "INCLINATION": "51.6330",
+    "RA_OF_ASC_NODE": "346.6801",
+    "ARG_OF_PERICENTER": "12.6584",
+    "MEAN_ANOMALY": "347.4598",
+    "MEAN_MOTION_DOT": ".00008852",
+    "MEAN_MOTION_DDOT": "0",
+    "BSTAR": ".00016699",
+}
+
+
+class TestTle:
+    def test_given_tle_when_to_list_then_returns_three_lines_in_order(self) -> None:
+        tle = TLE(line0="LINE0", line1="LINE1", line2="LINE2")
+
+        assert tle.to_list() == ["LINE0", "LINE1", "LINE2"]
+
+
+class TestOmm:
+    def test_given_omm_when_to_dict_then_returns_copy_of_fields(self) -> None:
+        omm = OMM(fields=OMM_FIELDS)
+
+        result = omm.to_dict()
+        result["OBJECT_NAME"] = "CHANGED"
+
+        assert result != omm.fields
+        assert omm.fields == OMM_FIELDS
+
+
+class TestOrbitFromOmm:
+    def test_given_fields_when_created_then_builds_omm_orbit(self) -> None:
+        orbit = Orbit.from_omm(OMM_FIELDS)
+
+        assert orbit.representation == OrbitRepresentation.OMM
+        assert orbit.data == OMM(fields=OMM_FIELDS)
+
+    def test_given_fields_when_created_then_copies_fields(self) -> None:
+        fields = dict(OMM_FIELDS)
+
+        orbit = Orbit.from_omm(fields)
+        fields["OBJECT_NAME"] = "CHANGED"
+
+        assert orbit.data == OMM(fields=OMM_FIELDS)
+
+
+class TestSatelliteFromTle:
+    def test_given_identifier_when_created_then_builds_satellite(self) -> None:
+        line0 = "ISS (ZARYA)"
+        line1 = "1 25544U 98067A   26013.20897862  .00008852  00000-0  16699-3 0  9991"
+        line2 = "2 25544  51.6330 346.6801 0007741  12.6584 347.4598 15.49269250547732"
+        identifier = next_satellite_identifier()
+
+        sat = Satellite.from_tle(line0=line0, line1=line1, line2=line2, identifier=identifier)
+
+        assert sat.identifier == identifier
+        assert sat.orbit.representation == OrbitRepresentation.TLE
+        assert sat.orbit.data == TLE(line0=line0, line1=line1, line2=line2)
+
+    def test_given_identifier_when_created_then_uses_custom_value(self) -> None:
+        line0 = "ISS (ZARYA)"
+        line1 = "1 25544U 98067A   26013.20897862  .00008852  00000-0  16699-3 0  9991"
+        line2 = "2 25544  51.6330 346.6801 0007741  12.6584 347.4598 15.49269250547732"
+        identifier = "ISS"
+
+        sat = Satellite.from_tle(line0=line0, line1=line1, line2=line2, identifier=identifier)
+
+        assert sat.identifier == identifier
+        assert sat.orbit.representation == OrbitRepresentation.TLE
+        assert sat.orbit.data == TLE(line0=line0, line1=line1, line2=line2)
+
+    def test_given_no_identifier_when_created_then_generates_identifier(self) -> None:
+        line0 = "ISS (ZARYA)"
+        line1 = "1 25544U 98067A   26013.20897862  .00008852  00000-0  16699-3 0  9991"
+        line2 = "2 25544  51.6330 346.6801 0007741  12.6584 347.4598 15.49269250547732"
+
+        sat = Satellite.from_tle(line0=line0, line1=line1, line2=line2)
+
+        assert UUID(sat.identifier)
+
+    def test_given_none_identifier_when_created_then_generates_identifier(self) -> None:
+        line0 = "ISS (ZARYA)"
+        line1 = "1 25544U 98067A   26013.20897862  .00008852  00000-0  16699-3 0  9991"
+        line2 = "2 25544  51.6330 346.6801 0007741  12.6584 347.4598 15.49269250547732"
+
+        sat = Satellite.from_tle(line0=line0, line1=line1, line2=line2, identifier=None)
+
+        assert UUID(sat.identifier)
+
+
+class TestSatelliteFromOmm:
+    def test_given_identifier_when_created_then_builds_satellite(self) -> None:
+        identifier = next_satellite_identifier()
+
+        sat = Satellite.from_omm(fields=OMM_FIELDS, identifier=identifier)
+
+        assert sat.identifier == identifier
+        assert sat.orbit.representation == OrbitRepresentation.OMM
+        assert sat.orbit.data == OMM(fields=OMM_FIELDS)
+
+    def test_given_fields_when_created_then_copies_fields(self) -> None:
+        fields = dict(OMM_FIELDS)
+
+        sat = Satellite.from_omm(fields=fields, identifier=next_satellite_identifier())
+        fields["OBJECT_NAME"] = "CHANGED"
+
+        assert sat.orbit.data == OMM(fields=OMM_FIELDS)
+
+    def test_given_no_identifier_when_created_then_generates_identifier(self) -> None:
+        sat = Satellite.from_omm(fields=OMM_FIELDS)
+
+        assert UUID(sat.identifier)
+
+    def test_given_none_identifier_when_created_then_generates_identifier(self) -> None:
+        sat = Satellite.from_omm(fields=OMM_FIELDS, identifier=None)
+
+        assert UUID(sat.identifier)
+
+
+class TestSatellite:
+    def test_given_no_identifier_when_created_then_generates_identifier(self) -> None:
+        sat = Satellite(orbit=Orbit.from_omm(OMM_FIELDS))
+
+        assert UUID(sat.identifier)
+
+    def test_given_no_identifier_when_created_twice_then_generates_unique_identifiers(self) -> None:
+        first = Satellite(orbit=Orbit.from_omm(OMM_FIELDS))
+        second = Satellite(orbit=Orbit.from_omm(OMM_FIELDS))
+
+        assert first.identifier != second.identifier

{satnogs_predict-0.4 → satnogs_predict-0.6}/tests/domain/test_required_fields.py

@@ -5,8 +5,7 @@ from collections.abc import Callable
 import pytest
 
 from satnogs_predict.domain.geometry import GeometrySample
-from satnogs_predict.domain.observer import Observer
-from satnogs_predict.domain.orbit import TLE, Orbit, Satellite
+from satnogs_predict.domain.orbit import OMM, TLE, Orbit, Satellite
 from satnogs_predict.domain.planner import PlanningConfig
 from satnogs_predict.domain.time import Duration, Instant, TimeRange
 from satnogs_predict.domain.window import ObservationWindow
@@ -20,16 +19,6 @@ class TestRequiredFields:
     @pytest.mark.parametrize(
         ("factory", "expected_message"),
         [
-            (
-                lambda: Observer(
-                    lat_deg=0.0,
-                    lon_deg=0.0,
-                    elevation_meters=0,
-                    horizon_deg=0.0,
-                    identifier=None,  # type: ignore[arg-type]
-                ),
-                r"Observer\.identifier cannot be None",
-            ),
             (
                 lambda: GeometrySample(
                     instant=None,  # type: ignore[arg-type]
@@ -54,21 +43,16 @@ class TestRequiredFields:
                 r"Orbit\.representation cannot be None",
             ),
             (
-                lambda: Satellite(
-                    orbit=None,  # type: ignore[arg-type]
-                    identifier="SAT",
+                lambda: OMM(
+                    fields=None,  # type: ignore[arg-type]
                 ),
-                r"Satellite\.orbit cannot be None",
+                r"OMM\.fields cannot be None",
             ),
             (
                 lambda: Satellite(
-                    orbit=Orbit(
-                        representation=0,
-                        data=TLE("LINE0", "LINE1", "LINE2"),
-                    ),
-                    identifier=None,  # type: ignore[arg-type]
+                    orbit=None,  # type: ignore[arg-type]
                 ),
-                r"Satellite\.identifier cannot be None",
+                r"Satellite\.orbit cannot be None",
             ),
             (
                 lambda: Duration(

{satnogs_predict-0.4 → satnogs_predict-0.6}/tests/propagation/test_propagator.py

@@ -1120,8 +1120,42 @@ class TestSkyfieldSatFromSatellite:
         assert first is not second
         assert len(created) == 2
 
+    def test_given_omm_satellite_when_called_then_uses_skyfield_from_omm(self, monkeypatch) -> None:
+        omm_fields = {
+            "OBJECT_NAME": "ISS (ZARYA)",
+            "NORAD_CAT_ID": "25544",
+        }
+        satellite = Satellite.from_omm(
+            fields=omm_fields,
+            identifier=next_satellite_identifier(),
+        )
+        skyfield_satellite = object()
+        captured: dict[str, object] = {}
+
+        class EarthSatelliteSpy:
+            @classmethod
+            def from_omm(cls, timescale, element_dict):
+                captured["timescale"] = timescale
+                captured["element_dict"] = element_dict
+                return skyfield_satellite
+
+        monkeypatch.setattr(propagator, "EarthSatellite", EarthSatelliteSpy)
+        propagator.clear_satellite_cache()
+
+        result = propagator._skyfield_sat_from_satellite(satellite)
+        omm_fields["OBJECT_NAME"] = "CHANGED"
+
+        assert result is skyfield_satellite
+        assert captured == {
+            "timescale": propagator.ts,
+            "element_dict": {
+                "OBJECT_NAME": "ISS (ZARYA)",
+                "NORAD_CAT_ID": "25544",
+            },
+        }
+
     def test_given_unknown_representation_when_called_then_raises(self) -> None:
-        orbit = Orbit(representation=1, data=TLE("LINE0", "LINE1", "LINE2"))
+        orbit = Orbit(representation=999, data=TLE("LINE0", "LINE1", "LINE2"))
         sat = Satellite(orbit=orbit, identifier=next_satellite_identifier())
         propagator.clear_satellite_cache()
 

satnogs_predict-0.4/src/satnogs_predict/core/__init__.py

@@ -1,3 +0,0 @@
-from .engine import find_observation_windows, get_altaz, get_and_validate_pass_from_range, get_range
-
-__all__ = ["find_observation_windows", "get_altaz", "get_and_validate_pass_from_range", "get_range"]

satnogs_predict-0.4/src/satnogs_predict/domain/orbit.py

@@ -1,53 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from enum import IntEnum
-
-from .validation import ensure_required_fields_not_none
-
-
-@dataclass(frozen=True, slots=True)
-class TLE:
-    line0: str
-    line1: str
-    line2: str
-
-    def __post_init__(self) -> None:
-        ensure_required_fields_not_none(self)
-
-    def to_list(self) -> list[str]:
-        return [self.line0, self.line1, self.line2]
-
-
-class OrbitRepresentation(IntEnum):
-    TLE = 0
-
-
-@dataclass(frozen=True, slots=True)
-class Orbit:
-    representation: OrbitRepresentation
-    data: TLE
-
-    def __post_init__(self) -> None:
-        ensure_required_fields_not_none(self)
-
-
-@dataclass(frozen=True, slots=True)
-class Satellite:
-    orbit: Orbit
-    identifier: str
-
-    def __post_init__(self) -> None:
-        ensure_required_fields_not_none(self)
-
-    @classmethod
-    def from_tle(
-        cls,
-        line0: str,
-        line1: str,
-        line2: str,
-        identifier: str,
-    ):
-        tle = TLE(line0=line0, line1=line1, line2=line2)
-        orbit = Orbit(representation=OrbitRepresentation.TLE, data=tle)
-        return cls(orbit=orbit, identifier=identifier)

satnogs_predict-0.4/tests/domain/test_orbit.py

@@ -1,37 +0,0 @@
-from __future__ import annotations
-
-from satnogs_predict.domain.orbit import TLE, OrbitRepresentation, Satellite
-from tests.helpers import next_satellite_identifier
-
-
-class TestTle:
-    def test_given_tle_when_to_list_then_returns_three_lines_in_order(self) -> None:
-        tle = TLE(line0="LINE0", line1="LINE1", line2="LINE2")
-
-        assert tle.to_list() == ["LINE0", "LINE1", "LINE2"]
-
-
-class TestSatelliteFromTle:
-    def test_given_identifier_when_created_then_builds_satellite(self) -> None:
-        line0 = "ISS (ZARYA)"
-        line1 = "1 25544U 98067A   26013.20897862  .00008852  00000-0  16699-3 0  9991"
-        line2 = "2 25544  51.6330 346.6801 0007741  12.6584 347.4598 15.49269250547732"
-        identifier = next_satellite_identifier()
-
-        sat = Satellite.from_tle(line0=line0, line1=line1, line2=line2, identifier=identifier)
-
-        assert sat.identifier == identifier
-        assert sat.orbit.representation == OrbitRepresentation.TLE
-        assert sat.orbit.data == TLE(line0=line0, line1=line1, line2=line2)
-
-    def test_given_identifier_when_created_then_uses_custom_value(self) -> None:
-        line0 = "ISS (ZARYA)"
-        line1 = "1 25544U 98067A   26013.20897862  .00008852  00000-0  16699-3 0  9991"
-        line2 = "2 25544  51.6330 346.6801 0007741  12.6584 347.4598 15.49269250547732"
-        identifier = "ISS"
-
-        sat = Satellite.from_tle(line0=line0, line1=line1, line2=line2, identifier=identifier)
-
-        assert sat.identifier == identifier
-        assert sat.orbit.representation == OrbitRepresentation.TLE
-        assert sat.orbit.data == TLE(line0=line0, line1=line1, line2=line2)