PyThea 1.0.0__tar.gz → 1.1.0__tar.gz

{pythea-1.0.0 → pythea-1.1.0}/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.1.0 (12-Feb-2025)
+
+## Minor Changes
+ - Updates the dependencies for sunpy>6.0
+ - Improves the utility of HEK events retrieval
+
+ ## Bug Fixes
+ - Fixes a flakes8 error for using bare except
+ - Fixes get_horizons_coord passing id_type
+ - Fixes a bug when no flare or AR data returned from HEK in the app
+ - Removes AIA fix_observer_location as it is no longer needed
+
 # v1.0.0 (19-Nov-2024)
 
 ## Features

{pythea-1.0.0 → pythea-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyThea
-Version: 1.0.0
+Version: 1.1.0
 Summary: PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 Home-page: https://github.com/AthKouloumvakos/PyThea
 Author: Athanasios Kouloumvakos
@@ -10,25 +10,25 @@ Keywords: science,solar physics,solar,sun,shock waves
 Platform: any
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.10, <3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: numpy==1.26.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: aiapy
-Requires-Dist: astropy==6.0.0
+Requires-Dist: astropy
 Requires-Dist: astroquery
 Requires-Dist: jplephem
 Requires-Dist: numexpr
-Requires-Dist: sunpy==5.1.2
+Requires-Dist: sunpy==6.0.4
 Requires-Dist: sunpy_soar
 Requires-Dist: parfive==2.1.0
 Requires-Dist: pooch
@@ -44,6 +44,17 @@ Requires-Dist: pyvista
 Requires-Dist: pytest-astropy
 Requires-Dist: pytest-sugar
 Requires-Dist: pytest-mpl
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 

{pythea-1.0.0 → pythea-1.1.0}/PyThea/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.0'
-__version_tuple__ = version_tuple = (1, 0, 0)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)

{pythea-1.0.0 → pythea-1.1.0}/PyThea/extensions/Parker_spirals/utils.py

@@ -25,7 +25,7 @@ def plot_parker_spiral(axis, map, bodies, sw_speed=350 * (u.km / u.second)):
     None
     """
     for body in bodies:
-        pos = get_horizons_coord(bodies_dict[body][0], map.date_average, 'id')
+        pos = get_horizons_coord(bodies_dict[body][0], map.date_average)
         pos = pos.transform_to(frames.HeliographicCarrington(observer='Earth', obstime=map.date_average))
 
         spiral_coord = Parker_spirals.spiral(pos, sw_speed[body], map.date_average)

{pythea-1.0.0 → pythea-1.1.0}/PyThea/extensions/hek/utils.py

@@ -8,8 +8,67 @@ from sunpy.net import hek
 from sunpy.physics.differential_rotation import solar_rotate_coordinate
 from sunpy.time import parse_time
 
+hek_client = hek.HEKClient()
 
-def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
+
+def get_hek_active_regions(date, time_range):
+    start_time = date + TimeDelta(time_range[0] * u.hour)
+    end_time = date + TimeDelta(time_range[1] * u.hour)
+
+    responses = hek_client.search(a.Time(start_time, end_time),
+                                  a.hek.AR, a.hek.FRM.Name == 'HMI SHARP')
+
+    if str(responses) == '<No columns>':
+        return []
+
+    responses.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime'])
+    indx = [i for i, x in enumerate(responses['ar_noaanum']) if x is None]
+    responses.remove_rows(indx)
+    responses = responses[['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime']]
+    dates = Time(responses['event_starttime'])
+    time_diff = np.abs(dates - date)
+    time_diff_seconds = np.array([td.sec for td in time_diff])
+    if len(np.unique(time_diff_seconds)) > 1:
+        responses.remove_rows(np.where(time_diff_seconds == np.max(time_diff_seconds)))
+
+    responses_ = hek_client.search(a.Time(start_time, end_time),
+                                   a.hek.AR, a.hek.FRM.Name == 'NOAA SWPC Observer')
+    responses_.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y'])
+
+    responses['ar_mcintoshcls'] = np.full(responses['ar_noaanum'].shape[0], None)
+    responses['ar_mtwilsoncls'] = np.full(responses['ar_noaanum'].shape[0], None)
+
+    for rn, clm, clw in zip(responses_['ar_noaanum'], responses_['ar_mcintoshcls'], responses_['ar_mtwilsoncls']):
+        i = np.argwhere(responses['ar_noaanum'] == rn)
+        responses['ar_mcintoshcls'][i] = clm
+        responses['ar_mtwilsoncls'][i] = clw
+
+    return responses
+
+
+def get_hek_coronal_holes(start_time, end_time):
+
+    responses = hek_client.search(a.Time(start_time, end_time),
+                                  a.hek.CH, a.hek.FRM.Name == 'SPoCA')
+    return responses
+
+
+def get_hek_flares(start_time, end_time):
+    # TODO: Merge this with get_hek_flare from PyThea utils.
+    responses = hek_client.search(a.Time(start_time, end_time),
+                                  a.hek.FL, a.hek.FRM.Name == 'SWPC')
+
+    if str(responses) == '<No columns>':
+        return []
+
+    responses.keep_columns(['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum'])
+    responses.remove_rows(np.where((responses['hgs_x'] == 0) & (responses['hgs_y'] == 0)))
+    responses = responses[['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum']]
+
+    return responses
+
+
+def plot_hek(axis, date, mode, time_range=[-2, 2], hek_responses=None):
     """
     Plots HEK (Heliophysics Event Knowledgebase) events on a given axis.
 
@@ -34,37 +93,13 @@ def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
     responses: list
         The list of HEK event responses.
     """
-    hek_client = hek.HEKClient()
-    start_time = map.date_average + TimeDelta(time_range[0] * u.hour)
-    end_time = map.date_average + TimeDelta(time_range[1] * u.hour)
+
+    start_time = date + TimeDelta(time_range[0] * u.hour)
+    end_time = date + TimeDelta(time_range[1] * u.hour)
 
     if mode == 'Active Regions':
         if hek_responses is None or not hek_responses['Active Regions']:
-            responses = hek_client.search(a.Time(start_time, end_time),
-                                          a.hek.AR, a.hek.FRM.Name == 'HMI SHARP')
-
-            responses.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime'])
-            indx = [i for i, x in enumerate(responses['ar_noaanum']) if x is None]
-            responses.remove_rows(indx)
-            responses = responses[['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y', 'event_starttime']]
-            dates = Time(responses['event_starttime'])
-            time_diff = np.abs(dates - map.date_average)
-            time_diff_seconds = np.array([td.sec for td in time_diff])
-            if len(np.unique(time_diff_seconds)) > 1:
-                responses.remove_rows(np.where(time_diff_seconds == np.max(time_diff_seconds)))
-
-            responses_ = hek_client.search(a.Time(start_time, end_time),
-                                           a.hek.AR, a.hek.FRM.Name == 'NOAA SWPC Observer')
-            responses_.keep_columns(['ar_noaanum', 'ar_mcintoshcls', 'ar_mtwilsoncls', 'hgs_x', 'hgs_y'])
-
-            responses['ar_mcintoshcls'] = np.full(responses['ar_noaanum'].shape[0], None)
-            responses['ar_mtwilsoncls'] = np.full(responses['ar_noaanum'].shape[0], None)
-
-            for rn, clm, clw in zip(responses_['ar_noaanum'], responses_['ar_mcintoshcls'], responses_['ar_mtwilsoncls']):
-                i = np.argwhere(responses['ar_noaanum'] == rn)
-                responses['ar_mcintoshcls'][i] = clm
-                responses['ar_mtwilsoncls'][i] = clw
-            print(responses)
+            responses = get_hek_active_regions(date, time_range)
         else:
             responses = hek_responses['Active Regions']
 
@@ -78,8 +113,7 @@ def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
                           horizontalalignment='center', verticalalignment='center')
     elif mode == 'Coronal Holes':
         if hek_responses is None or not hek_responses['Coronal Holes']:
-            responses = hek_client.search(a.Time(start_time, end_time),
-                                          a.hek.CH, a.hek.FRM.Name == 'SPoCA')
+            responses = get_hek_coronal_holes(start_time, end_time)
         else:
             responses = hek_responses['Coronal Holes']
 
@@ -92,15 +126,11 @@ def plot_hek(axis, map, mode, time_range=[-2, 2], hek_responses=None):
                 [(float(v[0]), float(v[1])) * u.arcsec for v in p3],
                 obstime=ch_date, observer='earth',
                 frame=frames.Helioprojective)
-            rotated_ch_boundary = solar_rotate_coordinate(ch_boundary, time=map.date_average)
+            rotated_ch_boundary = solar_rotate_coordinate(ch_boundary, time=date)
             axis.plot_coord(rotated_ch_boundary, color='c')
     elif mode == 'Flares':
         if hek_responses is None or not hek_responses['Flares']:
-            responses = hek_client.search(a.Time(start_time, end_time),
-                                          a.hek.FL, a.hek.FRM.Name == 'SWPC')
-            responses.keep_columns(['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum'])
-            responses.remove_rows(np.where((responses['hgs_x'] == 0) & (responses['hgs_y'] == 0)))
-            responses = responses[['event_starttime', 'event_peaktime', 'fl_goescls', 'hgs_x', 'hgs_y', 'ar_noaanum']]
+            responses = get_hek_flares(start_time, end_time)
         else:
             responses = hek_responses['Flares']
 

{pythea-1.0.0 → pythea-1.1.0}/PyThea/modules.py

@@ -352,7 +352,7 @@ def figure_streamlit(st, running_map, image_mode, imager, model):
         if 'hek_responses' not in st.session_state:
             st.session_state.hek_responses = {'Active Regions': [], 'Coronal Holes': [], 'Flares': []}
         for mode in st.session_state.hek_list:
-            st.session_state.hek_responses[mode] = plot_hek(axis, running_map, mode,
+            st.session_state.hek_responses[mode] = plot_hek(axis, running_map.date_average, mode,
                                                             st.session_state.imaging_time_range,
                                                             hek_responses=st.session_state.hek_responses)
 

{pythea-1.0.0 → pythea-1.1.0}/PyThea/sunpy_dev/extern/sunkit_instruments/aia/utils.py

@@ -1,6 +1,6 @@
 import warnings
 from astropy.time import TimeDelta
-from aiapy.calibrate import fix_observer_location, update_pointing
+from aiapy.calibrate import update_pointing
 
 __all__ = ['prep_aia']
 
@@ -8,10 +8,11 @@ __all__ = ['prep_aia']
 def prep_aia(map_sequence):
     try:
         map_sequence = [update_pointing(tmap) for tmap in map_sequence]
-    except:
+    except Exception:
         warnings.warn('Prepare AIA maps failed, script proceeded without update_pointing. Check connection with JSOC.', UserWarning)
 
-    map_sequence = [fix_observer_location(tmap) for tmap in map_sequence]
+    # AIAMap already fixes the .observer_coordinate property with HAE, therefore, the following is removed.
+    # map_sequence = [fix_observer_location(tmap) for tmap in map_sequence]
 
     for map_ in map_sequence:
         map_.meta['DATE-AVG'] = (map_.date + TimeDelta(map_.meta['exptime']/2, format='sec')).value

{pythea-1.0.0 → pythea-1.1.0}/PyThea/test/test_extension_utils.py

@@ -19,7 +19,7 @@ def test_parker_spiral():
     time = '2022-01-01T00:00:00'
     body = bodies_dict['Earth'][0]
 
-    pos = get_horizons_coord(body, time, 'id')
+    pos = get_horizons_coord(body, time)
     pos = pos.transform_to(frames.HeliographicCarrington(observer='Earth', obstime=time))
 
     spiral_coord = Parker_spirals.spiral(pos, 350 * (u.km/u.second), time)
@@ -43,7 +43,7 @@ def test_footpoint():
     time = '2022-01-01T00:00:00'
     body = bodies_dict['Earth'][0]
 
-    pos = get_horizons_coord(body, time, 'id')
+    pos = get_horizons_coord(body, time)
     pos = pos.transform_to(frames.HeliographicCarrington(observer='Earth', obstime=time))
 
     footpoint_coord = Parker_spirals.footpoint(pos, 350 * (u.km/u.second), time)

{pythea-1.0.0 → pythea-1.1.0}/PyThea.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PyThea
-Version: 1.0.0
+Version: 1.1.0
 Summary: PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 Home-page: https://github.com/AthKouloumvakos/PyThea
 Author: Athanasios Kouloumvakos
@@ -10,25 +10,25 @@ Keywords: science,solar physics,solar,sun,shock waves
 Platform: any
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.10, <3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: numpy==1.26.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: aiapy
-Requires-Dist: astropy==6.0.0
+Requires-Dist: astropy
 Requires-Dist: astroquery
 Requires-Dist: jplephem
 Requires-Dist: numexpr
-Requires-Dist: sunpy==5.1.2
+Requires-Dist: sunpy==6.0.4
 Requires-Dist: sunpy_soar
 Requires-Dist: parfive==2.1.0
 Requires-Dist: pooch
@@ -44,6 +44,17 @@ Requires-Dist: pyvista
 Requires-Dist: pytest-astropy
 Requires-Dist: pytest-sugar
 Requires-Dist: pytest-mpl
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 

{pythea-1.0.0 → pythea-1.1.0}/PyThea.egg-info/requires.txt

@@ -1,12 +1,12 @@
-numpy==1.26.4
+numpy
 pandas
 scipy
 aiapy
-astropy==6.0.0
+astropy
 astroquery
 jplephem
 numexpr
-sunpy==5.1.2
+sunpy==6.0.4
 sunpy_soar
 parfive==2.1.0
 pooch

{pythea-1.0.0 → pythea-1.1.0}/environment.yml

@@ -5,16 +5,16 @@ channels:
   - defaults
 
 dependencies:
-  - python=3.9
-  - numpy=1.26.4
+  - python=3.10
+  - numpy
   - pandas
   - scipy
   - matplotlib
   - aiapy
-  - astropy=6.0.0
+  - astropy
   - astroquery
   - numexpr
-  - sunpy=5.1.2
+  - sunpy=6.0.4
   - parfive=2.1.0  # The issue with streamlit and asyncio is resolved (see #13). Keep this for a while to make sure everything works smoothly.
   - streamlit
   - seaborn

{pythea-1.0.0 → pythea-1.1.0}/requirements.txt

@@ -1,12 +1,12 @@
-numpy==1.26.4
+numpy
 pandas
 scipy
 aiapy
-astropy==6.0.0
+astropy
 astroquery
 jplephem
 numexpr
-sunpy==5.1.2
+sunpy==6.0.4
 sunpy_soar
 parfive==2.1.0
 pooch

{pythea-1.0.0 → pythea-1.1.0}/setup.cfg

@@ -9,9 +9,8 @@ classifiers =
 	Operating System :: OS Independent
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
-	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
 	Topic :: Scientific/Engineering :: Physics
 
 [options]

{pythea-1.0.0 → pythea-1.1.0}/setup.py

@@ -37,8 +37,8 @@ setup(
     classifiers=[
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Operating System :: OS Independent',
@@ -46,7 +46,7 @@ setup(
         'Topic :: Scientific/Engineering :: Physics',
     ],
 
-    python_requires='>=3.8, <3.11',
+    python_requires='>=3.10, <3.12',
     install_requires=requirements,
 
     packages=find_packages(),