kerykeion 4.11.0__tar.gz → 4.15.0__tar.gz

{kerykeion-4.11.0 → kerykeion-4.15.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.11.0
+Version: 4.15.0
 Summary: A python library for astrology.
-Home-page: https://github.com/g-battaglia/kerykeion
+Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
 Keywords: astrology,ephemeris,astrology library,birtchart,svg,zodiac,zodiac-sing,astronomical-algorithms,synastry,astrology-calculator
 Author: Giacomo Battaglia
@@ -69,13 +69,13 @@ 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](http://centuryboy.altervista.org/KanyeNatalChart.svg)
+![Kanye Birth Chart](https://www.kerykeion.net/docs/assets/img/examples/birth-chart.svg)
 
 ## Web API
 
 If you want to use Kerykeion in a web application, I've created a web API for this purpose, you can find it here:
 
-**[AstrologerAPI](https://rapidapi.com/gbattaglia/api/astrologer/)**
+**[AstrologerAPI](https://rapidapi.com/gbattaglia/api/astrologer/pricing)**
 
 It's [open source](https://github.com/g-battaglia/Astrologer-API), it's a way to support me and the project.
 
@@ -95,9 +95,11 @@ Kerykeion is a _Python 3.9_ package, make sure you have _Python 3.9_ or above in
 pip3 install kerykeion
 ```
 
-## Usage
+## Basic Usage
 
-Here some examples:
+The basic usage of the library is to create an instance of the AstrologicalSubject class and then access the properties of the instance to get the astrological information about the subject.
+
+Here's an example:
 
 ```python
 
@@ -105,8 +107,8 @@ Here some examples:
 from kerykeion import AstrologicalSubject
 
 # Create a kerykeion instance:
-# Args: Name, year, month, day, hour, minuts, city, nation(optional)
-kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta")
+# Args: Name, year, month, day, hour, minuts, city, nation
+kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
 
 # Get the information about the sun in the chart:
 # (The position of the planets always starts at 0)
@@ -139,27 +141,57 @@ If you omit the nation, it will be set to "GB" by default, but the value is not
 
 ## Generate a SVG Chart
 
+### Birth Chart
+
+```python
+from kerykeion import AstrologicalSubject, KerykeionChartSVG
+
+
+birth_chart = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
+birth_chart_svg = KerykeionChartSVG(birth_chart)
+
+birth_chart_svg.makeSVG()
+```
+
+The SVG file will be saved in the home directory.
+![John Lennon Birth Chart](https://www.kerykeion.net/docs/assets/img/examples/birth-chart.svg)
+
+### Synastry Chart
+
 ```python
 from kerykeion import AstrologicalSubject, KerykeionChartSVG
 
-first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma")
-second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma")
+first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
 
 # Set the type, it can be Natal, Synastry or Transit
+synastry_chart = KerykeionChartSVG(first, "Synastry", second)
+synastry_chart.makeSVG()
 
-name = KerykeionChartSVG(first, chart_type="Synastry", second_obj=second)
-name.makeSVG()
-print(len(name.aspects_list))
+```
 
-#> Generating kerykeion object for Jack...
-#> Generating kerykeion object for Jane...
-#> Jack birth location: Roma, 41.89193, 12.51133
-#> SVG Generated Correctly
-#> 38
+![John Lennon and Paul McCartney Synastry](https://www.kerykeion.net/docs/assets/img/examples/synastry-chart.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:
+
+```python
+from kerykeion import AstrologicalSubject, KerykeionChartSVG
+
+first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
 
+# Set the output directory to the current directory
+synastry_chart = KerykeionChartSVG(first, "Synastry", second, new_output_directory=".")
+synastry_chart.makeSVG()
 ```
 
-![Synastry Chart](http://centuryboy.altervista.org/JackComposite_Chart.svg)
+### Change Language
+
+To change the language of the chart you should create a new kr.config.js file and pass it to the BirthChartSVG class. So far the available languages are English, Portuguese, Italian, Spanish, French and Chinese.
+
+Some examples [here](https://www.kerykeion.net/docs/examples/change-language).
 
 ## Report
 
@@ -168,7 +200,7 @@ To print a report of all the data:
 ```python
 from kerykeion import Report, AstrologicalSubject
 
-kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta")
+kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
 report = Report(kanye)
 report.print_report()
 
@@ -225,14 +257,14 @@ And if you want to export it to a file:
 python3 your_script_name.py > file.txt
 ```
 
-## Other exeples of possibles usecase
+## Other examples of possible use cases:
 
 ```python
 # Get all aspects between two persons:
 
 from kerykeion import SynastryAspects, AstrologicalSubject
-first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma")
-second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma")
+first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma", "IT")
+second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma", "IT")
 
 name = SynastryAspects(first, second)
 aspect_list = name.get_relevant_aspects()
@@ -246,7 +278,8 @@ print(aspect_list[0])
 
 ## Ayanamsa (Sidereal Modes)
 
-You can set the zodiac type and the sidereal mode in the AstrologicalSubject class:
+By default, the zodiac type is set to Tropic (Tropical).
+You can set the zodiac type to Sidereal and the sidereal mode in the AstrologicalSubject class:
 
 ```python
 johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
@@ -258,18 +291,55 @@ Full list of supported sidereal modes [here](https://www.kerykeion.net/pydocs/ke
 
 ## Houses Systems
 
+By default, the houses system is set to Placidus.
 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/).
+More examples [here](https://www.kerykeion.net/docs/examples/houses-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.
 
+## Perspective Type
+
+By default, the perspective type is set to Apparent Geocentric (the most common standard for astrology).
+The perspective indicates the point of view from which the chart is calculated (Es. Apparent Geocentric, Heliocentric, etc.).
+You can set the perspective type in the AstrologicalSubject class:
+
+```python
+johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", perspective_type="Heliocentric")
+```
+
+More examples [here](https://www.kerykeion.net/docs/examples/perspective-type/).
+
+Full list of supported perspective types [here](https://www.kerykeion.net/pydocs/kerykeion/kr_types/kr_literals.html#PerspectiveType).
+
+## Alternative Initialization
+
+You can initialize the AstrologicalSubject from a **UTC** ISO 8601 string:
+
+```python
+subject = AstrologicalSubject.get_from_iso_utc_time(
+    "Johnny Depp", "1963-06-09T05:00:00Z", "Owensboro", "US")
+```
+
+Note : The default time zone is UTC, with Greenwich longitude and latitude.
+
+The default online/offline mode is set to offline, if you set it online the default latitude and longitude will be ignored and
+calculated from the city and nation. Remember to pass also the geonames_username parameter if you want to use the online mode, like this:
+
+```python
+from kerykeion.astrological_subject import AstrologicalSubject
+
+# Use the static method get_from_iso_utc_time to create an instance of AstrologicalSubject
+subject = AstrologicalSubject.get_from_iso_utc_time(
+    "Johnny Depp", "1963-06-09T05:00:00Z", "Owensboro", "US", online=True)
+```
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

{kerykeion-4.11.0 → kerykeion-4.15.0}/README.md

@@ -32,13 +32,13 @@ 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](http://centuryboy.altervista.org/KanyeNatalChart.svg)
+![Kanye Birth Chart](https://www.kerykeion.net/docs/assets/img/examples/birth-chart.svg)
 
 ## Web API
 
 If you want to use Kerykeion in a web application, I've created a web API for this purpose, you can find it here:
 
-**[AstrologerAPI](https://rapidapi.com/gbattaglia/api/astrologer/)**
+**[AstrologerAPI](https://rapidapi.com/gbattaglia/api/astrologer/pricing)**
 
 It's [open source](https://github.com/g-battaglia/Astrologer-API), it's a way to support me and the project.
 
@@ -58,9 +58,11 @@ Kerykeion is a _Python 3.9_ package, make sure you have _Python 3.9_ or above in
 pip3 install kerykeion
 ```
 
-## Usage
+## Basic Usage
 
-Here some examples:
+The basic usage of the library is to create an instance of the AstrologicalSubject class and then access the properties of the instance to get the astrological information about the subject.
+
+Here's an example:
 
 ```python
 
@@ -68,8 +70,8 @@ Here some examples:
 from kerykeion import AstrologicalSubject
 
 # Create a kerykeion instance:
-# Args: Name, year, month, day, hour, minuts, city, nation(optional)
-kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta")
+# Args: Name, year, month, day, hour, minuts, city, nation
+kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
 
 # Get the information about the sun in the chart:
 # (The position of the planets always starts at 0)
@@ -102,27 +104,57 @@ If you omit the nation, it will be set to "GB" by default, but the value is not
 
 ## Generate a SVG Chart
 
+### Birth Chart
+
+```python
+from kerykeion import AstrologicalSubject, KerykeionChartSVG
+
+
+birth_chart = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
+birth_chart_svg = KerykeionChartSVG(birth_chart)
+
+birth_chart_svg.makeSVG()
+```
+
+The SVG file will be saved in the home directory.
+![John Lennon Birth Chart](https://www.kerykeion.net/docs/assets/img/examples/birth-chart.svg)
+
+### Synastry Chart
+
 ```python
 from kerykeion import AstrologicalSubject, KerykeionChartSVG
 
-first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma")
-second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma")
+first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
 
 # Set the type, it can be Natal, Synastry or Transit
+synastry_chart = KerykeionChartSVG(first, "Synastry", second)
+synastry_chart.makeSVG()
 
-name = KerykeionChartSVG(first, chart_type="Synastry", second_obj=second)
-name.makeSVG()
-print(len(name.aspects_list))
+```
 
-#> Generating kerykeion object for Jack...
-#> Generating kerykeion object for Jane...
-#> Jack birth location: Roma, 41.89193, 12.51133
-#> SVG Generated Correctly
-#> 38
+![John Lennon and Paul McCartney Synastry](https://www.kerykeion.net/docs/assets/img/examples/synastry-chart.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:
+
+```python
+from kerykeion import AstrologicalSubject, KerykeionChartSVG
+
+first = AstrologicalSubject("John Lennon", 1940, 10, 9, 18, 30, "Liverpool", "GB")
+second = AstrologicalSubject("Paul McCartney", 1942, 6, 18, 15, 30, "Liverpool", "GB")
 
+# Set the output directory to the current directory
+synastry_chart = KerykeionChartSVG(first, "Synastry", second, new_output_directory=".")
+synastry_chart.makeSVG()
 ```
 
-![Synastry Chart](http://centuryboy.altervista.org/JackComposite_Chart.svg)
+### Change Language
+
+To change the language of the chart you should create a new kr.config.js file and pass it to the BirthChartSVG class. So far the available languages are English, Portuguese, Italian, Spanish, French and Chinese.
+
+Some examples [here](https://www.kerykeion.net/docs/examples/change-language).
 
 ## Report
 
@@ -131,7 +163,7 @@ To print a report of all the data:
 ```python
 from kerykeion import Report, AstrologicalSubject
 
-kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta")
+kanye = AstrologicalSubject("Kanye", 1977, 6, 8, 8, 45, "Atlanta", "US")
 report = Report(kanye)
 report.print_report()
 
@@ -188,14 +220,14 @@ And if you want to export it to a file:
 python3 your_script_name.py > file.txt
 ```
 
-## Other exeples of possibles usecase
+## Other examples of possible use cases:
 
 ```python
 # Get all aspects between two persons:
 
 from kerykeion import SynastryAspects, AstrologicalSubject
-first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma")
-second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma")
+first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma", "IT")
+second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma", "IT")
 
 name = SynastryAspects(first, second)
 aspect_list = name.get_relevant_aspects()
@@ -209,7 +241,8 @@ print(aspect_list[0])
 
 ## Ayanamsa (Sidereal Modes)
 
-You can set the zodiac type and the sidereal mode in the AstrologicalSubject class:
+By default, the zodiac type is set to Tropic (Tropical).
+You can set the zodiac type to Sidereal and the sidereal mode in the AstrologicalSubject class:
 
 ```python
 johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", zodiac_type="Sidereal", sidereal_mode="LAHIRI")
@@ -221,18 +254,55 @@ Full list of supported sidereal modes [here](https://www.kerykeion.net/pydocs/ke
 
 ## Houses Systems
 
+By default, the houses system is set to Placidus.
 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/).
+More examples [here](https://www.kerykeion.net/docs/examples/houses-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.
 
+## Perspective Type
+
+By default, the perspective type is set to Apparent Geocentric (the most common standard for astrology).
+The perspective indicates the point of view from which the chart is calculated (Es. Apparent Geocentric, Heliocentric, etc.).
+You can set the perspective type in the AstrologicalSubject class:
+
+```python
+johnny = AstrologicalSubject("Johnny Depp", 1963, 6, 9, 0, 0, "Owensboro", "US", perspective_type="Heliocentric")
+```
+
+More examples [here](https://www.kerykeion.net/docs/examples/perspective-type/).
+
+Full list of supported perspective types [here](https://www.kerykeion.net/pydocs/kerykeion/kr_types/kr_literals.html#PerspectiveType).
+
+## Alternative Initialization
+
+You can initialize the AstrologicalSubject from a **UTC** ISO 8601 string:
+
+```python
+subject = AstrologicalSubject.get_from_iso_utc_time(
+    "Johnny Depp", "1963-06-09T05:00:00Z", "Owensboro", "US")
+```
+
+Note : The default time zone is UTC, with Greenwich longitude and latitude.
+
+The default online/offline mode is set to offline, if you set it online the default latitude and longitude will be ignored and
+calculated from the city and nation. Remember to pass also the geonames_username parameter if you want to use the online mode, like this:
+
+```python
+from kerykeion.astrological_subject import AstrologicalSubject
+
+# Use the static method get_from_iso_utc_time to create an instance of AstrologicalSubject
+subject = AstrologicalSubject.get_from_iso_utc_time(
+    "Johnny Depp", "1963-06-09T05:00:00Z", "Owensboro", "US", online=True)
+```
+
 ## Documentation
 
 Most of the functions and the classes are self documented by the types and have docstrings.

kerykeion-4.15.0/kerykeion/__init__.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+"""
+This is part of Kerykeion (C) 2024 Giacomo Battaglia
+
+.. include:: ../README.md
+"""
+
+# Local
+from .astrological_subject import AstrologicalSubject
+from .charts.kerykeion_chart_svg import KerykeionChartSVG
+from .kr_types import *
+from .relationship_score import RelationshipScore
+from .aspects import SynastryAspects, NatalAspects
+from .report import Report
+from .settings import KerykeionSettingsModel, get_settings
+from .enums import Planets, Aspects, Signs
+from .ephemeris_data import EphemerisDataFactory

{kerykeion-4.11.0 → kerykeion-4.15.0}/kerykeion/aspects/aspects_utils.py

@@ -8,6 +8,7 @@ from kerykeion import AstrologicalSubject
 from kerykeion.settings import KerykeionSettingsModel
 from swisseph import difdeg2n
 from typing import Union
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 
 
 def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, int], point_two: Union[float, int]):
@@ -23,7 +24,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     if int(distance) <= aspects_settings[0]["orb"]:
         name = aspects_settings[0]["name"]
         aspect_degrees = aspects_settings[0]["degree"]
-        color = aspects_settings[0]["color"]
         verdict = True
         aid = 0
 
@@ -34,7 +34,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[1]["name"]
         aspect_degrees = aspects_settings[1]["degree"]
-        color = aspects_settings[1]["color"]
         verdict = True
         aid = 1
 
@@ -45,7 +44,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[2]["name"]
         aspect_degrees = aspects_settings[2]["degree"]
-        color = aspects_settings[2]["color"]
         verdict = True
         aid = 2
 
@@ -56,7 +54,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[3]["name"]
         aspect_degrees = aspects_settings[3]["degree"]
-        color = aspects_settings[3]["color"]
         verdict = True
         aid = 3
 
@@ -67,7 +64,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[4]["name"]
         aspect_degrees = aspects_settings[4]["degree"]
-        color = aspects_settings[4]["color"]
         verdict = True
         aid = 4
 
@@ -78,7 +74,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[5]["name"]
         aspect_degrees = aspects_settings[5]["degree"]
-        color = aspects_settings[5]["color"]
         verdict = True
         aid = 5
 
@@ -89,7 +84,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[6]["name"]
         aspect_degrees = aspects_settings[6]["degree"]
-        color = aspects_settings[6]["color"]
         verdict = True
         aid = 6
 
@@ -100,7 +94,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[7]["name"]
         aspect_degrees = aspects_settings[7]["degree"]
-        color = aspects_settings[7]["color"]
         verdict = True
         aid = 7
 
@@ -111,7 +104,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[8]["name"]
         aspect_degrees = aspects_settings[8]["degree"]
-        color = aspects_settings[8]["color"]
         verdict = True
         aid = 8
 
@@ -122,7 +114,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[9]["name"]
         aspect_degrees = aspects_settings[9]["degree"]
-        color = aspects_settings[9]["color"]
         verdict = True
         aid = 9
 
@@ -133,7 +124,6 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
     ):
         name = aspects_settings[10]["name"]
         aspect_degrees = aspects_settings[10]["degree"]
-        color = aspects_settings[10]["color"]
         verdict = True
         aid = 10
 
@@ -142,18 +132,18 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
         name = None
         distance = 0
         aspect_degrees = 0
-        color = None
         aid = None
 
-    return (
-        verdict,
-        name,
-        distance - aspect_degrees,
-        aspect_degrees,
-        color,
-        aid,
-        diff,
-    )
+
+    return {
+        "verdict": verdict, 
+        "name": name,
+        "orbit": distance - aspect_degrees,
+        "distance": distance - aspect_degrees,
+        "aspect_degrees": aspect_degrees,
+        "aid": aid,
+        "diff": diff
+    }
 
 
 def planet_id_decoder(planets_settings: dict, name: str):
@@ -168,7 +158,7 @@ def planet_id_decoder(planets_settings: dict, name: str):
             return result
 
 
-def get_active_points_list(subject: AstrologicalSubject, settings: Union[KerykeionSettingsModel, dict]) -> list:
+def get_active_points_list(subject: Union[AstrologicalSubject, AstrologicalSubjectModel], settings: Union[KerykeionSettingsModel, dict]) -> list:
     """
     Given an astrological subject and the settings, return a list of the active points.
     Args:

{kerykeion-4.11.0 → kerykeion-4.15.0}/kerykeion/aspects/natal_aspects.py

@@ -11,6 +11,7 @@ from kerykeion.settings.kerykeion_settings import get_settings
 from dataclasses import dataclass
 from functools import cached_property
 from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
 
 
 AXES_LIST = [
@@ -27,7 +28,7 @@ class NatalAspects:
     Generates an object with all the aspects of a birthcart.
     """
 
-    user: AstrologicalSubject
+    user: Union[AstrologicalSubject, AstrologicalSubjectModel]
     new_settings_file: Union[Path, None] = None
 
     def __post_init__(self):
@@ -52,10 +53,18 @@ class NatalAspects:
         for first in range(len(active_points_list)):
             # Generates the aspects list without repetitions
             for second in range(first + 1, len(active_points_list)):
-                verdict, name, orbit, aspect_degrees, color, aid, diff = get_aspect_from_two_points(
+                aspect = get_aspect_from_two_points(
                     self.aspects_settings, active_points_list[first]["abs_pos"], active_points_list[second]["abs_pos"]
                 )
 
+                verdict = aspect["verdict"]
+                name = aspect["name"]
+                orbit = aspect["orbit"]
+                aspect_degrees = aspect["aspect_degrees"]
+                aid = aspect["aid"]
+                diff = aspect["diff"]
+                
+
                 if verdict == True:
                     d_asp = {
                         "p1_name": active_points_list[first]["name"],
@@ -65,7 +74,6 @@ class NatalAspects:
                         "aspect": name,
                         "orbit": orbit,
                         "aspect_degrees": aspect_degrees,
-                        "color": color,
                         "aid": aid,
                         "diff": diff,
                         "p1": planet_id_decoder(self.celestial_points, active_points_list[first]["name"]),

{kerykeion-4.11.0 → kerykeion-4.15.0}/kerykeion/aspects/synastry_aspects.py

@@ -11,6 +11,8 @@ from functools import cached_property
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.settings.kerykeion_settings import get_settings
 from kerykeion.aspects.aspects_utils import planet_id_decoder, get_aspect_from_two_points, get_active_points_list
+from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
+from typing import Union
 
 
 class SynastryAspects(NatalAspects):
@@ -20,8 +22,8 @@ class SynastryAspects(NatalAspects):
 
     def __init__(
         self,
-        kr_object_one: AstrologicalSubject,
-        kr_object_two: AstrologicalSubject,
+        kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
+        kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
         new_settings_file: Union[Path, None] = None,
     ):
         # Subjects
@@ -60,12 +62,20 @@ class SynastryAspects(NatalAspects):
         for first in range(len(first_active_points_list)):
             # Generates the aspects list whitout repetitions
             for second in range(len(second_active_points_list)):
-                verdict, name, orbit, aspect_degrees, color, aid, diff = get_aspect_from_two_points(
+                aspect = get_aspect_from_two_points(
                     self.aspects_settings,
                     first_active_points_list[first]["abs_pos"],
                     second_active_points_list[second]["abs_pos"],
                 )
 
+                verdict = aspect["verdict"]
+                name = aspect["name"]
+                orbit = aspect["orbit"]
+                aspect_degrees = aspect["aspect_degrees"]
+                aid = aspect["aid"]
+                diff = aspect["diff"]
+
+
                 if verdict == True:
                     d_asp = {
                         "p1_name": first_active_points_list[first]["name"],
@@ -75,7 +85,6 @@ class SynastryAspects(NatalAspects):
                         "aspect": name,
                         "orbit": orbit,
                         "aspect_degrees": aspect_degrees,
-                        "color": color,
                         "aid": aid,
                         "diff": diff,
                         "p1": planet_id_decoder(
@@ -96,8 +105,8 @@ if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
     setup_logging(level="debug")
 
-    john = AstrologicalSubject("John", 1940, 10, 9, 10, 30, "Liverpool")
-    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 10, 30, "Tokyo")
+    john = AstrologicalSubject("John", 1940, 10, 9, 18, 30, "Liverpool")
+    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 18, 30, "Tokyo", "JP")
 
     synastry_aspects = SynastryAspects(john, yoko)