kerykeion 5.0.0a4__tar.gz → 5.0.0a5__tar.gz

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kerykeion
-Version: 5.0.0a4
+Version: 5.0.0a5
 Summary: A python library for astrology.
 License: AGPL-3.0
 Keywords: astrology,ephemeris,astrology library,birtchart,svg,zodiac,zodiac-sing,astronomical-algorithms,synastry,astrology-calculator

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/astrological_subject_factory.py

@@ -214,50 +214,54 @@ class AstrologicalSubjectFactory:
         Returns:
             An AstrologicalSubjectModel with calculated data
         """
-        logging.debug("Starting Kerykeion calculation")
+        # Create a calculation data container
+        calc_data = {}
+
+        # Basic identity
+        calc_data["name"] = name
+        calc_data["json_dir"] = str(Path.home())
+
+        # Create a deep copy of active points to avoid modifying the original list
+        active_points = list(active_points)
+
+        calc_data["active_points"] = active_points
+
 
-        if "Sun" not in active_points:
+        if "Sun" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Sun' to active points")
-            active_points.append("Sun")
+            calc_data["active_points"].append("Sun")
 
-        if "Moon" not in active_points:
+        if "Moon" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Moon' to active points")
-            active_points.append("Moon")
+            calc_data["active_points"].append("Moon")
 
-        if "Ascendant" not in active_points:
+        if "Ascendant" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Ascendant' to active points")
-            active_points.append("Ascendant")
+            calc_data["active_points"].append("Ascendant")
 
-        if "Medium_Coeli" not in active_points:
+        if "Medium_Coeli" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Medium_Coeli' to active points")
-            active_points.append("Medium_Coeli")
+            calc_data["active_points"].append("Medium_Coeli")
 
-        if "Mercury" not in active_points:
+        if "Mercury" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Mercury' to active points")
-            active_points.append("Mercury")
+            calc_data["active_points"].append("Mercury")
 
-        if "Venus" not in active_points:
+        if "Venus" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Venus' to active points")
-            active_points.append("Venus")
+            calc_data["active_points"].append("Venus")
 
-        if "Mars" not in active_points:
+        if "Mars" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Mars' to active points")
-            active_points.append("Mars")
+            calc_data["active_points"].append("Mars")
 
-        if "Jupiter" not in active_points:
+        if "Jupiter" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Jupiter' to active points")
-            active_points.append("Jupiter")
+            calc_data["active_points"].append("Jupiter")
 
-        if "Saturn" not in active_points:
+        if "Saturn" not in calc_data["active_points"]:
             logging.info("Automatically adding 'Saturn' to active points")
-            active_points.append("Saturn")
-
-        # Create a calculation data container
-        calc_data = {}
-
-        # Basic identity
-        calc_data["name"] = name
-        calc_data["json_dir"] = str(Path.home())
+            calc_data["active_points"].append("Saturn")
 
         # Initialize configuration
         config = ChartConfiguration(
@@ -321,15 +325,14 @@ class AstrologicalSubjectFactory:
         calc_data["minute"] = minute
         calc_data["seconds"] = seconds
         calc_data["is_dst"] = is_dst
-        calc_data["active_points"] = active_points
 
         # Calculate time conversions
         cls._calculate_time_conversions(calc_data, location)
 
         # Initialize Swiss Ephemeris and calculate houses and planets
         cls._setup_ephemeris(calc_data, config)
-        cls._calculate_houses(calc_data, active_points)
-        cls._calculate_planets(calc_data, active_points)
+        cls._calculate_houses(calc_data, calc_data["active_points"])
+        cls._calculate_planets(calc_data, calc_data["active_points"])
         cls._calculate_day_of_week(calc_data)
 
         # Calculate lunar phase
@@ -349,7 +352,7 @@ class AstrologicalSubjectFactory:
         city: str = "Greenwich",
         nation: str = "GB",
         tz_str: str = "Etc/GMT",
-        online: bool = False,
+        online: bool = True,
         lng: float = 0.0,
         lat: float = 51.5074,
         geonames_username: str = DEFAULT_GEONAMES_USERNAME,

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/kerykeion_chart_svg.py

@@ -245,7 +245,6 @@ class KerykeionChartSVG:
         home_directory = Path.home()
         self.new_settings_file = new_settings_file
         self.chart_language = chart_language
-        self.active_points = active_points
         self.active_aspects = active_aspects
         self.chart_type = chart_type
         self.double_chart_aspect_grid_type = double_chart_aspect_grid_type
@@ -254,16 +253,16 @@ class KerykeionChartSVG:
         self.aspects_settings = aspects_settings
 
         if not active_points:
-            active_points = first_obj.active_points
+            self.active_points = first_obj.active_points
         else:
-            active_points = find_common_active_points(
+            self.active_points = find_common_active_points(
                 active_points,
                 first_obj.active_points
             )
 
         if second_obj:
-            active_points = find_common_active_points(
-                active_points,
+            self.active_points = find_common_active_points(
+                self.active_points,
                 second_obj.active_points
             )
 
@@ -285,7 +284,7 @@ class KerykeionChartSVG:
         # Configure available planets
         self.available_planets_setting = []
         for body in self.planets_settings:
-            if body["name"] in active_points:
+            if body["name"] in self.active_points:
                 body["is_active"] = True
                 self.available_planets_setting.append(body)
 
@@ -310,7 +309,7 @@ class KerykeionChartSVG:
             natal_aspects_instance = NatalAspects(
                 self.first_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = natal_aspects_instance.relevant_aspects
@@ -342,7 +341,7 @@ class KerykeionChartSVG:
                 raise KerykeionException("First object must be a CompositeSubjectModel instance.")
 
             # Calculate aspects
-            self.aspects_list = NatalAspects(self.first_obj, new_settings_file=self.new_settings_file, active_points=active_points).relevant_aspects
+            self.aspects_list = NatalAspects(self.first_obj, new_settings_file=self.new_settings_file, active_points=self.active_points).relevant_aspects
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -377,15 +376,13 @@ class KerykeionChartSVG:
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             # Secondary subject available points
-            self.t_available_kerykeion_celestial_points = []
-            for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+            self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -424,15 +421,13 @@ class KerykeionChartSVG:
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             # Secondary subject available points
-            self.t_available_kerykeion_celestial_points = []
-            for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+            self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -467,15 +462,13 @@ class KerykeionChartSVG:
                 self.first_obj,
                 self.second_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = synastry_aspects_instance.relevant_aspects
 
             # Secondary subject available points
-            self.t_available_kerykeion_celestial_points = []
-            for body in available_celestial_points_names:
-                self.t_available_kerykeion_celestial_points.append(self.second_obj.get(body))
+            self.t_available_kerykeion_celestial_points = self.available_kerykeion_celestial_points
 
             # Screen size
             self.height = self._DEFAULT_HEIGHT
@@ -502,7 +495,7 @@ class KerykeionChartSVG:
             natal_aspects_instance = NatalAspects(
                 self.first_obj,
                 new_settings_file=self.new_settings_file,
-                active_points=active_points,
+                active_points=self.active_points,
                 active_aspects=active_aspects,
             )
             self.aspects_list = natal_aspects_instance.relevant_aspects
@@ -1841,6 +1834,10 @@ if __name__ == "__main__":
     from kerykeion.planetary_return_factory import PlanetaryReturnFactory
     from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
 
+    ACTIVE_PLANETS: list[AstrologicalPoint] = [
+        "Sun", "Moon", "Pars_Fortunae"
+    ]
+
     setup_logging(level="info")
 
     subject = AstrologicalSubjectFactory.from_birth_data("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
@@ -1852,7 +1849,7 @@ if __name__ == "__main__":
         lng=-118.2437,
         lat=34.0522,
         tz_str="America/Los_Angeles",
-        altitude=0,
+        altitude=0
     )
 
     ###
@@ -1861,6 +1858,7 @@ if __name__ == "__main__":
         first_obj=subject,
         chart_language="IT",
         theme="strawberry",
+        active_points=ACTIVE_PLANETS,
     )
     birth_chart.makeSVG() # minify=True, remove_css_variables=True)
 
@@ -1875,7 +1873,7 @@ if __name__ == "__main__":
         second_obj=solar_return,
         chart_language="IT",
         theme="classic",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"],
+        active_points=ACTIVE_PLANETS,
     )
 
     solar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
@@ -1888,7 +1886,7 @@ if __name__ == "__main__":
         second_obj=solar_return,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+        active_points=ACTIVE_PLANETS,
     )
 
     single_wheel_return_chart.makeSVG() # minify=True, remove_css_variables=True)
@@ -1905,20 +1903,23 @@ if __name__ == "__main__":
         second_obj=lunar_return,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+        active_points=ACTIVE_PLANETS,
     )
     lunar_return_chart.makeSVG() # minify=True, remove_css_variables=True)
 
     ###
     ## Transit Chart
-    transit = AstrologicalSubjectFactory.from_current_time()
+    transit = AstrologicalSubjectFactory.from_iso_utc_time(
+        "Transit",
+        "2021-10-04T18:30:00+01:00",
+    )
     transit_chart = KerykeionChartSVG(
         first_obj=subject,
         chart_type="Transit",
         second_obj=transit,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"]
+        active_points=ACTIVE_PLANETS
     )
     transit_chart.makeSVG() # minify=True, remove_css_variables=True)
 
@@ -1931,7 +1932,7 @@ if __name__ == "__main__":
         second_obj=second_subject,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"],
+        active_points=ACTIVE_PLANETS
     )
     synastry_chart.makeSVG() # minify=True, remove_css_variables=True)
 
@@ -1944,7 +1945,7 @@ if __name__ == "__main__":
         second_obj=transit,
         chart_language="IT",
         theme="dark",
-        active_points=["Sun", "Moon", "Mercury", "Venus", "Mars", "Jupiter", "Saturn", "Ascendant"],
+        active_points=ACTIVE_PLANETS,
         double_chart_aspect_grid_type="table"
     )
     transit_chart_with_grid.makeSVG() # minify=True, remove_css_variables=True)

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/templates/chart.xml

@@ -370,9 +370,9 @@ OpenAstro.org -->
         <symbol id="Pars_Fortunae">
             <g transform="translate(1,2)">
                 <circle cx="11" cy="11" r="9"
-                    style="fill: none; stroke: $planets_color_21; stroke-width: 2px" />
-                <path d="M 11,2 L 11,20 M 2,11 L 20,11"
-                    style="stroke: $planets_color_21; stroke-width: 2px; fill: none;" />
+                    style="fill: none; stroke: $planets_color_36; stroke-width: 2px" />
+                <path d="M 5,5 L 17,17 M 17,5 L 5,17"
+                    style="stroke: $planets_color_36; stroke-width: 2px; fill: none;" />
             </g>
         </symbol>
 

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/themes/classic.css

@@ -92,6 +92,11 @@
     --kerykeion-chart-color-fire-percentage: #ff6600;
     --kerykeion-chart-color-water-percentage: #630e73;
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-chart-color-fire-percentage);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-chart-color-earth-percentage);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-chart-color-water-percentage);
+
     /* Other */
     --kerykeion-chart-color-house-number: #f00;
 }

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/themes/dark-high-contrast.css

@@ -134,6 +134,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/themes/dark.css

@@ -135,6 +135,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/themes/light.css

@@ -135,6 +135,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/charts/themes/strawberry.css

@@ -134,6 +134,11 @@
     --kerykeion-chart-color-fire-percentage: var(--kerykeion-color-accent);
     --kerykeion-chart-color-water-percentage: var(--kerykeion-color-secondary);
 
+    /* Modalities Percentage */
+    --kerykeion-chart-color-cardinal-percentage: var(--kerykeion-color-success);
+    --kerykeion-chart-color-fixed-percentage: var(--kerykeion-color-warning);
+    --kerykeion-chart-color-mutable-percentage: var(--kerykeion-color-error);
+
     /* Aspects */
     --kerykeion-chart-color-lunar-phase-0: var(--kerykeion-color-black);
     --kerykeion-chart-color-lunar-phase-1: var(--kerykeion-color-white);

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/planetary_return_factory.py

@@ -175,6 +175,7 @@ class PlanetaryReturnFactory:
             nation=self.nation, # type: ignore
             online=False,
             altitude=self.altitude,
+            active_points=self.subject.active_points,
         )
 
         model_data = solar_return_astrological_subject.model_dump()

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/settings/kr.config.json

@@ -252,10 +252,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Regulus",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Part de Fortune",
-                "Pars_Spiritus": "Part d'Esprit",
-                "Pars_Amoris": "Part d'Amour",
-                "Pars_Fidei": "Part de Foi",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }
@@ -382,10 +382,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Régulo",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Parte da Fortuna",
-                "Pars_Spiritus": "Parte do Espírito",
-                "Pars_Amoris": "Parte do Amor",
-                "Pars_Fidei": "Parte da Fé",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }
@@ -512,10 +512,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Regolo",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Parte di Fortuna",
-                "Pars_Spiritus": "Parte dello Spirito",
-                "Pars_Amoris": "Parte dell'Amore",
-                "Pars_Fidei": "Parte della Fede",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }
@@ -772,10 +772,10 @@
                 "Quaoar": "Quaoar",
                 "Regulus": "Régulo",
                 "Spica": "Spica",
-                "Pars_Fortunae": "Parte de Fortuna",
-                "Pars_Spiritus": "Parte del Espíritu",
-                "Pars_Amoris": "Parte del Amor",
-                "Pars_Fidei": "Parte de la Fe",
+                "Pars_Fortunae": "Pars Fortunae",
+                "Pars_Spiritus": "Pars Spiritus",
+                "Pars_Amoris": "Pars Amoris",
+                "Pars_Fidei": "Pars Fidei",
                 "Vertex": "Vertex",
                 "Anti_Vertex": "Anti-Vertex"
             }

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/kerykeion/utilities.py

@@ -677,18 +677,15 @@ def get_house_number(house_name: Houses) -> int:
 
 def find_common_active_points(first_points: list[AstrologicalPoint], second_points: list[AstrologicalPoint]) -> list[AstrologicalPoint]:
     """
-        Find the common astrological points between those available in the subject and those requested.
+    Find only the elements that are present in both lists.
 
-        Args:
-            first_points: List of points available in the astrological subject
-            second_points: List of points requested by the user
+    Args:
+        first_points: List of astrological points
+        second_points: List of astrological points
 
-        Returns:
-            List containing only the requested points that are also available in the subject
+    Returns:
+        List of elements common to both lists (without duplicates, order not guaranteed).
     """
-    common_points: list[AstrologicalPoint]
-    common_points = [point for point in second_points if point in first_points]
-
-    ignored_points = set(second_points) - set(common_points)
+    common_points = list(set(first_points) & set(second_points))
 
     return common_points

{kerykeion-5.0.0a4 → kerykeion-5.0.0a5}/pyproject.toml

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