kerykeion 4.2.4__py3-none-any.whl → 4.3.0__py3-none-any.whl

kerykeion/charts/kerykeion_chart_svg.py

@@ -13,7 +13,7 @@ from kerykeion.aspects.synastry_aspects import SynastryAspects
 from kerykeion.aspects.natal_aspects import NatalAspects
 from kerykeion.astrological_subject import AstrologicalSubject
 from kerykeion.kr_types import KerykeionException, ChartType
-from kerykeion.kr_types import ChartTemplateModel
+from kerykeion.kr_types import ChartTemplateDictionary
 from kerykeion.charts.charts_utils import decHourJoin, degreeDiff, offsetToTz, sliceToX, sliceToY
 from pathlib import Path
 from string import Template
@@ -1245,7 +1245,7 @@ class KerykeionChartSVG:
 
         return out
 
-    def _createTemplateDictionary(self):
+    def _createTemplateDictionary(self) -> ChartTemplateDictionary:
         # self.chart_type = "Transit"
         # empty element points
         self.fire = 0.0
@@ -1273,7 +1273,7 @@ class KerykeionChartSVG:
             viewbox = self.chart_settings["wide_chart_viewBox"]
 
         # template dictionary
-        td: ChartTemplateModel = dict()
+        td: ChartTemplateDictionary = dict() # type: ignore
         r = 240
 
         if self.chart_type == "ExternalNatal":

kerykeion/kr_types/__init__.py

@@ -1,5 +1,5 @@
 from .kerykeion_exception import KerykeionException
 from .kr_literals import *
 from .kr_models import *
-from .chart_types import ChartTemplateModel
-from .settings_models import KerykeionSettingsModel
+from .chart_types import ChartTemplateDictionary
+from .settings_models import KerykeionSettingsModel

kerykeion/kr_types/chart_types.py

@@ -1,16 +1,7 @@
-from typing import Literal, Union, Optional
-from pydantic import BaseModel
+from typing import TypedDict
 
 
-class ChartTemplateModel(BaseModel):
-    """Pydantic model for the chart template."""
-
-    def __setitem__(self, key, value):
-        setattr(self, key, value)
-
-    def __getitem__(self, key):
-        return getattr(self, key)
-
+class ChartTemplateDictionary(TypedDict):
     transitRing: str
     degreeRing: str
     c1: str
@@ -19,14 +10,14 @@ class ChartTemplateModel(BaseModel):
     c2style: str
     c3: str
     c3style: str
-    makeAspects: bool
-    makeAspectGrid: bool
-    makePatterns: bool
-    chart_width: int
-    circleX: int
-    circleY: int
-    svgWidth: int
-    svgHeight: int
+    makeAspects: str
+    makeAspectGrid: str
+    makePatterns: str
+    chart_width: float
+    circleX: str
+    circleY: str
+    svgWidth: str
+    svgHeight: str
     viewbox: str
     stringTitle: str
     stringName: str
@@ -39,7 +30,7 @@ class ChartTemplateModel(BaseModel):
     lunar_phase_cx: int
     lunar_phase_r: int
     lunar_phase_outline: str
-    lunar_phase_rotate: int
+    lunar_phase_rotate: float
     stringLocation: str
     stringDateTime: str
     stringLat: str
@@ -86,12 +77,12 @@ class ChartTemplateModel(BaseModel):
     orb_color_144: str
     orb_color_150: str
     orb_color_180: str
-    cfgZoom: float
-    cfgRotate: int
+    cfgZoom: str
+    cfgRotate: str
     cfgTranslate: str
-    makeZodiac: bool
-    makeHouses: bool
-    makePlanets: bool
-    makeElements: bool
-    makePlanetGrid: bool
-    makeHousesGrid: bool
+    makeZodiac: str
+    makeHouses: str
+    makePlanets: str
+    makeElements: str
+    makePlanetGrid: str
+    makeHousesGrid: str

kerykeion/kr_types/kr_models.py

@@ -11,7 +11,7 @@ from .kr_literals import *
 
 
 class LunarPhaseModel(BaseModel):
-    degrees_between_s_m: Union[int, float]
+    degrees_between_s_m: Union[float, int]
     moon_phase: int
     sun_phase: int
     moon_emoji: LunarPhaseEmoji
@@ -31,7 +31,7 @@ class LunarPhaseModel(BaseModel):
     def __repr__(self):
         return (
             super()
-            .dict(
+            .model_dump(
                 exclude_none=True,
                 exclude_unset=True,
                 exclude_defaults=True,