lunapi 1.2.1__cp310-cp310-macosx_11_0_arm64.whl → 1.3.0__cp310-cp310-macosx_11_0_arm64.whl

lunapi/lunapi0.cpp

@@ -50,6 +50,39 @@ PYBIND11_MODULE(lunapi0, m) {
   m.def( "version" ,
 	 &lunapi_t::version ,
 	 "Version of Luna" );
+
+  m.def( "fetch_doms" ,
+	 &lunapi_t::fetch_doms ,
+	 "Fetch all command domains" );
+  m.def( "fetch_cmds" ,
+	 &lunapi_t::fetch_cmds ,
+	 "Fetch all commands" );
+  m.def( "fetch_params" ,
+	 &lunapi_t::fetch_params ,
+	 "Fetch all parameters for a command" );
+  m.def( "fetch_tbls" ,
+	 &lunapi_t::fetch_tbls ,
+	 "Fetch all tables for a command" );
+  m.def( "fetch_vars" ,
+	 &lunapi_t::fetch_vars ,
+	 "Fetch all variables for a command/table" );
+
+  m.def( "fetch_desc_dom" ,
+         &lunapi_t::fetch_desc_dom ,
+         "Description for a domain" );
+  m.def( "fetch_desc_cmd" ,
+         &lunapi_t::fetch_desc_cmd ,
+         "Description for a command" );
+  m.def( "fetch_desc_param" ,
+         &lunapi_t::fetch_desc_param ,
+         "Description for a command/parameter" );
+  m.def( "fetch_desc_tbl" ,
+         &lunapi_t::fetch_desc_tbl ,
+         "Description for a command/table" );  
+  m.def( "fetch_desc_var" ,
+         &lunapi_t::fetch_desc_var ,
+         "Description for a command/table/variable" );
+
   
   //
   // lunapi_t engine class
@@ -165,6 +198,9 @@ PYBIND11_MODULE(lunapi0, m) {
     
     .def("tables",py::overload_cast<>(&lunapi_t::results,py::const_) ,
 	 "Return a result table (defined by a command/strata pair) from a prior eval()" );
+    
+
+  
   
   //
   // lunapi_inst_t : individual instance (EDF/annotation pair)
@@ -341,6 +377,9 @@ PYBIND11_MODULE(lunapi0, m) {
     .def( "compile_evts" , &segsrv_t::compile_evts )
     .def( "get_evnts_xaxes" , &segsrv_t::get_evnts_xaxes )
     .def( "get_evnts_yaxes" , &segsrv_t::get_evnts_yaxes )
+    .def( "set_evnt_format6" , &segsrv_t::set_annot_format6 )
+    .def( "get_evnts_xaxes_ends" , &segsrv_t::get_evnts_xaxes_ends )
+    .def( "get_evnts_yaxes_ends" , &segsrv_t::get_evnts_yaxes_ends )
     .def( "fetch_all_annots", &segsrv_t::fetch_all_evts )
     .def( "fetch_annots" , &segsrv_t::fetch_evts ); 
 

lunapi/lunapi1.py

@@ -1,7 +1,7 @@
 """lunapi1 module: a high-level wrapper around lunapi0 module functions"""
 
 # Luna Python interface (lunapi)
-# v1.2.1, 03-Jan-2025
+# v1.3.0, 05-Sep-2025
 
 import lunapi.lunapi0 as _luna
 
@@ -33,7 +33,7 @@ class resources:
    POPS_LIB = 's2'
    MODEL_PATH = '/build/luna-models/'
 
-lp_version = "v1.2.1"
+lp_version = "v1.3.0"
    
 # C++ singleton class (engine & sample list)
 # lunapi_t      --> luna
@@ -304,6 +304,8 @@ class proj:
       # clear all
       if key is None:
          proj.eng.clear_all_opts()
+         # and a spectial case: the sig list
+         self.vars( 'sig', '' )
          return
 
       # clear some/one
@@ -1178,7 +1180,11 @@ class inst:
          return
       if all( self.has( ch ) ) is not True:
          return
-      res = self.silent_proc( "PSD epoch-spectrum dB sig="+ch )[ 'PSD: CH_E_F' ]
+      if minf is None:
+         minf=0.5
+      if maxf is None:
+         maxf=25
+      res = self.silent_proc( "PSD epoch-spectrum dB sig="+ch+" min="+str(minf)+" max="+str(maxf) )[ 'PSD: CH_E_F' ]
       return spec( res , ch=ch, var='PSD', mine=mine,maxe=maxe,minf=minf,maxf=maxf,w=w)
 
 
@@ -1190,6 +1196,47 @@ class inst:
 # --------------------------------------------------------------------------------
 
 
+def fetch_doms():
+   """Fetch all command domains"""
+   return _luna.fetch_doms( True )
+
+def fetch_cmds( dom ):
+   """Fetch all commands"""
+   return _luna.fetch_cmds( dom, True )
+
+def fetch_params( cmd ):
+   """Fetch all command parameters"""
+   return _luna.fetch_params( cmd, True )
+
+def fetch_tbls( cmd ):
+   """Fetch all command tables"""
+   return _luna.fetch_tbls( cmd, True )
+
+def fetch_vars( cmd, tbl ):
+   """Fetch all command/table variables"""
+   return _luna.fetch_vars( cmd, tbl, True )
+
+def fetch_desc_dom( dom ):
+   """Description for a domain"""
+   return _luna.fetch_desc_dom( dom  )
+
+def fetch_desc_cmd( cmd ):
+   """Description for a command"""
+   return _luna.fetch_desc_cmd( cmd )
+
+def fetch_desc_param( cmd , param ):
+   """Description for a command/parameter"""
+   return _luna.fetch_desc_param( cmd, param )
+
+def fetch_desc_tbl( cmd , tbl ):
+   """Description for a command/table"""
+   return _luna.fetch_desc_tbl( cmd, tbl )
+
+def fetch_desc_var( cmd, tbl, var ):
+   """Fetch all command/table variable"""
+   return _luna.fetch_desc_var( cmd, tbl, var )
+
+
 # --------------------------------------------------------------------------------
 def cmdfile( f ):
    """load and parse a Luna command script from a file"""
@@ -1720,6 +1767,14 @@ class segsrv:
    def get_annots_yaxes(self,ann):
       return self.segsrv.get_evnts_yaxes( ann )
 
+   def set_annot_format6(self,b):
+      self.segsrv.set_evnt_format6(b)
+      
+   def get_annots_xaxes_ends(self,ann):
+      return self.segsrv.get_evnts_xaxes_ends( ann )
+
+   def get_annots_yaxes_ends(self,ann):
+      return self.segsrv.get_evnts_yaxes_ends( ann )
 
 
 
@@ -1807,7 +1862,6 @@ def scope( p,
         for key, value in anncols.items(): apalette[ key ] = value
     
 
-
     # define widgets
 
     wlay1 = widgets.Layout( width='95%' ) 
@@ -2174,8 +2228,8 @@ def scope( p,
                 g.data[ gidx ].visible = True
 
     def rescale(change):
-        ss.set_scaling( len(chbox.value) , len( anbox.value) , 2**float(yscale.value) , float(yspace.value) , header_height, footer_height , annot_height )
-        redraw()
+       ss.set_scaling( len(chbox.value) , len( anbox.value) , 2**float(yscale.value) , float(yspace.value) , header_height, footer_height , annot_height )
+       redraw()
     
     def update_bandpower(change):
         if pow_sel.value is None: return 
@@ -2412,7 +2466,7 @@ class moonbeam:
       self.pull_file( self.curr_edf )
 
       # EDFZ .idx
-      if re.search('\.edf\.gz$',self.curr_edf,re.IGNORECASE) or re.search('\.edfz$',self.curr_edf,re.IGNORECASE):
+      if re.search(r'\.edf\.gz$',self.curr_edf,re.IGNORECASE) or re.search(r'\.edfz$',self.curr_edf,re.IGNORECASE):
          self.pull_file( self.curr_edf + '.idx' )
 
       # annots (optional)
@@ -2481,3 +2535,5 @@ class moonbeam:
       df = pd.concat( [ df1 , df2 ] )
       return df
 
+
+

{lunapi-1.2.1.dist-info → lunapi-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lunapi
-Version: 1.2.1
+Version: 1.3.0
 Summary: Python interface to the Luna toolset for sleep signal analysis
 Keywords: Sleep,EEG,PSG,Luna,Signal processing
 Author-Email: Shaun Purcell <smpurcell@bwh.harvard.edu>, Senthil Palanivelu <spalanivelu@mgh.harvard.edu>, Nataliia Kozhemiako <nkozhemiako@bwh.harvard.edu>
@@ -17,8 +17,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Project-URL: Www, https://zzz.bwh.harvard.edu/luna
-Project-URL: Github, http://github.com/remnrem/luna-api
+Project-URL: www, https://zzz.bwh.harvard.edu/luna
+Project-URL: github, http://github.com/remnrem/luna-api
 Requires-Python: >=3.9
 Requires-Dist: pandas<3,>=2
 Requires-Dist: numpy>=2

lunapi-1.3.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+lunapi-1.3.0.dist-info/RECORD,,
+lunapi-1.3.0.dist-info/WHEEL,sha256=oeaqksGkf-80Owufqv_HTXjJrxDpA_v_U7oZjvUH15Y,114
+lunapi-1.3.0.dist-info/METADATA,sha256=z6EQtBSHYEuM-ZDJ1Pb8sYOqOpBFBS_A63TbhaIGyio,1519
+lunapi-1.3.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lunapi/lunapi0.cpython-310-darwin.so,sha256=LYoeiqxqQm90csHBJWIYFBtdMMgi_2cQajAUidNCHU0,16305232
+lunapi/__init__.py,sha256=cDep9d2N4KKUt81AzHUyFsuRdGwxCD1rqqFmptsAqsk,352
+lunapi/lunapi1.py,sha256=5qx6ZIw-aqzTF7C3rwnvRxGuqmI-Qp7lDqqmeDNim6M,93885
+lunapi/lunapi0.cpp,sha256=fzsbr3q6RFQHmFS-69BRu3sOzrTGU79mrDwxtTtkIlA,14266

{lunapi-1.2.1.dist-info → lunapi-1.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.10.7
+Generator: scikit-build-core 0.11.6
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_11_0_arm64
 

lunapi-1.2.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-lunapi-1.2.1.dist-info/RECORD,,
-lunapi-1.2.1.dist-info/WHEEL,sha256=rOJaAfyDeYqpyZcvF2uMKwvjCoDaR0tVOjIX1nCiRq8,114
-lunapi-1.2.1.dist-info/METADATA,sha256=kQ3-SdHdIbgO1Q1ezIdqswJQE71NUuOdYhZ1iggYKPw,1519
-lunapi-1.2.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lunapi/lunapi0.cpython-310-darwin.so,sha256=3PmwXSQkdW_SmQA1QCliDOyY8QW0ynzuua34sGRrsBQ,15851024
-lunapi/__init__.py,sha256=cDep9d2N4KKUt81AzHUyFsuRdGwxCD1rqqFmptsAqsk,352
-lunapi/lunapi1.py,sha256=phnWVTJ1vbCsNk96Sfz4qk-hHmFqng5zCaxuFDL-M90,92343
-lunapi/lunapi0.cpp,sha256=nQ5cwNdm4fvZ5TSDSxrgWu8Luw1r6NyDsvDWu9sLv7I,13053