Added planet on first house systems.

Author: theriftlab

README.md

@@ -22,11 +22,11 @@ Immanuel's output is currently available in the following locales / languages:
 * **es_ES:** Spanish
 * **de_DE:** German
 
-See [here](https://github.com/theriftlab/immanuel-python/tree/v1.4.3/docs/5-settings.md#locale) for details on how to switch. The documentation itself is not currently available in other translations. To contribute in-software translations, see [here](https://github.com/theriftlab/immanuel-python/tree/v1.4.3/docs/7-contributions.md).
+See [here](https://github.com/theriftlab/immanuel-python/tree/v1.4.4/docs/5-settings.md#locale) for details on how to switch. The documentation itself is not currently available in other translations. To contribute in-software translations, see [here](https://github.com/theriftlab/immanuel-python/tree/v1.4.4/docs/7-contributions.md).
 
 ## Documentation
 
-Full documentation is available [here](https://github.com/theriftlab/immanuel-python/tree/v1.4.3/docs/0-contents.md), or follow the Quick Start below to see how to quickly generate a natal chart.
+Full documentation is available [here](https://github.com/theriftlab/immanuel-python/tree/v1.4.4/docs/0-contents.md), or follow the Quick Start below to see how to quickly generate a natal chart.
 
 ## Quick Start
 

docs/5-settings.md

@@ -183,6 +183,16 @@ Which house system to use. Available options:
 * `chart.REGIOMONTANUS`
 * `chart.VEHLOW_EQUAL`
 * `chart.WHOLE_SIGN`
+* `chart.SUN_ON_FIRST`
+* `chart.MOON_ON_FIRST`
+* `chart.MERCURY_ON_FIRST`
+* `chart.VENUS_ON_FIRST`
+* `chart.MARS_ON_FIRST`
+* `chart.JUPITER_ON_FIRST`
+* `chart.SATURN_ON_FIRST`
+* `chart.URANUS_ON_FIRST`
+* `chart.NEPTUNE_ON_FIRST`
+* `chart.PLUTO_ON_FIRST`
 
 Default: `chart.PLACIDUS`
 

immanuel/charts.py

@@ -22,7 +22,7 @@
 from zoneinfo import ZoneInfo
 
 from immanuel.classes import wrap
-from immanuel.classes.localize import _
+from immanuel.classes.localize import localize as _
 from immanuel.const import calc, chart, names
 from immanuel.reports import aspect, dignity, pattern, weighting
 from immanuel.setup import settings

immanuel/classes/localize.py

@@ -51,7 +51,7 @@ def reset() -> None:
         MAPPINGS = {}
 
 
-def _(input: str, context: str = None) -> str:
+def localize(input: str, context: str = None) -> str:
     if Localize.translation is None:
         return input
 

immanuel/classes/wrap.py

@@ -11,11 +11,11 @@
 
 from datetime import datetime
 
+from immanuel.classes.localize import gender, localize as _
 from immanuel.const import calc, chart, dignities, names
 from immanuel.reports import dignity
 from immanuel.setup import settings
 from immanuel.tools import calculate, convert, date, ephemeris, position
-from immanuel.classes.localize import gender, _
 
 
 class Angle:

immanuel/const/chart.py

@@ -65,6 +65,17 @@
 REGIOMONTANUS = 111
 VEHLOW_EQUAL = 112
 WHOLE_SIGN = 113
+PLANET_ON_FIRST = 1000
+SUN_ON_FIRST = 1001
+MOON_ON_FIRST = 1002
+MERCURY_ON_FIRST = 1003
+VENUS_ON_FIRST = 1004
+MARS_ON_FIRST = 1005
+JUPITER_ON_FIRST = 1006
+SATURN_ON_FIRST = 1007
+URANUS_ON_FIRST = 1008
+NEPTUNE_ON_FIRST = 1009
+PLUTO_ON_FIRST = 1010
 
 """ Houses. """
 HOUSE = 2 * TYPE_MULTIPLIER

immanuel/const/names.py

@@ -76,6 +76,16 @@
     chart.REGIOMONTANUS: 'Regiomontanus',
     chart.VEHLOW_EQUAL: 'Vehlow Equal House',
     chart.WHOLE_SIGN: 'Whole Sign',
+    chart.SUN_ON_FIRST: 'Sun On First',
+    chart.MOON_ON_FIRST: 'Moon On First',
+    chart.MERCURY_ON_FIRST: 'Mercury On First',
+    chart.VENUS_ON_FIRST: 'Venus On First',
+    chart.MARS_ON_FIRST: 'Mars On First',
+    chart.JUPITER_ON_FIRST: 'Jupiter On First',
+    chart.SATURN_ON_FIRST: 'Saturn On First',
+    chart.URANUS_ON_FIRST: 'Uranus On First',
+    chart.NEPTUNE_ON_FIRST: 'Neptune On First',
+    chart.PLUTO_ON_FIRST: 'Pluto On First',
 }
 
 HOUSES = {

immanuel/tools/ephemeris.py

@@ -16,10 +16,10 @@
 
 import swisseph as swe
 
-from immanuel.const import chart, names
 from immanuel.classes.cache import cache
+from immanuel.classes.localize import localize as _
+from immanuel.const import chart, names
 from immanuel.tools import calculate, find
-from immanuel.classes.localize import _
 
 
 ALL = -1
@@ -333,10 +333,12 @@ def _angle(index: int, jd: float, lat: float, lon: float, house_system: int, arm
 
 def _house(index: int, jd: float, lat: float, lon: float, house_system: int, armc: float, armc_obliquity: float) -> dict:
     """ Function for house() and armc_house(). """
+    first_house_lon = get(_first_house_planet(house_system), jd)['lon'] if house_system > chart.PLANET_ON_FIRST else None
+
     if armc is not None:
-        houses = _angles_houses_vertex_armc(armc, lat, armc_obliquity, house_system)['houses']
+        houses = _angles_houses_vertex_armc(armc, lat, armc_obliquity, house_system, first_house_lon)['houses']
     else:
-        houses = _angles_houses_vertex(jd, lat, lon, house_system)['houses']
+        houses = _angles_houses_vertex(jd, lat, lon, house_system, first_house_lon)['houses']
 
     if index == ALL:
         return houses
@@ -519,22 +521,24 @@ def _is_daytime(jd: float, lat: float, lon: float, armc: float, armc_obliquity:
 
 
 @cache
-def _angles_houses_vertex(jd: float, lat: float, lon: float, house_system: int) -> dict:
-    """ Returns ecliptic longitudes for the houses, main angles,
-    and the vertex, along with their speeds. Based on Julian
-    date and lat / lon coordinates. """
-    return _angles_houses_vertex_from_swe(obliquity(jd), *swe.houses_ex2(jd, lat, lon, _SWE[house_system]))
+def _angles_houses_vertex(jd: float, lat: float, lon: float, house_system: int, first_house_lon: float = None) -> dict:
+    """ Returns ecliptic longitudes for the houses, main angles, and the vertex,
+    along with their speeds. Defaults to Placidus for main angles & vertex if
+    an PLANET_ON_FIRST house system is chosen. Based on Julian date and
+    lat / lon coordinates. """
+    return _angles_houses_vertex_from_swe(obliquity(jd), *swe.houses_ex2(jd, lat, lon, _SWE[house_system if house_system < chart.PLANET_ON_FIRST else chart.PLACIDUS]), first_house_lon)
 
 
 @cache
-def _angles_houses_vertex_armc(armc: float, lat: float, obliquity: float, house_system: int) -> dict:
-    """ Returns ecliptic longitudes for the houses, main angles,
-    and the vertex, along with their speeds. Based on ARMC, latitude
-    and ecliptic obliquity. """
-    return _angles_houses_vertex_from_swe(obliquity, *swe.houses_armc_ex2(armc, lat, obliquity, _SWE[house_system]))
+def _angles_houses_vertex_armc(armc: float, lat: float, obliquity: float, house_system: int, first_house_lon: float = None) -> dict:
+    """ Returns ecliptic longitudes for the houses, main angles, and the vertex,
+    along with their speeds. Defaults to Placidus for main angles & vertex if
+    an PLANET_ON_FIRST house system is chosen. Based on ARMC, latitude and
+    ecliptic obliquity. """
+    return _angles_houses_vertex_from_swe(obliquity, *swe.houses_armc_ex2(armc, lat, obliquity, _SWE[house_system if house_system < chart.PLANET_ON_FIRST else chart.PLACIDUS]), first_house_lon)
 
 
-def _angles_houses_vertex_from_swe(obliquity: float, cusps: tuple, ascmc: tuple, cuspsspeed: tuple, ascmcspeed: tuple) -> dict:
+def _angles_houses_vertex_from_swe(obliquity: float, cusps: tuple, ascmc: tuple, cuspsspeed: tuple, ascmcspeed: tuple, first_house_lon: float) -> dict:
     """ Get houses, angles & vertex direct from pyswisseph. """
     angles = {}
 
@@ -566,11 +570,19 @@ def _angles_houses_vertex_from_swe(obliquity: float, cusps: tuple, ascmc: tuple,
 
     houses = {}
 
-    for i, lon in enumerate(cusps, start=1):
+    for i in range(1, 13):
         index = chart.HOUSE + i
-        size = swe.difdeg2n(cusps[i if i < 12 else 0], lon)
-        speed = cuspsspeed[i-1]
-        dec = swe.cotrans((lon, 0, 0), -obliquity)[1]
+
+        if first_house_lon is not None:
+            lon = swe.degnorm(first_house_lon + (30 * (i-1)))
+            size = 30
+            speed = 0
+            dec = 0
+        else:
+            lon = cusps[i-1]
+            size = swe.difdeg2n(cusps[i if i < 12 else 0], lon)
+            speed = cuspsspeed[i-1]
+            dec = swe.cotrans((lon, 0, 0), -obliquity)[1]
 
         houses[index] = {
             'index': index,
@@ -668,3 +680,8 @@ def _swisseph_point(index: int, jd: float) -> dict:
 def _type(index: int) -> int:
     """ Return the type index of a given object's index. """
     return round(index, -2)
+
+
+def _first_house_planet(house_system: int) -> int:
+    """ Return the index of the planet that marks the first house. """
+    return (house_system - chart.PLANET_ON_FIRST) + chart.PLANET

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "immanuel"
-version = "1.4.3"
+version = "1.4.4"
 description = "Quickly produce both human-readable and JSON-formatted astrology chart data based on the Swiss Ephemeris and astro.com."
 authors = [
   { name = "Robert Davies", email = "robert@theriftlab.com" },

tests/test_ephemeris.py

@@ -299,6 +299,15 @@ def test_armc_house(jd, coords, armc, all_houses):
     assert ephemeris.armc_house(ephemeris.ALL, armc, coords[0], obliquity, chart.PLACIDUS) == ephemeris.armc_houses(armc, coords[0], obliquity, chart.PLACIDUS)
 
 
+def test_planet_on_first_house(jd, coords):
+    sun = ephemeris.planet(chart.SUN, jd)
+    first_house = ephemeris.house(chart.HOUSE1, jd, *coords, chart.SUN_ON_FIRST)
+    second_house = ephemeris.house(chart.HOUSE2, jd, *coords, chart.SUN_ON_FIRST)
+
+    assert sun['lon'] == first_house['lon']
+    assert sun['lon'] + 30 == second_house['lon']
+
+
 def test_point(jd, coords, all_points):
     for index in all_points:
         point = ephemeris.point(index, jd, *coords, chart.PLACIDUS, calc.DAY_NIGHT_FORMULA)