kerykeion 4.16.5__tar.gz → 4.17.0__tar.gz

{kerykeion-4.16.5 → kerykeion-4.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.16.5
+Version: 4.17.0
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0
@@ -318,7 +318,7 @@ 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).
 
-## Theme
+## Themes
 
 You can now personalize your astrological charts with different themes! Four themes are available:
 
@@ -327,7 +327,7 @@ You can now personalize your astrological charts with different themes! Four the
 - **Dark High Contrast**
 - **Light**
 
-Each theme offers a distinct visual style, allowing you to choose the one that best suits your preferences or presentation needs. If you prefer more control over the appearance, you can opt not to set any theme, making it easier to customize the chart by overriding the default CSS variables. For more detailed instructions on how to apply themes, check the [documentation]().
+Each theme offers a distinct visual style, allowing you to choose the one that best suits your preferences or presentation needs. If you prefer more control over the appearance, you can opt not to set any theme, making it easier to customize the chart by overriding the default CSS variables. For more detailed instructions on how to apply themes, check the [documentation](https://www.kerykeion.net/docs/examples/theming)
 
 Here's an example of how to set the theme:
 

{kerykeion-4.16.5 → kerykeion-4.17.0}/README.md

@@ -281,7 +281,7 @@ 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).
 
-## Theme
+## Themes
 
 You can now personalize your astrological charts with different themes! Four themes are available:
 
@@ -290,7 +290,7 @@ You can now personalize your astrological charts with different themes! Four the
 - **Dark High Contrast**
 - **Light**
 
-Each theme offers a distinct visual style, allowing you to choose the one that best suits your preferences or presentation needs. If you prefer more control over the appearance, you can opt not to set any theme, making it easier to customize the chart by overriding the default CSS variables. For more detailed instructions on how to apply themes, check the [documentation]().
+Each theme offers a distinct visual style, allowing you to choose the one that best suits your preferences or presentation needs. If you prefer more control over the appearance, you can opt not to set any theme, making it easier to customize the chart by overriding the default CSS variables. For more detailed instructions on how to apply themes, check the [documentation](https://www.kerykeion.net/docs/examples/theming)
 
 Here's an example of how to set the theme:
 

{kerykeion-4.16.5 → kerykeion-4.17.0}/kerykeion/aspects/natal_aspects.py

@@ -12,6 +12,7 @@ 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
+from kerykeion.kr_types.settings_models import KerykeionSettingsModel
 
 
 AXES_LIST = [
@@ -29,7 +30,7 @@ class NatalAspects:
     """
 
     user: Union[AstrologicalSubject, AstrologicalSubjectModel]
-    new_settings_file: Union[Path, None] = None
+    new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
 
     def __post_init__(self):
         self.settings = get_settings(self.new_settings_file)

{kerykeion-4.16.5 → kerykeion-4.17.0}/kerykeion/aspects/synastry_aspects.py

@@ -12,6 +12,7 @@ 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 kerykeion.kr_types.settings_models import KerykeionSettingsModel
 from typing import Union
 
 
@@ -24,7 +25,7 @@ class SynastryAspects(NatalAspects):
         self,
         kr_object_one: Union[AstrologicalSubject, AstrologicalSubjectModel],
         kr_object_two: Union[AstrologicalSubject, AstrologicalSubjectModel],
-        new_settings_file: Union[Path, None] = None,
+        new_settings_file: Union[Path, KerykeionSettingsModel, dict, None] = None
     ):
         # Subjects
         self.first_user = kr_object_one

{kerykeion-4.16.5 → kerykeion-4.17.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -14,7 +14,7 @@ from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType, KerykeionPointModel, Sign
 from kerykeion.kr_types import ChartTemplateDictionary
 from kerykeion.kr_types.kr_models import AstrologicalSubjectModel
-from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel
+from kerykeion.kr_types.settings_models import KerykeionSettingsCelestialPointModel, KerykeionSettingsModel
 from kerykeion.kr_types.kr_literals import KerykeionChartTheme
 from kerykeion.charts.charts_utils import (
     draw_zodiac_slice, 
@@ -59,6 +59,8 @@ class KerykeionChartSVG:
             In the settings file you can set the language, colors, planets, aspects, etc.
         - theme: Set the theme for the chart (default: classic). If None the <style> tag will be empty.
             That's useful if you want to use your own CSS file customizing the value of the default theme variables.
+        - double_chart_aspect_grid_type: Set the type of the aspect grid for the double chart (transit or synastry). (Default: list.)
+        - chart_language: Set the language for the chart (default: EN).
     """
     
     # Constants
@@ -71,7 +73,7 @@ class KerykeionChartSVG:
     second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None]
     chart_type: ChartType
     new_output_directory: Union[Path, None]
-    new_settings_file: Union[Path, None]
+    new_settings_file: Union[Path, None, KerykeionSettingsModel, dict]
     output_directory: Path
 
     # Internal properties
@@ -105,13 +107,15 @@ class KerykeionChartSVG:
         chart_type: ChartType = "Natal",
         second_obj: Union[AstrologicalSubject, AstrologicalSubjectModel, None] = None,
         new_output_directory: Union[str, None] = None,
-        new_settings_file: Union[Path, None] = None,
+        new_settings_file: Union[Path, None, KerykeionSettingsModel, dict] = None,
         theme: Union[KerykeionChartTheme, None] = "classic",
-        double_chart_aspect_grid_type: Literal["list", "table"] = "list"
+        double_chart_aspect_grid_type: Literal["list", "table"] = "list",
+        chart_language: str = "EN",
     ):
         # Directories:
         self.homedir = Path.home()
         self.new_settings_file = new_settings_file
+        self.chart_language = chart_language
 
         if new_output_directory:
             self.output_directory = Path(new_output_directory)
@@ -221,14 +225,13 @@ class KerykeionChartSVG:
         self.output_directory = dir_path
         logging.info(f"Output direcotry set to: {self.output_directory}")
 
-    def parse_json_settings(self, settings_file):
+    def parse_json_settings(self, settings_file_or_dict: Union[Path, dict, KerykeionSettingsModel, None]) -> None:
         """
         Parse the settings file.
         """
-        settings = get_settings(settings_file)
+        settings = get_settings(settings_file_or_dict)
 
-        language = settings["general_settings"]["language"]
-        self.language_settings = settings["language_settings"].get(language, "EN")
+        self.language_settings = settings["language_settings"][self.chart_language]
         self.chart_colors_settings = settings["chart_colors"]
         self.planets_settings = settings["celestial_points"]
         self.aspects_settings = settings["aspects"]
@@ -845,4 +848,44 @@ if __name__ == "__main__":
     # Transit Chart With draw_transit_aspect_grid table
     transit_chart_with_table_grid_subject = AstrologicalSubject("John Lennon - TCWTG", 1940, 10, 9, 18, 30, "Liverpool", "GB")
     transit_chart_with_table_grid = KerykeionChartSVG(transit_chart_with_table_grid_subject, "Transit", second, double_chart_aspect_grid_type="table", theme="dark")
-    transit_chart_with_table_grid.makeSVG()
+    transit_chart_with_table_grid.makeSVG()
+
+    # Chines Language Chart
+    chinese_subject = AstrologicalSubject("Hua Chenyu", 1990, 2, 7, 12, 0, "Hunan", "CN")
+    chinese_chart = KerykeionChartSVG(chinese_subject, chart_language="CN")
+    chinese_chart.makeSVG()
+
+    # French Language Chart
+    french_subject = AstrologicalSubject("Jeanne Moreau", 1928, 1, 23, 10, 0, "Paris", "FR")
+    french_chart = KerykeionChartSVG(french_subject, chart_language="FR")
+    french_chart.makeSVG()
+
+    # Spanish Language Chart
+    spanish_subject = AstrologicalSubject("Antonio Banderas", 1960, 8, 10, 12, 0, "Malaga", "ES")
+    spanish_chart = KerykeionChartSVG(spanish_subject, chart_language="ES")
+    spanish_chart.makeSVG()
+
+    # Portuguese Language Chart
+    portuguese_subject = AstrologicalSubject("Cristiano Ronaldo", 1985, 2, 5, 5, 25, "Funchal", "PT")
+    portuguese_chart = KerykeionChartSVG(portuguese_subject, chart_language="PT")
+    portuguese_chart.makeSVG()
+
+    # Italian Language Chart
+    italian_subject = AstrologicalSubject("Sophia Loren", 1934, 9, 20, 2, 0, "Rome", "IT")
+    italian_chart = KerykeionChartSVG(italian_subject, chart_language="IT")
+    italian_chart.makeSVG()
+
+    # Russian Language Chart
+    russian_subject = AstrologicalSubject("Mikhail Bulgakov", 1891, 5, 15, 12, 0, "Kiev", "UA")
+    russian_chart = KerykeionChartSVG(russian_subject, chart_language="RU")
+    russian_chart.makeSVG()
+
+    # Turkish Language Chart
+    turkish_subject = AstrologicalSubject("Mehmet Oz", 1960, 6, 11, 12, 0, "Istanbul", "TR")
+    turkish_chart = KerykeionChartSVG(turkish_subject, chart_language="TR")
+    turkish_chart.makeSVG()
+
+    # German Language Chart
+    german_subject = AstrologicalSubject("Albert Einstein", 1879, 3, 14, 11, 30, "Ulm", "DE")
+    german_chart = KerykeionChartSVG(german_subject, chart_language="DE")
+    german_chart.makeSVG()

{kerykeion-4.16.5 → kerykeion-4.17.0}/kerykeion/settings/kerykeion_settings.py

@@ -11,7 +11,7 @@ from typing import Dict, Union
 from kerykeion.kr_types import KerykeionSettingsModel
 
 
-def get_settings(new_settings_file: Union[Path, None] = None) -> KerykeionSettingsModel:
+def get_settings(new_settings_file: Union[Path, None, KerykeionSettingsModel, dict] = None) -> KerykeionSettingsModel:
     """
     This function is used to get the settings dict from the settings file.
     If no settings file is passed as argument, or the file is not found, it will fallback to:
@@ -25,6 +25,11 @@ def get_settings(new_settings_file: Union[Path, None] = None) -> KerykeionSettin
         Dict: The settings dict
     """
 
+    if isinstance(new_settings_file, dict):
+        return KerykeionSettingsModel(**new_settings_file)
+    elif isinstance(new_settings_file, KerykeionSettingsModel):
+        return new_settings_file
+
     # Config path we passed as argument
     if new_settings_file is not None:
         settings_file = new_settings_file

{kerykeion-4.16.5 → kerykeion-4.17.0}/kerykeion/settings/kr.config.json

@@ -209,6 +209,174 @@
         "Chiron": "凱龍星",
         "Mean_Lilith": "黑月亮"
       }
+    },
+    "ES": {
+      "info": "Información",
+      "cusp": "Casa",
+      "longitude": "Longitud",
+      "latitude": "Latitud",
+      "north": "Norte",
+      "east": "Este",
+      "south": "Sur",
+      "west": "Oeste",
+      "fire": "Fuego",
+      "earth": "Tierra",
+      "air": "Aire",
+      "water": "Agua",
+      "and_word": "y",
+      "transits": "Tránsitos para",
+      "type": "Tipo",
+      "aspects": "Aspectos de la pareja",
+      "planets_and_house": "Puntos para",
+      "transit_name": "En el momento del tránsito",
+      "lunar_phase": "Fase lunar",
+      "day": "Día",
+      "celestial_points": {
+        "Sun": "Sol",
+        "Moon": "Luna",
+        "Mercury": "Mercurio",
+        "Venus": "Venus",
+        "Mars": "Marte",
+        "Jupiter": "Júpiter",
+        "Saturn": "Saturno",
+        "Uranus": "Urano",
+        "Neptune": "Neptuno",
+        "Pluto": "Plutón",
+        "Asc": "Asc",
+        "Mc": "Mc",
+        "Dsc": "Dsc",
+        "Ic": "Ic",
+        "True_Node": "Nodo Norte",
+        "Mean_Node": "Nodo Medio",
+        "Chiron": "Quirón",
+        "Mean_Lilith": "Lilith"
+      }
+    },
+    "RU": {
+      "info": "Информация",
+      "cusp": "Дом",
+      "longitude": "Долгота",
+      "latitude": "Широта",
+      "north": "Север",
+      "east": "Восток",
+      "south": "Юг",
+      "west": "Запад",
+      "fire": "Огонь",
+      "earth": "Земля",
+      "air": "Воздух",
+      "water": "Вода",
+      "and_word": "и",
+      "transits": "Транзиты для",
+      "type": "Тип",
+      "aspects": "Аспекты пары",
+      "planets_and_house": "Пункты для",
+      "transit_name": "В момент транзита",
+      "lunar_phase": "Лунная фаза",
+      "day": "День",
+      "celestial_points": {
+        "Sun": "Солнце",
+        "Moon": "Луна",
+        "Mercury": "Меркурий",
+        "Venus": "Венера",
+        "Mars": "Марс",
+        "Jupiter": "Юпитер",
+        "Saturn": "Сатурн",
+        "Uranus": "Уран",
+        "Neptune": "Нептун",
+        "Pluto": "Плутон",
+        "Asc": "Асц",
+        "Mc": "MC",
+        "Dsc": "ДСЦ",
+        "Ic": "IC",
+        "True_Node": "Северный узел",
+        "Mean_Node": "Средний узел",
+        "Chiron": "Хирон",
+        "Mean_Lilith": "Лилит"
+      }
+    },
+    "TR": {
+      "info": "Bilgi",
+      "cusp": "Ev",
+      "longitude": "Boylam",
+      "latitude": "Enlem",
+      "north": "Kuzey",
+      "east": "Doğu",
+      "south": "Güney",
+      "west": "Batı",
+      "fire": "Ateş",
+      "earth": "Toprak",
+      "air": "Hava",
+      "water": "Su",
+      "and_word": "ve",
+      "transits": "Geçişler için",
+      "type": "Tür",
+      "aspects": "Çiftin Açılar",
+      "planets_and_house": "Puanlar için",
+      "transit_name": "Geçiş anında",
+      "lunar_phase": "Ay Aşaması",
+      "day": "Gün",
+      "celestial_points": {
+        "Sun": "Güneş",
+        "Moon": "Ay",
+        "Mercury": "Merkür",
+        "Venus": "Venüs",
+        "Mars": "Mars",
+        "Jupiter": "Jüpiter",
+        "Saturn": "Satürn",
+        "Uranus": "Uranüs",
+        "Neptune": "Neptün",
+        "Pluto": "Plüton",
+        "Asc": "Yükselen",
+        "Mc": "MC",
+        "Dsc": "İK",
+        "Ic": "IC",
+        "True_Node": "Kuzey Düğümü",
+        "Mean_Node": "Ortalama Düğüm",
+        "Chiron": "Kiron",
+        "Mean_Lilith": "Lilith"
+      }
+    },
+    "DE": {
+      "info": "Informationen",
+      "cusp": "Haus",
+      "longitude": "Längengrad",
+      "latitude": "Breitengrad",
+      "north": "Norden",
+      "east": "Osten",
+      "south": "Süden",
+      "west": "Westen",
+      "fire": "Feuer",
+      "earth": "Erde",
+      "air": "Luft",
+      "water": "Wasser",
+      "and_word": "und",
+      "transits": "Transite für",
+      "type": "Typ",
+      "aspects": "Aspekte des Paares",
+      "planets_and_house": "Punkte für",
+      "transit_name": "Zum Zeitpunkt des Transits",
+      "lunar_phase": "Mondphase",
+      "day": "Tag",
+      "celestial_points": {
+        "Sun": "Sonne",
+        "Moon": "Mond",
+        "Mercury": "Merkur",
+        "Venus": "Venus",
+        "Mars": "Mars",
+        "Jupiter": "Jupiter",
+        "Saturn": "Saturn",
+        "Uranus": "Uranus",
+        "Neptune": "Neptun",
+        "Pluto": "Pluto",
+        "Asc": "Asz",
+        "Mc": "MC",
+        "Dsc": "DSC",
+        "Ic": "IC",
+        "True_Node": "Wahrer Mondknoten",
+        "Mean_Node": "Mittlerer Mondknoten",
+        "Chiron": "Chiron",
+        "Mean_Lilith": "Lilith"
+      }
     }
   },
   "aspects": [

{kerykeion-4.16.5 → kerykeion-4.17.0}/pyproject.toml

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