kerykeion 4.25.0__tar.gz → 4.25.2__tar.gz

{kerykeion-4.25.0 → kerykeion-4.25.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.25.0
+Version: 4.25.2
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -39,24 +39,15 @@ Description-Content-Type: text/markdown
 
 <h1 align=center>Kerykeion</h1>
 <div align="center">
-    <a href="#">
         <img src="https://img.shields.io/github/contributors/g-battaglia/kerykeion?color=blue&logo=github" alt="contributors">
-    </a>
-    <a href="#">
         <img src="https://img.shields.io/github/stars/g-battaglia/kerykeion.svg?logo=github" alt="stars">
-    </a>
-    <a href="#">
         <img src="https://img.shields.io/github/forks/g-battaglia/kerykeion.svg?logo=github" alt="forks">
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
+        <img src="https://static.pepy.tech/badge/kerykeion" alt="PyPI Downloads">
         <img src="https://visitor-badge.laobi.icu/badge?page_id=g-battaglia.kerykeion" alt="visitors"/>
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
         <img src="https://img.shields.io/pypi/v/kerykeion?label=pypi%20package" alt="Package version">
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
         <img src="https://img.shields.io/pypi/pyversions/kerykeion.svg" alt="Supported Python versions">
-    </a>
+        <img src="https://img.shields.io/github/license/g-battaglia/kerykeion" alt="License">
+
 </div>
 
 &nbsp;
@@ -71,7 +62,7 @@ The core goal of this project is to provide a simple and easy approach to astrol
 
 Here's an example of a birthchart:
 
-![Kanye Birth Chart](https://www.kerykeion.net/docs/assets/img/examples/birth-chart.svg)
+![John Lenon Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/John%20Lennon%20-%20Dark%20Theme%20-%20Natal%20Chart.svg)
 
 ## Web API
 
@@ -174,6 +165,38 @@ synastry_chart.makeSVG()
 
 ![John Lennon and Paul McCartney Synastry](https://www.kerykeion.net/docs/assets/img/examples/synastry-chart.svg)
 
+
+### Transit Chart
+
+```python
+from kerykeion import AstrologicalSubject
+
+transit = AstrologicalSubject("Transit", 2025, 6, 8, 8, 45, "Atlanta", "US")
+subject = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+
+transit_chart = KerykeionChartSVG(subject, "Transit", transit)
+transit_chart.makeSVG()
+```
+
+![John Lennon Transit Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/John%20Lennon%20-%20Transit%20Chart.svg)
+
+### Composite Chart
+
+```python
+from kerykeion import CompositeChart, AstrologicalSubject, KerykeionChartSVG
+
+angelina = AstrologicalSubject("Angelina Jolie", 1975, 6, 4, 9, 9, "Los Angeles", "US", lng=-118.15, lat=34.03, tz_str="America/Los_Angeles")
+brad = AstrologicalSubject("Brad Pitt", 1963, 12, 18, 6, 31, "Shawnee", "US", lng=-96.56, lat=35.20, tz_str="America/Chicago")
+
+composite_subject_factory = CompositeSubjectFactory(angelina, brad)
+composite_subject_model = composite_subject_factory.get_midpoint_composite_subject_model()
+
+composite_chart = KerykeionChartSVG(composite_subject_model, "Composite")
+composite_chart.makeSVG()
+```
+
+![Angelina Jolie and Brad Pitt Composite Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/Angelina%20Jolie%20and%20Brad%20Pitt%20Composite%20Chart%20-%20Composite%20Chart.svg)
+
 ### Change the output directory
 
 By default the output directory is the home directory, you can change it by passing the new_output_directory parameter to the KerykeionChartSVG class:

{kerykeion-4.25.0 → kerykeion-4.25.2}/README.md

@@ -1,23 +1,14 @@
 <h1 align=center>Kerykeion</h1>
 <div align="center">
-    <a href="#">
         <img src="https://img.shields.io/github/contributors/g-battaglia/kerykeion?color=blue&logo=github" alt="contributors">
-    </a>
-    <a href="#">
         <img src="https://img.shields.io/github/stars/g-battaglia/kerykeion.svg?logo=github" alt="stars">
-    </a>
-    <a href="#">
         <img src="https://img.shields.io/github/forks/g-battaglia/kerykeion.svg?logo=github" alt="forks">
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
+        <img src="https://static.pepy.tech/badge/kerykeion" alt="PyPI Downloads">
         <img src="https://visitor-badge.laobi.icu/badge?page_id=g-battaglia.kerykeion" alt="visitors"/>
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
         <img src="https://img.shields.io/pypi/v/kerykeion?label=pypi%20package" alt="Package version">
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
         <img src="https://img.shields.io/pypi/pyversions/kerykeion.svg" alt="Supported Python versions">
-    </a>
+        <img src="https://img.shields.io/github/license/g-battaglia/kerykeion" alt="License">
+
 </div>
 
 &nbsp;
@@ -32,7 +23,7 @@ The core goal of this project is to provide a simple and easy approach to astrol
 
 Here's an example of a birthchart:
 
-![Kanye Birth Chart](https://www.kerykeion.net/docs/assets/img/examples/birth-chart.svg)
+![John Lenon Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/John%20Lennon%20-%20Dark%20Theme%20-%20Natal%20Chart.svg)
 
 ## Web API
 
@@ -135,6 +126,38 @@ synastry_chart.makeSVG()
 
 ![John Lennon and Paul McCartney Synastry](https://www.kerykeion.net/docs/assets/img/examples/synastry-chart.svg)
 
+
+### Transit Chart
+
+```python
+from kerykeion import AstrologicalSubject
+
+transit = AstrologicalSubject("Transit", 2025, 6, 8, 8, 45, "Atlanta", "US")
+subject = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+
+transit_chart = KerykeionChartSVG(subject, "Transit", transit)
+transit_chart.makeSVG()
+```
+
+![John Lennon Transit Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/John%20Lennon%20-%20Transit%20Chart.svg)
+
+### Composite Chart
+
+```python
+from kerykeion import CompositeChart, AstrologicalSubject, KerykeionChartSVG
+
+angelina = AstrologicalSubject("Angelina Jolie", 1975, 6, 4, 9, 9, "Los Angeles", "US", lng=-118.15, lat=34.03, tz_str="America/Los_Angeles")
+brad = AstrologicalSubject("Brad Pitt", 1963, 12, 18, 6, 31, "Shawnee", "US", lng=-96.56, lat=35.20, tz_str="America/Chicago")
+
+composite_subject_factory = CompositeSubjectFactory(angelina, brad)
+composite_subject_model = composite_subject_factory.get_midpoint_composite_subject_model()
+
+composite_chart = KerykeionChartSVG(composite_subject_model, "Composite")
+composite_chart.makeSVG()
+```
+
+![Angelina Jolie and Brad Pitt Composite Chart](https://raw.githubusercontent.com/g-battaglia/kerykeion/refs/heads/master/tests/charts/svg/Angelina%20Jolie%20and%20Brad%20Pitt%20Composite%20Chart%20-%20Composite%20Chart.svg)
+
 ### Change the output directory
 
 By default the output directory is the home directory, you can change it by passing the new_output_directory parameter to the KerykeionChartSVG class:

{kerykeion-4.25.0 → kerykeion-4.25.2}/kerykeion/charts/kerykeion_chart_svg.py

@@ -185,12 +185,24 @@ class KerykeionChartSVG:
             self.t_user = second_obj
 
             # Aspects
-            synastry_aspects_instance = SynastryAspects(
-                self.user, self.t_user,
-                new_settings_file=self.new_settings_file,
-                active_points=active_points,
-                active_aspects=active_aspects,
-            )
+            if self.chart_type == "Transit":
+                synastry_aspects_instance = SynastryAspects(
+                    self.t_user,
+                    self.user,
+                    new_settings_file=self.new_settings_file,
+                    active_points=active_points,
+                    active_aspects=active_aspects,
+                )
+
+            else:
+                synastry_aspects_instance = SynastryAspects(
+                    self.user,
+                    self.t_user,
+                    new_settings_file=self.new_settings_file,
+                    active_points=active_points,
+                    active_aspects=active_aspects,
+                )
+
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             self.t_available_kerykeion_celestial_points = []
@@ -432,7 +444,13 @@ class KerykeionChartSVG:
             template_dict['third_circle'] = draw_third_circle(self.main_radius, self.chart_colors_settings['zodiac_transit_ring_0'], self.chart_colors_settings['paper_1'], self.chart_type, self.third_circle_radius)
 
             if self.double_chart_aspect_grid_type == "list":
-                template_dict["makeAspectGrid"] = draw_transit_aspect_list(self.language_settings["aspects"], self.aspects_list, self.planets_settings, self.aspects_settings)
+                title = ""
+                if self.chart_type == "Synastry":
+                    title = self.language_settings.get("couple_aspects", "Couple Aspects")
+                else:
+                    title = self.language_settings.get("transit_aspects", "Transit Aspects")
+
+                template_dict["makeAspectGrid"] = draw_transit_aspect_list(title, self.aspects_list, self.planets_settings, self.aspects_settings)
             else:
                 template_dict["makeAspectGrid"] = draw_transit_aspect_grid(self.chart_colors_settings['paper_0'], self.available_planets_setting, self.aspects_list, 550, 450)
 
@@ -459,23 +477,23 @@ class KerykeionChartSVG:
 
         # Zodiac Type Info
         if self.user.zodiac_type == 'Tropic':
-            zodiac_info = "Tropical Zodiac"
+            zodiac_info = f"{self.language_settings.get('zodiac', 'Zodiac')}: {self.language_settings.get('tropical', 'Tropical')}"
         else:
             mode_const = "SIDM_" + self.user.sidereal_mode # type: ignore
             mode_name = swe.get_ayanamsa_name(getattr(swe, mode_const))
-            zodiac_info = f"Ayanamsa: {mode_name}"
+            zodiac_info = f"{self.language_settings.get('ayanamsa', 'Ayanamsa')}: {mode_name}"
 
-        template_dict["bottom_left_0"] = f"{self.user.houses_system_name} Houses"
+        template_dict["bottom_left_0"] = f"{self.language_settings.get('houses_system_' + self.user.houses_system_identifier, self.user.houses_system_name)} {self.language_settings.get('houses', 'Houses')}"
         template_dict["bottom_left_1"] = zodiac_info
 
         if self.chart_type in ["Natal", "ExternalNatal", "Synastry"]:
             template_dict["bottom_left_2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")} {self.language_settings.get("day", "Day").lower()}: {self.user.lunar_phase.get("moon_phase", "")}'
-            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.user.lunar_phase.moon_phase_name}'
-            template_dict["bottom_left_4"] = f'{self.user.perspective_type}'
+            template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get(self.user.lunar_phase.moon_phase_name.lower().replace(" ", "_"), self.user.lunar_phase.moon_phase_name)}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get(self.user.perspective_type.lower().replace(" ", "_"), self.user.perspective_type)}'
         elif self.chart_type == "Transit":
             template_dict["bottom_left_2"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.language_settings.get("day", "Day")} {self.t_user.lunar_phase.get("moon_phase", "")}'
             template_dict["bottom_left_3"] = f'{self.language_settings.get("lunar_phase", "Lunar Phase")}: {self.t_user.lunar_phase.moon_phase_name}'
-            template_dict["bottom_left_4"] = f'{self.t_user.perspective_type}'
+            template_dict["bottom_left_4"] = f'{self.language_settings.get(self.t_user.perspective_type.lower().replace(" ", "_"), self.t_user.perspective_type)}'
         elif self.chart_type == "Composite":
             template_dict["bottom_left_2"] = f'{self.user.first_subject.perspective_type}'
             template_dict["bottom_left_3"] = f'{self.language_settings.get("composite_chart", "Composite Chart")} - {self.language_settings.get("midpoints", "Midpoints")}'
@@ -529,7 +547,7 @@ class KerykeionChartSVG:
             longitude_string = convert_longitude_coordinate_to_string(self.geolon, self.language_settings['east'], self.language_settings['west'])
             template_dict["top_left_3"] = f"{self.language_settings['latitude']}: {latitude_string}"
             template_dict["top_left_4"] = f"{self.language_settings['longitude']}: {longitude_string}"
-            template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.chart_type}"
+            template_dict["top_left_5"] = f"{self.language_settings['type']}: {self.language_settings.get(self.chart_type, self.chart_type)}"
 
 
         # Set paper colors

{kerykeion-4.25.0 → kerykeion-4.25.2}/kerykeion/kr_types/settings_models.py

@@ -116,33 +116,79 @@ class KerykeionLanguageModel(SubscriptableBaseModel):
     it's used to translate the celestial points and the other labels
     """
 
-    info: str = Field(title="Info", description="The name of the Info label in the chart, in the language")
-    cusp: str = Field(title="Cusp", description="The name of the Cusp label in the chart, in the language")
-    longitude: str = Field(title="Longitude", description="The name of the Longitude label in the chart, in the language")
-    latitude: str = Field(title="Latitude", description="The name of the Latitude label in the chart, in the language")
-    north: str = Field(title="North", description="The name of the North label in the chart, in the language")
-    east: str = Field(title="East", description="The name of the East label in the chart, in the language")
-    south: str = Field(title="South", description="The name of the South label in the chart, in the language")
-    west: str = Field(title="West", description="The name of the West label in the chart, in the language")
-    fire: str = Field(title="Fire", description="The name of the Fire label in the chart, in the language")
-    earth: str = Field(title="Earth", description="The name of the Earth label in the chart, in the language")
-    air: str = Field(title="Air", description="The name of the Air label in the chart, in the language")
-    water: str = Field(title="Water", description="The name of the Water label in the chart, in the language")
-    and_word: str = Field(title="And", description="The name of the And word in the chart, in the language")
-    transits: str = Field(title="Transits", description="The name of the Transits label in the chart, in the language")
-    type: str = Field(title="Type", description="The name of the Type label in the chart, in the language")
-    aspects: str = Field(title="Aspects", description="The name of the Aspects label in the chart, in the language")
-    planets_and_house: str = Field(title="Planets and Houses", description="The name of the Planets and Houses label in the chart, in the language")
-    transit_name: str = Field(title="Transit Name", description="The name of the Transit Name label in the chart, in the language")
-    lunar_phase: str = Field(title="Lunar Phase", description="The name of the Lunar Phase label in the chart, in the language")
-    day: str = Field(title="Day", description="The name of the Day label in the chart, in the language")
+    info: str
+    cusp: str
+    longitude: str
+    latitude: str
+    north: str
+    east: str
+    south: str
+    west: str
+    fire: str
+    earth: str
+    air: str
+    water: str
+    and_word: str
+    transits: str
+    type: str
+    couple_aspects: str
+    transit_aspects: str
+    planets_and_house: str
+    transit_name: str
+    lunar_phase: str
+    day: str
     celestial_points: KerykeionLanguageCelestialPointModel
-    composite_chart: str = Field(title="Composite Chart", description="The name of the Composite Chart label in the chart, in the language")
-    midpoints: str = Field(title="Midpoints", description="The name of the Midpoints label in the chart, in the language")
-    north_letter: str = Field(title="North Letter", description="The name of the North Letter label in the chart, in the language")
-    east_letter: str = Field(title="East Letter", description="The name of the East Letter label in the chart, in the language")
-    south_letter: str = Field(title="South Letter", description="The name of the South Letter label in the chart, in the language")
-    west_letter: str = Field(title="West Letter", description="The name of the West Letter label in the chart, in the language")
+    composite_chart: str
+    midpoints: str
+    north_letter: str
+    east_letter: str
+    south_letter: str
+    west_letter: str
+    tropical: str
+    sidereal: str
+    zodiac: str
+    ayanamsa: str
+    apparent_geocentric: str
+    heliocentric: str
+    topocentric: str
+    true_geocentric: str
+    new_moon: str
+    waxing_crescent: str
+    first_quarter: str
+    waxing_gibbous: str
+    full_moon: str
+    waning_gibbous: str
+    last_quarter: str
+    waning_crescent: str
+    houses: str
+    houses_system_A: str
+    houses_system_B: str
+    houses_system_C: str
+    houses_system_D: str
+    houses_system_F: str
+    houses_system_H: str
+    houses_system_I: str
+    houses_system_i: str
+    houses_system_K: str
+    houses_system_L: str
+    houses_system_M: str
+    houses_system_N: str
+    houses_system_O: str
+    houses_system_P: str
+    houses_system_Q: str
+    houses_system_R: str
+    houses_system_S: str
+    houses_system_T: str
+    houses_system_U: str
+    houses_system_V: str
+    houses_system_W: str
+    houses_system_X: str
+    houses_system_Y: str
+    Natal: str
+    ExternalNatal: str
+    Synastry: str
+    Transit: str
+    Composite: str
 
 
 class KerykeionGeneralSettingsModel(SubscriptableBaseModel):

{kerykeion-4.25.0 → kerykeion-4.25.2}/kerykeion/relationship_score/relationship_score_factory.py

@@ -221,57 +221,10 @@ if __name__ == "__main__":
 
     setup_logging(level="critical")
 
-    john = AstrologicalSubject("John", 1940, 10, 9, 18, 30, "Liverpool", "UK")
-    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 20, 30, "Tokyo", "JP")
-
-    relationship_score_factory = RelationshipScoreFactory(john, yoko)
-    relationship_score = relationship_score_factory.get_relationship_score()
-
-    print("John and Yoko relationship score:")
-    print(relationship_score.score_value)
-    print(relationship_score.score_description)
-    print(relationship_score.is_destiny_sign)
-    print(len(relationship_score.aspects))
-    print(len(relationship_score_factory._synastry_aspects))
-
-    print("------------------->")
-    freud = AstrologicalSubject("Freud", 1856, 5, 6, 18, 30, "Freiberg", "DE")
-    jung = AstrologicalSubject("Jung", 1875, 7, 26, 18, 30, "Kesswil", "CH")
-
-    relationship_score_factory = RelationshipScoreFactory(freud, jung)
-    relationship_score = relationship_score_factory.get_relationship_score()
-
-    print("Freud and Jung relationship score:")
-    print(relationship_score.score_value)
-    print(relationship_score.score_description)
-    print(relationship_score.is_destiny_sign)
-    print(len(relationship_score.aspects))
-    print(len(relationship_score_factory._synastry_aspects))
-
-    print("------------------->")
-    richart_burton = AstrologicalSubject("Richard Burton", 1925, 11, 10, 15, 00, "Pontrhydyfen", "UK")
-    liz_taylor = AstrologicalSubject("Elizabeth Taylor", 1932, 2, 27, 2, 30, "London", "UK")
-
-    relationship_score_factory = RelationshipScoreFactory(richart_burton, liz_taylor)
-    relationship_score = relationship_score_factory.get_relationship_score()
-
-    print("Richard Burton and Elizabeth Taylor relationship score:")
-    print(relationship_score.score_value)
-    print(relationship_score.score_description)
-    print(relationship_score.is_destiny_sign)
-    print(len(relationship_score.aspects))
-    print(len(relationship_score_factory._synastry_aspects))
-
-    print("------------------->")
-    dario_fo = AstrologicalSubject("Dario Fo", 1926, 3, 24, 12, 25, "Sangiano", "IT")
-    franca_rame = AstrologicalSubject("Franca Rame", 1929, 7, 18, 12, 25, "Parabiago", "IT")
-
-    relationship_score_factory = RelationshipScoreFactory(dario_fo, franca_rame)
-    relationship_score = relationship_score_factory.get_relationship_score()
-
-    print("Dario Fo and Franca Rame relationship score:")
-    print(relationship_score.score_value)
-    print(relationship_score.score_description)
-    print(relationship_score.is_destiny_sign)
-    print(len(relationship_score.aspects))
-    print(len(relationship_score_factory._synastry_aspects))
+    giacomo = AstrologicalSubject("Giacomo", 1993, 6, 10, 12, 15, "Montichiari", "IT")
+    yoko = AstrologicalSubject("Susie Cox", 1949, 6, 17, 9, 40, "Tucson", "US")
+
+    factory = RelationshipScoreFactory(giacomo, yoko)
+    score = factory.get_relationship_score()
+    print(score)
+