oafuncs 0.0.88__py2.py3-none-any.whl → 0.0.90__py2.py3-none-any.whl

oafuncs/oa_down/literature.py

@@ -1,21 +1,19 @@
 #!/usr/bin/env python
 # coding=utf-8
-'''
+"""
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-28 10:42:56
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-28 10:43:18
+LastEditTime: 2025-01-05 10:51:42
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\literature.py
-Description:  
+Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
 SystemInfo: Windows 11
 Python Version: 3.12
-'''
-
+"""
 
 import os
-import random
 import re
 import time
 from pathlib import Path
@@ -24,11 +22,12 @@ import pandas as pd
 import requests
 from rich import print
 from rich.progress import track
+from oafuncs.oa_down.user_agent import get_ua
 
-__all__ = ['download5doi']
+__all__ = ["download5doi"]
 
 
-def _get_file_size(file_path, unit='KB'):
+def _get_file_size(file_path, unit="KB"):
     # 检查文件是否存在
     if not os.path.exists(file_path):
         return "文件不存在"
@@ -38,11 +37,11 @@ def _get_file_size(file_path, unit='KB'):
 
     # 单位转换字典
     unit_dict = {
-        'PB': 1024**5,
-        'TB': 1024**4,
-        'GB': 1024**3,
-        'MB': 1024**2,
-        'KB': 1024,
+        "PB": 1024**5,
+        "TB": 1024**4,
+        "GB": 1024**3,
+        "MB": 1024**2,
+        "KB": 1024,
     }
 
     # 检查传入的单位是否合法
@@ -56,28 +55,29 @@ def _get_file_size(file_path, unit='KB'):
 
 
 class _Downloader:
-    '''
+    """
     根据doi下载文献pdf
-    '''
+    """
 
     def __init__(self, doi, store_path):
-        self.url_list = [r'https://sci-hub.se',
-                         r'https://sci-hub.ren',
-                         r'https://sci-hub.st',
-                         r'https://sci-hub.ru',
-                         ]
+        self.url_list = [
+            r"https://sci-hub.se",
+            r"https://sci-hub.ren",
+            r"https://sci-hub.st",
+            r"https://sci-hub.ru",
+        ]
         self.base_url = None
         self.url = None
         self.doi = doi
         self.pdf_url = None
         self.pdf_path = None
-        self.headers = {'User-Agent': self.get_ua().encode('utf-8')}
+        self.headers = {"User-Agent": get_ua().encode("utf-8")}
         # 10.1175/1520-0493(1997)125<0742:IODAOO>2.0.CO;2.pdf
         # self.fname = doi.replace(r'/', '_') + '.pdf'
-        self.fname = re.sub(r'[/<>:"?*|]', '_', doi) + '.pdf'
+        self.fname = re.sub(r'[/<>:"?*|]', "_", doi) + ".pdf"
         self.store_path = Path(store_path)
         self.fpath = self.store_path / self.fname
-        self.wrong_record_file = self.store_path / 'wrong_record.txt'
+        self.wrong_record_file = self.store_path / "wrong_record.txt"
         self.sleep = 5
         self.cookies = None
         self.check_size = 50
@@ -85,113 +85,42 @@ class _Downloader:
         self.try_times_each_url_max = 3
         self.try_times = 0
 
-    def get_ua(self):
-        ua_list = [
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36 OPR/26.0.1656.60",
-            "Opera/8.0 (Windows NT 5.1; U; en)",
-            "Mozilla/5.0 (Windows NT 5.1; U; en; rv:1.8.1) Gecko/20061208 Firefox/2.0.0 Opera 9.50",
-            "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.50",
-            "Opera/9.80 (Macintosh; Intel Mac OS X 10.6.8; U; en) Presto/2.8.131 Version/11.11",
-            "Opera/9.80 (Windows NT 6.1; U; en) Presto/2.8.131 Version/11.11",
-            "Opera/9.80 (Android 2.3.4; Linux; Opera Mobi/build-1107180945; U; en-GB) Presto/2.8.149 Version/11.10",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:34.0) Gecko/20100101 Firefox/34.0",
-            "Mozilla/5.0 (X11; U; Linux x86_64; zh-CN; rv:1.9.2.10) Gecko/20100922 Ubuntu/10.10 (maverick) Firefox/3.6.10",
-            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv,2.0.1) Gecko/20100101 Firefox/4.0.1",
-            "Mozilla/5.0 (Windows NT 6.1; rv,2.0.1) Gecko/20100101 Firefox/4.0.1",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.57.2 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2",
-            "MAC：Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.122 Safari/537.36",
-            "Windows：Mozilla/5.0 (Windows; U; Windows NT 6.1; en-us) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50",
-            "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5",
-            "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5",
-            "Mozilla/5.0 (iPad; U; CPU OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36",
-            "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.64 Safari/537.11",
-            "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.133 Safari/534.16",
-            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; 360SE)",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.11 TaoBrowser/2.0 Safari/536.11",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.71 Safari/537.1 LBBROWSER",
-            "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; LBBROWSER)",
-            "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; QQDownload 732; .NET4.0C; .NET4.0E; LBBROWSER)"
-            "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; QQBrowser/7.0.3698.400)",
-            "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; QQDownload 732; .NET4.0C; .NET4.0E)",
-            "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.84 Safari/535.11 SE 2.X MetaSr 1.0",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; SV1; QQDownload 732; .NET4.0C; .NET4.0E; SE 2.X MetaSr 1.0)",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; SE 2.X MetaSr 1.0; SE 2.X MetaSr 1.0; .NET CLR 2.0.50727; SE 2.X MetaSr 1.0)",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Maxthon/4.4.3.4000 Chrome/30.0.1599.101 Safari/537.36",
-            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.122 UBrowser/4.0.3214.0 Safari/537.36",
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 UBrowser/6.2.4094.1 Safari/537.36",
-            "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5",
-            "Mozilla/5.0 (iPod; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5",
-            "Mozilla/5.0 (iPad; U; CPU OS 4_2_1 like Mac OS X; zh-cn) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5",
-            "Mozilla/5.0 (iPad; U; CPU OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5",
-            "Mozilla/5.0 (Linux; U; Android 2.2.1; zh-cn; HTC_Wildfire_A3333 Build/FRG83D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-            "Mozilla/5.0 (Linux; U; Android 2.3.7; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-            "MQQBrowser/26 Mozilla/5.0 (Linux; U; Android 2.3.7; zh-cn; MB200 Build/GRJ22; CyanogenMod-7) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-            "Opera/9.80 (Android 2.3.4; Linux; Opera Mobi/build-1107180945; U; en-GB) Presto/2.8.149 Version/11.10",
-            "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13",
-            "Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.337 Mobile Safari/534.1+",
-            "Mozilla/5.0 (hp-tablet; Linux; hpwOS/3.0.0; U; en-US) AppleWebKit/534.6 (KHTML, like Gecko) wOSBrowser/233.70 Safari/534.6 TouchPad/1.0",
-            "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0;",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)",
-            "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)",
-            "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; The World)",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; TencentTraveler 4.0)",
-            "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Avant Browser)",
-            "Mozilla/5.0 (Linux; U; Android 2.3.7; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
-            "Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 NokiaN97-1/20.0.019; Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebKit/525 (KHTML, like Gecko) BrowserNG/7.1.18124",
-            "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; HTC; Titan)",
-            "UCWEB7.0.2.37/28/999",
-            "NOKIA5700/UCWEB7.0.2.37/28/999",
-            "Openwave/UCWEB7.0.2.37/28/999",
-            "Openwave/UCWEB7.0.2.37/28/999",
-        ]
-        ua_index = random.randint(0, len(ua_list)-1)
-        ua = ua_list[ua_index]
-        return ua
-
     def get_pdf_url(self):
-        print('[bold #E6E6FA]-'*100)
+        print("[bold #E6E6FA]-" * 100)
         print(f"DOI: {self.doi}")
         print(f"Requesting: {self.url}...")
         response = requests.get(self.url, headers=self.headers)
         if response.status_code == 200:
             self.cookies = response.cookies
-            text = response.text.replace('\\', '')
+            text = response.text.replace("\\", "")
             # text = text.replace(' ', '')  # It is important to remove the space
             # print(text)
-            pattern = re.compile(
-                r'onclick = "location.href=\'(.*?\.pdf\?download=true)\'"')
+            pattern = re.compile(r'onclick = "location.href=\'(.*?\.pdf\?download=true)\'"')
             match = pattern.search(text)
             if match:
                 got_url = match.group(1)
-                if r'http' not in got_url:
-                    if got_url[:2] == '//':
-                        self.pdf_url = 'https:' + got_url
+                if r"http" not in got_url:
+                    if got_url[:2] == "//":
+                        self.pdf_url = "https:" + got_url
                     else:
                         self.pdf_url = self.base_url + got_url
                 else:
                     self.pdf_url = got_url
                 print(f"URL: {self.pdf_url}")
             else:
-                print(f'[bold #AFEEEE]The website {self.url_list[self.url_index]} do not inlcude the PDF file.')
-                self.try_times = self.try_times_each_url_max+1
+                print(f"[bold #AFEEEE]The website {self.url_list[self.url_index]} do not inlcude the PDF file.")
+                self.try_times = self.try_times_each_url_max + 1
         else:
             print(f"Failed to retrieve the webpage. Status code: {response.status_code}")
-            print(f'[bold #AFEEEE]The website {self.url_list[self.url_index]} do not inlcude the PDF file.')
-            self.try_times = self.try_times_each_url_max+1
+            print(f"[bold #AFEEEE]The website {self.url_list[self.url_index]} do not inlcude the PDF file.")
+            self.try_times = self.try_times_each_url_max + 1
 
     def url_iterate(self):
         if self.url_index >= len(self.url_list):
             return
         url = self.url_list[self.url_index]
         self.base_url = url
-        self.url = url + '/' + self.doi
+        self.url = url + "/" + self.doi
         self.get_pdf_url()
         # for url in self.url_list:
         #     self.url = url + self.doi
@@ -200,18 +129,18 @@ class _Downloader:
         #         break
 
     def write_wrong_record(self):
-        with open(self.wrong_record_file, 'a') as f:
-            f.write(self.doi + '\n')
+        with open(self.wrong_record_file, "a") as f:
+            f.write(self.doi + "\n")
 
     def download_pdf(self):
         if self.fpath.exists():
-            fsize = _get_file_size(self.fpath, unit='KB')
+            fsize = _get_file_size(self.fpath, unit="KB")
             if fsize < self.check_size:
                 # delete the wrong file
                 os.remove(self.fpath)
                 print(f"[bold yellow]The PDF file {self.fpath} is only {fsize:.2f} KB. It will be deleted and retry.")
             else:
-                print('[bold #E6E6FA]-'*100)
+                print("[bold #E6E6FA]-" * 100)
                 print(f"[bold purple]The PDF file {self.fpath} already exists.")
                 return
         self.url_index = 0
@@ -240,9 +169,9 @@ class _Downloader:
             try:
                 response = requests.get(self.pdf_url, headers=self.headers, cookies=self.cookies)
                 if response.status_code == 200:
-                    with open(self.fpath, 'wb') as f:
+                    with open(self.fpath, "wb") as f:
                         f.write(response.content)
-                    fsize = _get_file_size(self.fpath, unit='KB')
+                    fsize = _get_file_size(self.fpath, unit="KB")
                     if fsize < self.check_size:
                         # delete the wrong file
                         os.remove(self.fpath)
@@ -251,9 +180,9 @@ class _Downloader:
                         print(f"[bold green]Sucessful to download {self.fpath}")
                         already_downloaded = True
                 else:
-                    self.try_times = self.try_times_each_url_max+1
+                    self.try_times = self.try_times_each_url_max + 1
                     print(f"Failed to download the PDF file. Status code: {response.status_code}")
-                    print(f'[bold #AFEEEE]The website {self.url_list[self.url_index]} do not inlcude the PDF file.')
+                    print(f"[bold #AFEEEE]The website {self.url_list[self.url_index]} do not inlcude the PDF file.")
             except Exception as e:
                 print(f"Failed to download the PDF file. Error: {e}")
             time.sleep(self.sleep)
@@ -264,31 +193,32 @@ class _Downloader:
                     self.write_wrong_record()
                     return
                 if self.try_times == self.try_times_each_url_max:
-                    print(f'Tried {self.try_times} times for {self.url_list[self.url_index-1]}.')
+                    print(f"Tried {self.try_times} times for {self.url_list[self.url_index-1]}.")
                     print("Try another URL...")
 
 
-def read_excel(file, col_name=r'DOI'):
+def read_excel(file, col_name=r"DOI"):
     df = pd.read_excel(file)
     df_list = df[col_name].tolist()
     # 去掉nan
-    df_list = [doi for doi in df_list if str(doi) != 'nan']
+    df_list = [doi for doi in df_list if str(doi) != "nan"]
     return df_list
 
 
 def read_txt(file):
-    with open(file, 'r') as f:
+    with open(file, "r") as f:
         lines = f.readlines()
     # 去掉换行符以及空行
     lines = [line.strip() for line in lines if line.strip()]
     return lines
 
 
-def download5doi(store_path=None, doi_list=None, txt_file=None, excel_file=None, col_name=r'DOI'):
-    '''
-    Description: Download PDF files by DOI.
+def download5doi(store_path=None, doi_list=None, txt_file=None, excel_file=None, col_name=r"DOI"):
+    """
+    Description:
+        Download PDF files by DOI.
 
-    Args:
+    Parameters:
         store_path: str, The path to store the PDF files.
         doi_list: list or str, The list of DOIs.
         txt_file: str, The path of the txt file that contains the DOIs.
@@ -305,7 +235,7 @@ def download5doi(store_path=None, doi_list=None, txt_file=None, excel_file=None,
         download5doi(store_path=r'I:\Delete\ref_pdf', txt_file=r'I:\Delete\ref_pdf\wrong_record.txt')
         download5doi(store_path=r'I:\Delete\ref_pdf', excel_file=r'I:\Delete\ref_pdf\wrong_record.xlsx')
         download5doi(store_path=r'I:\Delete\ref_pdf', excel_file=r'I:\Delete\ref_pdf\wrong_record.xlsx', col_name='DOI')
-    '''
+    """
     if not store_path:
         store_path = Path.cwd()
     else:
@@ -321,12 +251,13 @@ def download5doi(store_path=None, doi_list=None, txt_file=None, excel_file=None,
     if excel_file:
         doi_list = read_excel(excel_file, col_name)
     print(f"Downloading {len(doi_list)} PDF files...")
-    for doi in track(doi_list, description='Downloading...'):
+    for doi in track(doi_list, description="Downloading..."):
         download = _Downloader(doi, store_path)
         download.download_pdf()
 
 
-if __name__ == '__main__':
-    store_path = r'I:\Delete\ref_pdf'
+if __name__ == "__main__":
+    store_path = r"I:\Delete\ref_pdf"
+    excel_file = r"I:\Delete\Ref_DA_ROMS\savedrecs.xls"
     # download5doi(store_path, doi_list='10.1007/s00382-022-06260-x')
-    download5doi(store_path, excel_file=r'I:\Delete\ref_pdf\savedrecs.xls')
+    download5doi(store_path, excel_file=excel_file)

oafuncs/oa_down/user_agent.py

@@ -28,7 +28,4 @@ def get_ua():
         # 去掉换行符和空行
         ua_list = [line.strip() for line in ua_list if line.strip()]
 
-    # if current_platform == 'Linux':
-    #     ua_list = [line for line in ua_list if 'Linux' in line]
-
     return random.choice(ua_list)

oafuncs/oa_draw.py

@@ -23,6 +23,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import xarray as xr
 from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
+from rich import print
 
 __all__ = ["fig_minus", "gif", "add_cartopy", "add_gridlines", "MidpointNormalize", "add_lonlat_unit", "contour", "contourf", "quiver"]
 

oafuncs/oa_file.py

@@ -17,6 +17,7 @@ import glob
 import os
 import re
 import shutil
+from rich import print
 
 __all__ = ["find_file", "link_file", "copy_file", "rename_file", "make_folder", "clear_folder", "remove_empty_folder", "remove", "file_size"]
 
@@ -325,16 +326,31 @@ def file_size(file_path, unit="KB"):
 
 
 # ** 计算文件夹下指定相关文件的平均大小
-def mean_size(parent_path,fname):
+def mean_size(parent_path,fname,max_num=None,unit="KB"):
+    """
+    Description:
+        Calculate the average size of the specified related files in the folder
+    
+    Parameters:
+        parent_path: The parent path where the files are located
+        fname: The file name pattern to search for
+        max_num: The maximum number of files to search for
+        unit: The unit of the file size, default is "KB"
+    
+    Returns:
+        The average size
+    """
     flist = find_file(parent_path, fname)
     if flist:
-        size_list = [file_size(f) for f in flist if file_size(f) != 0]
-    if size_list:
-        min_size, max_size = min(size_list), max(size_list)
-        mean_size = sum(size_list) / len(size_list)
+        if max_num:
+            flist = flist[:int(max_num)]
+        size_list = [file_size(f,unit) for f in flist if file_size(f,unit) > 0]
+        if size_list:
+            return sum(size_list) / len(size_list)
+        else:
+            return 0.0
     else:
-        mean_size, min_size, max_size = 0, 0, 0
-    return mean_size, min_size, max_size
+        return 0.0
 
 
 if __name__ == "__main__":

oafuncs/oa_help.py

@@ -118,9 +118,10 @@ def log():
     print("更新日志：")
     print(
         """
-        2025-01-04
-        1. 下调Python支持版本到3.7，但未经过测试
+        2025-01-07
+        1. 测试Python版本最低为3.9
         2. 优化了部分函数说明
+        3. 优化hycom_3hourly模块，仅更新30次件大小，避免每次计算，提高下载速度。
         """
     )
     print(

oafuncs/oa_nc.py

@@ -18,6 +18,7 @@ import os
 import netCDF4 as nc
 import numpy as np
 import xarray as xr
+from rich import print
 
 __all__ = ["get_var", "extract", "save", "merge", "modify", "rename", "check_file", "convert_longitude", "isel"]
 

oafuncs/oa_python.py

@@ -14,6 +14,7 @@ Python Version: 3.11
 '''
 
 import os
+from rich import print
 
 __all__ = ['install_lib', 'upgrade_lib']
 

{oafuncs-0.0.88.dist-info → oafuncs-0.0.90.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.88
+Version: 0.0.90
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -9,28 +9,27 @@ License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-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: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.7.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: scipy
+Requires-Dist: pandas
 Requires-Dist: xarray
-Requires-Dist: Cartopy
-Requires-Dist: netCDF4
-Requires-Dist: requests
-Requires-Dist: bs4
 Requires-Dist: rich
 Requires-Dist: pathlib
-Requires-Dist: pandas
+Requires-Dist: requests
+Requires-Dist: bs4
+Requires-Dist: matplotlib
+Requires-Dist: Cartopy
+Requires-Dist: netCDF4
+Requires-Dist: xlrd
 
 
 # oafuncs

oafuncs-0.0.90.dist-info/RECORD

@@ -0,0 +1,26 @@
+oafuncs/__init__.py,sha256=glcIlhQ9xSK4WtL58dq7Od2S3JPqsuEyhUQ-VWO8hOc,1426
+oafuncs/oa_cmap.py,sha256=azVg9QR_IlG9lXCCXXVs1LS1kFci8yjxDmb_VA_TdTQ,7408
+oafuncs/oa_data.py,sha256=21HC_7GVFAtU9AMYKGSSzY9J6_0Ju-5n8dJKwOOx5HI,15641
+oafuncs/oa_draw.py,sha256=QypQp4vJIrbAyFddEVxd9K9Q4d85PRYqYQi9xDUmSZw,11150
+oafuncs/oa_file.py,sha256=9b2uXTOqJqds5IhEqA_702G-qzyCZiguGY5JcT9CZ78,12728
+oafuncs/oa_help.py,sha256=42xvmv6BSTyrKfQtW0bvedyv6ElhFJLMblq5jhziuB4,4076
+oafuncs/oa_nc.py,sha256=m_80xWzoyY2niupfpTSvej1D_k4WvTnDYlnlYbIfqGI,17525
+oafuncs/oa_python.py,sha256=Q-6UGGw_dJff7Ef8i87fsLPoGeHV5jBzfb-7HP4THR0,4018
+oafuncs/data_store/OAFuncs.png,sha256=HZORbnBSRX0MZSLTGAZAPK24RBUTmihguMeG9YiU_So,3261697
+oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
+oafuncs/oa_down/__init__.py,sha256=pKPqxD0z09NEXWCemuemfgTct7Kcu3APPJqqB1FPXRM,565
+oafuncs/oa_down/hycom_3hourly.py,sha256=Bt4MjcshhAyDckfFvdqxjNvzU7JuBVYCwvY8b1OPbPw,59501
+oafuncs/oa_down/literature.py,sha256=Txv1YGSG-Z7m4o7FGHvXOR40EFxYozMsyM0-gy5CMEg,10086
+oafuncs/oa_down/test_ua.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
+oafuncs/oa_down/user_agent.py,sha256=TsPcAxFmMTYAEHRFjurI1bQBJfDhcA70MdHoUPwQmks,785
+oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
+oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8anFY,6525
+oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
+oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
+oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
+oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
+oafuncs-0.0.90.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.90.dist-info/METADATA,sha256=s3X6lHw6yv20rd2528K-5cOk7zcYRGSIGYEg4SeIqqI,3321
+oafuncs-0.0.90.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.90.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.90.dist-info/RECORD,,

oafuncs-0.0.88.dist-info/RECORD

@@ -1,26 +0,0 @@
-oafuncs/__init__.py,sha256=glcIlhQ9xSK4WtL58dq7Od2S3JPqsuEyhUQ-VWO8hOc,1426
-oafuncs/oa_cmap.py,sha256=azVg9QR_IlG9lXCCXXVs1LS1kFci8yjxDmb_VA_TdTQ,7408
-oafuncs/oa_data.py,sha256=2MkWCsESVPjZPnLnbQIwrBJUhcF9x-WXbZhni3I44ss,15617
-oafuncs/oa_draw.py,sha256=PUk8DdGBUapCXrOVQ-d_DD6EccB_eHAX3r6jwrnQTk8,11126
-oafuncs/oa_file.py,sha256=-AdRnFEtRTpIMXr5geYe5fEhyiMOFad5ethi_lF-Ogo,12277
-oafuncs/oa_help.py,sha256=DsX6rFPZ-ZMaexcyCXeGeB3h1zPScY6ijH-uLNVWidA,3988
-oafuncs/oa_nc.py,sha256=b8pbiPSRDi7Te42UcnR0AlW1sQEVtn5VU9ERiAdX-yY,17501
-oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
-oafuncs/data_store/OAFuncs.png,sha256=w2pR7MUyeeWrT8BVTSy40EIRDIrfpdo1QvWvvjLOgjM,3258809
-oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
-oafuncs/oa_down/__init__.py,sha256=pKPqxD0z09NEXWCemuemfgTct7Kcu3APPJqqB1FPXRM,565
-oafuncs/oa_down/hycom_3hourly.py,sha256=wYOZrV5mZVSTfx6a5QLay8Jg2sL2x3sWKWmxwidRzMo,62928
-oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
-oafuncs/oa_down/test_ua.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
-oafuncs/oa_down/user_agent.py,sha256=NSJjB2LAqPKS0hErvN5FfwsQeb58XjlOc68emiAK66c,893
-oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
-oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8anFY,6525
-oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
-oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
-oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
-oafuncs-0.0.88.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.88.dist-info/METADATA,sha256=FdhoLgCze7Aq-k7QCedDga-gUjZSGKGD2og_CZJ8NCs,3402
-oafuncs-0.0.88.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.88.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.88.dist-info/RECORD,,