Added to_json() helper to Chart base class.

Author: theriftlab

immanuel/charts.py

@@ -18,11 +18,13 @@
 
 """
 
+import json
 from datetime import datetime
-from zoneinfo import ZoneInfo
+from typing import TypeVar
 
 from immanuel.classes import wrap
 from immanuel.classes.localize import localize as _
+from immanuel.classes.serialize import ToJSON
 from immanuel.const import calc, chart, names
 from immanuel.reports import aspect, dignity, pattern, weighting
 from immanuel.setup import settings
@@ -36,6 +38,9 @@
 )
 
 
+ChartType = TypeVar("ChartType", bound="Chart")
+
+
 class Subject:
     """Simple class to model a chart subject - essentially just
     a time and place."""
@@ -71,7 +76,7 @@ class Chart:
     """Base chart class. This acts as an abstract class for the actual chart
     classes to inherit from."""
 
-    def __init__(self, type: int, aspects_to: "Chart" = None) -> None:
+    def __init__(self, type: int, aspects_to: ChartType | None = None) -> None:
         self.type = _(names.CHART_TYPES[type])
         self._type = type
         self._aspects_to = aspects_to
@@ -217,6 +222,9 @@ def set_wrapped_weightings(self) -> None:
             quadrants=weighting.quadrants(self._objects, self._houses),
         )
 
+    def to_json(self, **kwargs) -> str:
+        return json.dumps(self, cls=ToJSON, **kwargs)
+
 
 class Natal(Chart):
     """Standard natal chart generates data straight from the passed

immanuel/classes/serialize.py

@@ -12,8 +12,8 @@
 
 class ToJSON(JSONEncoder):
     def default(self, obj) -> dict | str | None:
-        if hasattr(obj, "to_json"):
-            return obj.to_json()
+        if hasattr(obj, "__json__"):
+            return obj.__json__()
 
         if hasattr(obj, "__dict__"):
             return {k: v for k, v in obj.__dict__.items() if k[0] != "_"}