Update astro_core.py

astro_core.py

@@ -1,4 +1,3 @@
-
 # astro_core.py
 """
 Core astrology calculation module.
@@ -6,7 +5,7 @@ Handles birth chart calculations using flatlib.
 """
 
 from datetime import datetime
-import pytz
+import zoneinfo  # Use zoneinfo instead of pytz
 from typing import Dict, Any
 from flatlib.datetime import Datetime
 from flatlib.geopos import GeoPos
@@ -29,9 +28,7 @@ class ChartCalculator:
         ]
     
     def _get_house_number(self, lon: float, chart: Chart) -> int:
-        """
-        Determine house number for a given longitude
-        """
+        """Determine house number for a given longitude"""
         house_lons = []
         for i in range(1, 13):
             try:
@@ -40,51 +37,48 @@ class ChartCalculator:
             except (KeyError, AttributeError):
                 house_lons.append(0)
         
-        # Convert longitude to house number
+        # Simplified zodiac wrap-around handling (may need adjustments)
+        lon = self._normalize_longitude(lon)
+        house_lons = [self._normalize_longitude(lon) for lon in house_lons] 
         for i in range(12):
-            next_i = (i + 1) % 12
-            if (house_lons[i] <= lon < house_lons[next_i]) or \
-               (house_lons[i] > house_lons[next_i] and  # Handle zodiac wrap
-                (lon >= house_lons[i] or lon < house_lons[next_i])):
+            if house_lons[i] <= lon < house_lons[(i + 1) % 12]:
                 return i + 1
-        return 1  # Default to first house if no match found
-    
+        return 1  # Default to first house if no match
+
     def _normalize_longitude(self, lon: float) -> float:
         """Normalize longitude to 0-360 range"""
         return lon % 360
     
     def _get_zodiac_sign(self, longitude: float) -> str:
-        """
-        Get zodiac sign from longitude
-        """
+        """Get zodiac sign from longitude"""
         sign_num = int(self._normalize_longitude(longitude) / 30)
         return ZODIAC_SIGNS[sign_num]
     
     def calculate_birth_chart(self, 
-                            birth_datetime: datetime,
-                            latitude: float,
-                            longitude: float,
-                            timezone: str) -> Dict[str, Any]:
+                              birth_datetime: datetime,
+                              latitude: float,
+                              longitude: float,
+                              timezone: str) -> Dict[str, Any]:
         """
         Calculate birth chart positions
         Returns a dictionary of planetary positions and house cusps
         """
         try:
-            # Ensure timezone is valid
-            tz = pytz.timezone(timezone)
-            birth_datetime = tz.localize(birth_datetime) if birth_datetime.tzinfo is None else birth_datetime
+            # Timezone handling with zoneinfo
+            tz = zoneinfo.ZoneInfo(timezone) 
+            birth_datetime = birth_datetime.replace(tzinfo=tz)
             
             # Extract date and time components from birth_datetime
             date_str = birth_datetime.strftime('%Y/%m/%d')
             time_str = birth_datetime.strftime('%H:%M')
-            
+
             # Convert to flatlib datetime
             date = Datetime(date_str, time_str, timezone)
             pos = GeoPos(latitude, longitude)
-            
+
             # Calculate chart
             chart = Chart(date, pos)
-            
+
             # Extract planetary positions
             positions = {}
             for planet in self.planets:
@@ -93,13 +87,13 @@ class ChartCalculator:
                     if obj:
                         # Normalize longitude
                         lon = self._normalize_longitude(obj.lon)
-                        
+
                         # Get sign
                         sign = self._get_zodiac_sign(lon)
-                        
+
                         # Get house
                         house = self._get_house_number(lon, chart)
-                        
+
                         positions[planet] = {
                             'sign': sign,
                             'degrees': lon,
@@ -112,7 +106,7 @@ class ChartCalculator:
                         'house': 1,
                         'error': str(e)
                     }
-            
+
             # Extract house cusps
             houses = {}
             for i in range(1, 13):
@@ -130,20 +124,33 @@ class ChartCalculator:
                         'degrees': 0,
                         'error': str(e)
                     }
-            
+
             return {
                 'planets': positions,
                 'houses': houses
             }
-            
-        except Exception as e:
+
+        except zoneinfo.ZoneInfoNotFoundError:
+            return {
+                'error': f"Invalid timezone: {timezone}",
+                'planets': {},
+                'houses': {}
+            }
+        except KeyError as e: 
+            # Example of catching a specific exception
+            return {
+                'error': f"KeyError during chart calculation: {str(e)}",
+                'planets': {},
+                'houses': {}
+            }
+        except Exception as e:  # Catch-all for unexpected errors
             return {
                 'error': f"Failed to calculate birth chart: {str(e)}",
                 'planets': {},
                 'houses': {}
             }
-    
+
     def get_planet_aspects(self, chart_data: Dict[str, Any]) -> Dict[str, list]:
         """Calculate major aspects between planets"""
-        # TODO: Implement aspect calculation
-        return {}
+        # TODO: Implement aspect calculation using flatlib
+        return {}