Eph module function renames.

Author: theriftlab

immanuel/charts.py

@@ -224,11 +224,11 @@ def __init__(self, native: Subject, aspects_to: Chart | None = None) -> None:
         super().__init__(chart.NATAL, aspects_to)
 
     def generate(self) -> None:
-        self._obliquity = ephemeris.obliquity(self._native.julian_date)
+        self._obliquity = ephemeris.get_obliquity(self._native.julian_date)
 
-        self._triad[chart.SUN] = ephemeris.planet(chart.SUN, self._native.julian_date)
-        self._triad[chart.MOON] = ephemeris.planet(chart.MOON, self._native.julian_date)
-        self._triad[chart.ASC] = ephemeris.angle(
+        self._triad[chart.SUN] = ephemeris.get_planet(chart.SUN, self._native.julian_date)
+        self._triad[chart.MOON] = ephemeris.get_planet(chart.MOON, self._native.julian_date)
+        self._triad[chart.ASC] = ephemeris.get_angle(
             index=chart.ASC,
             jd=self._native.julian_date,
             lat=self._native.latitude,
@@ -242,15 +242,15 @@ def generate(self) -> None:
         self._moon_phase = calculate.moon_phase(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
-        self._objects = ephemeris.objects(
+        self._objects = ephemeris.get_objects(
             object_list=settings.objects,
             jd=self._native.julian_date,
             lat=self._native.latitude,
             lon=self._native.longitude,
             house_system=settings.house_system,
             part_formula=settings.part_formula,
         )
-        self._houses = ephemeris.houses(
+        self._houses = ephemeris.get_houses(
             jd=self._native.julian_date,
             lat=self._native.latitude,
             lon=self._native.longitude,
@@ -272,18 +272,18 @@ def generate(self) -> None:
         self._solar_return_jd = forecast.solar_return(
             self._native.julian_date, self._solar_return_year
         )
-        self._obliquity = ephemeris.obliquity(self._solar_return_jd)
-        self._solar_return_armc = ephemeris.angle(
+        self._obliquity = ephemeris.get_obliquity(self._solar_return_jd)
+        self._solar_return_armc = ephemeris.get_angle(
             index=chart.ARMC,
             jd=self._solar_return_jd,
             lat=self._native.latitude,
             lon=self._native.longitude,
             house_system=settings.house_system,
         )
 
-        self._triad[chart.SUN] = ephemeris.planet(chart.SUN, self._solar_return_jd)
-        self._triad[chart.MOON] = ephemeris.planet(chart.MOON, self._solar_return_jd)
-        self._triad[chart.ASC] = ephemeris.angle(
+        self._triad[chart.SUN] = ephemeris.get_planet(chart.SUN, self._solar_return_jd)
+        self._triad[chart.MOON] = ephemeris.get_planet(chart.MOON, self._solar_return_jd)
+        self._triad[chart.ASC] = ephemeris.get_angle(
             index=chart.ASC,
             jd=self._solar_return_jd,
             lat=self._native.latitude,
@@ -297,15 +297,15 @@ def generate(self) -> None:
         self._moon_phase = calculate.moon_phase(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
-        self._objects = ephemeris.objects(
+        self._objects = ephemeris.get_objects(
             object_list=settings.objects,
             jd=self._solar_return_jd,
             lat=self._native.latitude,
             lon=self._native.longitude,
             house_system=settings.house_system,
             part_formula=settings.part_formula,
         )
-        self._houses = ephemeris.houses(
+        self._houses = ephemeris.get_houses(
             jd=self._solar_return_jd,
             lat=self._native.latitude,
             lon=self._native.longitude,
@@ -345,7 +345,7 @@ def generate(self) -> None:
             lon=self._native.longitude,
         )
         progression_jd = date.to_jd(self._progression_date_time)
-        progression_armc = ephemeris.angle(
+        progression_armc = ephemeris.get_angle(
             index=chart.ARMC,
             jd=progression_jd,
             lat=self._native.latitude,
@@ -362,11 +362,11 @@ def generate(self) -> None:
             house_system=settings.house_system,
             method=settings.mc_progression_method,
         )
-        self._obliquity = ephemeris.obliquity(self._progressed_jd)
+        self._obliquity = ephemeris.get_obliquity(self._progressed_jd)
 
-        self._triad[chart.SUN] = ephemeris.planet(chart.SUN, self._progressed_jd)
-        self._triad[chart.MOON] = ephemeris.planet(chart.MOON, self._progressed_jd)
-        self._triad[chart.ASC] = ephemeris.armc_angle(
+        self._triad[chart.SUN] = ephemeris.get_planet(chart.SUN, self._progressed_jd)
+        self._triad[chart.MOON] = ephemeris.get_planet(chart.MOON, self._progressed_jd)
+        self._triad[chart.ASC] = ephemeris.get_armc_angle(
             index=chart.ASC,
             armc=self._progressed_armc_longitude,
             lat=self._native.latitude,
@@ -380,7 +380,7 @@ def generate(self) -> None:
         self._moon_phase = calculate.moon_phase(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
-        self._objects = ephemeris.armc_objects(
+        self._objects = ephemeris.get_armc_objects(
             object_list=settings.objects,
             jd=self._progressed_jd,
             armc=self._progressed_armc_longitude,
@@ -390,7 +390,7 @@ def generate(self) -> None:
             house_system=settings.house_system,
             part_formula=settings.part_formula,
         )
-        self._houses = ephemeris.armc_houses(
+        self._houses = ephemeris.get_armc_houses(
             armc=self._progressed_armc_longitude,
             lat=self._native.latitude,
             obliquity=self._obliquity,
@@ -432,15 +432,15 @@ def generate(self) -> None:
             self._native.julian_date, self._partner.julian_date
         )
 
-        native_objects = ephemeris.objects(
+        native_objects = ephemeris.get_objects(
             object_list=settings.objects,
             jd=self._native.julian_date,
             lat=self._native.latitude,
             lon=self._native.longitude,
             house_system=settings.house_system,
             part_formula=settings.part_formula,
         )
-        partner_objects = ephemeris.objects(
+        partner_objects = ephemeris.get_objects(
             object_list=settings.objects,
             jd=self._partner.julian_date,
             lat=self._partner.latitude,
@@ -455,14 +455,14 @@ def generate(self) -> None:
         )
 
         if settings.house_system == chart.WHOLE_SIGN:
-            native_armc = ephemeris.angle(
+            native_armc = ephemeris.get_angle(
                 index=chart.ARMC,
                 jd=self._native.julian_date,
                 lat=self._native.latitude,
                 lon=self._native.longitude,
                 house_system=settings.house_system,
             )
-            partner_armc = ephemeris.angle(
+            partner_armc = ephemeris.get_angle(
                 index=chart.ARMC,
                 jd=self._partner.julian_date,
                 lat=self._partner.latitude,
@@ -472,20 +472,20 @@ def generate(self) -> None:
             armc = midpoint.composite(native_armc, partner_armc, self._obliquity)["lon"]
             latitude = (self._native.latitude + self._partner.latitude) / 2
 
-            self._houses = ephemeris.armc_houses(
+            self._houses = ephemeris.get_armc_houses(
                 armc=armc,
                 lat=latitude,
                 obliquity=self._obliquity,
                 house_system=settings.house_system,
             )
         else:
-            native_houses = ephemeris.houses(
+            native_houses = ephemeris.get_houses(
                 jd=self._native.julian_date,
                 lat=self._native.latitude,
                 lon=self._native.longitude,
                 house_system=settings.house_system,
             )
-            partner_houses = ephemeris.houses(
+            partner_houses = ephemeris.get_houses(
                 jd=self._partner.julian_date,
                 lat=self._partner.latitude,
                 lon=self._partner.longitude,
@@ -500,14 +500,14 @@ def generate(self) -> None:
         if chart.ASC in self._objects:
             self._triad[chart.ASC] = self._objects[chart.ASC]
         else:
-            native_asc = ephemeris.angle(
+            native_asc = ephemeris.get_angle(
                 index=chart.ASC,
                 jd=self._native.julian_date,
                 lat=self._native.latitude,
                 lon=self._native.longitude,
                 house_system=settings.house_system,
             )
-            partner_asc = ephemeris.angle(
+            partner_asc = ephemeris.get_angle(
                 index=chart.ASC,
                 jd=self._partner.julian_date,
                 lat=self._partner.latitude,
@@ -521,17 +521,17 @@ def generate(self) -> None:
         if chart.SUN in self._objects:
             self._triad[chart.SUN] = self._objects[chart.SUN]
         else:
-            native_sun = ephemeris.planet(chart.SUN, self._native.julian_date)
-            partner_sun = ephemeris.planet(chart.SUN, self._partner.julian_date)
+            native_sun = ephemeris.get_planet(chart.SUN, self._native.julian_date)
+            partner_sun = ephemeris.get_planet(chart.SUN, self._partner.julian_date)
             self._triad[chart.SUN] = midpoint.composite(
                 native_sun, partner_sun, self._obliquity
             )
 
         if chart.MOON in self._objects:
             self._triad[chart.MOON] = self._objects[chart.MOON]
         else:
-            native_moon = ephemeris.planet(chart.MOON, self._native.julian_date)
-            partner_moon = ephemeris.planet(chart.MOON, self._partner.julian_date)
+            native_moon = ephemeris.get_planet(chart.MOON, self._native.julian_date)
+            partner_moon = ephemeris.get_planet(chart.MOON, self._partner.julian_date)
             self._triad[chart.MOON] = midpoint.composite(
                 native_moon, partner_moon, self._obliquity
             )
@@ -566,11 +566,11 @@ def __init__(
         super().__init__(chart.TRANSITS, aspects_to)
 
     def generate(self) -> None:
-        self._obliquity = ephemeris.obliquity(self._native.julian_date)
+        self._obliquity = ephemeris.get_obliquity(self._native.julian_date)
 
-        self._triad[chart.SUN] = ephemeris.planet(chart.SUN, self._native.julian_date)
-        self._triad[chart.MOON] = ephemeris.planet(chart.MOON, self._native.julian_date)
-        self._triad[chart.ASC] = ephemeris.angle(
+        self._triad[chart.SUN] = ephemeris.get_planet(chart.SUN, self._native.julian_date)
+        self._triad[chart.MOON] = ephemeris.get_planet(chart.MOON, self._native.julian_date)
+        self._triad[chart.ASC] = ephemeris.get_angle(
             index=chart.ASC,
             jd=self._native.julian_date,
             lat=self._native.latitude,
@@ -584,7 +584,7 @@ def generate(self) -> None:
         self._moon_phase = calculate.moon_phase(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
-        self._objects = ephemeris.objects(
+        self._objects = ephemeris.get_objects(
             object_list=settings.objects,
             jd=self._native.julian_date,
             lat=self._native.latitude,
@@ -593,7 +593,7 @@ def generate(self) -> None:
             part_formula=settings.part_formula,
         )
         self._houses = (
-            ephemeris.houses(
+            ephemeris.get_houses(
                 jd=self._native.julian_date,
                 lat=self._native.latitude,
                 lon=self._native.longitude,

immanuel/classes/wrap.py

@@ -126,7 +126,7 @@ def __init__(
         self.timezone = self.datetime.tzname()
         self.ambiguous = date.ambiguous(self.datetime) and time_is_dst is None
         self.julian = date.to_jd(dt)
-        self.deltat = ephemeris.deltat(self.julian)
+        self.deltat = ephemeris.get_deltat(self.julian)
 
         if armc is not None:
             self.sidereal_time = convert.dec_to_string(
@@ -339,7 +339,7 @@ def __str__(self) -> str:
 
 class Subject:
     def __init__(self, subject: "Subject") -> None:
-        armc = ephemeris.angle(
+        armc = ephemeris.get_angle(
             index=chart.ARMC,
             jd=subject.julian_date,
             lat=subject.latitude,

immanuel/tools/calculate.py

@@ -179,7 +179,7 @@ def is_out_of_bounds(
         dec = object
 
     if jd is not None:
-        obliquity = ephemeris.obliquity(jd)
+        obliquity = ephemeris.get_obliquity(jd)
     elif obliquity is None:
         return None
 
@@ -194,11 +194,11 @@ def synodic_period(
     index1 = object1["index"] if isinstance(object1, dict) else object1
     index2 = object2["index"] if isinstance(object2, dict) else object2
 
-    sidereal_period1 = ephemeris.sidereal_period(index1, jd)
-    sidereal_period2 = ephemeris.sidereal_period(index2, jd)
+    sidereal_period1 = ephemeris.get_sidereal_period(index1, jd)
+    sidereal_period2 = ephemeris.get_sidereal_period(index2, jd)
 
-    orbital_eccentricity1 = ephemeris.orbital_eccentricity(index1, jd)
-    orbital_eccentricity2 = ephemeris.orbital_eccentricity(index2, jd)
+    orbital_eccentricity1 = ephemeris.get_orbital_eccentricity(index1, jd)
+    orbital_eccentricity2 = ephemeris.get_orbital_eccentricity(index2, jd)
 
     avg = 1 / abs(1 / sidereal_period1 - 1 / sidereal_period2)
 
@@ -219,8 +219,8 @@ def retrograde_period(object: dict | int, jd: float) -> float:
     if index in (chart.SUN, chart.MOON):
         return 0.0
 
-    t1 = ephemeris.sidereal_period(chart.TERRA, jd)
-    t2 = ephemeris.sidereal_period(index, jd)
+    t1 = ephemeris.get_sidereal_period(chart.TERRA, jd)
+    t2 = ephemeris.get_sidereal_period(index, jd)
 
     a1 = (t1**2) ** (1 / 3)
     a2 = (t2**2) ** (1 / 3)