open-space-toolkit-astrodynamics 16.0.0__py311-none-manylinux2014_x86_64.whl → 16.1.0__py311-none-manylinux2014_x86_64.whl

{open_space_toolkit_astrodynamics-16.0.0.dist-info → open_space_toolkit_astrodynamics-16.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: open-space-toolkit-astrodynamics
-Version: 16.0.0
+Version: 16.1.0
 Summary: Orbit, attitude, access.
 Author: Open Space Collective
 Author-email: contact@open-space-collective.org

{open_space_toolkit_astrodynamics-16.0.0.dist-info → open_space_toolkit_astrodynamics-16.1.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ostk/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-311-x86_64-linux-gnu.so,sha256=v2JLaefDB_DXbtCifodPy88ODSTSmEMN8Li3u3yt3f4,2840848
 ostk/astrodynamics/__init__.py,sha256=3gWyqFIbhAfcdeMhmfBPQPlPQTmaOzm-6flkJe745Zk,251
-ostk/astrodynamics/__init__.pyi,sha256=GCNGFJa9H1zEPwj32IJ8jrechnJ3JW2W_JIf-4kZN1c,32193
+ostk/astrodynamics/__init__.pyi,sha256=7m6On-qjnNorccVTHIVnbrri1AwqT65fAE0gouxfcjU,32193
 ostk/astrodynamics/access.pyi,sha256=t2CF0TU6_6ow_rkV_I4rVKap7ZIdC4jYKL3WkTDHRXg,25157
 ostk/astrodynamics/converters.py,sha256=luPh30qMp9bzEkN7hUccmxlLf7zRp_AzqmBe8IUjPhU,3314
 ostk/astrodynamics/converters.pyi,sha256=HrZFyizkc6Hv_K38ZKZ80fX_bAxd6keA_NFWNQygvbs,1745
@@ -14,7 +14,7 @@ ostk/astrodynamics/guidance_law.pyi,sha256=rVmbpV2Y5FsIXejaInxINS67nVHmTIxVEkhaD
 ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.16,sha256=K8Pnig_cKlxFlypbFxHQAIRtFp1_3pI_9ezyr5jjOR4,122033672
 ostk/astrodynamics/solver.pyi,sha256=sPqyYPXBfFGC24dzzYyFyt01VfMAlWQ5_gh_RpeaBFk,17734
 ostk/astrodynamics/utilities.py,sha256=y8mr3M46J5z-GhS1oIEnuEJA6otwcyJ9YDhvn_5JxHM,6976
-ostk/astrodynamics/viewer.py,sha256=-Q4migLFOB9dNzs6TRPIXHNewyV5udsDSpcSma0kv8A,16376
+ostk/astrodynamics/viewer.py,sha256=PLznIOEArRlx-pfMHpGoszNRf2F8mf2SHe8CGvZrVnw,16740
 ostk/astrodynamics/conjunction/__init__.pyi,sha256=HFvWl8bCmrq3cBkUh5X5RGIh8webmVGxaZdpsz3WN-E,79
 ostk/astrodynamics/conjunction/message/__init__.pyi,sha256=5H__sg_QUx7ybf9jtVWvXzrUHeK3ECotfhddAdHjJUc,75
 ostk/astrodynamics/conjunction/message/ccsds.pyi,sha256=1Peto19hRqlD7KHf1cyLP3CT4OAKzwtemqvO6_4FZ0g,28162
@@ -26,8 +26,8 @@ ostk/astrodynamics/flight/profile/__init__.pyi,sha256=WBTG17V59UwD-X1r6TOrXT_rA3
 ostk/astrodynamics/flight/profile/model.pyi,sha256=g5Uy2ZLxImuETrMP4jqXr5FXl2dGAoKuNgzOH07EdBo,6807
 ostk/astrodynamics/pytrajectory/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/pytrajectory/__init__.pyi,sha256=QWrGyQNiICBEI3pKku2wJYdu-SQCBKXjJ_93XTEgkP8,79
-ostk/astrodynamics/pytrajectory/pystate.py,sha256=c0wR5OJn070ImwVJtW25XhEW7d2_8jkAd168Fo9u6K8,7959
-ostk/astrodynamics/pytrajectory/pystate.pyi,sha256=dbYwAoyZo9ZgLjms8nH9s_OhxlmxMLLILR-wXGqphbw,3320
+ostk/astrodynamics/pytrajectory/pystate.py,sha256=HbWtj1_FXGXTuvSu52ewMaO3ahwLBLStyJ4e5xqL-jw,8415
+ostk/astrodynamics/pytrajectory/pystate.pyi,sha256=ljE5Q9Y56dpWgxY75ji9ibrTWIJTXeO29_foHBPxGs4,3413
 ostk/astrodynamics/test/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/test/conftest.py,sha256=stmQOt7UXjBlXKJzNN6RkS2miv1xXSOX-YNpFhaHTqI,2771
 ostk/astrodynamics/test/test_access.py,sha256=MCBsUPtuVm7NgHZR0z0DpWnPZ_qBu4aRhLI2PnRNUYs,3940
@@ -89,7 +89,7 @@ ostk/astrodynamics/test/trajectory/test_orbit.py,sha256=vp7gDMtjO7nqERe0yq1OQZ0p
 ostk/astrodynamics/test/trajectory/test_propagator.py,sha256=ALjMvzndO9r6dVVXllk0iqu61tEoqu2j25MtzEitDIQ,14076
 ostk/astrodynamics/test/trajectory/test_segment.py,sha256=aXdF5CpNLwN_hKRU5sG3ID3hJR-NZ1_kgtNA-xHMBkM,12223
 ostk/astrodynamics/test/trajectory/test_sequence.py,sha256=4piYpMZ9C_eCXxaOcdz2We67wZxhsNBnETgKwvq6dl0,15083
-ostk/astrodynamics/test/trajectory/test_state.py,sha256=th1BvTIhmgsPPFTbVnpR3URvqYFrf0oyluJyoPP7TPI,17135
+ostk/astrodynamics/test/trajectory/test_state.py,sha256=JO-SnUCRZ6sfVNwB5soT5c1f8c5DXuFN5lHZkiiTcYc,18119
 ostk/astrodynamics/test/trajectory/test_state_builder.py,sha256=LpCCYdCaLu_D2npm9wgA2sMlcekrtbRqP-afe5IE5L4,4871
 ostk/astrodynamics/test/trajectory/orbit/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/test/trajectory/orbit/test_model.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
@@ -119,7 +119,7 @@ ostk/astrodynamics/test/trajectory/state/coordinate_subset/test_attitude_quatern
 ostk/astrodynamics/test/trajectory/state/coordinate_subset/test_cartesian_acceleration.py,sha256=1p37_FYN85d9SrOqO3iCkNecovJJayhnFeZ4QCOw2ao,3528
 ostk/astrodynamics/test/trajectory/state/coordinate_subset/test_cartesian_position.py,sha256=XvHdk1KjacTwtkgx2jUAc9I9N3nvjPDv03FAanpv8jQ,2702
 ostk/astrodynamics/test/trajectory/state/coordinate_subset/test_cartesian_velocity.py,sha256=-kd5TZO5TICihbkqDTew2i_tDpggdpe3Yf23046FATM,3057
-ostk/astrodynamics/trajectory/__init__.pyi,sha256=dxNnpdnDid4GRXiBs_Lr6WNn1L7jx42pwu_eq4Nk9Ss,76183
+ostk/astrodynamics/trajectory/__init__.pyi,sha256=uC9WD4s1XZpnJy8GhSTap818vHPMgMNieusLaxlzh4U,76264
 ostk/astrodynamics/trajectory/orbit/__init__.pyi,sha256=wbuRK7Yp_NYBr3ta5-NpnJYMX4baUl7yIlUWhaRlR4o,12899
 ostk/astrodynamics/trajectory/orbit/message/__init__.pyi,sha256=-GNBlYPrsjelhKxWorYQYhIWzFsibiIQNZvMXjhRpfM,77
 ostk/astrodynamics/trajectory/orbit/message/spacex.pyi,sha256=fnUVJGWlSPo8AmLVuu08LubsAuVGo-gFaT86yd4f4CI,10558
@@ -129,8 +129,8 @@ ostk/astrodynamics/trajectory/orbit/model/kepler.pyi,sha256=OZMznHuU7e6m1rfqtOgX
 ostk/astrodynamics/trajectory/orbit/model/sgp4.pyi,sha256=OhFzoPPQHlYy7m3LiZ8TXF89M4uBTfNk6tGsBEp0sjI,14235
 ostk/astrodynamics/trajectory/state/__init__.pyi,sha256=bq__Fii35czVrTeNxc9eQVjXdqwbbQxUdNQWK3vLrMo,17649
 ostk/astrodynamics/trajectory/state/coordinate_subset.pyi,sha256=kYMfMwEjCqO1NepMYFT4QS6kIPBkVL6sGCLeLbogcMw,10176
-open_space_toolkit_astrodynamics-16.0.0.dist-info/METADATA,sha256=QZzoZmh6ksKVxnXob_SRtfRykp2hf20s2fLMk70AXtk,1913
-open_space_toolkit_astrodynamics-16.0.0.dist-info/WHEEL,sha256=TGDbqQQZHBKkiqIWZs35YdYV5yssI9IDMgO6_kbBT10,110
-open_space_toolkit_astrodynamics-16.0.0.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
-open_space_toolkit_astrodynamics-16.0.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-open_space_toolkit_astrodynamics-16.0.0.dist-info/RECORD,,
+open_space_toolkit_astrodynamics-16.1.0.dist-info/METADATA,sha256=-oOEr23wSU5vy8jOZpmEflURSXpN7wm-K4nMa6S9JPc,1913
+open_space_toolkit_astrodynamics-16.1.0.dist-info/WHEEL,sha256=TGDbqQQZHBKkiqIWZs35YdYV5yssI9IDMgO6_kbBT10,110
+open_space_toolkit_astrodynamics-16.1.0.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
+open_space_toolkit_astrodynamics-16.1.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+open_space_toolkit_astrodynamics-16.1.0.dist-info/RECORD,,

ostk/astrodynamics/__init__.pyi

@@ -14,20 +14,20 @@ from ostk import mathematics as OpenSpaceToolkitMathematicsPy
 from ostk.mathematics import curve_fitting
 from ostk.mathematics import geometry
 from ostk.mathematics import object
-from ostk import physics as OpenSpaceToolkitPhysicsPy
 import ostk.physics
+from ostk import physics as OpenSpaceToolkitPhysicsPy
 from ostk.physics import Environment
 from ostk.physics import Manager
 from ostk.physics import Unit
-from ostk.physics import coordinate
 import ostk.physics.coordinate
+from ostk.physics import coordinate
 import ostk.physics.coordinate.spherical
 from ostk.physics import environment
 import ostk.physics.environment.object
 import ostk.physics.time
 from ostk.physics import time
-from ostk.physics import unit
 import ostk.physics.unit
+from ostk.physics import unit
 import typing
 from . import access
 from . import conjunction

ostk/astrodynamics/pytrajectory/pystate.py

@@ -18,7 +18,7 @@ from ostk.astrodynamics.trajectory.state.coordinate_subset import (
     AngularVelocity,
 )
 
-CANONICAL_FORMAT: str = r"(r|v)_(.*?)_(x|y|z)"
+POS_VEL_CANONICAL_FORMAT: str = r"(r|v)_(.*?)_(x|y|z)"
 
 
 def custom_class_generator(frame: Frame, coordinate_subsets: list) -> type:
@@ -68,6 +68,7 @@ def from_dict(data: dict) -> State:
     - 'drag_coefficient'/'cd': The drag coefficient. Optional.
     - 'cross_sectional_area'/'surface_area': The cross-sectional area. Optional.
     - 'mass': The mass. Optional.
+    - 'ballistic_coefficient'/'bc': The ballistic coefficient. Optional.
 
     Args:
         data (dict): The dictionary.
@@ -76,7 +77,7 @@ def from_dict(data: dict) -> State:
         State: The State.
     """
 
-    instant: Instant = coerce_to_instant(data["timestamp"])
+    # Position and velocity subsets
 
     eci_columns: list[str] = [
         "rx_eci",
@@ -123,7 +124,7 @@ def from_dict(data: dict) -> State:
     ]
 
     match_groups: list[re.Match] = [
-        re.match(CANONICAL_FORMAT, column) for column in data.keys()
+        re.match(POS_VEL_CANONICAL_FORMAT, column) for column in data.keys()
     ]
 
     if len(matches := [match for match in match_groups if match is not None]) == 6:
@@ -188,6 +189,8 @@ def from_dict(data: dict) -> State:
     else:
         raise ValueError("Invalid state data.")
 
+    # Attitude and angular velocity subsets
+
     if all(
         column in data for column in ["q_B_ECI_x", "q_B_ECI_y", "q_B_ECI_z", "q_B_ECI_s"]
     ):
@@ -216,6 +219,8 @@ def from_dict(data: dict) -> State:
             ],
         )
 
+    # Extra subsets
+
     if (data.get("drag_coefficient") is not None) or (data.get("cd") is not None):
         coordinate_subsets.append(CoordinateSubset.drag_coefficient())
         coordinates = np.append(
@@ -239,8 +244,15 @@ def from_dict(data: dict) -> State:
             data["mass"],
         )
 
+    if (data.get("ballistic_coefficient") is not None) or (data.get("bc") is not None):
+        coordinate_subsets.append(CoordinateSubset.ballistic_coefficient())
+        coordinates = np.append(
+            coordinates,
+            data.get("ballistic_coefficient", data.get("bc")),
+        )
+
     return State(
-        instant=instant,
+        instant=coerce_to_instant(data["timestamp"]),
         coordinates=coordinates,
         frame=frame,
         coordinate_subsets=coordinate_subsets,

ostk/astrodynamics/pytrajectory/pystate.pyi

@@ -13,7 +13,7 @@ import ostk.physics.coordinate
 from ostk.physics.coordinate import Frame
 from ostk.physics.time import Instant
 import re as re
-__all__ = ['AngularVelocity', 'AttitudeQuaternion', 'CANONICAL_FORMAT', 'CartesianPosition', 'CartesianVelocity', 'CoordinateSubset', 'Frame', 'Instant', 'State', 'StateBuilder', 'coerce_to_instant', 'custom_class_generator', 'from_dict', 'np', 're']
+__all__ = ['AngularVelocity', 'AttitudeQuaternion', 'CartesianPosition', 'CartesianVelocity', 'CoordinateSubset', 'Frame', 'Instant', 'POS_VEL_CANONICAL_FORMAT', 'State', 'StateBuilder', 'coerce_to_instant', 'custom_class_generator', 'from_dict', 'np', 're']
 def custom_class_generator(frame: ostk.physics.coordinate.Frame, coordinate_subsets: list) -> type:
     """
     
@@ -54,6 +54,7 @@ def from_dict(data: dict) -> ostk.astrodynamics.trajectory.State:
         - 'drag_coefficient'/'cd': The drag coefficient. Optional.
         - 'cross_sectional_area'/'surface_area': The cross-sectional area. Optional.
         - 'mass': The mass. Optional.
+        - 'ballistic_coefficient'/'bc': The ballistic coefficient. Optional.
     
         Args:
             data (dict): The dictionary.
@@ -62,4 +63,4 @@ def from_dict(data: dict) -> ostk.astrodynamics.trajectory.State:
             State: The State.
         
     """
-CANONICAL_FORMAT: str = '(r|v)_(.*?)_(x|y|z)'
+POS_VEL_CANONICAL_FORMAT: str = '(r|v)_(.*?)_(x|y|z)'

ostk/astrodynamics/test/trajectory/test_state.py

@@ -458,6 +458,41 @@ class TestState:
         assert isinstance(state, State)
         assert state.get_size() == 6
 
+    def test_from_dict_with_ballistic_coefficient(self):
+        data: dict = {
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "rx_eci": 7000.0,
+            "ry_eci": 0.0,
+            "rz_eci": 0.0,
+            "vx_eci": 0.0,
+            "vy_eci": 7.5,
+            "vz_eci": 0.0,
+            "ballistic_coefficient": 2.2,
+        }
+
+        state: State = State.from_dict(data)
+
+        assert state is not None
+        assert isinstance(state, State)
+        assert state.get_size() == 7
+
+        data: dict = {
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "rx_eci": 7000.0,
+            "ry_eci": 0.0,
+            "rz_eci": 0.0,
+            "vx_eci": 0.0,
+            "vy_eci": 7.5,
+            "vz_eci": 0.0,
+            "ballistic_coefficient": None,
+        }
+
+        state: State = State.from_dict(data)
+
+        assert state is not None
+        assert isinstance(state, State)
+        assert state.get_size() == 6
+
     @pytest.mark.parametrize(
         ("data", "expected_length", "expected_frame"),
         [

ostk/astrodynamics/trajectory/__init__.pyi

@@ -1414,6 +1414,7 @@ class State:
             - 'drag_coefficient'/'cd': The drag coefficient. Optional.
             - 'cross_sectional_area'/'surface_area': The cross-sectional area. Optional.
             - 'mass': The mass. Optional.
+            - 'ballistic_coefficient'/'bc': The ballistic coefficient. Optional.
         
             Args:
                 data (dict): The dictionary.

ostk/astrodynamics/viewer.py

@@ -105,7 +105,7 @@ class Viewer:
         show_orbital_track: bool = False,
         color: str | None = None,
         image: str | None = None,
-    ) -> None:
+    ) -> Viewer:
         """
         Add Orbit to Viewer.
 
@@ -116,6 +116,9 @@ class Viewer:
             show_orbital_track (bool, optional): Whether to show the orbital track. Defaults to False.
             color (str, optional): Color of the orbit. Defaults to None.
             image (str, optional): Logo to be added. Defaults to None.
+
+        Returns:
+            Viewer: The Viewer.
         """
         instants: list[Instant] = self._interval.generate_grid(step)
         states: list[State] = orbit.get_states_at(instants)
@@ -164,6 +167,8 @@ class Viewer:
                 )
             )
 
+        return self
+
     def add_profile(
         self,
         profile: Profile,
@@ -172,7 +177,7 @@ class Viewer:
         cesium_asset_id: int | None = None,
         sensors: list[Sensor] | None = None,
         show_xyz_axes: bool = False,
-    ) -> None:
+    ) -> Viewer:
         """
         Add Profile to Viewer.
 
@@ -183,6 +188,9 @@ class Viewer:
             cesium_asset_id (int, optional): The Cesium asset ID. Defaults to None.
             sensors (list[Sensor], optional): Sensors to be added to the asset. Defaults to None.
             show_xyz_axes (bool, optional): Whether to show the XYZ axes. Defaults to False.
+
+        Returns:
+            Viewer: The Viewer.
         """
 
         instants: list[Instant] = self._interval.generate_grid(step)
@@ -257,13 +265,15 @@ class Viewer:
                 )
             )
 
+        return self
+
     def add_target(
         self,
         position: Position,
         size: int | None = None,
         color: str | None = None,
         label: str | None = None,
-    ) -> None:
+    ) -> Viewer:
         """
         Add target to Viewer.
 
@@ -272,6 +282,9 @@ class Viewer:
             size (int, optional): Target size. Defaults to None.
             color (str, optional): Target color. Defaults to None.
             label (str, optional): Target label. Defaults to None.
+
+        Returns:
+            Viewer: The Viewer.
         """
 
         self._viewer.entities.add(
@@ -285,12 +298,14 @@ class Viewer:
         if label:
             self.add_label(position, label, size, color)
 
+        return self
+
     def add_line(
         self,
         positions: list[Position],
         size: int | None = None,
         color: str | None = None,
-    ) -> None:
+    ) -> Viewer:
         """
         Add line to Viewer.
 
@@ -298,6 +313,9 @@ class Viewer:
             positions (list[Position]): Line positions.
             size (int, optional): Line size. Defaults to None.
             color (str, optional): Line color. Defaults to None.
+
+        Returns:
+            Viewer: The Viewer.
         """
 
         self._viewer.entities.add(
@@ -321,13 +339,15 @@ class Viewer:
             )
         )
 
+        return self
+
     def add_label(
         self,
         position: Position,
         text: str,
         size: int | None = None,
         color: str | None = None,
-    ) -> None:
+    ) -> Viewer:
         """
         Add label to Viewer.
 
@@ -337,6 +357,8 @@ class Viewer:
             size (int, optional): Label size. Defaults to None.
             color (str, optional): Label color. Defaults to None.
 
+        Returns:
+            Viewer: The Viewer.
         """
 
         self._viewer.entities.add(
@@ -348,6 +370,8 @@ class Viewer:
             )
         )
 
+        return self
+
     def render(self) -> str:
         """
         Render Viewer as HTML string.