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

satnogs_predict-1.0/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+## 1.0
+
+### Breaking Changes
+
+- `Satellite.identifier` no longer defaults to a generated UUID. It now defaults to an empty string and is treated as caller metadata.
+- `Observer.identifier` no longer defaults to a generated UUID. It now defaults to an empty string and is treated as caller metadata.
+- Skyfield satellite and observer caches **no longer use identifiers as cache keys**. Satellite cache identity is based on orbital data, and observer cache identity is based on latitude, longitude, and elevation.
+- `OMM.fields` is now stored as a read-only mapping. Use `OMM.to_dict()` when a mutable dictionary is needed.
+
+### Added
+
+- Added `cache_key` properties for `TLE`, `OMM`, `Orbit`, `Satellite`, and `Observer`.
+- Added a shared internal `cache_digest()` helper.
+
+### Improved
+
+- It is no longer the caller's responsibility to manage cache by using identifiers.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satnogs-predict
-Version: 0.6
+Version: 1.0
 Summary: A package for calculating passes and observation windows for satellites.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -46,6 +46,8 @@ from satnogs_predict import find_observation_windows
 
 For more complete examples and usage patterns, see [docs/docs.md](docs/docs.md).
 
+For release notes and breaking changes, see [CHANGELOG.md](CHANGELOG.md).
+
 ## License
 
 [![license](https://img.shields.io/badge/license-AGPL%203.0-6672D8.svg)](LICENSE)

{satnogs_predict-0.6 → satnogs_predict-1.0}/README.md

@@ -36,6 +36,8 @@ from satnogs_predict import find_observation_windows
 
 For more complete examples and usage patterns, see [docs/docs.md](docs/docs.md).
 
+For release notes and breaking changes, see [CHANGELOG.md](CHANGELOG.md).
+
 ## License
 
 [![license](https://img.shields.io/badge/license-AGPL%203.0-6672D8.svg)](LICENSE)

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

@@ -20,10 +20,9 @@
 - [6 - Finding passes](#6---finding-passes)
   - [6.1 - Constraints](#61---constraints)
   - [6.2 - Windows returned](#62---windows-returned)
-  - [6.3 - Implementation Details](#63---implementation-details)
-  - [6.4 - Full workflow for finding passes](#64---full-workflow-for-finding-passes)
-  - [6.5 - Sampling point-in-time geometry](#65---sampling-point-in-time-geometry)
-  - [6.6 - Full workflow for validating time ranges that belong to passes](#66---full-workflow-for-validating-time-ranges-that-belong-to-passes)
+  - [6.3 - Full workflow for finding passes](#63---full-workflow-for-finding-passes)
+  - [6.4 - Sampling point-in-time geometry](#64---sampling-point-in-time-geometry)
+  - [6.5 - Full workflow for validating time ranges that belong to passes](#65---full-workflow-for-validating-time-ranges-that-belong-to-passes)
 
 
 # 1. Installation
@@ -102,8 +101,12 @@ satellite = Satellite.from_omm(
 )
 ```
 
-The `identifier` is optional and defaults to a random UUID. Provide an explicit
-identifier when you need a stable public value or cache key.
+The `identifier` is optional metadata and defaults to an empty string. It is copied
+to produced `ObservationWindow.sat_identifier` values so callers can conveniently connect windows back to their own satellite records.
+
+Because the underlying skyfield object EarthSatellite is computationally expensive to create, the EarthSatellite of the last-used satellite is cached. Cache identity is based on orbital state: TLE `line1`/`line2`, or normalized OMM fields.
+
+OMM field data are copied when the `OMM` object is created. The stored mapping is read-only, and `to_dict()` returns a mutable copy.
 
 For testing or development, you can also generate a synthetic TLE:
 
@@ -133,8 +136,11 @@ station = Observer(
 )
 ```
 
-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.
+The `identifier` is optional metadata and defaults to an empty string. It is copied
+to produced `ObservationWindow.observer_identifier` for convenience.
+
+Because the underlying skyfield object Topos that represents an observer is computationally expensive, the Topos of the last-used observer is cached.
+Observer cache identity depends on `lat_deg`, `lon_deg` and `elevation_meters`. The `horizon_deg` value is not part of the Topos object so it doesn't affect caching.
 
 
 ## 3.3 - Time Modeling
@@ -248,13 +254,14 @@ class ObservationWindow:
     A schedulable observation window.
     """
 
-    sat_identifier: str
-    observer_identifier: str
-
     start_sample: GeometrySample
     end_sample: GeometrySample
     max_altitude_sample: GeometrySample
 
+    # Caller metadata copied from Satellite.identifier and Observer.identifier.
+    sat_identifier: str = ""
+    observer_identifier: str = ""
+
     # The altitude has multiple peaks during the window (None means unknown)
     has_multiple_peaks: bool | None = None
 
@@ -404,15 +411,7 @@ For the helper `get_and_validate_pass_from_range`, constraints are validated via
 
 The function returns a tuple of observation window lists. The first element of the tuple is the list of valid windows, and the second is the list of windows that were rejected due to constraints.
 
-## 6.3 - Implementation Details
-
-Internally, satellite & observer are converted to Skyfield's types, which is computationally expensive. For this reason, the last satellite and the last observer used is cached, differentiated by the `identifier` field.
-
-This way, repeated consecutive calls of `find_observation_windows` with the same satellite, or with the same `observer` reuse the objects under the hood.
-
-If you need to clear these caches explicitly, the public helpers `clear_satellite_cache()` and `clear_observer_cache()` are available.
-
-## 6.4 - Full workflow for finding passes
+## 6.3 - Full workflow for finding passes
 
 High-level process:
 
@@ -484,7 +483,7 @@ valid_windows, rejected_windows = find_observation_windows(
 )
 ```
 
-## 6.5 - Sampling point-in-time geometry
+## 6.4 - Sampling point-in-time geometry
 
 For point-in-time queries, the public API also provides helpers for sampling a satellite relative to an observer at a single `Instant`.
 
@@ -506,7 +505,7 @@ range_sample = get_range(
 - `get_range()` returns a `RangeSample` with range in meters and range rate in meters per second.
 
 
-## 6.6 - Full workflow for validating time ranges that belong to passes
+## 6.5 - Full workflow for validating time ranges that belong to passes
 
 - Given a time range, we can validate whether it belongs to a single pass and whether it satisfies constraints.
 

satnogs_predict-1.0/src/satnogs_predict/domain/observer.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+from satnogs_predict.utils import cache_digest
+
+from .validation import ensure_required_fields_not_none
+
+
+@dataclass(frozen=True, slots=True)
+class Observer:
+    """Observer to calculate passes over e.g. a ground station"""
+
+    lat_deg: float
+    lon_deg: float
+    elevation_meters: int
+    horizon_deg: float
+    identifier: str = ""
+    _cache_key: str = field(init=False, repr=False, compare=False, default="")
+
+    def __post_init__(self) -> None:
+        ensure_required_fields_not_none(self)
+        object.__setattr__(
+            self,
+            "_cache_key",
+            cache_digest(
+                str(self.lat_deg),
+                str(self.lon_deg),
+                str(self.elevation_meters),
+            ),
+        )
+
+    @property
+    def cache_key(self) -> str:
+        return self._cache_key

{satnogs_predict-0.6 → satnogs_predict-1.0}/src/satnogs_predict/domain/orbit.py

@@ -3,7 +3,9 @@ from __future__ import annotations
 from collections.abc import Mapping
 from dataclasses import dataclass, field
 from enum import IntEnum
-from uuid import uuid4
+from types import MappingProxyType
+
+from satnogs_predict.utils import cache_digest
 
 from .validation import ensure_required_fields_not_none
 
@@ -13,24 +15,41 @@ class TLE:
     line0: str
     line1: str
     line2: str
+    _cache_key: str = field(init=False, repr=False, compare=False, default="")
 
     def __post_init__(self) -> None:
         ensure_required_fields_not_none(self)
+        object.__setattr__(self, "_cache_key", cache_digest(self.line1, self.line2))
 
     def to_list(self) -> list[str]:
         return [self.line0, self.line1, self.line2]
 
+    @property
+    def cache_key(self) -> str:
+        return self._cache_key
+
 
 @dataclass(frozen=True, slots=True)
 class OMM:
-    fields: dict[str, str]
+    fields: Mapping[str, str]
+    _cache_key: str = field(init=False, repr=False, compare=False, default="")
 
     def __post_init__(self) -> None:
         ensure_required_fields_not_none(self)
+        fields = MappingProxyType(dict(self.fields))
+        object.__setattr__(self, "fields", fields)
+        parts: list[str] = []
+        for key, value in sorted(fields.items()):
+            parts.extend((key, value))
+        object.__setattr__(self, "_cache_key", cache_digest(*parts))
 
     def to_dict(self) -> dict[str, str]:
         return dict(self.fields)
 
+    @property
+    def cache_key(self) -> str:
+        return self._cache_key
+
 
 class OrbitRepresentation(IntEnum):
     TLE = 0
@@ -41,27 +60,37 @@ class OrbitRepresentation(IntEnum):
 class Orbit:
     representation: OrbitRepresentation
     data: TLE | OMM
+    _cache_key: str = field(init=False, repr=False, compare=False, default="")
 
     def __post_init__(self) -> None:
         ensure_required_fields_not_none(self)
+        object.__setattr__(self, "_cache_key", self.data.cache_key)
+
+    @property
+    def cache_key(self) -> str:
+        return self._cache_key
 
     @classmethod
     def from_omm(
         cls,
         fields: Mapping[str, str],
     ):
-        return cls(representation=OrbitRepresentation.OMM, data=OMM(fields=dict(fields)))
+        return cls(representation=OrbitRepresentation.OMM, data=OMM(fields=fields))
 
 
 @dataclass(frozen=True, slots=True)
 class Satellite:
     orbit: Orbit
-    identifier: str = field(default_factory=lambda: str(uuid4()))
+    identifier: str = ""
+    _cache_key: str = field(init=False, repr=False, compare=False, default="")
 
     def __post_init__(self) -> None:
-        if self.identifier is None:
-            object.__setattr__(self, "identifier", str(uuid4()))
         ensure_required_fields_not_none(self)
+        object.__setattr__(self, "_cache_key", self.orbit.cache_key)
+
+    @property
+    def cache_key(self) -> str:
+        return self._cache_key
 
     @classmethod
     def from_tle(
@@ -69,21 +98,17 @@ class Satellite:
         line0: str,
         line1: str,
         line2: str,
-        identifier: str | None = None,
+        identifier: str = "",
     ):
         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,
+        identifier: str = "",
     ):
         orbit = Orbit.from_omm(fields)
-        if identifier is None:
-            return cls(orbit=orbit)
         return cls(orbit=orbit, identifier=identifier)

{satnogs_predict-0.6 → satnogs_predict-1.0}/src/satnogs_predict/domain/window.py

@@ -19,13 +19,13 @@ class ObservationWindow:
     A schedulable observation window.
     """
 
-    sat_identifier: str
-    observer_identifier: str
-
     start_sample: GeometrySample
     end_sample: GeometrySample
     max_altitude_sample: GeometrySample
 
+    sat_identifier: str = ""
+    observer_identifier: str = ""
+
     # The altitude does has multiple peaks during the window (None means unknown)
     has_multiple_peaks: bool | None = None
 

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

@@ -65,20 +65,20 @@ def _instant_from_skyfield_time(t: Time):
 
 
 _last_sat: EarthSatellite | None = None
-_last_sat_identifier: str | None = None
+_last_sat_cache_key: str | None = None
 
 
 def clear_satellite_cache() -> None:
-    global _last_sat, _last_sat_identifier
+    global _last_sat, _last_sat_cache_key
 
     _last_sat = None
-    _last_sat_identifier = None
+    _last_sat_cache_key = None
 
 
 def _skyfield_sat_from_satellite(satellite: Satellite) -> EarthSatellite:
-    global _last_sat, _last_sat_identifier
+    global _last_sat, _last_sat_cache_key
 
-    if _last_sat_identifier == satellite.identifier and _last_sat is not None:
+    if _last_sat_cache_key == satellite.cache_key and _last_sat is not None:
         return _last_sat
 
     match satellite.orbit.representation:
@@ -87,8 +87,7 @@ def _skyfield_sat_from_satellite(satellite: Satellite) -> EarthSatellite:
             skyfield_sat = EarthSatellite(
                 tle.line1,
                 tle.line2,
-                satellite.identifier,
-                ts,
+                ts=ts,
             )
         case OrbitRepresentation.OMM:
             omm = cast(OMM, satellite.orbit.data)
@@ -96,26 +95,26 @@ def _skyfield_sat_from_satellite(satellite: Satellite) -> EarthSatellite:
         case _:
             raise ValueError("Unknown orbit representation")
 
-    _last_sat_identifier = satellite.identifier
+    _last_sat_cache_key = satellite.cache_key
     _last_sat = skyfield_sat
     return skyfield_sat
 
 
 _last_topos: Topos | None = None
-_last_identifier: str | None = None
+_last_observer_cache_key: str | None = None
 
 
 def clear_observer_cache() -> None:
-    global _last_topos, _last_identifier
+    global _last_topos, _last_observer_cache_key
 
     _last_topos = None
-    _last_identifier = None
+    _last_observer_cache_key = None
 
 
 def _skyfield_topos_from_observer(observer: Observer) -> Topos:
-    global _last_topos, _last_identifier
+    global _last_topos, _last_observer_cache_key
 
-    if _last_identifier == observer.identifier and _last_topos is not None:
+    if _last_observer_cache_key == observer.cache_key and _last_topos is not None:
         return _last_topos
 
     _last_topos = Topos(
@@ -123,7 +122,7 @@ def _skyfield_topos_from_observer(observer: Observer) -> Topos:
         longitude_degrees=observer.lon_deg,
         elevation_m=observer.elevation_meters,
     )
-    _last_identifier = observer.identifier
+    _last_observer_cache_key = observer.cache_key
     return _last_topos
 
 

satnogs_predict-1.0/src/satnogs_predict/utils.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+from hashlib import sha256
+
+
+def cache_digest(*parts: str) -> str:
+    return sha256("".join(parts).encode()).hexdigest()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satnogs-predict
-Version: 0.6
+Version: 1.0
 Summary: A package for calculating passes and observation windows for satellites.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -46,6 +46,8 @@ from satnogs_predict import find_observation_windows
 
 For more complete examples and usage patterns, see [docs/docs.md](docs/docs.md).
 
+For release notes and breaking changes, see [CHANGELOG.md](CHANGELOG.md).
+
 ## License
 
 [![license](https://img.shields.io/badge/license-AGPL%203.0-6672D8.svg)](LICENSE)

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

@@ -2,6 +2,7 @@
 .gitlab-ci.yml
 .pre-commit-config.yaml
 .python-version
+CHANGELOG.md
 CONTRIBUTING.md
 LICENSE
 README.md
@@ -12,10 +13,13 @@ docs/docs.md
 src/satnogs_predict/__init__.py
 src/satnogs_predict/py.typed
 src/satnogs_predict/tle.py
+src/satnogs_predict/utils.py
 src/satnogs_predict.egg-info/PKG-INFO
 src/satnogs_predict.egg-info/SOURCES.txt
 src/satnogs_predict.egg-info/dependency_links.txt
 src/satnogs_predict.egg-info/requires.txt
+src/satnogs_predict.egg-info/scm_file_list.json
+src/satnogs_predict.egg-info/scm_version.json
 src/satnogs_predict.egg-info/top_level.txt
 src/satnogs_predict/constraints/__init__.py
 src/satnogs_predict/constraints/constraints.py

satnogs_predict-1.0/src/satnogs_predict.egg-info/scm_file_list.json

@@ -0,0 +1,52 @@
+{
+  "files": [
+    ".gitignore",
+    ".gitlab-ci.yml",
+    ".pre-commit-config.yaml",
+    "CHANGELOG.md",
+    ".python-version",
+    "README.md",
+    "CONTRIBUTING.md",
+    "uv.lock",
+    "pyproject.toml",
+    "LICENSE",
+    "setup.py",
+    "tests/conftest.py",
+    "tests/__init__.py",
+    "tests/helpers.py",
+    "tests/test_tle.py",
+    "tests/integration/test_fake_tle_integration.py",
+    "tests/domain/test_time.py",
+    "tests/domain/test_planner_domain.py",
+    "tests/domain/test_required_fields.py",
+    "tests/domain/test_orbit.py",
+    "tests/domain/test_observer.py",
+    "tests/domain/test_window.py",
+    "tests/planning/test_planner.py",
+    "tests/propagation/test_propagator.py",
+    "tests/core/test_engine.py",
+    "tests/constraints/test_constraints.py",
+    "src/satnogs_predict/__init__.py",
+    "src/satnogs_predict/py.typed",
+    "src/satnogs_predict/utils.py",
+    "src/satnogs_predict/tle.py",
+    "src/satnogs_predict/domain/constraints.py",
+    "src/satnogs_predict/domain/time.py",
+    "src/satnogs_predict/domain/observer.py",
+    "src/satnogs_predict/domain/validation.py",
+    "src/satnogs_predict/domain/planner.py",
+    "src/satnogs_predict/domain/__init__.py",
+    "src/satnogs_predict/domain/window.py",
+    "src/satnogs_predict/domain/geometry.py",
+    "src/satnogs_predict/domain/orbit.py",
+    "src/satnogs_predict/planning/planner.py",
+    "src/satnogs_predict/planning/__init__.py",
+    "src/satnogs_predict/propagation/__init__.py",
+    "src/satnogs_predict/propagation/propagator.py",
+    "src/satnogs_predict/core/engine.py",
+    "src/satnogs_predict/core/__init__.py",
+    "src/satnogs_predict/constraints/constraints.py",
+    "src/satnogs_predict/constraints/__init__.py",
+    "docs/docs.md"
+  ]
+}

satnogs_predict-1.0/src/satnogs_predict.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.0",
+  "distance": 0,
+  "node": "g302d7309b6fa2c41ed4296c82e03362c8a8350b7",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-01"
+}

satnogs_predict-1.0/tests/domain/test_observer.py

@@ -0,0 +1,59 @@
+from satnogs_predict.domain.observer import Observer
+
+
+class TestObserver:
+    def test_given_topos_values_change_when_getting_cache_key_then_key_changes(self) -> None:
+        observer = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=0.0,
+        )
+
+        assert (
+            observer.cache_key
+            != Observer(
+                lat_deg=1.0,
+                lon_deg=0.0,
+                elevation_meters=0,
+                horizon_deg=0.0,
+            ).cache_key
+        )
+        assert (
+            observer.cache_key
+            != Observer(
+                lat_deg=0.0,
+                lon_deg=1.0,
+                elevation_meters=0,
+                horizon_deg=0.0,
+            ).cache_key
+        )
+        assert (
+            observer.cache_key
+            != Observer(
+                lat_deg=0.0,
+                lon_deg=0.0,
+                elevation_meters=1,
+                horizon_deg=0.0,
+            ).cache_key
+        )
+
+    def test_given_non_topos_values_changes_when_getting_cache_key_then_key_is_unchanged(
+        self,
+    ) -> None:
+        first = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=0.0,
+            identifier="OBS-1",
+        )
+        second = Observer(
+            lat_deg=0.0,
+            lon_deg=0.0,
+            elevation_meters=0,
+            horizon_deg=10.0,
+            identifier="OBS-2",
+        )
+
+        assert first.cache_key == second.cache_key

satnogs_predict-1.0/tests/domain/test_orbit.py

@@ -0,0 +1,131 @@
+from __future__ import annotations
+
+import pytest
+
+from satnogs_predict.domain.orbit import OMM, TLE, Orbit, Satellite
+
+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"]
+
+    def test_given_line1_or_line2_changes_when_getting_cache_key_then_key_changes(self) -> None:
+        tle = TLE(line0="LINE0", line1="LINE1", line2="LINE2")
+
+        assert tle.cache_key != TLE(line0="LINE0", line1="CHANGED", line2="LINE2").cache_key
+        assert tle.cache_key != TLE(line0="LINE0", line1="LINE1", line2="CHANGED").cache_key
+
+    def test_given_only_line0_changes_when_getting_cache_key_then_key_is_unchanged(self) -> None:
+        tle = TLE(line0="LINE0", line1="LINE1", line2="LINE2")
+
+        assert tle.cache_key == TLE(line0="CHANGED", line1="LINE1", line2="LINE2").cache_key
+
+
+class TestOmm:
+    def test_given_fields_when_created_then_copies_fields(self) -> None:
+        fields = dict(OMM_FIELDS)
+
+        omm = OMM(fields=fields)
+        fields["OBJECT_NAME"] = "CHANGED"
+
+        assert omm.fields == OMM_FIELDS
+
+    def test_given_omm_when_mutating_fields_then_raises(self) -> None:
+        omm = OMM(fields=OMM_FIELDS)
+
+        with pytest.raises(TypeError):
+            omm.fields["OBJECT_NAME"] = "CHANGED"
+
+    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
+
+    def test_given_same_fields_in_different_order_when_getting_cache_key_then_key_is_stable(
+        self,
+    ) -> None:
+        fields = {
+            "OBJECT_NAME": "ISS (ZARYA)",
+            "NORAD_CAT_ID": "25544",
+        }
+        reversed_fields = {
+            "NORAD_CAT_ID": "25544",
+            "OBJECT_NAME": "ISS (ZARYA)",
+        }
+
+        assert OMM(fields=fields).cache_key == OMM(fields=reversed_fields).cache_key
+
+    def test_given_field_value_changes_when_getting_cache_key_then_key_changes(self) -> None:
+        fields = {
+            "OBJECT_NAME": "ISS (ZARYA)",
+            "NORAD_CAT_ID": "25544",
+        }
+        changed_fields = {
+            "OBJECT_NAME": "CHANGED",
+            "NORAD_CAT_ID": "25544",
+        }
+
+        assert OMM(fields=fields).cache_key != OMM(fields=changed_fields).cache_key
+
+
+class TestOrbitFromOmm:
+    def test_given_omm_orbit_when_getting_cache_key_then_delegates_to_omm_data(self) -> None:
+        orbit = Orbit.from_omm(OMM_FIELDS)
+
+        assert orbit.cache_key == orbit.data.cache_key
+
+
+class TestSatellite:
+    def test_given_only_identifier_changes_when_getting_cache_key_then_key_is_unchanged(
+        self,
+    ) -> None:
+        first = Satellite.from_tle(
+            line0="LINE0",
+            line1="LINE1",
+            line2="LINE2",
+            identifier="SAT-1",
+        )
+        second = Satellite.from_tle(
+            line0="LINE0",
+            line1="LINE1",
+            line2="LINE2",
+            identifier="SAT-2",
+        )
+
+        assert first.cache_key == second.cache_key
+
+    def test_given_tle_satellite_when_getting_cache_key_then_delegates_to_orbit(self) -> None:
+        sat = Satellite.from_tle(line0="LINE0", line1="LINE1", line2="LINE2")
+
+        assert sat.cache_key == sat.orbit.cache_key
+
+    def test_given_omm_satellite_when_getting_cache_key_then_delegates_to_orbit(self) -> None:
+        sat = Satellite.from_omm(fields=OMM_FIELDS)
+
+        assert sat.cache_key == sat.orbit.cache_key

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

@@ -8,7 +8,6 @@ from satnogs_predict.domain.geometry import GeometrySample
 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
 
 
 def _sample(micros: int) -> GeometrySample:
@@ -74,16 +73,6 @@ class TestRequiredFields:
                 ),
                 r"PlanningConfig\.overlap_handling cannot be None",
             ),
-            (
-                lambda: ObservationWindow(
-                    sat_identifier=None,  # type: ignore[arg-type]
-                    observer_identifier="OBS",
-                    start_sample=_sample(0),
-                    end_sample=_sample(1_000_000),
-                    max_altitude_sample=_sample(500_000),
-                ),
-                r"ObservationWindow\.sat_identifier cannot be None",
-            ),
         ],
     )
     def test_given_none_for_required_field_when_created_then_raises(

{satnogs_predict-0.6 → satnogs_predict-1.0}/tests/helpers.py

@@ -57,22 +57,35 @@ def window_seconds(
     )
 
 
-def make_observer(identifier: str | None = None) -> Observer:
+def make_observer(
+    identifier: str = "",
+    *,
+    lat_deg: float = 0.0,
+    lon_deg: float = 0.0,
+    elevation_meters: int = 0,
+    horizon_deg: float = 0.0,
+) -> Observer:
     return Observer(
-        lat_deg=0.0,
-        lon_deg=0.0,
-        elevation_meters=0,
-        horizon_deg=0.0,
-        identifier=identifier or next_observer_identifier(),
+        lat_deg=lat_deg,
+        lon_deg=lon_deg,
+        elevation_meters=elevation_meters,
+        horizon_deg=horizon_deg,
+        identifier=identifier,
     )
 
 
-def make_satellite(identifier: str | None = None) -> Satellite:
+def make_satellite(
+    identifier: str = "",
+    *,
+    line0: str = "LINE0",
+    line1: str = "LINE1",
+    line2: str = "LINE2",
+) -> Satellite:
     return Satellite.from_tle(
-        line1="LINE1",
-        line2="LINE2",
-        line0="LINE0",
-        identifier=identifier or next_satellite_identifier(),
+        line0=line0,
+        line1=line1,
+        line2=line2,
+        identifier=identifier,
     )
 
 

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

@@ -1082,9 +1082,7 @@ class TestCalculateMinAltSkyfieldSample:
 
 
 class TestSkyfieldSatFromSatellite:
-    def test_given_same_identifier_when_called_twice_then_reuses_instance(
-        self, monkeypatch
-    ) -> None:
+    def test_given_same_values_when_called_twice_then_reuses_instance(self, monkeypatch) -> None:
         created: list[object] = []
 
         class EarthSatelliteSpy:
@@ -1102,7 +1100,7 @@ class TestSkyfieldSatFromSatellite:
         assert first is second
         assert len(created) == 1
 
-    def test_given_different_identifier_when_called_then_returns_different_instances(
+    def test_given_different_values_when_called_then_returns_different_instances(
         self, monkeypatch
     ) -> None:
         created: list[object] = []
@@ -1115,7 +1113,7 @@ class TestSkyfieldSatFromSatellite:
         propagator.clear_satellite_cache()
 
         first = propagator._skyfield_sat_from_satellite(make_satellite())
-        second = propagator._skyfield_sat_from_satellite(make_satellite())
+        second = propagator._skyfield_sat_from_satellite(make_satellite(line1="LINE1CHANGED"))
 
         assert first is not second
         assert len(created) == 2
@@ -1164,9 +1162,7 @@ class TestSkyfieldSatFromSatellite:
 
 
 class TestSkyfieldToposFromObserver:
-    def test_given_same_identifier_when_called_twice_then_reuses_instance(
-        self, monkeypatch
-    ) -> None:
+    def test_given_same_values_when_called_twice_then_reuses_instance(self, monkeypatch) -> None:
         created: list[object] = []
 
         class ToposSpy:
@@ -1184,7 +1180,7 @@ class TestSkyfieldToposFromObserver:
         assert first is second
         assert len(created) == 1
 
-    def test_given_different_identifier_when_called_then_returns_different_instances(
+    def test_given_different_latlngalt_values_when_called_then_returns_different_instances(
         self, monkeypatch
     ) -> None:
         created: list[object] = []
@@ -1197,7 +1193,7 @@ class TestSkyfieldToposFromObserver:
         propagator.clear_observer_cache()
 
         first = propagator._skyfield_topos_from_observer(make_observer())
-        second = propagator._skyfield_topos_from_observer(make_observer())
+        second = propagator._skyfield_topos_from_observer(make_observer(lat_deg=1.0))
 
         assert first is not second
         assert len(created) == 2

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

@@ -1,22 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-from uuid import uuid4
-
-from .validation import ensure_required_fields_not_none
-
-
-@dataclass(frozen=True, slots=True)
-class Observer:
-    """Observer to calculate passes over e.g. a ground station"""
-
-    lat_deg: float
-    lon_deg: float
-    elevation_meters: int
-    horizon_deg: float
-    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/tests/domain/test_observer.py

@@ -1,44 +0,0 @@
-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

@@ -1,146 +0,0 @@
-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