Fix #147

Author: g-battaglia

examples/charts/composite_chart.py

@@ -0,0 +1,20 @@
+from kerykeion.astrological_subject import AstrologicalSubject
+from kerykeion.composite_subject_factory import CompositeSubjectFactory
+from kerykeion.charts.kerykeion_chart_svg import KerykeionChartSVG
+
+# Create astrological subjects
+first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
+
+# Generate composite chart data
+composite_chart = CompositeSubjectFactory(first, second)
+print(composite_chart.get_midpoint_composite_subject_model().model_dump_json(indent=4))
+
+# Create and save the composite chart as an SVG
+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()

kerykeion/composite_subject_factory.py

@@ -8,7 +8,8 @@
     get_kerykeion_point_from_degree,
     get_planet_house,
     circular_mean,
-    calculate_moon_phase
+    calculate_moon_phase,
+    circular_sort
 )
 
 
@@ -132,17 +133,22 @@ def _calculate_midpoint_composite_points_and_houses(self):
         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/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

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.25.2"
+version = "4.25.3"
 authors = ["Giacomo Battaglia <kerykeion.astrology@gmail.com>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"