kerykeion 4.25.1__py3-none-any.whl → 4.25.3__py3-none-any.whl

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)
 

kerykeion/composite_subject_factory.py

@@ -8,7 +8,8 @@ from kerykeion.utilities import (
     get_kerykeion_point_from_degree,
     get_planet_house,
     circular_mean,
-    calculate_moon_phase
+    calculate_moon_phase,
+    circular_sort
 )
 
 
@@ -132,17 +133,22 @@ class CompositeSubjectFactory:
         house_degree_list_ut = []
         for house in self.first_subject.houses_names_list:
             house_lower = house.lower()
-            self[house_lower] = get_kerykeion_point_from_degree(
+            house_degree_list_ut.append(
                 circular_mean(
                     self.first_subject[house_lower]["abs_pos"],
                     self.second_subject[house_lower]["abs_pos"]
-                ),
-                house,
+                )
+        )
+        house_degree_list_ut = circular_sort(house_degree_list_ut)
+
+        for house_index, house_name in enumerate(self.first_subject.houses_names_list):
+            house_lower = house_name.lower()
+            self[house_lower] = get_kerykeion_point_from_degree(
+                house_degree_list_ut[house_index],
+                house_name,
                 "House"
             )
-            house_degree_list_ut.append(self[house_lower]["abs_pos"])
 
-        house_degree_list_ut = sorted(house_degree_list_ut)
 
         # Planets
         common_planets = []

kerykeion/kr_types/settings_models.py

@@ -131,7 +131,8 @@ class KerykeionLanguageModel(SubscriptableBaseModel):
     and_word: str
     transits: str
     type: str
-    aspects: str
+    couple_aspects: str
+    transit_aspects: str
     planets_and_house: str
     transit_name: str
     lunar_phase: str

kerykeion/settings/kr.config.json

@@ -16,7 +16,8 @@
       "and_word": "and",
       "transits": "Transits for",
       "type": "Type",
-      "aspects": "Couple aspects",
+      "couple_aspects": "Couple aspects",
+      "transit_aspects": "Transit aspects",
       "planets_and_house": "Points for",
       "transit_name": "At the time of the transit",
       "lunar_phase": "Lunar phase",
@@ -111,7 +112,8 @@
       "and_word": "et",
       "transits": "Transites pour",
       "type": "Type",
-      "aspects": "Les aspects",
+      "couple_aspects": "Les aspects",
+      "transit_aspects": "Les aspects de transit",
       "planets_and_house": "Points pour",
       "transit_name": "Au moment de la transition",
       "lunar_phase": "Phase Lunaire",
@@ -206,7 +208,8 @@
       "and_word": "e",
       "transits": "Trânsitos para",
       "type": "Tipo",
-      "aspects": "Aspectos do casal",
+      "couple_aspects": "Aspectos do casal",
+      "transit_aspects": "Aspectos do trânsito",
       "planets_and_house": "Pontos para",
       "transit_name": "No momento do trânsito",
       "lunar_phase": "Fase lunar",
@@ -301,7 +304,8 @@
       "and_word": "e",
       "transits": "Transiti per",
       "type": "Tipo",
-      "aspects": "Aspetti di coppia",
+      "couple_aspects": "Aspetti di coppia",
+      "transit_aspects": "Aspetti di transito",
       "planets_and_house": "Punti per",
       "transit_name": "Al momento del transito",
       "lunar_phase": "Fase lunare",
@@ -396,7 +400,8 @@
       "and_word": "與",
       "transits": "流年合盤",
       "type": "盤型",
-      "aspects": "相位",
+      "couple_aspects": "相位",
+      "transit_aspects": "流年相位",
       "planets_and_house": "行星 與 宫位",
       "transit_name": "流年名稱",
       "lunar_phase": "月相",
@@ -491,7 +496,8 @@
       "and_word": "y",
       "transits": "Tránsitos para",
       "type": "Tipo",
-      "aspects": "Aspectos de la pareja",
+      "couple_aspects": "Aspectos de la pareja",
+      "transit_aspects": "Aspectos de tránsito",
       "planets_and_house": "Puntos para",
       "transit_name": "En el momento del tránsito",
       "lunar_phase": "Fase lunar",
@@ -586,7 +592,8 @@
       "and_word": "и",
       "transits": "Транзиты для",
       "type": "Тип",
-      "aspects": "Аспекты пары",
+      "couple_aspects": "Аспекты пары",
+      "transit_aspects": "Транзитные аспекты",
       "planets_and_house": "Пункты для",
       "transit_name": "В момент транзита",
       "lunar_phase": "Лунная фаза",
@@ -681,7 +688,8 @@
       "and_word": "ve",
       "transits": "Geçişler için",
       "type": "Tür",
-      "aspects": "Çiftin Açılar",
+      "couple_aspects": "Çiftin Açılar",
+      "transit_aspects": "Geçiş Açıları",
       "planets_and_house": "Puanlar için",
       "transit_name": "Geçiş anında",
       "lunar_phase": "Ay Aşaması",
@@ -776,7 +784,8 @@
       "and_word": "und",
       "transits": "Transite für",
       "type": "Typ",
-      "aspects": "Aspekte des Paares",
+      "couple_aspects": "Aspekte des Paares",
+      "transit_aspects": "Transitaspekte",
       "planets_and_house": "Punkte für",
       "transit_name": "Zum Zeitpunkt des Transits",
       "lunar_phase": "Mondphase",
@@ -871,7 +880,8 @@
       "and_word": "और",
       "transits": "गोचर के लिए",
       "type": "प्रकार",
-      "aspects": "जोड़ी के पहलू",
+      "couple_aspects": "जोड़ी के पहलू",
+      "transit_aspects": "गोचर के पहलू",
       "planets_and_house": "अंक के लिए",
       "transit_name": "गोचर के समय",
       "lunar_phase": "चंद्र चरण",

kerykeion/utilities.py

@@ -390,3 +390,53 @@ def calculate_moon_phase(moon_abs_pos: float, sun_abs_pos: float) -> LunarPhaseM
     }
 
     return LunarPhaseModel(**lunar_phase_dictionary)
+
+
+def circular_sort(degrees: list[Union[int, float]]) -> list[Union[int, float]]:
+    """
+    Sort a list of degrees in a circular manner, starting from the first element
+    and progressing clockwise around the circle.
+
+    Args:
+        degrees: A list of numeric values representing degrees
+
+    Returns:
+        A list sorted based on circular clockwise progression from the first element
+
+    Raises:
+        ValueError: If the list is empty or contains non-numeric values
+    """
+    # Input validation
+    if not degrees:
+        raise ValueError("Input list cannot be empty")
+
+    if not all(isinstance(degree, (int, float)) for degree in degrees):
+        invalid = next(d for d in degrees if not isinstance(d, (int, float)))
+        raise ValueError(f"All elements must be numeric, found: {invalid} of type {type(invalid).__name__}")
+
+    # If list has 0 or 1 element, return it as is
+    if len(degrees) <= 1:
+        return degrees.copy()
+
+    # Save the first element as the reference
+    reference = degrees[0]
+
+    # Define a function to calculate clockwise distance from reference
+    def clockwise_distance(angle: Union[int, float]) -> Union[int, float]:
+        # Normalize angles to 0-360 range
+        ref_norm = reference % 360
+        angle_norm = angle % 360
+
+        # Calculate clockwise distance
+        distance = angle_norm - ref_norm
+        if distance < 0:
+            distance += 360
+
+        return distance
+
+    # Sort the rest of the elements based on circular distance
+    remaining = degrees[1:]
+    sorted_remaining = sorted(remaining, key=clockwise_distance)
+
+    # Return the reference followed by the sorted remaining elements
+    return [reference] + sorted_remaining

{kerykeion-4.25.1.dist-info → kerykeion-4.25.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.25.1
+Version: 4.25.3
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -39,24 +39,16 @@ 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://visitor-badge.laobi.icu/badge?page_id=g-battaglia.kerykeion" alt="visitors"/>
-    </a>
-    <a href="https://pypi.org/project/kerykeion" target="_blank">
+        
+</div>
+<div align="center">
+        <img src="https://static.pepy.tech/badge/kerykeion/month" alt="PyPI Downloads">
+        <img src="https://static.pepy.tech/badge/kerykeion/week" alt="PyPI Downloads">
+        <img src="https://img.shields.io/github/contributors/g-battaglia/kerykeion?color=blue&logo=github" alt="contributors">
         <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>
 </div>
 
 &nbsp;
@@ -174,6 +166,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 CompositeSubjectFactory, 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.1.dist-info → kerykeion-4.25.3.dist-info}/RECORD

@@ -8,7 +8,7 @@ kerykeion/astrological_subject.py,sha256=643axkLtIVPkOOTHhB4InHYn3XVEOBZdXLS9B-N
 kerykeion/charts/__init__.py,sha256=i9NMZ7LdkllPlqQSi1or9gTobHbROGDKmJhBDO4R0mA,128
 kerykeion/charts/charts_utils.py,sha256=TGmya60LMswUvQMi6irJWaboK6QRWCZ52wv5FMgaUT8,40424
 kerykeion/charts/draw_planets.py,sha256=Uty3zpWYMQZvvK7ZHhlmynCHeL8DIN3qL2ifnBXVciM,17393
-kerykeion/charts/kerykeion_chart_svg.py,sha256=JPsNV7AAwYY1tQ8jNnc0TKEGXY-l-Ez3-Z632QcbR90,51221
+kerykeion/charts/kerykeion_chart_svg.py,sha256=-mtL2rfGTeT17L5nZQ9bq5T5VYUZx2TpYRisEU3Bx_s,51891
 kerykeion/charts/templates/aspect_grid_only.xml,sha256=ZiBVeToVmCA8QxYlB_cfnsAO1NNeQAnJ_6rIYkr4F58,70091
 kerykeion/charts/templates/chart.xml,sha256=2p2LNNib9MfZiq521tFoEUwOBEN6KlbKOY4ZINdf7Dc,74985
 kerykeion/charts/templates/wheel_only.xml,sha256=E0JCxcnjTjxuaomw7PQEc_3xRVErj1y2hIOGTrShuhc,71304
@@ -16,7 +16,7 @@ kerykeion/charts/themes/classic.css,sha256=-b6XllAZmqUDjBwDtIkfzfI3Wtc8AImuGMpfA
 kerykeion/charts/themes/dark-high-contrast.css,sha256=9tdyFC-4Ytnv4lrVwKnOjZJ0YNgbRrP_HNnfJRlnbn0,6099
 kerykeion/charts/themes/dark.css,sha256=ml2lnzQVuS5DhCdoeUrDmMv9kB1nNceRt7hHbOHSbjM,6099
 kerykeion/charts/themes/light.css,sha256=ALf5U8tQsb6ky0N9R7ZLOHDrfKEXNM-sBR3JIRxFrCI,6092
-kerykeion/composite_subject_factory.py,sha256=3wyY03mefF9OPfeFyV7Ck4BIq8oY-kSqkHi4f8Ap9B0,8049
+kerykeion/composite_subject_factory.py,sha256=ha66wQzcyJTb6XvJo3ppcZIZfvg4LQbFMLiIOm8Up0c,8245
 kerykeion/enums.py,sha256=nPXgP_ocsRnRno5H-yunZy3fp-hLZ9aYRaUb-2gBdvw,1199
 kerykeion/ephemeris_data.py,sha256=Cd5TK5nTkFHYU6bkLKjZRfiU4_6AgsWGcwBDrBHKrQk,8096
 kerykeion/fetch_geonames.py,sha256=e66Nh6yq9A4VjnuvVSiV1TW1IkJ9m3Q2LKPWrkOGgO0,4764
@@ -25,7 +25,7 @@ kerykeion/kr_types/chart_types.py,sha256=EFXTddX1wwTzbLSDKw_ipg4tbOihTKPEnn2T9oo
 kerykeion/kr_types/kerykeion_exception.py,sha256=kE1y0K0rmuz32b4K_ZppSsZ59I2Get0ZkvOkTE5HejI,314
 kerykeion/kr_types/kr_literals.py,sha256=b1JEgByA8-PWtkM8TdkNb2aePr8dUApI-OH3ciulJF8,4327
 kerykeion/kr_types/kr_models.py,sha256=N7VhwxcMkXMjn5UNArleuxZ684woJzBjvvNC1CF7ttg,6824
-kerykeion/kr_types/settings_models.py,sha256=kIq8If9rjnDhLUZ4y68fl0xcHTQoI9kbbny8NegPtsY,10968
+kerykeion/kr_types/settings_models.py,sha256=vo_feYdV_DFMw2aDQahe2q8W_OzsmzP0R91wxUxEZzg,11000
 kerykeion/relationship_score/__init__.py,sha256=cLaEBQXQBfyRkv0OaS3ceLROzvWcvKXWiRq0PS6LDjY,114
 kerykeion/relationship_score/relationship_score.py,sha256=lJkSbHw9nOUaPMrPxqcGhnVQIwAgI52K8BQzXXswb6A,6504
 kerykeion/relationship_score/relationship_score_factory.py,sha256=wVdVomy_WlIvIvidnsf5a7jEZA8HJV8m8E3E_gia2yY,8651
@@ -33,12 +33,12 @@ kerykeion/report.py,sha256=snqnrJzb89q2ixL74qS9ksvzNSh_WXtZ_haBOIvHYeY,2814
 kerykeion/settings/__init__.py,sha256=QQNFCl7sgN27MKaVscqtpPk10HGz4wZS3I_7KEGMaVA,69
 kerykeion/settings/config_constants.py,sha256=OUi28L2l8s09Df3GHiQUiBZuTjOdfL4A5zSRNqBRHc8,1255
 kerykeion/settings/kerykeion_settings.py,sha256=7GCGUzcctEg5uyWlzRk2YIotJSkCZDOVAo_CXwgMeK4,2934
-kerykeion/settings/kr.config.json,sha256=5ktsoMnuhY9eUpQHC8oNmRZqPC7Lt3ILgOucKQvsJkQ,42059
+kerykeion/settings/kr.config.json,sha256=4ZB7fkM0xiiXDLtxPRVDIVm0lUMYahWQmCVugFe274I,42628
 kerykeion/sweph/README.md,sha256=L7FtNAJTWtrZNGKa8MX87SjduFYPYxwWhaI5fmtzNZo,73
 kerykeion/sweph/seas_18.se1,sha256=X9nCqhZU43wJpq61WAdueVQJt9xL2UjrwPqn1Kdoa1s,223002
-kerykeion/utilities.py,sha256=6TQpxENYDMacH4CsRJGJ4rmoV2Pn7pmQc8MTOUR2CSg,13824
-kerykeion-4.25.1.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
-kerykeion-4.25.1.dist-info/METADATA,sha256=PQnqq2_2emnyReIYrR2P7io4x0WRQ3EFwftDiGA6cvc,17802
-kerykeion-4.25.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-kerykeion-4.25.1.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
-kerykeion-4.25.1.dist-info/RECORD,,
+kerykeion/utilities.py,sha256=sZUFZQJXrMieLPg-0hCTrvfGQaWuPx6cMi-t1kJAxPw,15534
+kerykeion-4.25.3.dist-info/LICENSE,sha256=UTLH8EdbAsgQei4PA2PnBCPGLSZkq5J-dhkyJuXgWQU,34273
+kerykeion-4.25.3.dist-info/METADATA,sha256=z2-LCuJBlGFi26Wtpiz1FJlPX5tBJyQgmnFDeKu0Plk,18976
+kerykeion-4.25.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+kerykeion-4.25.3.dist-info/entry_points.txt,sha256=5SmANYscFDDTdeovHvGQ-cnj0hdFvGoxPaWLCpyDFnQ,49
+kerykeion-4.25.3.dist-info/RECORD,,