kerykeion 5.0.0a11__py3-none-any.whl → 5.0.0b1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of kerykeion might be problematic. Click here for more details.

Files changed (56) hide show
  1. kerykeion/__init__.py +32 -9
  2. kerykeion/aspects/__init__.py +2 -4
  3. kerykeion/aspects/aspects_factory.py +530 -0
  4. kerykeion/aspects/aspects_utils.py +75 -6
  5. kerykeion/astrological_subject_factory.py +380 -229
  6. kerykeion/backword.py +680 -0
  7. kerykeion/chart_data_factory.py +484 -0
  8. kerykeion/charts/{kerykeion_chart_svg.py → chart_drawer.py} +612 -439
  9. kerykeion/charts/charts_utils.py +135 -94
  10. kerykeion/charts/draw_planets.py +38 -28
  11. kerykeion/charts/templates/aspect_grid_only.xml +188 -17
  12. kerykeion/charts/templates/chart.xml +104 -28
  13. kerykeion/charts/templates/wheel_only.xml +195 -24
  14. kerykeion/charts/themes/classic.css +11 -0
  15. kerykeion/charts/themes/dark-high-contrast.css +11 -0
  16. kerykeion/charts/themes/dark.css +11 -0
  17. kerykeion/charts/themes/light.css +11 -0
  18. kerykeion/charts/themes/strawberry.css +10 -0
  19. kerykeion/composite_subject_factory.py +4 -4
  20. kerykeion/ephemeris_data_factory.py +12 -9
  21. kerykeion/house_comparison/__init__.py +0 -3
  22. kerykeion/house_comparison/house_comparison_factory.py +51 -18
  23. kerykeion/house_comparison/house_comparison_utils.py +37 -8
  24. kerykeion/planetary_return_factory.py +8 -4
  25. kerykeion/relationship_score_factory.py +5 -5
  26. kerykeion/report.py +748 -67
  27. kerykeion/{kr_types → schemas}/__init__.py +44 -4
  28. kerykeion/schemas/chart_template_model.py +340 -0
  29. kerykeion/{kr_types → schemas}/kr_literals.py +7 -3
  30. kerykeion/{kr_types → schemas}/kr_models.py +247 -21
  31. kerykeion/{kr_types → schemas}/settings_models.py +7 -7
  32. kerykeion/settings/config_constants.py +75 -8
  33. kerykeion/settings/kerykeion_settings.py +1 -1
  34. kerykeion/settings/kr.config.json +130 -40
  35. kerykeion/settings/legacy/legacy_celestial_points_settings.py +8 -8
  36. kerykeion/sweph/ast136/s136108s.se1 +0 -0
  37. kerykeion/sweph/ast136/s136199s.se1 +0 -0
  38. kerykeion/sweph/ast136/s136472s.se1 +0 -0
  39. kerykeion/sweph/ast28/se28978s.se1 +0 -0
  40. kerykeion/sweph/ast50/se50000s.se1 +0 -0
  41. kerykeion/sweph/ast90/se90377s.se1 +0 -0
  42. kerykeion/sweph/ast90/se90482s.se1 +0 -0
  43. kerykeion/sweph/sefstars.txt +1602 -0
  44. kerykeion/transits_time_range_factory.py +11 -11
  45. kerykeion/utilities.py +61 -38
  46. kerykeion-5.0.0b1.dist-info/METADATA +1055 -0
  47. kerykeion-5.0.0b1.dist-info/RECORD +58 -0
  48. kerykeion/aspects/natal_aspects_factory.py +0 -235
  49. kerykeion/aspects/synastry_aspects_factory.py +0 -275
  50. kerykeion/house_comparison/house_comparison_models.py +0 -38
  51. kerykeion/kr_types/chart_types.py +0 -106
  52. kerykeion-5.0.0a11.dist-info/METADATA +0 -641
  53. kerykeion-5.0.0a11.dist-info/RECORD +0 -50
  54. /kerykeion/{kr_types → schemas}/kerykeion_exception.py +0 -0
  55. {kerykeion-5.0.0a11.dist-info → kerykeion-5.0.0b1.dist-info}/WHEEL +0 -0
  56. {kerykeion-5.0.0a11.dist-info → kerykeion-5.0.0b1.dist-info}/licenses/LICENSE +0 -0
kerykeion/__init__.py CHANGED
@@ -6,34 +6,57 @@ This is part of Kerykeion (C) 2025 Giacomo Battaglia
6
6
  """
7
7
 
8
8
  # Local
9
- from .aspects import SynastryAspectsFactory, NatalAspectsFactory
9
+ from .aspects import AspectsFactory
10
10
  from .astrological_subject_factory import AstrologicalSubjectFactory
11
- from .charts.kerykeion_chart_svg import KerykeionChartSVG
11
+ from .chart_data_factory import ChartDataFactory
12
+ from .schemas import KerykeionException
13
+ from .schemas.kr_models import (
14
+ ChartDataModel,
15
+ SingleChartDataModel,
16
+ DualChartDataModel,
17
+ ElementDistributionModel,
18
+ QualityDistributionModel,
19
+ HouseComparisonModel,
20
+ )
21
+ from .charts.chart_drawer import ChartDrawer
12
22
  from .composite_subject_factory import CompositeSubjectFactory
13
23
  from .ephemeris_data_factory import EphemerisDataFactory
14
24
  from .house_comparison.house_comparison_factory import HouseComparisonFactory
15
- from .house_comparison.house_comparison_models import HouseComparisonModel
16
- from .kr_types import *
17
25
  from .planetary_return_factory import PlanetaryReturnFactory, PlanetReturnModel
18
26
  from .relationship_score_factory import RelationshipScoreFactory
19
- from .report import Report
27
+ from .report import ReportGenerator
20
28
  from .settings import KerykeionSettingsModel, get_settings
21
29
  from .transits_time_range_factory import TransitsTimeRangeFactory
30
+ from .backword import (
31
+ AstrologicalSubject, # Legacy wrapper
32
+ KerykeionChartSVG, # Legacy wrapper
33
+ SynastryAspects, # Legacy wrapper
34
+ )
22
35
 
23
36
  __all__ = [
24
- "SynastryAspectsFactory",
25
- "NatalAspectsFactory",
37
+ "AspectsFactory",
26
38
  "AstrologicalSubjectFactory",
27
- "KerykeionChartSVG",
39
+ "ChartDataFactory",
40
+ "ChartDataModel",
41
+ "SingleChartDataModel",
42
+ "DualChartDataModel",
43
+ "ElementDistributionModel",
44
+ "QualityDistributionModel",
45
+ "ChartDrawer",
28
46
  "CompositeSubjectFactory",
29
47
  "EphemerisDataFactory",
30
48
  "HouseComparisonFactory",
31
49
  "HouseComparisonModel",
50
+ "KerykeionException",
32
51
  "PlanetaryReturnFactory",
33
52
  "PlanetReturnModel",
34
53
  "RelationshipScoreFactory",
35
- "Report",
54
+ "ReportGenerator",
36
55
  "KerykeionSettingsModel",
37
56
  "get_settings",
38
57
  "TransitsTimeRangeFactory",
58
+ # Legacy (v4) exported names for backward compatibility
59
+ "AstrologicalSubject",
60
+ "KerykeionChartSVG",
61
+ "SynastryAspects",
39
62
  ]
@@ -7,10 +7,8 @@ The aspects module contains the classes and functions for calculating
7
7
  """
8
8
 
9
9
 
10
- from .synastry_aspects_factory import SynastryAspectsFactory
11
- from .natal_aspects_factory import NatalAspectsFactory
10
+ from .aspects_factory import AspectsFactory
12
11
 
13
12
  __all__ = [
14
- "SynastryAspectsFactory",
15
- "NatalAspectsFactory",
13
+ "AspectsFactory",
16
14
  ]
@@ -0,0 +1,530 @@
1
+ # -*- coding: utf-8 -*-
2
+ """
3
+ This is part of Kerykeion (C) 2025 Giacomo Battaglia
4
+ """
5
+
6
+ import logging
7
+ from typing import Union, List, Optional
8
+
9
+ from kerykeion.astrological_subject_factory import AstrologicalSubjectFactory
10
+ from kerykeion.aspects.aspects_utils import get_aspect_from_two_points, get_active_points_list, calculate_aspect_movement
11
+ from kerykeion.schemas.kr_models import (
12
+ AstrologicalSubjectModel,
13
+ AspectModel,
14
+ ActiveAspect,
15
+ CompositeSubjectModel,
16
+ PlanetReturnModel,
17
+ SingleChartAspectsModel,
18
+ DualChartAspectsModel,
19
+ # Legacy aliases for backward compatibility
20
+ NatalAspectsModel,
21
+ SynastryAspectsModel
22
+ )
23
+ from kerykeion.schemas.kr_literals import AstrologicalPoint
24
+ from kerykeion.settings.config_constants import DEFAULT_ACTIVE_ASPECTS, DEFAULT_AXIS_ORBIT
25
+ from kerykeion.settings.legacy.legacy_celestial_points_settings import DEFAULT_CELESTIAL_POINTS_SETTINGS
26
+ from kerykeion.settings.legacy.legacy_chart_aspects_settings import DEFAULT_CHART_ASPECTS_SETTINGS
27
+ from kerykeion.utilities import find_common_active_points
28
+
29
+ # Axes constants for orb filtering
30
+ AXES_LIST = [
31
+ "Ascendant",
32
+ "Medium_Coeli",
33
+ "Descendant",
34
+ "Imum_Coeli",
35
+ ]
36
+
37
+
38
+ class AspectsFactory:
39
+ """
40
+ Unified factory class for creating both single chart and dual chart aspects analysis.
41
+
42
+ This factory provides methods to calculate all aspects within a single chart or
43
+ between two charts. It consolidates the common functionality between different
44
+ types of aspect calculations while providing specialized methods for each type.
45
+
46
+ The factory provides both comprehensive and filtered aspect lists based on orb settings
47
+ and relevance criteria.
48
+
49
+ Key Features:
50
+ - Calculates aspects within a single chart (natal, returns, composite, etc.)
51
+ - Calculates aspects between two charts (synastry, transits, comparisons, etc.)
52
+ - Filters aspects based on orb thresholds
53
+ - Applies stricter orb limits for chart axes (ASC, MC, DSC, IC)
54
+ - Supports multiple subject types (natal, composite, planetary returns)
55
+
56
+ Example:
57
+ >>> # For single chart aspects (natal, returns, etc.)
58
+ >>> johnny = AstrologicalSubjectFactory.from_birth_data("Johnny", 1963, 6, 9, 0, 0, "Owensboro", "US")
59
+ >>> single_chart_aspects = AspectsFactory.single_chart_aspects(johnny)
60
+ >>>
61
+ >>> # For dual chart aspects (synastry, comparisons, etc.)
62
+ >>> john = AstrologicalSubjectFactory.from_birth_data("John", 1990, 1, 1, 12, 0, "London", "GB")
63
+ >>> jane = AstrologicalSubjectFactory.from_birth_data("Jane", 1992, 6, 15, 14, 30, "Paris", "FR")
64
+ >>> dual_chart_aspects = AspectsFactory.dual_chart_aspects(john, jane)
65
+ """
66
+
67
+ @staticmethod
68
+ def single_chart_aspects(
69
+ subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
70
+ *,
71
+ active_points: Optional[List[AstrologicalPoint]] = None,
72
+ active_aspects: Optional[List[ActiveAspect]] = None,
73
+ ) -> SingleChartAspectsModel:
74
+ """
75
+ Create aspects analysis for a single astrological chart.
76
+
77
+ This method calculates all astrological aspects (angular relationships)
78
+ within a single chart. Can be used for any type of chart including:
79
+ - Natal charts
80
+ - Planetary return charts
81
+ - Composite charts
82
+ - Any other single chart type
83
+
84
+ Args:
85
+ subject: The astrological subject for aspect calculation
86
+
87
+ Kwargs:
88
+ active_points: List of points to include in calculations
89
+ active_aspects: List of aspects with their orb settings
90
+
91
+ Returns:
92
+ SingleChartAspectsModel containing all calculated aspects data
93
+
94
+ Example:
95
+ >>> johnny = AstrologicalSubjectFactory.from_birth_data("Johnny", 1963, 6, 9, 0, 0, "Owensboro", "US")
96
+ >>> chart_aspects = AspectsFactory.single_chart_aspects(johnny)
97
+ >>> print(f"Found {len(chart_aspects.relevant_aspects)} relevant aspects")
98
+ """
99
+ # Initialize settings and configurations
100
+ celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
101
+ aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
102
+ axes_orbit_settings = DEFAULT_AXIS_ORBIT
103
+
104
+ # Set active aspects with default fallback
105
+ active_aspects_resolved = active_aspects if active_aspects is not None else DEFAULT_ACTIVE_ASPECTS
106
+
107
+ # Determine active points to use
108
+ if active_points is None:
109
+ active_points_resolved = subject.active_points
110
+ else:
111
+ active_points_resolved = find_common_active_points(
112
+ subject.active_points,
113
+ active_points,
114
+ )
115
+
116
+ return AspectsFactory._create_single_chart_aspects_model(
117
+ subject, active_points_resolved, active_aspects_resolved,
118
+ aspects_settings, axes_orbit_settings, celestial_points
119
+ )
120
+
121
+ @staticmethod
122
+ def dual_chart_aspects(
123
+ first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
124
+ second_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
125
+ *,
126
+ active_points: Optional[List[AstrologicalPoint]] = None,
127
+ active_aspects: Optional[List[ActiveAspect]] = None,
128
+ ) -> DualChartAspectsModel:
129
+ """
130
+ Create aspects analysis between two astrological charts.
131
+
132
+ This method calculates all astrological aspects (angular relationships)
133
+ between planets and points in two different charts. Can be used for:
134
+ - Synastry (relationship compatibility)
135
+ - Transit comparisons
136
+ - Composite vs natal comparisons
137
+ - Any other dual chart analysis
138
+
139
+ Args:
140
+ first_subject: The first astrological subject
141
+ second_subject: The second astrological subject to compare with the first
142
+
143
+ Kwargs:
144
+ active_points: Optional list of celestial points to include in calculations.
145
+ If None, uses common points between both subjects.
146
+ active_aspects: Optional list of aspect types with their orb settings.
147
+ If None, uses default aspect configuration.
148
+
149
+ Returns:
150
+ DualChartAspectsModel: Complete model containing all calculated aspects data,
151
+ including both comprehensive and filtered relevant aspects.
152
+
153
+ Example:
154
+ >>> john = AstrologicalSubjectFactory.from_birth_data("John", 1990, 1, 1, 12, 0, "London", "GB")
155
+ >>> jane = AstrologicalSubjectFactory.from_birth_data("Jane", 1992, 6, 15, 14, 30, "Paris", "FR")
156
+ >>> synastry = AspectsFactory.dual_chart_aspects(john, jane)
157
+ >>> print(f"Found {len(synastry.relevant_aspects)} relevant aspects")
158
+ """
159
+ # Initialize settings and configurations
160
+ celestial_points = DEFAULT_CELESTIAL_POINTS_SETTINGS
161
+ aspects_settings = DEFAULT_CHART_ASPECTS_SETTINGS
162
+ axes_orbit_settings = DEFAULT_AXIS_ORBIT
163
+
164
+ # Set active aspects with default fallback
165
+ active_aspects_resolved = active_aspects if active_aspects is not None else DEFAULT_ACTIVE_ASPECTS
166
+
167
+ # Determine active points to use - find common points between both subjects
168
+ if active_points is None:
169
+ active_points_resolved = first_subject.active_points
170
+ else:
171
+ active_points_resolved = find_common_active_points(
172
+ first_subject.active_points,
173
+ active_points,
174
+ )
175
+
176
+ # Further filter with second subject's active points
177
+ active_points_resolved = find_common_active_points(
178
+ second_subject.active_points,
179
+ active_points_resolved,
180
+ )
181
+
182
+ return AspectsFactory._create_dual_chart_aspects_model(
183
+ first_subject, second_subject, active_points_resolved, active_aspects_resolved,
184
+ aspects_settings, axes_orbit_settings, celestial_points
185
+ )
186
+
187
+ @staticmethod
188
+ def _create_single_chart_aspects_model(
189
+ subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
190
+ active_points_resolved: List[AstrologicalPoint],
191
+ active_aspects_resolved: List[ActiveAspect],
192
+ aspects_settings: List[dict],
193
+ axes_orbit_settings: float,
194
+ celestial_points: List[dict]
195
+ ) -> SingleChartAspectsModel:
196
+ """
197
+ Create the complete single chart aspects model with all calculations.
198
+
199
+ Returns:
200
+ SingleChartAspectsModel containing all aspects data
201
+ """
202
+ all_aspects = AspectsFactory._calculate_single_chart_aspects(
203
+ subject, active_points_resolved, active_aspects_resolved, aspects_settings, celestial_points
204
+ )
205
+ relevant_aspects = AspectsFactory._filter_relevant_aspects(all_aspects, axes_orbit_settings)
206
+
207
+ return SingleChartAspectsModel(
208
+ subject=subject,
209
+ all_aspects=all_aspects,
210
+ relevant_aspects=relevant_aspects,
211
+ active_points=active_points_resolved,
212
+ active_aspects=active_aspects_resolved,
213
+ )
214
+
215
+ @staticmethod
216
+ def _create_dual_chart_aspects_model(
217
+ first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
218
+ second_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
219
+ active_points_resolved: List[AstrologicalPoint],
220
+ active_aspects_resolved: List[ActiveAspect],
221
+ aspects_settings: List[dict],
222
+ axes_orbit_settings: float,
223
+ celestial_points: List[dict]
224
+ ) -> DualChartAspectsModel:
225
+ """
226
+ Create the complete dual chart aspects model with all calculations.
227
+
228
+ Args:
229
+ first_subject: First astrological subject
230
+ second_subject: Second astrological subject
231
+ active_points_resolved: Resolved list of active celestial points
232
+ active_aspects_resolved: Resolved list of active aspects with orbs
233
+ aspects_settings: Chart aspect configuration settings
234
+ axes_orbit_settings: Orb threshold for chart axes
235
+ celestial_points: Celestial points configuration
236
+
237
+ Returns:
238
+ DualChartAspectsModel: Complete model containing all aspects data
239
+ """
240
+ all_aspects = AspectsFactory._calculate_dual_chart_aspects(
241
+ first_subject, second_subject, active_points_resolved, active_aspects_resolved,
242
+ aspects_settings, celestial_points
243
+ )
244
+ relevant_aspects = AspectsFactory._filter_relevant_aspects(all_aspects, axes_orbit_settings)
245
+
246
+ return DualChartAspectsModel(
247
+ first_subject=first_subject,
248
+ second_subject=second_subject,
249
+ all_aspects=all_aspects,
250
+ relevant_aspects=relevant_aspects,
251
+ active_points=active_points_resolved,
252
+ active_aspects=active_aspects_resolved,
253
+ )
254
+
255
+ @staticmethod
256
+ def _calculate_single_chart_aspects(
257
+ subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
258
+ active_points: List[AstrologicalPoint],
259
+ active_aspects: List[ActiveAspect],
260
+ aspects_settings: List[dict],
261
+ celestial_points: List[dict]
262
+ ) -> List[AspectModel]:
263
+ """
264
+ Calculate all aspects within a single chart.
265
+
266
+ This method handles all aspect calculations including settings updates,
267
+ opposite pair filtering, and planet ID resolution for single charts.
268
+ Works with any chart type (natal, return, composite, etc.).
269
+
270
+ Returns:
271
+ List of all calculated AspectModel instances
272
+ """
273
+ active_points_list = get_active_points_list(subject, active_points)
274
+
275
+ # Update aspects settings with active aspects orbs
276
+ filtered_settings = AspectsFactory._update_aspect_settings(aspects_settings, active_aspects)
277
+
278
+ # Create a lookup dictionary for planet IDs to optimize performance
279
+ planet_id_lookup = {planet["name"]: planet["id"] for planet in celestial_points}
280
+
281
+ # Define opposite pairs that should be skipped for single chart aspects
282
+ opposite_pairs = {
283
+ ("Ascendant", "Descendant"),
284
+ ("Descendant", "Ascendant"),
285
+ ("Medium_Coeli", "Imum_Coeli"),
286
+ ("Imum_Coeli", "Medium_Coeli"),
287
+ ("True_North_Lunar_Node", "True_South_Lunar_Node"),
288
+ ("Mean_North_Lunar_Node", "Mean_South_Lunar_Node"),
289
+ ("True_South_Lunar_Node", "True_North_Lunar_Node"),
290
+ ("Mean_South_Lunar_Node", "Mean_North_Lunar_Node"),
291
+ }
292
+
293
+ all_aspects_list = []
294
+
295
+ for first in range(len(active_points_list)):
296
+ # Generate aspects list without repetitions (single chart - same chart)
297
+ for second in range(first + 1, len(active_points_list)):
298
+ # Skip predefined opposite pairs (AC/DC, MC/IC, North/South nodes)
299
+ first_name = active_points_list[first]["name"]
300
+ second_name = active_points_list[second]["name"]
301
+
302
+ if (first_name, second_name) in opposite_pairs:
303
+ continue
304
+
305
+ aspect = get_aspect_from_two_points(
306
+ filtered_settings,
307
+ active_points_list[first]["abs_pos"],
308
+ active_points_list[second]["abs_pos"]
309
+ )
310
+
311
+ if aspect["verdict"]:
312
+ # Get planet IDs using lookup dictionary for better performance
313
+ first_planet_id = planet_id_lookup.get(first_name, 0)
314
+ second_planet_id = planet_id_lookup.get(second_name, 0)
315
+
316
+ # Calculate aspect movement (applying/separating/exact)
317
+ aspect_movement = calculate_aspect_movement(
318
+ active_points_list[first]["abs_pos"],
319
+ active_points_list[second]["abs_pos"],
320
+ aspect["aspect_degrees"]
321
+ )
322
+
323
+ aspect_model = AspectModel(
324
+ p1_name=first_name,
325
+ p1_owner=subject.name,
326
+ p1_abs_pos=active_points_list[first]["abs_pos"],
327
+ p2_name=second_name,
328
+ p2_owner=subject.name,
329
+ p2_abs_pos=active_points_list[second]["abs_pos"],
330
+ aspect=aspect["name"],
331
+ orbit=aspect["orbit"],
332
+ aspect_degrees=aspect["aspect_degrees"],
333
+ diff=aspect["diff"],
334
+ p1=first_planet_id,
335
+ p2=second_planet_id,
336
+ aspect_movement=aspect_movement,
337
+ )
338
+ all_aspects_list.append(aspect_model)
339
+
340
+ return all_aspects_list
341
+
342
+ @staticmethod
343
+ def _calculate_dual_chart_aspects(
344
+ first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
345
+ second_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
346
+ active_points: List[AstrologicalPoint],
347
+ active_aspects: List[ActiveAspect],
348
+ aspects_settings: List[dict],
349
+ celestial_points: List[dict]
350
+ ) -> List[AspectModel]:
351
+ """
352
+ Calculate all aspects between two charts.
353
+
354
+ This method performs comprehensive aspect calculations between all active points
355
+ of both subjects, applying the specified orb settings and creating detailed
356
+ aspect models with planet IDs and positional information.
357
+ Works with any chart types (synastry, transits, comparisons, etc.).
358
+
359
+ Args:
360
+ first_subject: First astrological subject
361
+ second_subject: Second astrological subject
362
+ active_points: List of celestial points to include in calculations
363
+ active_aspects: List of aspect types with their orb settings
364
+ aspects_settings: Base aspect configuration settings
365
+ celestial_points: Celestial points configuration with IDs
366
+
367
+ Returns:
368
+ List[AspectModel]: Complete list of all calculated aspect instances
369
+ """
370
+ # Get active points lists for both subjects
371
+ first_active_points_list = get_active_points_list(first_subject, active_points)
372
+ second_active_points_list = get_active_points_list(second_subject, active_points)
373
+
374
+ # Create a lookup dictionary for planet IDs to optimize performance
375
+ planet_id_lookup = {planet["name"]: planet["id"] for planet in celestial_points}
376
+
377
+ # Update aspects settings with active aspects orbs
378
+ filtered_settings = AspectsFactory._update_aspect_settings(aspects_settings, active_aspects)
379
+
380
+ all_aspects_list = []
381
+ for first in range(len(first_active_points_list)):
382
+ # Generate aspects list between all points of first and second subjects
383
+ for second in range(len(second_active_points_list)):
384
+ aspect = get_aspect_from_two_points(
385
+ filtered_settings,
386
+ first_active_points_list[first]["abs_pos"],
387
+ second_active_points_list[second]["abs_pos"],
388
+ )
389
+
390
+ if aspect["verdict"]:
391
+ first_name = first_active_points_list[first]["name"]
392
+ second_name = second_active_points_list[second]["name"]
393
+
394
+ # Get planet IDs using lookup dictionary for better performance
395
+ first_planet_id = planet_id_lookup.get(first_name, 0)
396
+ second_planet_id = planet_id_lookup.get(second_name, 0)
397
+
398
+ # Calculate aspect movement (applying/separating/exact)
399
+ aspect_movement = calculate_aspect_movement(
400
+ first_active_points_list[first]["abs_pos"],
401
+ second_active_points_list[second]["abs_pos"],
402
+ aspect["aspect_degrees"]
403
+ )
404
+
405
+ aspect_model = AspectModel(
406
+ p1_name=first_name,
407
+ p1_owner=first_subject.name,
408
+ p1_abs_pos=first_active_points_list[first]["abs_pos"],
409
+ p2_name=second_name,
410
+ p2_owner=second_subject.name,
411
+ p2_abs_pos=second_active_points_list[second]["abs_pos"],
412
+ aspect=aspect["name"],
413
+ orbit=aspect["orbit"],
414
+ aspect_degrees=aspect["aspect_degrees"],
415
+ diff=aspect["diff"],
416
+ p1=first_planet_id,
417
+ p2=second_planet_id,
418
+ aspect_movement=aspect_movement,
419
+ )
420
+ all_aspects_list.append(aspect_model)
421
+
422
+ return all_aspects_list
423
+
424
+ @staticmethod
425
+ def _update_aspect_settings(
426
+ aspects_settings: List[dict],
427
+ active_aspects: List[ActiveAspect]
428
+ ) -> List[dict]:
429
+ """
430
+ Update aspects settings with active aspects orbs.
431
+
432
+ This is a common utility method used by both single chart and dual chart calculations.
433
+
434
+ Args:
435
+ aspects_settings: Base aspect settings
436
+ active_aspects: Active aspects with their orb configurations
437
+
438
+ Returns:
439
+ List of filtered and updated aspect settings
440
+ """
441
+ filtered_settings = []
442
+ for aspect_setting in aspects_settings:
443
+ for active_aspect in active_aspects:
444
+ if aspect_setting["name"] == active_aspect["name"]:
445
+ aspect_setting = aspect_setting.copy() # Don't modify original
446
+ aspect_setting["orb"] = active_aspect["orb"]
447
+ filtered_settings.append(aspect_setting)
448
+ break
449
+ return filtered_settings
450
+
451
+ @staticmethod
452
+ def _filter_relevant_aspects(all_aspects: List[AspectModel], axes_orbit_settings: float) -> List[AspectModel]:
453
+ """
454
+ Filter aspects based on orb thresholds for axes and comprehensive criteria.
455
+
456
+ This method consolidates all filtering logic including axes checks and orb thresholds
457
+ for both single chart and dual chart aspects in a single comprehensive filtering method.
458
+
459
+ Args:
460
+ all_aspects: Complete list of calculated aspects
461
+ axes_orbit_settings: Orb threshold for axes aspects
462
+
463
+ Returns:
464
+ Filtered list of relevant aspects
465
+ """
466
+ logging.debug("Calculating relevant aspects by filtering orbs...")
467
+
468
+ relevant_aspects = []
469
+
470
+ for aspect in all_aspects:
471
+ # Check if aspect involves any of the chart axes and apply stricter orb limits
472
+ aspect_involves_axes = (aspect.p1_name in AXES_LIST or aspect.p2_name in AXES_LIST)
473
+
474
+ if aspect_involves_axes and abs(aspect.orbit) >= axes_orbit_settings:
475
+ continue
476
+
477
+ relevant_aspects.append(aspect)
478
+
479
+ return relevant_aspects
480
+
481
+ # Legacy methods for temporary backward compatibility
482
+ @staticmethod
483
+ def natal_aspects(
484
+ subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
485
+ *,
486
+ active_points: Optional[List[AstrologicalPoint]] = None,
487
+ active_aspects: Optional[List[ActiveAspect]] = None,
488
+ ) -> NatalAspectsModel:
489
+ """
490
+ Legacy method - use single_chart_aspects() instead.
491
+
492
+ ⚠️ DEPRECATION WARNING ⚠️
493
+ This method is deprecated. Use AspectsFactory.single_chart_aspects() instead.
494
+ """
495
+ return AspectsFactory.single_chart_aspects(subject, active_points=active_points, active_aspects=active_aspects)
496
+
497
+ @staticmethod
498
+ def synastry_aspects(
499
+ first_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
500
+ second_subject: Union[AstrologicalSubjectModel, CompositeSubjectModel, PlanetReturnModel],
501
+ *,
502
+ active_points: Optional[List[AstrologicalPoint]] = None,
503
+ active_aspects: Optional[List[ActiveAspect]] = None,
504
+ ) -> SynastryAspectsModel:
505
+ """
506
+ Legacy method - use dual_chart_aspects() instead.
507
+
508
+ ⚠️ DEPRECATION WARNING ⚠️
509
+ This method is deprecated. Use AspectsFactory.dual_chart_aspects() instead.
510
+ """
511
+ return AspectsFactory.dual_chart_aspects(
512
+ first_subject, second_subject, active_points=active_points, active_aspects=active_aspects
513
+ )
514
+
515
+
516
+ if __name__ == "__main__":
517
+ from kerykeion.utilities import setup_logging
518
+
519
+ setup_logging(level="debug")
520
+
521
+ # Test single chart aspects (replaces natal aspects)
522
+ johnny = AstrologicalSubjectFactory.from_birth_data("Johnny Depp", 1963, 6, 9, 0, 0, city="Owensboro", nation="US")
523
+ single_chart_aspects = AspectsFactory.single_chart_aspects(johnny)
524
+ print(f"Single chart aspects - All: {len(single_chart_aspects.all_aspects)}, Relevant: {len(single_chart_aspects.relevant_aspects)}")
525
+
526
+ # Test dual chart aspects (replaces synastry aspects)
527
+ john = AstrologicalSubjectFactory.from_birth_data("John", 1940, 10, 9, 10, 30, "Liverpool", "GB")
528
+ yoko = AstrologicalSubjectFactory.from_birth_data("Yoko", 1933, 2, 18, 10, 30, "Tokyo", "JP")
529
+ dual_chart_aspects = AspectsFactory.dual_chart_aspects(john, yoko)
530
+ print(f"Dual chart aspects - All: {len(dual_chart_aspects.all_aspects)}, Relevant: {len(dual_chart_aspects.relevant_aspects)}")