kerykeion 4.8.1__py3-none-any.whl → 4.14.2__py3-none-any.whl

kerykeion/__init__.py

@@ -1,101 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-    This is part of Kerykeion (C) 2024 Giacomo Battaglia
-
-    Kerykeion is a python library for Astrology.
-    It can calculate all the planet and house position,
-    also it can calculate the aspects of a single persone or between two, you can set how many planets you
-    need in the settings in the utility module.
-    It also can generate an SVG of a birthchart, a synastry chart or a transit chart.
-
-    Here some examples:
-
-    ```python
-
-    # Import the main class for creating a kerykeion instance:
-    >>> 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")
-
-    # Get the information about the sun in the chart:
-    # (The position of the planets always starts at 0)
-    >>> kanye.sun
-    {'name': 'Sun', 'quality': 'Mutable', 'element': 'Air', 'sign': 'Gem', 'sign_num': 2, 'pos': 17.598992059774275, 'abs_pos': 77.59899205977428, 'emoji': '♊️', 'house': '12th House', 'retrograde': False}
-
-    # Get informations about the first house:
-    >>> kanye.first_house
-    {'name': '1', 'quality': 'Cardinal', 'element': 'Water', 'sign': 'Can', 'sign_num': 3, 'pos': 17.995779673209114, 'abs_pos': 107.99577967320911, 'emoji': '♋️'}
-
-    # Get element of the moon sign:
-    >>> kanye.moon.get("element")
-    'Water'
-
-    ```
-
-    ## Generate a SVG of the birthchart:
-
-    ```python
-    >>> from kerykeion import AstrologicalSubject, KerykeionChartSVG
-
-    >>> first = AstrologicalSubject("Jack", 1990, 6, 15, 15, 15, "Roma")
-    >>> second = AstrologicalSubject("Jane", 1991, 10, 25, 21, 00, "Roma")
-
-    # Set the type, it can be Natal, Synastry or Transit
-
-    >>> 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
-
-    ```
-
-    ![alt text](http://centuryboy.altervista.org/JackSynastry_Chart.svg)
-
-
-    ## Other exeples of possibles usecase
-
-    ```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")
-
-    >>> name = SynastryAspects(first, second)
-    >>> aspect_list = name.relevant_aspects
-    >>> print(aspect_list[0])
-
-    Generating kerykeion object for Jack...
-    Generating kerykeion object for Jane...
-    {'p1_name': 'Sun', 'p1_abs_pos': 84.17867971515636, 'p2_name': 'Sun', 'p2_abs_pos': 211.90472999502984, 'aspect': 'trine', 'orbit': 7.726050279873476, 'aspect_degrees': 120, 'color': '#36d100', 'aid': 6, 'diff': 127.72605027987348, 'p1': 0, 'p2': 0}
-
-    ```
-
-    ## Documentation
-
-    Most of the functions and the classes are self documented by the types and have docstrings.
-    An auto-generated documentation [is available here](https://g-battaglia.github.io/kerykeion).
-
-    Sooner or later I'll try to write an extensive documentation.
-
-    ## Installation
-
-    Kerykeion is a Python 3 package, make sure you have Python 3 installed on your system.
-
-    ## Development
-
-    You can clone this repository or download a zip file using the right side buttons.
-
-    ## Contributing
-
-    Feel free to contribute to the code!
+This is part of Kerykeion (C) 2024 Giacomo Battaglia
 
+.. include:: ../README.md
 """
 
 # Local
@@ -107,3 +14,4 @@ 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/aspects/aspects_utils.py

@@ -23,7 +23,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 +33,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 +43,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 +53,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 +63,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 +73,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 +83,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 +93,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 +103,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 +113,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 +123,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 +131,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):

kerykeion/aspects/natal_aspects.py

@@ -52,10 +52,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 +73,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/aspects/synastry_aspects.py

@@ -60,12 +60,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 +83,6 @@ class SynastryAspects(NatalAspects):
                         "aspect": name,
                         "orbit": orbit,
                         "aspect_degrees": aspect_degrees,
-                        "color": color,
                         "aid": aid,
                         "diff": diff,
                         "p1": planet_id_decoder(
@@ -96,8 +103,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)