PyThea 1.2.0__tar.gz → 1.3.0__tar.gz

{pythea-1.2.0 → pythea-1.3.0}/CHANGELOG.md

@@ -1,4 +1,18 @@
-# v1.1.0 (12-Feb-2025)
+# v1.3.0 (12-Feb-2025)
+
+## Features
+- Extend net sources for selected imagers
+- Adds a method to manually import fits files from folder
+
+## Minor Changes
+ - Updates dependences with sunpy>=7.1.2
+
+ ## Bug Fixes
+ - Fixes a bug with figure creation
+ - Fixes a bug with kinematic plots
+ - Guard against uninitialized variables
+
+# v1.2.0 (12-Feb-2025)
 
 ## Minor Changes
  - Change installation to pyproject.toml

{pythea-1.2.0 → pythea-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyThea
-Version: 1.2.0
+Version: 1.3.0
 Summary: PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 Author-email: Athanasios Kouloumvakos <athkouloumvakos@gmail.com>
 License: 
@@ -662,17 +662,17 @@ Keywords: science,solar physics,solar,coronal mass ejections,shock waves,EUV wav
 Platform: any
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
 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
 Provides: PyThea
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: sunpy>=7.0.1
+Requires-Dist: sunpy>=7.1.2
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: matplotlib

{pythea-1.2.0 → pythea-1.3.0}/PyThea/PyThea_app.py

@@ -19,7 +19,9 @@
 
 
 import datetime
-from copy import copy
+import glob
+import os
+from copy import deepcopy
 
 import astropy.units as u
 import numpy as np
@@ -49,11 +51,34 @@ def delete_from_state(vars):
             del st.session_state[var]
 
 
+def call_extend_sources(instrument):
+    for imager in selected_imagers.providers[instrument]['imagers']:
+        st.session_state.selected_imagers_[imager]['fido'][2] = a.Provider(st.session_state[f'provider_{instrument}'])
+
+
 def highlight_row(row, row_index):
-    if row.name.strftime('%Y-%m-%dT%H:%M:%S.%f') == row_index.strftime('%Y-%m-%dT%H:%M:%S.%f').values[0]:
-        return ['background-color: lightpink']*len(row)
-    else:
-        return ['']*len(row)
+    try:
+        if not len(row_index):
+            return ['']*len(row)
+        if row.name.strftime('%Y-%m-%dT%H:%M:%S.%f') == row_index.strftime('%Y-%m-%dT%H:%M:%S.%f').values[0]:
+            return ['background-color: lightpink']*len(row)
+    except (IndexError, AttributeError):
+        pass
+    return ['']*len(row)
+
+
+def clear_text_input():
+    st.session_state['manual_dir'] = st.session_state['manual_dir_text']
+    st.session_state['manual_dir_text'] = ''
+
+
+def list_fits_files(directory):
+    """Returns a list of .fits and .fts file paths from the selected directory."""
+    if directory:
+        fits_files = glob.glob(os.path.join(directory, '*.fits')) + \
+            glob.glob(os.path.join(directory, '*.fts'))
+        return fits_files
+    return []
 
 
 def footer_text():
@@ -81,6 +106,10 @@ def footer_text():
     st.markdown("""
                 **Citation**: Please cite the following paper [![https://www.frontiersin.org/articles/10.3389/fspas.2022.974137/](https://img.shields.io/static/v1?label=Paper&message=Frontiers&color=red)](https://www.frontiersin.org/articles/10.3389/fspas.2022.974137/) and [![https://doi.org/10.5281/zenodo.5713659](https://zenodo.org/badge/DOI/10.5281/zenodo.5713659.svg)](https://doi.org/10.5281/zenodo.5713659)
                 """)
+    st.success('''
+            **Don't miss these new features:**
+            - Import .fits files from folder.
+            ''', icon='ℹ️')
     st.info('''
             More imaging data have been added:
             - SDO/AIA images from 211A channel.
@@ -118,6 +147,8 @@ def run():
     #############################################################
     # Startup Variables
     if 'startup' not in st.session_state:
+        from PyThea.sunpy_dev.net.dataretriever.sources import lasco  # noqa
+        from PyThea.sunpy_dev.net.dataretriever.sources import stereo  # noqa
         st.session_state.startup = {'fitting': True}
 
     #############################################################
@@ -125,6 +156,29 @@ def run():
 
     if 'date_process' not in st.session_state:
         date_and_event_selection(st)
+        if 'selected_imagers_' not in st.session_state:
+            st.session_state.selected_imagers_ = deepcopy(selected_imagers.imager_dict)
+
+        st.sidebar.toggle('Change default data providers',
+                          value=False,
+                          help='Change data provider if you face issues or data are missing.',
+                          key='extend_net_sources')
+        if st.session_state.extend_net_sources:
+            container = st.sidebar.container(border=True)
+            container.text('Select provider',
+                           help='The default providers (left) use VSO to download data.')
+            for instrument in selected_imagers.providers.keys():
+                # container.text(f'{selected_imagers.imager_dict[prov]["source"]}')
+                col1, col2 = container.columns([0.3, 0.7], vertical_alignment='center')
+                col1.markdown(f'{instrument}:')
+                col2.segmented_control(f'{instrument}:',
+                                       options=selected_imagers.providers[instrument]['providers'],
+                                       selection_mode='single',
+                                       default=selected_imagers.providers[instrument]['providers'][0],
+                                       on_change=call_extend_sources,
+                                       args=[instrument],
+                                       key=f'provider_{instrument}',
+                                       label_visibility='collapsed')
     else:
         st.sidebar.markdown('## Processing Event|Date:')
         st.sidebar.info(f'{st.session_state.event_selected}')
@@ -163,6 +217,8 @@ def run():
         long_val = [0., 360.]
     elif st.session_state.coord_system == 'HGS':
         long_val = [-180., 180.]
+    else:
+        raise ValueError(f"Unsupported coordinate system: '{st.session_state.coord_system}'. Expected 'HGC' or 'HGS'.")
 
     longit = st.sidebar.slider(f'{st.session_state.coord_system} \
                                Longitude [deg.]:',
@@ -180,7 +236,6 @@ def run():
 
     fitting_sliders(st)
 
-    col1, col3, col2 = st.sidebar.columns(3)
     store_fit_button_pressed = st.sidebar.button('Store Fit')
 
     #############################################################
@@ -189,7 +244,7 @@ def run():
     with st.sidebar.expander('Download Options'):
         select_imagers_form = st.form(key='select_imagers_form', border=False)
         imagers_list = select_imagers_form.multiselect('Select Imagers',
-                                                       options=selected_imagers.imager_dict.keys(),
+                                                       options=st.session_state.selected_imagers_.keys(),
                                                        default=['LC2', 'LC3', 'COR2A'],
                                                        key='imagers_list')
         select_imagers_form.form_submit_button(label='Submit', use_container_width=True)
@@ -203,6 +258,37 @@ def run():
                                                  kwargs={'vars': ['map', 'map_', 'imagers_list_', 'hek_responses']},
                                                  use_container_width=True)
 
+        # Import Imagers Manually
+        select_imager_manual_form = st.container()
+        if 'manual_dir' not in st.session_state:
+            st.session_state['manual_dir'] = ''
+
+        imager_manual = select_imager_manual_form.selectbox('Select an imager for manual import',
+                                                            options={key for key in st.session_state.selected_imagers_.keys() if not key.endswith('m')})
+        select_imager_manual_form.text_input('Enter path containing the .fits files',
+                                             key='manual_dir_text', on_change=clear_text_input)
+
+        if st.session_state.manual_dir:
+            if os.path.isdir(st.session_state.manual_dir):
+                fits_files = list_fits_files(st.session_state.manual_dir)
+                if fits_files:
+                    st.session_state.selected_imagers_[f'{imager_manual}m'] = deepcopy(st.session_state.selected_imagers_[imager_manual])
+                    st.session_state.selected_imagers_[f'{imager_manual}m']['fido'] = {
+                        'path': st.session_state.manual_dir,
+                        'fits_files': fits_files}
+                    st.session_state['manual_dir'] = ''
+                    st.rerun()
+                else:
+                    select_imager_manual_form.warning('No FITS files found in the selected directory.')
+            else:
+                select_imager_manual_form.error('Invalid directory. Please enter a valid folder path.')
+            st.session_state['manual_dir'] = ''
+
+        filtered_imager_dict = [key for key in st.session_state.selected_imagers_.keys() if key.endswith('m')]
+        if filtered_imager_dict:
+            formatted_list = ', '.join(filtered_imager_dict)
+            select_imager_manual_form.success(f'Imagers available for manual import: {formatted_list}')
+
     with st.sidebar.expander('Processing Options'):
         procoption_container = st.container()
         if 'imagers_list_' not in st.session_state:
@@ -294,13 +380,17 @@ def run():
         st.session_state['imagers_list_'] = imagers_list
         progress_bar = st.progress(0, text='Preparing to Download data')
         for i, imager in enumerate(imager_added):
-            progress_bar.progress(i/len(imager_added), text=f'Download {imager} images from VSO')
+            progress_bar.progress((i + 1)/len(imager_added), text=f'Download {imager} images from VSO')
             if imager not in st.session_state.map_:
                 timerange = a.Time(st.session_state.date_process + datetime.timedelta(hours=imaging_time_range[0]),
                                    st.session_state.date_process + datetime.timedelta(hours=imaging_time_range[1]))
 
                 if st.session_state.offline_mode is False:
-                    downloaded_files = download_fits(timerange, imager)
+                    if imager[-1] != 'm':
+                        downloaded_files = download_fits(timerange, imager,
+                                                         imager_dict=st.session_state.selected_imagers_)
+                    else:
+                        downloaded_files = st.session_state.selected_imagers_[imager]['fido']['fits_files']
                 elif st.session_state.offline_mode is True:
                     progress_bar.desc = f'Load {imager} images from local database.'
                     event_id = st.session_state.event_selected.replace('-', '').replace(':', '').replace('|', 'D').replace('.', 'p') \
@@ -309,7 +399,7 @@ def run():
 
                 st.session_state.map_[imager] = load_fits(downloaded_files)
                 st.session_state.map_[imager] = single_imager_maps_process(st.session_state.map_[imager],
-                                                                           **selected_imagers.imager_dict[imager]['process'],
+                                                                           **st.session_state.selected_imagers_[imager]['process'],
                                                                            skip='sequence_processing')
             processed_images = single_imager_maps_process(st.session_state.map_[imager],
                                                           skip=['filter', 'prepare'],
@@ -394,6 +484,8 @@ def run():
                           frame=frames.HeliographicStonyhurst,
                           observer='earth',
                           obstime=running_map_date)
+    else:
+        raise ValueError(f"Unsupported coordinate system: '{st.session_state.coord_system}'. Expected 'HGC' or 'HGS'.")
     st.session_state.center = center
 
     if st.session_state.geometrical_model == 'Spheroid':
@@ -402,6 +494,8 @@ def run():
         model = ellipsoid(center, radaxis, orthoaxis1, orthoaxis2, tilt)
     elif st.session_state.geometrical_model == 'GCS':
         model = gcs(center, height, alpha, kappa, tilt)
+    else:
+        raise ValueError(f"Unsupported geometrical model: '{st.session_state.geometrical_model}'. Expected 'Spheroid', 'Ellipsoid', or 'GCS'.")
 
     #############################################################
     # Plot main and supplement figure images
@@ -418,12 +512,14 @@ def run():
         st.markdown('*Active Regions without NOAA number have been removed from the table.')
 
     if plt_supp_imagers:
-        if len(st.session_state.imagers_list_) < 3:
-            other_element = [element for element in st.session_state.imagers_list_ if element != imager_select][0]
-            fig, axis = figure_streamlit(st, get_closest(st.session_state.map[other_element], running_map_date), image_mode, other_element, model)
+        other_elements = [element for element in st.session_state.imagers_list_ if element != imager_select]
+        if not other_elements:
+            st.warning('No supplementary imagers available.')
+        elif len(st.session_state.imagers_list_) < 3:
+            fig, axis = figure_streamlit(st, get_closest(st.session_state.map[other_elements[0]], running_map_date), image_mode, other_elements[0], model)
             st.pyplot(fig)
         else:
-            supl_imagers_list = copy(st.session_state.imagers_list_)
+            supl_imagers_list = deepcopy(st.session_state.imagers_list_)
             supl_imagers_list.remove(imager_select)
             supl_imagers = st.select_slider('Select supplement imagers',
                                             options=supl_imagers_list,
@@ -502,6 +598,8 @@ def run():
             fit_args_ = {'type': 'custom', 'expression': fitcustexpres_select,
                          'bounds': ([-np.inf, -np.inf, -np.inf], [np.inf, np.inf, np.inf]), 'order': 3}
             st.info(f'A custom function {fit_args_["expression"]} was fitted when processing parameters.')
+        else:
+            raise ValueError(f"Unsupported fit mode: '{fit_mode}'. Expected 'polynomial', 'spline', or 'custom'.")
 
         if plt_kinematics_select == 'All':
             col1, col2 = st.columns(2)

pythea-1.3.0/PyThea/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.3.0'
+__version_tuple__ = version_tuple = (1, 3, 0)
+
+__commit_id__ = commit_id = 'gf5bc63e11'

{pythea-1.2.0 → pythea-1.3.0}/PyThea/config/selected_imagers.py

@@ -3,87 +3,93 @@
  How to use this:
 
 '''
+
 import astropy.units as u
 import sunpy_soar  # noqa
 from sunpy.net import attrs as a
 
 imager_dict = {}
 
-imager_dict['LC2'] = {'fido': (a.Instrument.lasco, a.Detector.c2),
+imager_dict['LC2'] = {'fido': [a.Instrument.lasco, a.Detector.c2, a.Provider('SDAC')],
                       'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'polar': 'Clear', 'superpixel': 2},
                       'source': 'SOHO', 'instrument': 'LASCO', 'detector': 'C2'}
 
-imager_dict['LC3'] = {'fido': (a.Instrument.lasco, a.Detector.c3),
+imager_dict['LC3'] = {'fido': [a.Instrument.lasco, a.Detector.c3, a.Provider('SDAC')],
                       'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'polar': 'Clear', 'superpixel': 2},
                       'source': 'SOHO', 'instrument': 'LASCO', 'detector': 'C3'}
 
-imager_dict['AIA-193'] = {'fido': (a.Instrument.aia, a.Wavelength(19.3 * u.nm), a.Sample(1*u.minute)),
+imager_dict['AIA-193'] = {'fido': [a.Instrument.aia, a.Wavelength(19.3 * u.nm), a.Sample(1*u.minute)],
                           'process': {'dimensions': (4096*u.pixel, 4096*u.pixel), 'superpixel': 8, 'exposure': 1.90},
                           'source': 'SDO', 'instrument': 'AIA', 'wavelength': '193'}
 
-imager_dict['AIA-211'] = {'fido': (a.Instrument.aia, a.Wavelength(21.1 * u.nm), a.Sample(1*u.minute)),
+imager_dict['AIA-211'] = {'fido': [a.Instrument.aia, a.Wavelength(21.1 * u.nm), a.Sample(1*u.minute)],
                           'process': {'dimensions': (4096*u.pixel, 4096*u.pixel), 'superpixel': 8, 'exposure': 1.90},
                           'source': 'SDO', 'instrument': 'AIA', 'wavelength': '211'}
 
-imager_dict['COR2A'] = {'fido': (a.Source('STEREO_A'), a.Detector.cor2),
+imager_dict['COR2A'] = {'fido': [a.Source('STEREO_A'), a.Detector.cor2, a.Provider('SSC')],
                         'process': {'dimensions': (2048*u.pixel, 2048*u.pixel), 'polar': 1001, 'superpixel': 4},
                         'source': 'STEREO_A', 'instrument': 'SECCHI', 'detector': 'COR2'}
 
-imager_dict['COR2B'] = {'fido': (a.Source('STEREO_B'), a.Detector.cor2),
+imager_dict['COR2B'] = {'fido': [a.Source('STEREO_B'), a.Detector.cor2, a.Provider('SSC')],
                         'process': {'dimensions': (2048*u.pixel, 2048*u.pixel), 'polar': 1001, 'superpixel': 4},
                         'source': 'STEREO_B', 'instrument': 'SECCHI', 'detector': 'COR2'}
 
-imager_dict['EUVIA'] = {'fido': (a.Source('STEREO_A'), a.Detector.euvi, a.Wavelength(19.5 * u.nm)),
+imager_dict['EUVIA'] = {'fido': [a.Source('STEREO_A'), a.Detector.euvi, a.Wavelength(19.5 * u.nm), a.Provider('SSC')],
                         'process': {'dimensions': (2048*u.pixel, 2048*u.pixel), 'superpixel': 4},
                         'source': 'STEREO_A', 'instrument': 'SECCHI', 'detector': 'EUVI'}
 
-imager_dict['EUVIB'] = {'fido': (a.Source('STEREO_B'), a.Detector.euvi, a.Wavelength(19.5 * u.nm)),
+imager_dict['EUVIB'] = {'fido': [a.Source('STEREO_B'), a.Detector.euvi, a.Wavelength(19.5 * u.nm), a.Provider('SSC')],
                         'process': {'dimensions': (2048*u.pixel, 2048*u.pixel), 'superpixel': 4},
                         'source': 'STEREO_B', 'instrument': 'SECCHI', 'detector': 'EUVI'}
 
-imager_dict['COR1A'] = {'fido': (a.Source('STEREO_A'), a.Detector.cor1),
+imager_dict['COR1A'] = {'fido': [a.Source('STEREO_A'), a.Detector.cor1, a.Provider('SSC'), a.Provider('SSC')],
                         'process': {'dimensions': (512*u.pixel, 512*u.pixel)},
                         'source': 'STEREO_A', 'instrument': 'SECCHI', 'detector': 'COR1'}
 
-imager_dict['COR1B'] = {'fido': (a.Source('STEREO_B'), a.Detector.cor1),
+imager_dict['COR1B'] = {'fido': [a.Source('STEREO_B'), a.Detector.cor1, a.Provider('SSC'), a.Provider('SSC')],
                         'process': {'dimensions': (512*u.pixel, 512*u.pixel)},
                         'source': 'STEREO_B', 'instrument': 'SECCHI', 'detector': 'COR1'}
 
-imager_dict['HI1A'] = {'fido': (a.Source('STEREO_A'), a.Detector.hi1),
+imager_dict['HI1A'] = {'fido': [a.Source('STEREO_A'), a.Detector.hi1, a.Provider('SSC')],
                        'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'superpixel': 2},
                        'source': 'STEREO_A', 'instrument': 'SECCHI', 'detector': 'HI1'}
 
-imager_dict['HI1B'] = {'fido': (a.Source('STEREO_B'), a.Detector.hi1),
+imager_dict['HI1B'] = {'fido': [a.Source('STEREO_B'), a.Detector.hi1, a.Provider('SSC')],
                        'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'superpixel': 2},
                        'source': 'STEREO_B', 'instrument': 'SECCHI', 'detector': 'HI1'}
 
-imager_dict['HI2A'] = {'fido': (a.Source('STEREO_A'), a.Detector.hi2),
+imager_dict['HI2A'] = {'fido': [a.Source('STEREO_A'), a.Detector.hi2, a.Provider('SSC')],
                        'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'superpixel': 2},
                        'source': 'STEREO_A', 'instrument': 'SECCHI', 'detector': 'HI2'}
 
-imager_dict['HI2B'] = {'fido': (a.Source('STEREO_B'), a.Detector.hi2),
+imager_dict['HI2B'] = {'fido': [a.Source('STEREO_B'), a.Detector.hi2, a.Provider('SSC')],
                        'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'superpixel': 2},
                        'source': 'STEREO_B', 'instrument': 'SECCHI', 'detector': 'HI2'}
 
-imager_dict['WISPR1'] = {'fido': (a.Instrument.wispr, a.Detector.inner),
+imager_dict['WISPR1'] = {'fido': [a.Instrument.wispr, a.Detector.inner],
                          'process': {'dimensions': (960*u.pixel, 1024*u.pixel), 'processing_level': 3, 'superpixel': 2},
                          'source': 'PSP', 'instrument': 'WISPR', 'detector': 'Inner'}
 
-imager_dict['WISPR2'] = {'fido': (a.Instrument.wispr, a.Detector.outer),
+imager_dict['WISPR2'] = {'fido': [a.Instrument.wispr, a.Detector.outer],
                          'process': {'dimensions': (960*u.pixel, 1024*u.pixel), 'processing_level': 3, 'superpixel': 2},
                          'source': 'PSP', 'instrument': 'WISPR', 'detector': 'Outer'}
 
-imager_dict['EUI-FSI'] = {'fido': (a.Instrument('EUI'), a.soar.Product('EUI-FSI174-IMAGE'), a.Level(2)),
+imager_dict['EUI-FSI'] = {'fido': [a.Instrument('EUI'), a.soar.Product('EUI-FSI174-IMAGE'), a.Level(2)],
                           'process': {'superpixel': 1},
                           'source': 'SOLO', 'instrument': 'EUI-FSI', 'wavelength': '174'}
 
-imager_dict['METIS'] = {'fido': (a.Instrument('METIS'), a.soar.Product('METIS-VL-TB'), a.Level(2)),
+imager_dict['METIS'] = {'fido': [a.Instrument('METIS'), a.soar.Product('METIS-VL-TB'), a.Level(2)],
                         'process': {'dimensions': (1024*u.pixel, 1024*u.pixel), 'superpixel': 2},
                         'source': 'SOLO', 'instrument': 'METIS', 'detector': 'VLD', 'wavelength': 'TB'}
 
 for tile in range(1, 5):
     z = 'T' if tile in [1, 2] else 'G'
-    imager_dict[f'SOLOHI-T{tile}'] = {'fido': (a.Instrument('SOLOHI'),
-                                               a.soar.Product(f'SOLOHI-{tile}F{z}'), a.Level(2)),
+    imager_dict[f'SOLOHI-T{tile}'] = {'fido': [a.Instrument('SOLOHI'),
+                                               a.soar.Product(f'SOLOHI-{tile}F{z}'), a.Level(2)],
                                       'process': {'superpixel': 2},
                                       'source': 'SOLO', 'instrument': 'SOLOHI', 'detector': f'T{tile}'}
+
+providers = {'LASCO': {'imagers': ['LC2', 'LC3'], 'providers': ['SDAC', 'NASCOM']},
+             'STEREO': {'imagers': ['COR2A', 'COR2B', 'COR1A', 'COR1B',
+                                    'EUVIA', 'EUVIB', 'HI1A', 'HI1B',
+                                    'HI2A', 'HI2B'], 'providers': ['SSC', 'NASCOM']}, }

{pythea-1.2.0 → pythea-1.3.0}/PyThea/geometrical_models.py

@@ -406,7 +406,7 @@ class spheroid:
         output += 'CRLT = %3.2f degrees \n'%center_.lat.to_value(u.degree)
         output += 'rcenter = %3.2f Rsun \n'%self.rcenter.to_value(u.R_sun)
         output += 'radaxis = %3.2f Rsun \n'%self.radaxis.to_value(u.R_sun)
-        output += 'height = %3.2f Rsun \n'%self.radaxis.to_value(u.R_sun)
+        output += 'height = %3.2f Rsun \n'%self.height.to_value(u.R_sun)
         output += 'kappa = %3.2f \n'%self.kappa
         output += 'epsilon = %3.2f '%self.epsilon
         output += '>'
@@ -576,7 +576,7 @@ class ellipsoid(spheroid):
         output += 'radaxis = %3.2f Rsun \n'%self.radaxis.to_value(u.R_sun)
         output += 'orthoaxis1 = %3.2f Rsun \n'%self.orthoaxis1.to_value(u.R_sun)
         output += 'orthoaxis2 = %3.2f Rsun \n'%self.orthoaxis2.to_value(u.R_sun)
-        output += 'height = %3.2f Rsun \n'%self.radaxis.to_value(u.R_sun)
+        output += 'height = %3.2f Rsun \n'%self.height.to_value(u.R_sun)
         output += 'kappa = %3.2f \n'%self.kappa
         output += 'alpha = %3.2f \n'%self.alpha
         output += 'epsilon = %3.2f '%self.epsilon
@@ -653,7 +653,7 @@ class gcs():
         """
         Returns the cross-section radius at the apex (see eq. 29 in T2011).
         """
-        rapex = self.kappa * (self.h_() / np.cos(self.alpha) +  self.h_() * np.tan(self.alpha)) / (1 - self.kappa ** 2)
+        rapex = self.kappa * (self.h / np.cos(self.alpha) + self.h * np.tan(self.alpha)) / (1 - self.kappa ** 2)
         return rapex
 
     @property
@@ -695,7 +695,6 @@ class gcs():
         Converted and modified from the IDL script shellskeleton.pro
         https://hesperia.gsfc.nasa.gov/ssw/stereo/secchi/idl/scraytrace/shellskeleton.pro
         """
-        self.height.to_value(u.R_sun)
         alpha = self.alpha.to_value(u.rad)
         kappa = self.kappa
         h = self.h.to_value(u.R_sun)
@@ -795,7 +794,7 @@ class gcs():
         output += 'CRLN = %3.2f degrees \n'%center_.lon.to_value(u.degree)
         output += 'CRLT = %3.2f degrees \n'%center_.lat.to_value(u.degree)
         output += 'rcenter = %3.2f Rsun \n'%self.rcenter.to_value(u.R_sun)
-        output += 'height = %3.2f Rsun \n'%self.radaxis.to_value(u.R_sun)
+        output += 'height = %3.2f Rsun \n'%self.height.to_value(u.R_sun)
         output += 'alpha = %3.2f \n'%self.alpha
         output += 'kappa = %3.2f \n'%self.kappa
         output += 'tilt = %3.2f '%self.tilt

{pythea-1.2.0 → pythea-1.3.0}/PyThea/modules.py

@@ -88,8 +88,8 @@ def date_and_event_selection(st):
 
     elif initialisation == 'Manual':
         # Manual form for event ID selection and time input
-        with st.sidebar.form('my_form'):
-            col1, col2 = st.columns(2)
+        with st.sidebar.form('my_form') as form:
+            col1, col2 = form.columns(2)
             ev_id = col1.selectbox('Event ID',
                                    options=['Select', 'FL', 'CME', 'SHW'])
             time = col2.time_input('Time', datetime.time(12, 0))
@@ -256,6 +256,8 @@ def final_parameters_gmodel(st):
             rcenter, radaxis, orthoaxis1 = (st.session_state.rcenter * u.R_sun,
                                             st.session_state.radaxis * u.R_sun,
                                             st.session_state.orthoaxis1 * u.R_sun)
+        else:
+            raise ValueError(f"Unsupported representation mode for Spheroid: '{rmode}'. Expected 'h, e, k' or 'r, a, b'.")
         return rcenter, radaxis, orthoaxis1
 
     elif gmodel == 'Ellipsoid':
@@ -269,6 +271,8 @@ def final_parameters_gmodel(st):
                                                         st.session_state.radaxis * u.R_sun,
                                                         st.session_state.orthoaxis1 * u.R_sun,
                                                         st.session_state.orthoaxis2 * u.R_sun)
+        else:
+            raise ValueError(f"Unsupported representation mode for Ellipsoid: '{rmode}'. Expected 'h, e, k, a' or 'r, a, b, c'.")
         tilt = st.session_state.tilt * u.degree
         return rcenter, radaxis, orthoaxis1, orthoaxis2, tilt
 
@@ -278,6 +282,8 @@ def final_parameters_gmodel(st):
             alpha = st.session_state.alpha * u.degree
             kappa = st.session_state.kappa
             rcenter = gcs.rcenter_(height, alpha, kappa)
+        else:
+            raise ValueError(f"Unsupported representation mode for GCS: '{rmode}'. Expected 'h, a, k, t'.")
         tilt = st.session_state.tilt * u.degree
         return rcenter, height, alpha, kappa, tilt
 
@@ -325,13 +331,17 @@ def figure_streamlit(st, running_map, image_mode, imager, model):
 
     # Plot the model based on the selected mesh mode
     plot_mode = st.session_state.plot_mesh_mode
-    if plot_mode == 'Skeleton':
+    if plot_mode == 'No plot':
+        pass
+    elif plot_mode == 'Skeleton':
         model.plot(axis, mode='Skeleton')
     elif plot_mode == 'Full':
         model.plot(axis, mode='Skeleton')
         model.plot(axis, mode='Full')
     elif plot_mode == 'Surface':
         model.plot(axis, only_surface=True)
+    else:
+        raise ValueError(f"Unsupported plot mode: '{plot_mode}'. Expected 'No plot', 'Skeleton', 'Full', or 'Surface'.")
 
     # Optionally plot star field, solar reference lines, and Parker spirals
     if st.session_state.star_field:
@@ -352,7 +362,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.date_average, mode,
+            st.session_state.hek_responses[mode] = plot_hek(axis, getattr(running_map, 'date_average', None) or running_map.date, mode,
                                                             st.session_state.imaging_time_range,
                                                             hek_responses=st.session_state.hek_responses)
 

pythea-1.3.0/PyThea/sunpy_dev/net/dataretriever/sources/lasco.py

@@ -0,0 +1,87 @@
+from collections import OrderedDict
+
+import pandas as pd
+from sunpy.net.dataretriever import GenericClient, QueryResponse
+from sunpy.time import TimeRange
+
+__all__ = ['LASCOClient']
+
+
+class LASCOClient(GenericClient):
+    """
+    Provides access to data from NASA/NASCOM for LASCO instrument on board SOHO.
+
+    Examples
+    --------
+    >>> from sunpy.net import Fido, attrs as a
+    >>> res = Fido.search(a.Time('2015-06-21 00:00', '2015-06-23 23:59'),
+    ...                    a.Detector('c2'),
+                           a.Instrument('LASCO'),
+                           a.Provider('NASCOM'))
+
+    """
+
+    baseurl = r'https://sohoftp.nascom.nasa.gov/qkl/lasco/quicklook/level_05/%y%m%d/'
+    # r'https://umbra.nascom.nasa.gov/pub/lasco_level05/%y%m%d/'
+
+    def post_search_hook(self, i, matchdict):
+
+        rowdict = OrderedDict()
+        rowdict['Start Time'] = i['start']
+        rowdict['End Time'] = i['start']
+        rowdict['Instrument'] = matchdict['Instrument'][0].upper()
+        rowdict['Source'] = matchdict['Source'][0]
+        rowdict['Provider'] = matchdict['Provider'][0]
+        rowdict['url'] = i['url']
+
+        return rowdict
+
+    def search(self, *args, **kwargs):
+        """
+        Query this client for a list of results.
+
+        Parameters
+        ----------
+        \\*args: `tuple`
+            `sunpy.net.attrs` objects representing the query.
+        \\*\\*kwargs: `dict`
+             Any extra keywords to refine the search.
+
+        Returns
+        -------
+        A `QueryResponse` instance containing the query result.
+        """
+
+        baseurl, _, matchdict = self.pre_search_hook(*args, **kwargs)
+
+        tr = TimeRange(matchdict['Start Time'], matchdict['End Time'])
+
+        metalist = []
+
+        for times in pd.date_range(tr.start.strftime('%Y-%m-%d %H:%M:%S'), tr.end.strftime('%Y-%m-%d %H:%M:%S')):
+            url = times.strftime(baseurl)
+
+            data = pd.read_fwf(url + matchdict['Detector'][0] + '/img_hdr.txt',
+                               header=None, widths=(13, 13, 13),
+                               names=['filename', 'date', 'time'])
+            data = data.set_index([pd.to_datetime(data.iloc[:, 1]+' '+data.iloc[:, 2], format='%Y/%m/%d %H:%M:%S')])
+            data = data[(data.index >= tr.start.strftime('%Y-%m-%d %H:%M:%S')) &
+                        (data.index <= tr.end.strftime('%Y-%m-%d %H:%M:%S'))]
+            # files = 'https://sohoftp.nascom.nasa.gov/qkl/lasco/quicklook/level_05/210804/' + 'c2/' + files
+
+            for f in data.itertuples():
+                filemeta = {'start': f.Index,
+                            'url': url+matchdict['Detector'][0]+'/' + f.filename}
+                rowdict = self.post_search_hook(filemeta, matchdict)
+                metalist.append(rowdict)
+
+        return QueryResponse(metalist, client=self)
+
+    @classmethod
+    def register_values(cls):
+        from sunpy.net import attrs
+        adict = {attrs.Instrument: [('LASCO', '')],
+                 attrs.Source: [('SOHO', '')],
+                 attrs.Provider: [('NASCOM', '')],
+                 attrs.Detector: [('c2', ''), ('c3', '')]}
+        return adict

pythea-1.3.0/PyThea/sunpy_dev/net/dataretriever/sources/stereo.py

@@ -0,0 +1,100 @@
+from collections import OrderedDict
+
+import pandas as pd
+from sunpy.net.dataretriever import GenericClient, QueryResponse
+from sunpy.time import TimeRange
+
+__all__ = ['STEREOClient']
+
+
+class STEREOClient(GenericClient):
+    """
+    Provides access to data from NASA/NASCOM for SECCHI instrument suite on board STEREO.
+
+    Examples
+    --------
+    >>> from sunpy.net import Fido, attrs as a
+    >>> res = Fido.search(a.Time('2015-06-21 00:00', '2015-06-23 23:59'),
+    ...                    a.Detector('cor2'),
+                           a.Instrument('STEREO'),
+                           a.Provider('NASCOM'))
+
+    """
+
+    baseurl = r'https://stereo-ssc.nascom.nasa.gov/data/ins_data/secchi/L0/a/img/INSTRUMENT/%Y%m%d/'
+
+    def post_search_hook(self, i, matchdict):
+
+        rowdict = OrderedDict()
+        rowdict['Start Time'] = i['start']
+        rowdict['End Time'] = i['start']
+        rowdict['Instrument'] = matchdict['Instrument'][0].upper()
+        rowdict['Source'] = matchdict['Source'][0]
+        rowdict['Provider'] = matchdict['Provider'][0]
+        rowdict['url'] = i['url']
+
+        return rowdict
+
+    def search(self, *args, **kwargs):
+        """
+        Query this client for a list of results.
+
+        Parameters
+        ----------
+        \\*args: `tuple`
+            `sunpy.net.attrs` objects representing the query.
+        \\*\\*kwargs: `dict`
+             Any extra keywords to refine the search.
+
+        Returns
+        -------
+        A `QueryResponse` instance containing the query result.
+        """
+
+        baseurl, _, matchdict = self.pre_search_hook(*args, **kwargs)
+        summaryurl = r'https://stereo-ssc.nascom.nasa.gov/data/ins_data/secchi/L0/??/summary/SCC%Y%m.img.DETECTOR'
+
+        tr = TimeRange(matchdict['Start Time'], matchdict['End Time'])
+
+        metalist = []
+        print(matchdict['Source'][0])
+        if matchdict['Source'][0].upper() == 'STEREO_A':
+            scl, scc = 'a', 'sccA'
+        elif matchdict['Source'][0].upper() == 'STEREO_B':
+            scl, scc = 'b', 'sccB'
+
+        if matchdict['Detector'][0].upper() == 'COR2':
+            detect = 'c2'
+
+        for times in pd.date_range(tr.start.strftime('%Y-%m-%d %H:%M:%S'), tr.end.strftime('%Y-%m-%d %H:%M:%S')):
+            urlsum =  summaryurl.replace('??', scl).replace('SCC', scc).replace('DETECTOR', detect)
+            urlsum = times.strftime(urlsum)  # sccA201105.img.h1
+
+            data = pd.read_fwf(urlsum,
+                               header=None, colspecs=([0, 25], [28, 47], [50, 54]), skiprows=2,
+                               names=['filename', 'date', 'telescope'])
+            data = data.set_index([pd.to_datetime(data.iloc[:, 1], format='%Y/%m/%d %H:%M:%S')])
+            data = data[(data.index >= tr.start.strftime('%Y-%m-%d %H:%M:%S')) &
+                        (data.index <= tr.end.strftime('%Y-%m-%d %H:%M:%S'))]
+
+            # URL for example: files = 'https://stereo-ssc.nascom.nasa.gov/data/ins_data/secchi/L0/a/img/cor2/20211028/' + files
+            urldata = times.strftime(baseurl).replace('INSTRUMENT', matchdict['Detector'][0])
+
+            for f in data.itertuples():
+                filemeta = {'start': f.Index,
+                            'url': urldata + f.filename}
+                rowdict = self.post_search_hook(filemeta, matchdict)
+                metalist.append(rowdict)
+
+        return QueryResponse(metalist, client=self)
+
+    @classmethod
+    def register_values(cls):
+        from sunpy.net import attrs
+        adict = {
+            attrs.Instrument: [('SECCHI', '')],
+            attrs.Source: [('STEREO_A', ''), ('STEREO_B', '')],
+            attrs.Provider: [('NASCOM', '')],
+            attrs.Detector: [('COR2', ''), ('COR1', '')]
+        }
+        return adict

{pythea-1.2.0 → pythea-1.3.0}/PyThea/utils.py

@@ -91,7 +91,7 @@ def get_hek_flare(timerange, thresshold='B1.0'):
     return flare_list_
 
 
-def make_figure(map, cmap='Greys_r', clim=[-20, 20], clip_model=True, **kwargs):
+def make_figure(smap, cmap='Greys_r', clim=[-20, 20], clip_model=True, **kwargs):
     """
     Creates the main imager figure and returns the figure and axis handles.
 
@@ -121,49 +121,49 @@ def make_figure(map, cmap='Greys_r', clim=[-20, 20], clip_model=True, **kwargs):
     This function customizes the plot by optionally applying a median filter,
     setting color limits, drawing the solar limb, and adjusting axis properties.
     """
-    fig = kwargs.get('fig', plt.figure())
-    axis = kwargs.get('axis', plt.subplot(projection=map))
+    fig = kwargs['fig'] if 'fig' in kwargs else plt.figure()
+    axis = kwargs['axis'] if 'axis' in kwargs else plt.subplot(projection=smap)
 
     median_filter_value = kwargs.get('median_filter', 1)
     if median_filter_value != 1:
-        map = sunpy.map.Map(median_filter(map.data, size=int(median_filter_value)), map.meta)
+        smap = sunpy.map.Map(median_filter(smap.data, size=int(median_filter_value)), smap.meta)
 
-    if map.instrument in ['WISPR', 'Metis'] or map.instrument.startswith('SoloHI'):
+    if smap.instrument in ['WISPR', 'Metis'] or smap.instrument.startswith('SoloHI'):
         clim = [-10**-clim[0], 10**-clim[1]]
 
     if cmap == 'default':
         # TODO: For plain images or when EUVIA-B are used, this does not work very well.
-        map.plot(norm=colors.Normalize(vmin=clim[0], vmax=clim[1]))
+        smap.plot(norm=colors.Normalize(vmin=clim[0], vmax=clim[1]))
     else:
-        map.plot(cmap=cmap, norm=colors.Normalize(vmin=clim[0], vmax=clim[1]))
+        smap.plot(cmap=cmap, norm=colors.Normalize(vmin=clim[0], vmax=clim[1]))
 
-    map.draw_limb(resolution=90)
+    smap.draw_limb(resolution=90)
 
     yax = axis.coords[1]
     yax.set_ticklabel(rotation=90)
 
     if clip_model:
-        axis.set_xlim([0, map.data.shape[0]])
-        axis.set_ylim([0, map.data.shape[1]])
+        axis.set_xlim([0, smap.data.shape[0]])
+        axis.set_ylim([0, smap.data.shape[1]])
 
-    cref = map.pixel_to_world(0*u.pix, 0*u.pix)
-    if cref.Tx > 0 and (map.instrument != 'WISPR'):
+    cref = smap.pixel_to_world(0*u.pix, 0*u.pix)
+    if cref.Tx > 0 and (smap.instrument != 'WISPR'):
         axis.invert_xaxis()
     if cref.Ty > 0:
         axis.invert_yaxis()
 
-    if map.instrument == 'SoloHI':
-        title = 'SoloHI' + f' Tile-{map.detector}' ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S')
-    elif map.instrument == 'Metis':
+    if smap.instrument == 'SoloHI':
+        title = 'SoloHI' + f' Tile-{smap.detector}' ' $T_{AGV}:$' + parse_time(smap.date_average).strftime('%Y-%m-%d %H:%M:%S')
+    elif smap.instrument == 'Metis':
         title = re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}',
-                       ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S'),
-                       map.latex_name.replace('VLD', 'METIS-VDL'))
+                       ' $T_{AGV}:$' + parse_time(smap.date_average).strftime('%Y-%m-%d %H:%M:%S'),
+                       smap.latex_name.replace('VLD', 'METIS-VDL'))
     else:
         title = re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}',
-                       ' $T_{AGV}:$' + parse_time(map.date_average).strftime('%Y-%m-%d %H:%M:%S'),
-                       map.latex_name)
-    print(map.instrument)
-    print(map.latex_name)
+                       ' $T_{AGV}:$' + parse_time(smap.date_average).strftime('%Y-%m-%d %H:%M:%S'),
+                       smap.latex_name)
+    print(smap.instrument)
+    print(smap.latex_name)
     axis.set_title(title,
                    fontsize=10, pad=8)
 
@@ -433,13 +433,15 @@ def single_imager_maps_process(map_list, skip=None, **kwargs):
     -----
     Operations can be skipped by specifying them in `skip`, e.g., 'filter', 'prepare', 'sequence_processing'.
     """
-    if 'filter' not in str(skip or ''):
+    skip_set = set([skip] if isinstance(skip, str) else (skip or []))
+
+    if 'filter' not in skip_set:
         map_list = filter_maps(map_list, **kwargs)
 
-    if 'prepare' not in str(skip or ''):
+    if 'prepare' not in skip_set:
         map_list = prepare_maps(map_list, **kwargs)
 
-    if 'sequence_processing' not in str(skip or ''):
+    if 'sequence_processing' not in skip_set:
         map_list = maps_sequence_processing(map_list, **kwargs)
 
     return map_list
@@ -477,12 +479,12 @@ class model_fittings:
         Converts the model fittings to JSON format.
     """
 
-    def __init__(self, event_selected, date_process, geometrical_model, model_parameters, kinematics={'fit_method': None}):
+    def __init__(self, event_selected, date_process, geometrical_model, model_parameters, kinematics=None):
         self.event_selected = event_selected
         self.date_process = date_process
         self.geometrical_model = geometrical_model
         self.parameters = model_parameters
-        self.kinematics = kinematics
+        self.kinematics = kinematics if kinematics is not None else {'fit_method': None}
 
     @staticmethod
     def load_from_json(json_file):
@@ -920,8 +922,8 @@ def parameter_fit(x, y, fit_args):
             sv_bound_low = np.minimum(sv_bound_low, spl(xxx))
             sv_bound_dup = np.maximum(sv_bound_dup, np.gradient(spl(xxx), xxx))
             sv_bound_dlow = np.minimum(sv_bound_dlow, np.gradient(spl(xxx), xxx))
-            sv_bound_ddup = np.maximum(sv_bound_ddup, np.gradient(np.gradient(spl(xxx), xxx)))
-            sv_bound_ddlow = np.minimum(sv_bound_ddlow, np.gradient(np.gradient(spl(xxx), xxx)))
+            sv_bound_ddup = np.maximum(sv_bound_ddup, np.gradient(np.gradient(spl(xxx), xxx), xxx))
+            sv_bound_ddlow = np.minimum(sv_bound_ddlow, np.gradient(np.gradient(spl(xxx), xxx), xxx))
 
         fitting = {
             'spl': spl,

{pythea-1.2.0 → pythea-1.3.0}/PyThea/utils_database.py

@@ -55,6 +55,9 @@ def update_nested_dict(d, u):
 
 def get_fits_filenames_from_database(event_id, timerange, imager):
 
+    if imager not in imager_dict:
+        raise KeyError(f"Unknown imager '{imager}'. Available imagers: {list(imager_dict.keys())}")
+
     db_args = [imager_dict[imager]['source'],
                imager_dict[imager]['instrument'],
                imager_dict[imager].get('detector', imager_dict[imager].get('wavelength'))]

{pythea-1.2.0 → pythea-1.3.0}/PyThea.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyThea
-Version: 1.2.0
+Version: 1.3.0
 Summary: PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves
 Author-email: Athanasios Kouloumvakos <athkouloumvakos@gmail.com>
 License: 
@@ -662,17 +662,17 @@ Keywords: science,solar physics,solar,coronal mass ejections,shock waves,EUV wav
 Platform: any
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
 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
 Provides: PyThea
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: sunpy>=7.0.1
+Requires-Dist: sunpy>=7.1.2
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: matplotlib

{pythea-1.2.0 → pythea-1.3.0}/PyThea.egg-info/SOURCES.txt

@@ -51,6 +51,11 @@ PyThea/sunpy_dev/extern/sunkit_instruments/stereo/__init__.py
 PyThea/sunpy_dev/extern/sunkit_instruments/stereo/utils.py
 PyThea/sunpy_dev/map/__init__.py
 PyThea/sunpy_dev/map/maputils.py
+PyThea/sunpy_dev/net/__init__.py
+PyThea/sunpy_dev/net/dataretriever/__init__.py
+PyThea/sunpy_dev/net/dataretriever/sources/__init__.py
+PyThea/sunpy_dev/net/dataretriever/sources/lasco.py
+PyThea/sunpy_dev/net/dataretriever/sources/stereo.py
 PyThea/test/Pythea_test.py
 PyThea/test/__init__.py
 PyThea/test/conftest.py

{pythea-1.2.0 → pythea-1.3.0}/PyThea.egg-info/requires.txt

@@ -1,4 +1,4 @@
-sunpy>=7.0.1
+sunpy>=7.1.2
 pandas
 scipy
 matplotlib

{pythea-1.2.0 → pythea-1.3.0}/pyproject.toml

@@ -9,13 +9,13 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "PyThea"
 description = "PyThea: A software package to reconstruct the 3D structure of CMEs and shock waves"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 readme = "README.md"
 license = { file = "LICENSE.md" }
 classifiers=[
   'Programming Language :: Python',
   'Programming Language :: Python :: 3',
-  'Programming Language :: Python :: 3.11',
+  'Programming Language :: Python :: 3.12',
   'Development Status :: 5 - Production/Stable',
   'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
   'Operating System :: OS Independent',
@@ -28,7 +28,7 @@ authors = [
 ]
 
 dependencies = [
-  "sunpy>=7.0.1",
+  "sunpy>=7.1.2",
   "pandas",
   "scipy",
   "matplotlib",

pythea-1.2.0/PyThea/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '1.2.0'
-__version_tuple__ = version_tuple = (1, 2, 0)
-
-__commit_id__ = commit_id = 'g0f05ae06e'