py2ls 0.1.7.6__py3-none-any.whl → 0.1.7.8__py3-none-any.whl

py2ls/netfinder.py

@@ -116,11 +116,18 @@ def extract_text_from_content(content, content_type="text/html", where=None, wha
                 texts = ""
                 for tag in result_set:
                     texts =texts+" "+ extract_text(tag) + " \n"
-                text_list = [tx.strip() for tx in texts.split("\n") if tx.strip()]
+                text_list = [tx.strip() for tx in texts.split(" \n") if tx.strip()]
                 return text_list
             else:
-                texts_ = " ".join(tag.get_text() for tag in result_set)
-                texts = [tx.strip() for tx in texts_.split("\n") if tx.strip()]
+                # texts_ = " ".join(tag.get_text() for tag in result_set)
+                texts_=[]
+                for tag in result_set:
+                    for child in tag.children:
+                        if child.name is None:
+                            texts_.append(child.strip())
+                # texts_=" ".join(texts_)
+                # texts = [tx.strip() for tx in texts_.split("\n") if tx.strip()]
+                texts = [tx.strip() for tx in texts_ if tx.strip()]
                 return texts
 
 def extract_text_from_json(content, key=None):
@@ -493,7 +500,7 @@ def downloader(url, dir_save=dir_save, kind=['.pdf'], contains=None, rm_folder=F
             new_filename = f"{base}_{counter_}{ext}"
             counter += 1
         return new_filename
-    fpath_tmp=None
+    fpath_tmp, corrected_fname=None, None
     if not isinstance(kind,list):
         kind=[kind]
     if isinstance(url, list):
@@ -588,7 +595,10 @@ def downloader(url, dir_save=dir_save, kind=['.pdf'], contains=None, rm_folder=F
 
         print(f'\n{len(fnames)} files were downloaded:')
         if verbose:
-            pp(corrected_fname) if corrected_fname in locals() else pp(fnames)
+            if corrected_fname:
+                pp(corrected_fname)  
+            else: 
+                pp(fnames)
             print(f"\n\nsaved @:\n{dir_save}")
         
 def find_img(url, driver='request',dir_save="images", rm_folder=False, verbose=True):

py2ls/sleep_events_detectors.py

@@ -139,7 +139,7 @@ def filter_bandpass(data=None, ord=4, freq_range=[11, 16], fs=1000):
 def moving_average(data, window_size):
     return convolve1d(data, np.ones(window_size) / window_size)
 
-def detect_cross(data, thr=0):
+def detect_cross(data, thr=0, match=True):
     if isinstance(data, list):
         data = np.array(data)
     if data.ndim == 1:
@@ -162,6 +162,18 @@ def detect_cross(data, thr=0):
             falling_before.pop(0)
             if len(rising_before) > len(falling_before):
                 rising_before.pop(0)
+    if rising_before and falling_before:
+        return rising_before, falling_before
+    else:
+        signal_shifted = data - thr
+        signal_sign = np.sign(signal_shifted)
+        sign_diff = np.diff(signal_sign)
+        rising_before, falling_before=np.where(sign_diff > 0)[0],np.where(sign_diff < 0)[0]
+        if match:
+            # make sure they are matched
+            min_length = min(len(rising_indices), len(falling_indices))
+            rising_before, falling_before=rising_before[:min_length], falling_before[:min_length]
+        return rising_before, falling_before
     ## debug
     # a = np.sin(np.arange(0, 10 * np.pi, np.pi / 100))
 
@@ -188,8 +200,6 @@ def detect_cross(data, thr=0):
     #         lw=5 - i,
     #     )
     # plt.gca().axhline(thres)
-    return rising_before, falling_before
-
 def find_repeats(data, N, nGap=None):
     """
     Find the beginning and end points of repeated occurrences in a dataset.

{py2ls-0.1.7.6.dist-info → py2ls-0.1.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.7.6
+Version: 0.1.7.8
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.7.6.dist-info → py2ls-0.1.7.8.dist-info}/RECORD

@@ -135,13 +135,13 @@ py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
 py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,2325
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
 py2ls/ips.py,sha256=KkrkGAF0VQ-N0rH4FQFLyP-C-skY6EPpeO8t_5RngWw,88519
-py2ls/netfinder.py,sha256=9Mer8VAsOoIEew6wEW3wLZhg_46QpISPEsa_O16zO1k,47175
+py2ls/netfinder.py,sha256=MY_0TQY_zaRBZ6wfR4RxNCGrU93HFmDVDRRy1EXl75o,47566
 py2ls/plot.py,sha256=8_33-1wpkGZrDUuvRBfTPUi_BRKdf1njoR725OLSLSY,48579
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
-py2ls/sleep_events_detectors.py,sha256=36MCuRrpurn0Uvzpo3p3b3_JlVsRNHSWCXbJxCGM3mg,51546
+py2ls/sleep_events_detectors.py,sha256=OzXn_uWr3x2aecOOymKDhKj6TAny-T-8C7vAM1zI6Io,52101
 py2ls/stats.py,sha256=Wd9yCKQ_61QD29WMEgMuEcreFxF91NmlPW65iWT2B5w,39041
 py2ls/translator.py,sha256=bc5FB-wqC4TtQz9gyCP1mE38HqNRJ_pmuRIgKnAlMzM,30581
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.7.6.dist-info/METADATA,sha256=sA2AqQ6j0UbJH2s5hTkAAq5nrWvM0d3kNYciCIEcNTQ,20017
-py2ls-0.1.7.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.7.6.dist-info/RECORD,,
+py2ls-0.1.7.8.dist-info/METADATA,sha256=AY6ORoiV4L48RkIU4yhh3WwK7e-M9VxhTtvlDxEVYOk,20017
+py2ls-0.1.7.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.7.8.dist-info/RECORD,,