Merge pull request #116 from IPGP/dev-tpx1_01a

update rinexmod imports to version 4 compatibility

Author: PierreS-alpha

README.md

@@ -3,8 +3,8 @@
 # autorino
 autorino is a tool for _Assisted Unloading, Treatment & Organisation of RINex Observations_  🛰️ 🌐 🦏 
 
-**Version: 2.3.2**  
-**Date: 2025-11-20**
+**Version: 2.4.0**  
+**Date: 2025-12-03**
 
 **Main developper:** [Pierre Sakic](https://github.com/PierreS-alpha) (IPGP-OVS, Paris, France)  
 **Contact e-mail:** sakic@ipgp.fr

autorino/__init__.py

@@ -10,7 +10,7 @@
 import os
 from os import path
 
-__version__ = "2.3.2"  #  changed automaticcaly with bump-my-version
+__version__ = "2.4.0"  #  changed automaticcaly with bump-my-version
 
 #### IMPORT CONFIG FOR LOGGER
 log_file_path = os.path.join(

autorino/cfgfiles/cfgfile_read.py

@@ -20,11 +20,11 @@
 import autorino.handle as arohdl
 
 #### new rinexmod v4 import
-# import rinexmod.api as rimo_api
-# import rinexmod.classes.metadata as rimo_mda
+import rinexmod.api as rimo_api
+import rinexmod.classes as rimo_cls
 #### old rinexmod import (for compatibility with older versions)
-from rinexmod import rinexmod_api as rimo_api
-from rinexmod import metadata as rimo_mda
+#from rinexmod import rinexmod_api as rimo_api
+#from rinexmod import metadata as rimo_mda
 
 import datetime as dt
 
@@ -613,7 +613,7 @@ def _device2mda(y_station):
             )
             y_dev[attkw] = "unknown"
 
-    metadata = rimo_mda.MetaData()
+    metadata = rimo_cls.MetaData()
     rec_dic = dict()
     rec_dic["Receiver Type"] = y_dev["rec_type"]
     rec_dic["Serial Number"] = str(y_dev["rec_sn"])

autorino/check/check_cls.py

@@ -10,7 +10,7 @@
 
 import autorino.handle as arohdl
 import autorino.check as arochk
-import rinexmod
+import rinexmod.classes as rimo_cls
 import tqdm
 
 
@@ -73,7 +73,7 @@ def analyze_rnxs(self):
                 ds["%"] = 0
             else:
                 ### get RINEX as an rinexMod's Object
-                rnxobj = rinexmod.rinexfile.RinexFile(ds["fpath"])
+                rnxobj = rimo_cls.RinexFile(ds["fpath"])
                 ### get RINEX site code
                 ds["site"] = rnxobj.get_site(lower_case=False, only_4char=False)
 

autorino/common/step_cls.py

@@ -21,11 +21,12 @@
 import autorino.common as arocmn
 import autorino.cfglog as arologcfg
 
-import rinexmod
+#import rinexmod
 # new rinexmod v4 import
-# import rinexmod.api as rimo_api
+import rinexmod.api as rimo_api
+import rinexmod.classes as rimo_cls
 # old rinexmod import
-from rinexmod import rinexmod_api as rimo_api
+#from rinexmod import rinexmod_api as rimo_api
 
 from geodezyx import utils, conv
 
@@ -851,11 +852,11 @@ def updt_epotab_rnx(self, use_rnx_filename_only=False, update_epoch_range=True):
 
         for irow, row in self.table.iterrows():
             if not use_rnx_filename_only:
-                rnx = rinexmod.rinexfile.RinexFile(row["fpath_inp"])
+                rnx = rimo_cls.RinexFile(row["fpath_inp"])
                 epo_srt = rnx.start_date
                 epo_end = rnx.end_date
             else:
-                epo_srt, epo_end, _ = rinexmod.rinexfile.dates_from_rinex_filename(
+                epo_srt, epo_end, _ = rimo_api.dates_from_rinex_filename(
                     row["fpath_inp"]
                 )
 
@@ -2518,7 +2519,7 @@ def mono_rinexmod(
                 not self.table.loc[irow, "epoch_srt"]
                 or not self.table.loc[irow, "epoch_end"]
             ):
-                epo_srt_ok, epo_end_ok = rinexmod.rinexfile.dates_from_rinex_filename(
+                epo_srt_ok, epo_end_ok = rimo_api.dates_from_rinex_filename(
                     frnxmod
                 )
                 self.table.loc[irow, "epoch_srt"] = epo_srt_ok
@@ -2818,7 +2819,7 @@ def mono_guess_rnx(self, irow, io="out", shortname=False):
         epo_end = epo_end.replace(tzinfo=None)
 
         # Determine the file period string based on the epoch range
-        prd_str = rinexmod.rinexfile.file_period_from_timedelta(epo_srt, epo_end)[0]
+        prd_str = rimo_api.file_period_from_timedelta(epo_srt, epo_end)[0]
 
         # Generate the RINEX file name using site and session information
         if not shortname:

autorino/convert/cnv_cls.py

@@ -278,7 +278,7 @@ def convert(
                 converter_name_use = converter  # converter is forced
             else:
                 # ++ do a first converter selection by identifying odd files
-                converter_name_use = arocnv.select_conv_odd_file(fraw)
+                converter_name_use = arocnv.slct_conv_odd_f(fraw)
                 # NB: converter selection for regular files is done in
                 # autorino.conv_cmd_run._convert_select
 

autorino/convert/cnv_cmd_build.py

@@ -96,7 +96,7 @@ def _options_list2str(options):
 
     Returns
     -------
-    cmd_list : list
+    cmd_list : list of str
         A list where the elements are command line options and their values.
     cmd_str : str
         A string that represents the command line options and their values.

autorino/convert/cnv_cmd_run.py

@@ -36,7 +36,7 @@ def _convert_select(converter_inp, inp_raw_fpath=None):
     Returns directly those attributes based on `converter_inp` keyword,
     or can do a basic research based on the RAW file extension
 
-    See also autorino.conv_fcts.select_conv_odd_file
+    See also autorino.conv_fcts.slct_conv_odd_f
     for the converter selection of oddly named files
 
     Parameters
@@ -156,7 +156,7 @@ def _convert_select(converter_inp, inp_raw_fpath=None):
         bin_kwoptions = dict()
 
     # +++++ SEPTENTRIO
-    elif re.match(".([0-9]{2}_|A)", ext) or converter_inp == "sbf2rin":
+    elif re.match(".([0-9]{2}_|.*A)", ext) or converter_inp == "sbf2rin":
         converter_name = "sbf2rin"
         brand = "Septentrio"
         cmd_build_fct = arocnv.cmd_build_sbf2rin

autorino/convert/cnv_fcts.py

@@ -16,9 +16,9 @@
 import grp
 
 ### new rinexmod v4 import
-# import rinexmod.api as rimo_api
+import rinexmod.api as rimo_api
 ### old rinexmod import
-from rinexmod import rinexmod_api as rimo_api
+#from rinexmod import rinexmod_api as rimo_api
 
 #### Import the logger
 import logging
@@ -112,7 +112,7 @@ def site_search_from_list(fraw_inp, site_list_inp):
     return site_out
 
 
-def select_conv_odd_file(fraw_inp, ext_excluded=None):
+def slct_conv_odd_f(fraw_inp, ext_excluded=None):
     """
     Identifies the right converter for a raw file with an unconventional extension, or excludes the file
     if its extension matches an excluded one.
@@ -129,7 +129,7 @@ def select_conv_odd_file(fraw_inp, ext_excluded=None):
         The name of the raw file with an unconventional extension.
     ext_excluded : list, optional
         A list of file extensions to be excluded. If a file's extension matches one in this list, the file is skipped.
-        Default is [".TG!$", ".DAT", ".Z", ".BCK", "^.[0-9]{3}$", ".A$", "Trimble", ".ORIG"].
+        Default is [".TG!$", ".DAT", ".Z", ".BCK", "^.[0-9]{3}$", "Trimble", ".ORIG"].
 
     Returns
     -------
@@ -147,7 +147,7 @@ def select_conv_odd_file(fraw_inp, ext_excluded=None):
             ".Z",
             ".BCK",
             "^.[0-9]{3}$",
-            ".A$",
+            #".A$", # allowed .A files allowed as Septentrio
             "Trimble",
             ".ORIG",
         ]

docs/_modules/autorino/convert/cnv_cls.html

@@ -368,7 +368,7 @@ <h1>Source code for autorino.convert.cnv_cls</h1><div class="highlight"><pre>
                 <span class="n">converter_name_use</span> <span class="o">=</span> <span class="n">converter</span>  <span class="c1"># converter is forced</span>
             <span class="k">else</span><span class="p">:</span>
                 <span class="c1"># ++ do a first converter selection by identifying odd files</span>
-                <span class="n">converter_name_use</span> <span class="o">=</span> <span class="n">arocnv</span><span class="o">.</span><span class="n">select_conv_odd_file</span><span class="p">(</span><span class="n">fraw</span><span class="p">)</span>
+                <span class="n">converter_name_use</span> <span class="o">=</span> <span class="n">arocnv</span><span class="o">.</span><span class="n">slct_conv_odd_f</span><span class="p">(</span><span class="n">fraw</span><span class="p">)</span>
                 <span class="c1"># NB: converter selection for regular files is done in</span>
                 <span class="c1"># autorino.conv_cmd_run._convert_select</span>