kerykeion 4.10.1__py3-none-any.whl → 4.11.0__py3-none-any.whl

kerykeion/__init__.py

@@ -126,7 +126,7 @@ print(len(name.aspects_list))
 
 ![Synastry Chart](http://centuryboy.altervista.org/JackComposite_Chart.svg)
 
-# Report
+## Report
 
 To print a report of all the data:
 
@@ -217,6 +217,10 @@ You can set the zodiac type and the sidereal mode in the AstrologicalSubject cla
 johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
 ```
 
+More examples [here](https://www.kerykeion.net/docs/examples/sidereal-modes/).
+
+Full list of supported sidereal modes [here](https://www.kerykeion.net/pydocs/kerykeion/kr_types/kr_literals.html#SiderealMode).
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

kerykeion/astrological_subject.py

@@ -16,7 +16,8 @@ from kerykeion.kr_types import (
     LunarPhaseModel,
     KerykeionPointModel,
     PointType,
-    SiderealMode
+    SiderealMode,
+    HousesSystemIdentifier
 )
 from kerykeion.utilities import (
     get_number_from_name, 
@@ -30,6 +31,7 @@ from typing import Union, get_args
 
 DEFAULT_GEONAMES_USERNAME = "century.boy"
 DEFAULT_SIDEREAL_MODE = "FAGAN_BRADLEY"
+DEFAULT_HOUSES_SYSTEM = "P"
 
 
 class AstrologicalSubject:
@@ -65,6 +67,7 @@ class AstrologicalSubject:
         The mode to use for the sidereal zodiac, according to the Swiss Ephemeris.
         Defaults to "FAGAN_BRADLEY".
         Available modes are visible in the SiderealMode Literal.
+    - houses_system_identifier (HousesSystemIdentifier, optional): The system to use for the calculation of the houses.
     """
 
     # Defined by the user
@@ -84,6 +87,8 @@ class AstrologicalSubject:
     online: bool
     zodiac_type: ZodiacType
     sidereal_mode: SiderealMode
+    houses_system_identifier: HousesSystemIdentifier
+    houses_system_name: str
 
     # Generated internally
     city_data: dict[str, str]
@@ -148,7 +153,8 @@ class AstrologicalSubject:
         online: bool = True,
         utc_datetime: Union[datetime, None] = None,
         disable_chiron: bool = False,
-        sidereal_mode: Union[SiderealMode, None] = None
+        sidereal_mode: Union[SiderealMode, None] = None,
+        houses_system_identifier: HousesSystemIdentifier = DEFAULT_HOUSES_SYSTEM
     ) -> None:
         logging.debug("Starting Kerykeion")
 
@@ -176,6 +182,14 @@ class AstrologicalSubject:
         self.utc_datetime = utc_datetime
         self.disable_chiron = disable_chiron
         self.sidereal_mode = sidereal_mode
+        self.houses_system_identifier = houses_system_identifier
+
+        # House System check and setup --->
+        if self.houses_system_identifier not in get_args(HousesSystemIdentifier):
+            raise KerykeionException(f"\n* ERROR: '{self.houses_system_identifier}' is NOT a valid house system! Available systems are: *" + "\n" + str(get_args(HousesSystemIdentifier)))
+
+        self.houses_system_name = swe.house_name(self.houses_system_identifier.encode('ascii'))
+        # <--- House System check and setup
 
         # Zodiac Type and Sidereal mode checks and setup --->
         if zodiac_type and not zodiac_type in get_args(ZodiacType):
@@ -350,11 +364,17 @@ class AstrologicalSubject:
 
         if self.zodiac_type == "Sidereal":
             self.houses_degree_ut = swe.houses_ex(
-                tjdut=self.julian_day, lat=self.lat, lon=self.lng, hsys=str.encode('P'), flags=swe.FLG_SIDEREAL
+                tjdut=self.julian_day,
+                lat=self.lat, lon=self.lng,
+                hsys=str.encode(self.houses_system_identifier),
+                flags=swe.FLG_SIDEREAL
             )[0]
+
         elif self.zodiac_type == "Tropic":
             self.houses_degree_ut = swe.houses(
-                tjdut=self.julian_day, lat=self.lat, lon=self.lng, hsys=str.encode('P')
+                tjdut=self.julian_day, lat=self.lat,
+                lon=self.lng,
+                hsys=str.encode(self.houses_system_identifier)
             )[0]
 
         point_type: PointType = "House"
@@ -643,3 +663,7 @@ if __name__ == "__main__":
     # With Sidereal Zodiac
     johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
     print(johnny.json(dump=True, indent=2))
+
+    # With Morinus Houses
+    johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", houses_system_identifier="M")
+    print(johnny.json(dump=True, indent=2))

kerykeion/charts/kerykeion_chart_svg.py

@@ -1234,13 +1234,15 @@ class KerykeionChartSVG:
 
         # Bottom Left Corner
         if self.chart_type == "Natal" or self.chart_type == "ExternalNatal" or self.chart_type == "Synastry":
-            td["bottomLeft1"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft0"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft1"] = f"{self.user.houses_system_name}"
             td["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.user.lunar_phase.moon_phase_name}'
             td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.user.lunar_phase.get("moon_phase", "")}'
             td["bottomLeft4"] = ""
 
         else:
-            td["bottomLeft1"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft0"] = f"{self.user.zodiac_type if self.user.zodiac_type == 'Tropic' else self.user.zodiac_type + ' ' + self.user.sidereal_mode}"
+            td["bottomLeft1"] = f"{self.user.houses_system_name}"
             td["bottomLeft2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
             td["bottomLeft3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
             td["bottomLeft4"] = ""
@@ -1456,3 +1458,16 @@ if __name__ == "__main__":
     sidereal_subject = AstrologicalSubject("John Lennon J2000", 1940, 10, 9, 10, 30, "Liverpool", "GB", zodiac_type="Sidereal", sidereal_mode="J2000")
     sidereal_chart = KerykeionChartSVG(sidereal_subject)
     sidereal_chart.makeSVG()
+
+    # House System Morinus
+    morinus_house_subject = AstrologicalSubject("John Lennon - House System Morinus", 1940, 10, 9, 10, 30, "Liverpool", "GB", houses_system_identifier="M")
+    morinus_house_chart = KerykeionChartSVG(morinus_house_subject)
+    morinus_house_chart.makeSVG()
+
+    ## To check all the available house systems uncomment the following code:
+    # from kerykeion.kr_types import HousesSystemIdentifier
+    # from typing import get_args
+    # for i in get_args(HousesSystemIdentifier):
+    #     alternatives_house_subject = AstrologicalSubject(f"John Lennon - House System {i}", 1940, 10, 9, 10, 30, "Liverpool", "GB", houses_system=i)
+    #     alternatives_house_chart = KerykeionChartSVG(alternatives_house_subject)
+    #     alternatives_house_chart.makeSVG()

kerykeion/charts/templates/chart.xml

@@ -21,6 +21,7 @@
             <text x="20" y="86" style="fill: $paper_color_0; font-size: 11px">$stringLat</text>
             <text x="20" y="98" style="fill: $paper_color_0; font-size: 11px">$stringLon</text>
             <text x="20" y="110" style="fill: $paper_color_0; font-size: 11px">$stringPosition</text>
+            <text x="20" y="466" style="fill: $paper_color_0; font-size: 10px">$bottomLeft0</text>
             <text x="20" y="480" style="fill: $paper_color_0; font-size: 10px">$bottomLeft1</text>
             <text x="20" y="494" style="fill: $paper_color_0; font-size: 10px">$bottomLeft2</text>
             <text x="20" y="508" style="fill: $paper_color_0; font-size: 10px">$bottomLeft3</text>

kerykeion/kr_types/chart_types.py

@@ -20,6 +20,7 @@ class ChartTemplateDictionary(TypedDict):
     viewbox: str
     stringTitle: str
     stringName: str
+    bottomLeft0: str
     bottomLeft1: str
     bottomLeft2: str
     bottomLeft3: str

kerykeion/kr_types/kr_literals.py

@@ -54,4 +54,36 @@ LunarPhaseName = Literal["New Moon", "Waxing Crescent", "First Quarter", "Waxing
 
 
 SiderealMode = Literal["FAGAN_BRADLEY", "LAHIRI", "DELUCE", "RAMAN", "USHASHASHI", "KRISHNAMURTI", "DJWHAL_KHUL", "YUKTESHWAR", "JN_BHASIN", "BABYL_KUGLER1", "BABYL_KUGLER2", "BABYL_KUGLER3", "BABYL_HUBER", "BABYL_ETPSC", "ALDEBARAN_15TAU", "HIPPARCHOS", "SASSANIAN", "J2000", "J1900", "B1950"]
-"""Literal type for Sidereal Modes, as known as Ayanamsa"""
+"""Literal type for Sidereal Modes, as known as Ayanamsa"""
+
+
+HousesSystemIdentifier = Literal["A", "B", "C", "D", "F", "H", "I", "i", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y"]
+"""
+Literal type for Houses Systems:
+
+A = equal
+B = Alcabitius
+C = Campanus
+D = equal (MC)
+F = Carter poli-equ.
+H = horizon/azimut
+I = Sunshine
+i = Sunshine/alt.
+K = Koch
+L = Pullen SD
+M = Morinus
+N = equal/1=Aries
+O = Porphyry
+P = Placidus
+Q = Pullen SR
+R = Regiomontanus
+S = Sripati
+T = Polich/Page
+U = Krusinski-Pisa-Goelzer
+V = equal/Vehlow
+W = equal/whole sign
+X = axial rotation system/Meridian houses
+Y = APC houses
+
+Usually the standard is Placidus (P)
+"""

kerykeion/kr_types/kr_models.py

@@ -7,7 +7,7 @@
 from typing import Union, Optional
 from pydantic import BaseModel
 
-from kerykeion.kr_types import LunarPhaseEmoji, LunarPhaseName, Planet, Houses, Quality, Element, Sign, ZodiacType, SignNumbers, HouseNumbers, PointType, SiderealMode
+from kerykeion.kr_types import LunarPhaseEmoji, LunarPhaseName, Planet, Houses, Quality, Element, Sign, ZodiacType, SignNumbers, HouseNumbers, PointType, SiderealMode, HousesSystemIdentifier
 
 class SubscriptableBaseModel(BaseModel):
     """
@@ -66,6 +66,8 @@ class AstrologicalSubjectModel(SubscriptableBaseModel):
     tz_str: str
     zodiac_type: ZodiacType
     sidereal_mode: Union[SiderealMode, None]
+    houses_system_identifier: HousesSystemIdentifier
+    houses_system_name: str
     local_time: float
     utc_time: float
     julian_day: float

kerykeion/utilities.py

@@ -285,7 +285,7 @@ def get_planet_house(planet_position_degree: Union[int, float], houses_degree_ut
     elif check_if_point_between(houses_degree_ut_list[11], houses_degree_ut_list[0], planet_position_degree) == True:
         house = "Twelfth_House"
     else:
-        raise ValueError("Error in house calculation, planet: ", planet_position_degree)
+        raise ValueError("Error in house calculation, planet: ", planet_position_degree, "houses: ", houses_degree_ut_list)
 
     return house
 
@@ -353,4 +353,4 @@ def get_moon_phase_name_from_phase_int(phase: int) -> LunarPhaseName:
     else:
         raise KerykeionException(f"Error in moon name calculation! Phase: {phase}")
     
-    return result
+    return result

{kerykeion-4.10.1.dist-info → kerykeion-4.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.10.1
+Version: 4.11.0
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0
@@ -161,7 +161,7 @@ print(len(name.aspects_list))
 
 ![Synastry Chart](http://centuryboy.altervista.org/JackComposite_Chart.svg)
 
-# Report
+## Report
 
 To print a report of all the data:
 
@@ -176,7 +176,7 @@ report.print_report()
 
 Returns:
 
-```bash
+```txt
 +- Kerykeion report for Kanye -+
 +----------+------+-------------+-----------+----------+
 | Date     | Time | Location    | Longitude | Latitude |
@@ -256,6 +256,20 @@ More examples [here](https://www.kerykeion.net/docs/examples/sidereal-modes/).
 
 Full list of supported sidereal modes [here](https://www.kerykeion.net/pydocs/kerykeion/kr_types/kr_literals.html#SiderealMode).
 
+## Houses Systems
+
+You can set the houses system in the AstrologicalSubject class:
+
+```python
+johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", houses_system="M")
+```
+
+More examples [here](https://www.kerykeion.net/docs/examples/house-systems/).
+
+Full list of supported house systems [here](https://www.kerykeion.net/pydocs/kerykeion/kr_types/kr_literals.html#HousesSystem).
+
+So far all the available houses system in the Swiss Ephemeris are supported but the Gauquelin Sectors.
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

{kerykeion-4.10.1.dist-info → kerykeion-4.11.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
 LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion/__init__.py,sha256=9BqSYounDLNO07ajTAaqB5gZJH63Xt7QAxeh4g_d09A,9306
+kerykeion/__init__.py,sha256=s1o1Y29ZdIPCrbXPDygQGNhRHDGh7xi1gHrONGAPxrQ,9517
 kerykeion/aspects/__init__.py,sha256=9FlDVI1ndCJga0-chNIhcLitjU_x3kbtAFfFqVp2ejc,293
 kerykeion/aspects/aspects_utils.py,sha256=Rdo3ITDSU80n6U7aazpzzK4ruv7Iui2PaI3zMGqu1NQ,5832
 kerykeion/aspects/natal_aspects.py,sha256=m3_v1dM6YXvENZ6iN_EJkikKxySZBeR5QKhGsaChERk,4507
 kerykeion/aspects/synastry_aspects.py,sha256=uwg7Lc7wKnpxW9ydOdBHqx9cvO_t0ydGfIGluBIDD7c,3993
-kerykeion/astrological_subject.py,sha256=ECUkDb4TafAIN3s771YoZPW1thiMCXb3wu9aSa1IdIg,24426
+kerykeion/astrological_subject.py,sha256=GSYq3f5fBMgNlkbLgW6_hY_djmbZ3-HLMX8OiKlE7C4,25603
 kerykeion/charts/__init__.py,sha256=Juxkduy2TaagWblh_7CE8Acrg3dHL27-WEddJhau_eQ,127
 kerykeion/charts/charts_utils.py,sha256=Pfy-SkPnABIy5ZkKgypnGqxXOAKhTRIeQX3fQKO8DgQ,15065
-kerykeion/charts/kerykeion_chart_svg.py,sha256=5PtKiubdeR2hVo3DfxYTkdGvV4ajqKEAd9i3rMOPZYo,62739
-kerykeion/charts/templates/chart.xml,sha256=g8trrQdGj7Gw4B2uJS-cysyD8pf3cXA9rKF6fT75pEs,67615
+kerykeion/charts/kerykeion_chart_svg.py,sha256=ECz_nTtNl5b2JeWnLAQSXFoCMILeFoI5wHfZetUceNw,63657
+kerykeion/charts/templates/chart.xml,sha256=5LjTkvWU8_iafIIeHUYAVqh5bUyGzqXau09OLkuiduE,67714
 kerykeion/enums.py,sha256=Ben9GLYkPucpYY2ZDpURzUbNCc9jzK2MuaffkgiXFdQ,965
 kerykeion/fetch_geonames.py,sha256=ZWB1DbcH54ab3fQhzPhLY0Dz0OaPJqiHFn2e7DRr1MM,4588
 kerykeion/kr_types/__init__.py,sha256=-qhGQikurdoHnGtuT1bsaEeZ-IwmZtIHMjGOPC9_oqQ,295
-kerykeion/kr_types/chart_types.py,sha256=g9z53FTOsb2rusUG8nK4dtFgvVa6RCwAfAbrxFb9KaM,2180
+kerykeion/kr_types/chart_types.py,sha256=qaZjm1rMpDDnUZlLjEihd9KPyv3PvrV8vkRmNBuRZzE,2201
 kerykeion/kr_types/kerykeion_exception.py,sha256=G-7VFta78qBt10l54JZWvwH-3lUNKmDwuILXaVGVu9A,314
-kerykeion/kr_types/kr_literals.py,sha256=bjv5TR7EX7yXx2hv4yn-639HEwm3EGZVGGdLc4jENsI,1997
-kerykeion/kr_types/kr_models.py,sha256=_BAW5moUJu4CWem1knwcyfnai6vkZZxnW8eJyu2azLY,3113
+kerykeion/kr_types/kr_literals.py,sha256=Q9kfm2y3uwg3ZpEzIIrEpAC8X0BWYQjT0gy5iAKfAdc,2613
+kerykeion/kr_types/kr_models.py,sha256=nP65w8_SC1iprYT3o7n4JknyafCD56SsAZKcgAHVN10,3218
 kerykeion/kr_types/settings_models.py,sha256=Gh467QjvlGmheD6eJI1IHpuK4cz_hbtjGTJT_1NMoAE,12376
 kerykeion/relationship_score.py,sha256=R9JugfK5_gJgr5ND-EghkqpqZcutzzKlJ-2JnYUMVv4,6794
 kerykeion/report.py,sha256=kS5avIN119pJVapYjZOvabg77nEcA8sSrOuXbRifABk,2565
@@ -24,9 +24,9 @@ kerykeion/settings/kerykeion_settings.py,sha256=uRAbhJ0ZXAbGBPGJjhh5u8YX2phcXobE
 kerykeion/settings/kr.config.json,sha256=1Yhv9RGHom5U9e-JZZRWVfT2Ubllz2WrckdwadDWfyg,12282
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion/utilities.py,sha256=Sb-EdrgvyGgLNxFUNWaMr4DBTbvyTkZjXR_c0ouTCj0,10872
-kerykeion-4.10.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.10.1.dist-info/METADATA,sha256=a4Ha8zpnKE15-4qiAFTVKNDthXgbVUmlcAM93ibhIPs,10826
-kerykeion-4.10.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kerykeion-4.10.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.10.1.dist-info/RECORD,,
+kerykeion/utilities.py,sha256=2ZDx03qU4KUmlahTrdR5WeGej80OFNQcpV46og4od8E,10908
+kerykeion-4.11.0.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.11.0.dist-info/METADATA,sha256=05feKIoZFNOkVrUpmyltoIKad6Dt06cO2Q3VrzFYh5g,11337
+kerykeion-4.11.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kerykeion-4.11.0.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.11.0.dist-info/RECORD,,