solarmoonpy 1.0.6__tar.gz → 1.0.7__tar.gz

{solarmoonpy-1.0.6 → solarmoonpy-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solarmoonpy
-Version: 1.0.6
+Version: 1.0.7
 Summary: Precise solar and lunar calculations for astronomical applications
 Author-email: figorr <jdcuartero@yahoo.es>
 License:                                  Apache License

{solarmoonpy-1.0.6 → solarmoonpy-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "solarmoonpy"
-version = "1.0.6"
+version = "1.0.7"
 description = "Precise solar and lunar calculations for astronomical applications"
 readme = "README.md"
 authors = [{ name = "figorr", email = "jdcuartero@yahoo.es" }]

{solarmoonpy-1.0.6 → solarmoonpy-1.0.7}/solarmoonpy/location.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from datetime import date, datetime, timezone
 from zoneinfo import ZoneInfo
-from typing import Optional, Union, Literal
+from typing import Optional, Union, Literal, Dict
 
 from .sun import sunrise_sunset, noon, dawn, dusk, midnight  # Importar funciones de sun.py
 
@@ -257,57 +257,6 @@ class Location:
             date=date,
             timezone=self.tzinfo if local else timezone.utc
         )
-
-    def sun_events(
-        self,
-        date: Optional[date] = None,
-        local: bool = True,
-        elevation: Optional[float] = None
-    ) -> dict:
-        """
-        Devuelve un diccionario con sunrise, noon y sunset para una fecha dada.
-
-        Args:
-            date: Fecha para la cual calcular los eventos solares. Si es None, usa la fecha actual.
-            local: True para devolver las horas en la zona horaria local, False para UTC.
-            elevation: Elevación del observador en metros. Si es None, usa self.elevation.
-
-        Returns:
-            dict: {
-                "sunrise": datetime,
-                "noon": datetime,
-                "sunset": datetime
-            }
-        """
-        if local and self.timezone is None:
-            raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
-
-        tz = self.tzinfo if local else timezone.utc
-        date = date or datetime.now(tz).date()
-        elevation = elevation if elevation is not None else self.elevation
-
-        # Calcular amanecer y atardecer
-        sunrise, sunset = sunrise_sunset(
-            latitude=self.latitude,
-            longitude=self.longitude,
-            date=date,
-            elevation=elevation,
-            timezone=tz,
-            with_refraction=True,
-        )
-
-        # Calcular mediodía solar
-        noon_time = noon(
-            longitude=self.longitude,
-            date=date,
-            timezone=tz,
-        )
-
-        return {
-            "sunrise": sunrise,
-            "noon": noon_time,
-            "sunset": sunset,
-        }
     
     def dawn(
         self,
@@ -372,4 +321,139 @@ class Location:
             longitude=self.longitude,
             date=date,
             timezone=self.tzinfo if local else timezone.utc
-        )
+        )
+    
+    def sun_events(
+        self,
+        date: Optional[date] = None,
+        local: bool = True,
+        elevation: Optional[float] = None,
+    ) -> Dict:
+        """
+        Devuelve un diccionario con los eventos solares para una fecha dada, incluyendo todos los tipos de crepúsculo.
+
+        Args:
+            date: Fecha para la cual calcular los eventos solares. Si es None, usa la fecha actual.
+            local: True para devolver las horas en la zona horaria local, False para UTC.
+            elevation: Elevación del observador en metros. Si es None, usa self.elevation.
+
+        Returns:
+            dict: {
+                "dawn_civil": datetime | None,
+                "dawn_nautical": datetime | None,
+                "dawn_astronomical": datetime | None,
+                "sunrise": datetime,
+                "noon": datetime,
+                "sunset": datetime,
+                "dusk_civil": datetime | None,
+                "dusk_nautical": datetime | None,
+                "dusk_astronomical": datetime | None,
+                "midnight": datetime,
+                "daylight_duration": float | None
+            }
+        """
+        if local and self.timezone is None:
+            raise ValueError("Se solicitó hora local pero no se definió una zona horaria.")
+
+        tz = self.tzinfo if local else timezone.utc
+        date = date or datetime.now(tz).date()
+        elevation = elevation if elevation is not None else self.elevation
+
+        # Calcular amanecer y atardecer
+        sunrise, sunset = sunrise_sunset(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+
+        # Calcular mediodía solar
+        noon_time = noon(
+            longitude=self.longitude,
+            date=date,
+            timezone=tz,
+        )
+
+        # Calcular medianoche solar
+        midnight_time = midnight(
+            longitude=self.longitude,
+            date=date,
+            timezone=tz,
+        )
+
+        # Calcular duración del día (en horas)
+        daylight_duration = None
+        if sunrise and sunset:
+            daylight_duration = (sunset - sunrise).total_seconds() / 3600
+
+        # Calcular dawn y dusk para cada tipo de crepúsculo
+        dawn_civil = dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="civil",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dusk_civil = dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="civil",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dawn_nautical = dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="nautical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dusk_nautical = dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="nautical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dawn_astronomical = dawn(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="astronomical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+        dusk_astronomical = dusk(
+            latitude=self.latitude,
+            longitude=self.longitude,
+            date=date,
+            twilight_type="astronomical",
+            elevation=elevation,
+            timezone=tz,
+            with_refraction=True,
+        )
+
+        return {
+            "dawn_civil": dawn_civil,
+            "dawn_nautical": dawn_nautical,
+            "dawn_astronomical": dawn_astronomical,
+            "sunrise": sunrise,
+            "noon": noon_time,
+            "sunset": sunset,
+            "dusk_civil": dusk_civil,
+            "dusk_nautical": dusk_nautical,
+            "dusk_astronomical": dusk_astronomical,
+            "midnight": midnight_time,
+            "daylight_duration": daylight_duration,
+        }

solarmoonpy-1.0.7/solarmoonpy/version.py

@@ -0,0 +1,2 @@
+# version.py
+__version__ = "1.0.7"

{solarmoonpy-1.0.6 → solarmoonpy-1.0.7}/solarmoonpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solarmoonpy
-Version: 1.0.6
+Version: 1.0.7
 Summary: Precise solar and lunar calculations for astronomical applications
 Author-email: figorr <jdcuartero@yahoo.es>
 License:                                  Apache License

solarmoonpy-1.0.6/solarmoonpy/version.py

@@ -1,2 +0,0 @@
-# version.py
-__version__ = "1.0.6"