Moved and renamed functions to avoid circular dependencies.

Author: theriftlab

immanuel/charts.py

@@ -134,12 +134,12 @@ def set_wrapped_objects(self) -> None:
                 object=object,
                 houses=self._houses,
             )
-            out_of_bounds = ephemeris.get_out_of_bounds(
+            out_of_bounds = ephemeris.is_out_of_bounds(
                 object=object,
                 obliquity=self._obliquity,
             )
             in_sect = (
-                ephemeris.get_in_sect(
+                ephemeris.is_in_sect(
                     object=object,
                     is_daytime=self._diurnal,
                     sun=self._triad[chart.SUN],
@@ -227,7 +227,7 @@ def __init__(self, native: Subject, aspects_to: Chart | None = None) -> None:
         super().__init__(chart.NATAL, aspects_to)
 
     def generate(self) -> None:
-        self._obliquity = ephemeris.get_obliquity(self._native.julian_date)
+        self._obliquity = ephemeris.earth_obliquity(self._native.julian_date)
 
         self._triad[chart.SUN] = ephemeris.get_planet(
             chart.SUN, self._native.julian_date
@@ -243,10 +243,10 @@ def generate(self) -> None:
             house_system=settings.house_system,
         )
 
-        self._diurnal = ephemeris.calculate_daytime(
+        self._diurnal = ephemeris.is_daytime_from(
             self._triad[chart.SUN], self._triad[chart.ASC]
         )
-        self._moon_phase = ephemeris.calculate_moon_phase(
+        self._moon_phase = ephemeris.moon_phase_from(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
         self._objects = ephemeris.get_objects(
@@ -279,7 +279,7 @@ def generate(self) -> None:
         self._solar_return_jd = forecast.solar_return(
             self._native.julian_date, self._solar_return_year
         )
-        self._obliquity = ephemeris.get_obliquity(self._solar_return_jd)
+        self._obliquity = ephemeris.earth_obliquity(self._solar_return_jd)
         self._solar_return_armc = ephemeris.get_angle(
             index=chart.ARMC,
             jd=self._solar_return_jd,
@@ -300,10 +300,10 @@ def generate(self) -> None:
             house_system=settings.house_system,
         )
 
-        self._diurnal = ephemeris.calculate_daytime(
+        self._diurnal = ephemeris.is_daytime_from(
             self._triad[chart.SUN], self._triad[chart.ASC]
         )
-        self._moon_phase = ephemeris.calculate_moon_phase(
+        self._moon_phase = ephemeris.moon_phase_from(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
         self._objects = ephemeris.get_objects(
@@ -375,7 +375,7 @@ def generate(self) -> None:
             house_system=settings.house_system,
             method=settings.mc_progression_method,
         )
-        self._obliquity = ephemeris.get_obliquity(self._progressed_jd)
+        self._obliquity = ephemeris.earth_obliquity(self._progressed_jd)
 
         self._triad[chart.SUN] = ephemeris.get_planet(chart.SUN, self._progressed_jd)
         self._triad[chart.MOON] = ephemeris.get_planet(chart.MOON, self._progressed_jd)
@@ -387,10 +387,10 @@ def generate(self) -> None:
             house_system=settings.house_system,
         )
 
-        self._diurnal = ephemeris.calculate_daytime(
+        self._diurnal = ephemeris.is_daytime_from(
             self._triad[chart.SUN], self._triad[chart.ASC]
         )
-        self._moon_phase = ephemeris.calculate_moon_phase(
+        self._moon_phase = ephemeris.moon_phase_from(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
         self._objects = ephemeris.get_armc_objects(
@@ -551,10 +551,10 @@ def generate(self) -> None:
                 native_moon, partner_moon, self._obliquity
             )
 
-        self._diurnal = ephemeris.calculate_daytime(
+        self._diurnal = ephemeris.is_daytime_from(
             self._triad[chart.SUN], self._triad[chart.ASC]
         )
-        self._moon_phase = ephemeris.calculate_moon_phase(
+        self._moon_phase = ephemeris.moon_phase_from(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
 
@@ -582,7 +582,7 @@ def __init__(
         super().__init__(chart.TRANSITS, aspects_to)
 
     def generate(self) -> None:
-        self._obliquity = ephemeris.get_obliquity(self._native.julian_date)
+        self._obliquity = ephemeris.earth_obliquity(self._native.julian_date)
 
         self._triad[chart.SUN] = ephemeris.get_planet(
             chart.SUN, self._native.julian_date
@@ -598,10 +598,10 @@ def generate(self) -> None:
             house_system=settings.house_system,
         )
 
-        self._diurnal = ephemeris.calculate_daytime(
+        self._diurnal = ephemeris.is_daytime_from(
             self._triad[chart.SUN], self._triad[chart.ASC]
         )
-        self._moon_phase = ephemeris.calculate_moon_phase(
+        self._moon_phase = ephemeris.moon_phase_from(
             self._triad[chart.SUN], self._triad[chart.MOON]
         )
         self._objects = ephemeris.get_objects(

immanuel/classes/wrap.py

@@ -128,11 +128,11 @@ def __init__(
         self.timezone = date.timezone_name(self.datetime)
         self.ambiguous = date.ambiguous(self.datetime) and time_is_dst is None
         self.julian = date.to_jd(dt)
-        self.deltat = ephemeris.get_deltat(self.julian)
+        self.deltat = ephemeris.deltat(self.julian)
 
         if armc is not None:
             self.sidereal_time = convert.dec_to_string(
-                ephemeris.get_sidereal_time(armc), format=convert.FORMAT_TIME
+                ephemeris.sidereal_time(armc), format=convert.FORMAT_TIME
             )
 
     def __str__(self) -> str:
@@ -306,11 +306,11 @@ def __str__(self) -> str:
 
 class ObjectMovement:
     def __init__(self, object: dict) -> None:
-        self._movement = ephemeris.get_object_movement(object)
+        self._movement = ephemeris.object_movement(object)
         self.direct = self._movement == calc.DIRECT
         self.stationary = self._movement == calc.STATIONARY
         self.retrograde = self._movement == calc.RETROGRADE
-        self.typical = ephemeris.get_object_movement_typical(object)
+        self.typical = ephemeris.is_object_movement_typical(object)
         self.formatted = _(
             names.OBJECT_MOVEMENTS[self._movement], gender(object["index"])
         )

immanuel/tools/date.py

@@ -121,7 +121,6 @@ def get_timezone(
 
 def timezone_lookup(lat: float, lon: float) -> str:
     """Returns a timezone string based on decimal lat/lon coordinates."""
-    print("Looking up timezone")
     from timezonefinder import TimezoneFinder
 
     return TimezoneFinder().timezone_at(lat=lat, lng=lon)