oafuncs 0.0.98.31__py3-none-any.whl → 0.0.98.33__py3-none-any.whl

oafuncs/_script/cprogressbar.py

@@ -300,11 +300,13 @@ class ColorProgressBar:
             # 获取终端宽度
             try:
                 term_width = self.bar_length or (shutil.get_terminal_size().columns if self._is_terminal else 80)
+                # print(f'Terminal width: {term_width}')  # 调试输出
             except (AttributeError, OSError):
                 term_width = 80  # 默认终端宽度
 
             # 确保有效宽度不小于最低限制
-            effective_width = max(15, term_width - 40)
+            # effective_width = max(15, term_width - 40)
+            effective_width = max(15, int(term_width * 0.6))  # 保留40个字符用于其他信息
             if effective_width < 10:
                 warnings.warn("Terminal width is too small for proper progress bar rendering.")
                 effective_width = 10  # 设置最低宽度限制

oafuncs/_script/data_interp.py

@@ -1,18 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-25 16:22:52
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-26 19:21:31
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\_script\\data_interp.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 from typing import List, Union
 
 import numpy as np

oafuncs/_script/email.py

@@ -1,21 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-04 20:21:59
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-04 20:21:59
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\_script\\email.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
-
-
-
 import random
 import smtplib
 from email.header import Header
@@ -26,7 +8,6 @@ from rich import print
 
 __all__ = ["send"]
 
-
 def _email_info():
     email_dict = {
         "liukun0312@vip.qq.com": [4, 13, -10, 2, -10, 4, -7, -8, 8, -1, 3, -2, -11, -6, -9, -7],

oafuncs/_script/netcdf_modify.py

@@ -1,18 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-05 14:00:50
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-05 14:00:50
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\_script\\netcdf_modify.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 import os
 
 import netCDF4 as nc

oafuncs/_script/replace_file_content.py

@@ -1,18 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-03-21 10:02:32
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-03-21 10:02:33
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\_script\\replace_file_concent.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 import datetime
 import os
 import re

oafuncs/oa_cmap.py

@@ -258,10 +258,17 @@ def get(colormap_name: Optional[str] = None, show_available: bool = False) -> Op
         "cool_1": ["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC"],
         "warm_1": ["#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"],
         # ---------------------------------------------------------------------------
+        # suitable for diverging color maps, wind vector
         "diverging_2": ["#4A235A", "#1F618D", "#1ABC9C", "#A9DFBF", "#F2F3F4", "#FDEBD0", "#F5B041", "#E74C3C", "#78281F"],
         "cool_2": ["#4A235A", "#1F618D", "#1ABC9C", "#A9DFBF", "#F2F3F4"],
         "warm_2": ["#F2F3F4", "#FDEBD0", "#F5B041", "#E74C3C", "#78281F"],
         # ---------------------------------------------------------------------------
+        "diverging_3": ["#1a66f2", "#5DADE2", "#48C9B0", "#A9DFBF", "#F2F3F4", "#FFDAB9", "#FF9E80", "#FF6F61", "#FF1744"],
+        "cool_3": ["#1a66f2", "#5DADE2", "#48C9B0", "#A9DFBF", "#F2F3F4"],
+        "warm_3": ["#F2F3F4", "#FFDAB9", "#FF9E80", "#FF6F61", "#FF1744"],
+        # ---------------------------------------------------------------------------
+        "diverging_4": ["#5DADE2", "#A2D9F7", "#D6EAF8", "#F2F3F4", "#FADBD8", "#F1948A", "#E74C3C"],
+        # ----------------------------------------------------------------------------
         "colorful_1": ["#6d00db", "#9800cb", "#F2003C", "#ff4500", "#ff7f00", "#FE28A2", "#FFC0CB", "#DDA0DD", "#40E0D0", "#1a66f2", "#00f7fb", "#8fff88", "#E3FF00"],
     }
 

oafuncs/oa_date.py

@@ -1,20 +1,6 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-03-27 16:56:57
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-04 12:58:15
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_date.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 import calendar
 import datetime
+import functools
 from typing import List, Optional
 
 from rich import print
@@ -64,15 +50,16 @@ def hour_range(start_time: str, end_time: str, hour_interval: int = 6) -> List[s
         date_s += datetime.timedelta(hours=hour_interval)
     return date_list
 
+
 def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", output_format: Optional[str] = None) -> str:
     """
     Adjust a given base time by adding a specified time delta.
 
     Args:
-        base_time (str): Base time in the format "yyyymmdd" to "yyyymmddHHMMSS".
-                         Missing parts are assumed to be "0".
+        base_time (str): Base time in the format "yyyy" to "yyyymmddHHMMSS".
+                         Missing parts are padded with appropriate defaults.
         time_delta (int): The amount of time to add.
-        delta_unit (str): The unit of time to add ("seconds", "minutes", "hours", "days").
+        delta_unit (str): The unit of time to add ("seconds", "minutes", "hours", "days", "months", "years").
         output_format (str, optional): Custom output format for the adjusted time. Defaults to None.
 
     Returns:
@@ -84,17 +71,31 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
         >>> adjust_time("20240101000000", 2, "hours", "%Y-%m-%d %H:%M:%S")
         '2024-01-01 02:00:00'
         >>> adjust_time("20240101000000", 30, "minutes")
-        '2024-01-01 00:30:00'
+        '20240101003000'
     """
     # Normalize the input time to "yyyymmddHHMMSS" format
     time_format = "%Y%m%d%H%M%S"
-    if len(base_time) == 4:
-        base_time += "0101"
-    elif len(base_time) == 6:
-        base_time += "01"
-    base_time = base_time.ljust(14, "0")
 
-    time_obj = datetime.datetime.strptime(base_time, time_format)
+    # Pad the time string to full format
+    if len(base_time) == 4:  # yyyy
+        base_time += "0101000000"
+    elif len(base_time) == 6:  # yyyymm
+        base_time += "01000000"
+    elif len(base_time) == 8:  # yyyymmdd
+        base_time += "000000"
+    elif len(base_time) == 10:  # yyyymmddhh
+        base_time += "0000"
+    elif len(base_time) == 12:  # yyyymmddhhmm
+        base_time += "00"
+    elif len(base_time) == 14:  # yyyymmddhhmmss
+        pass  # Already complete
+    else:
+        raise ValueError(f"Invalid base_time format. Expected 4-14 digits, got {len(base_time)}")
+
+    try:
+        time_obj = datetime.datetime.strptime(base_time, time_format)
+    except ValueError as e:
+        raise ValueError(f"Invalid date format: {base_time}. Error: {e}")
 
     # Add the specified amount of time
     if delta_unit == "seconds":
@@ -114,8 +115,18 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
         time_obj = time_obj.replace(year=year, month=month, day=day)
     elif delta_unit == "years":
         # Handle year addition separately
-        year = time_obj.year + time_delta
-        time_obj = time_obj.replace(year=year)
+        try:
+            year = time_obj.year + time_delta
+            # Handle leap year edge case for Feb 29
+            if time_obj.month == 2 and time_obj.day == 29:
+                if not calendar.isleap(year):
+                    time_obj = time_obj.replace(year=year, day=28)
+                else:
+                    time_obj = time_obj.replace(year=year)
+            else:
+                time_obj = time_obj.replace(year=year)
+        except ValueError as e:
+            raise ValueError(f"Invalid year calculation: {e}")
     else:
         raise ValueError("Invalid time unit. Use 'seconds', 'minutes', 'hours', 'days', 'months', or 'years'.")
 
@@ -123,19 +134,9 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
     if output_format:
         return time_obj.strftime(output_format)
     else:
-        if delta_unit == "seconds":
-            default_format = "%Y%m%d%H%M%S"
-        elif delta_unit == "minutes":
-            default_format = "%Y%m%d%H%M"
-        elif delta_unit == "hours":
-            default_format = "%Y%m%d%H"
-        elif delta_unit == "days":
-            default_format = "%Y%m%d"
-        elif delta_unit == "months":
-            default_format = "%Y%m"
-        elif delta_unit == "years":
-            default_format = "%Y"
-        return time_obj.strftime(default_format)
+        # Use default format based on delta_unit
+        format_map = {"seconds": "%Y%m%d%H%M%S", "minutes": "%Y%m%d%H%M%S", "hours": "%Y%m%d%H", "days": "%Y%m%d", "months": "%Y%m", "years": "%Y"}
+        return time_obj.strftime(format_map[delta_unit])
 
 
 class timeit:
@@ -154,26 +155,29 @@ class timeit:
     Example:
         @timeit(log_to_file=True, display_time=True)
         def example_function():
-            # Simulate some work
+            import time
             time.sleep(2)
     """
 
-    def __init__(self, func, log_to_file: bool = False, display_time: bool = True):
-        self.func = func
+    def __init__(self, log_to_file: bool = False, display_time: bool = True):
         self.log_to_file = log_to_file
         self.display_time = display_time
 
-    def __call__(self, *args, **kwargs):
-        start_time = datetime.datetime.now()
-        result = self.func(*args, **kwargs)
-        end_time = datetime.datetime.now()
-        elapsed_time = (end_time - start_time).total_seconds()
+    def __call__(self, func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            start_time = datetime.datetime.now()
+            result = func(*args, **kwargs)
+            end_time = datetime.datetime.now()
+            elapsed_time = (end_time - start_time).total_seconds()
+
+            if self.display_time:
+                print(f"[bold green]Function '{func.__name__}' executed in {elapsed_time:.2f} seconds.[/bold green]")
 
-        if self.display_time:
-            print(f"[bold green]Function '{self.func.__name__}' executed in {elapsed_time:.2f} seconds.[/bold green]")
+            if self.log_to_file:
+                with open("execution_time.log", "a", encoding="utf-8") as log_file:
+                    log_file.write(f"{datetime.datetime.now()} - Function '{func.__name__}' executed in {elapsed_time:.2f} seconds.\n")
 
-        if self.log_to_file:
-            with open("execution_time.log", "a") as log_file:
-                log_file.write(f"{datetime.datetime.now()} - Function '{self.func.__name__}' executed in {elapsed_time:.2f} seconds.\n")
+            return result
 
-        return result
+        return wrapper

oafuncs/oa_down/__init__.py

@@ -1,17 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2024-09-17 16:09:20
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-26 08:09:01
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\__init__.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.11
-"""
 
 # from .love_ocean import sign as love_ocean
 # from .meteorological_home import sign as meteorological_home

oafuncs/oa_down/hycom_3hourly.py

@@ -719,7 +719,7 @@ class _HycomDownloader:
                     timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S,%f")[:-3]
                     # print(f"{timestamp} - INFO - ", end="") # Output log prefix without newline
                     # print("[bold #3dfc40]Success")
-                    print(f"{timestamp} - RESULT - [bold #3dfc40]Success")
+                    print(f"{timestamp} - INFO - [bold #3dfc40]Success")
                     return
 
             except Exception as e:
@@ -733,10 +733,11 @@ class _HycomDownloader:
                     logging.error(f"Giving up on {file_name}")
                     self.count["fail"] += 1
                     count_dict["fail"] += 1
+                    count_dict["fail_data_list"].append(file_name)
                     timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S,%f")[:-3]
                     # print(f"{timestamp} - ERROR - ", end="")
                     # print("[bold red]Failed")
-                    print(f"{timestamp} - RESULT - [bold red]Failure")
+                    print(f"{timestamp} - INFO - [bold red]Failure")
                     return
 
     async def run(self):
@@ -1091,7 +1092,7 @@ def download(
             end_time += "21"
 
     global count_dict
-    count_dict = {"success": 0, "fail": 0, "skip": 0, "no_data": 0, "total": 0, "no_data_list": []}
+    count_dict = {"success": 0, "fail": 0, "skip": 0, "no_data": 0, "total": 0, "no_data_list": [], "fail_data_list": []}
 
     global fsize_dict
     fsize_dict = {}
@@ -1162,6 +1163,8 @@ def download(
     print("[bold #ecdbfe]=" * mark_len)
     if count_dict["fail"] > 0:
         print("[bold #be5528]Please try again to download the failed data later.")
+        for fail_data in count_dict["fail_data_list"]:
+            print(f"[bold #d81b60]{fail_data}")
     if count_dict["no_data"] > 0:
         print(f"[bold #f90000]{count_dict['no_data']} data entries do not exist in any dataset or version.")
         for no_data in count_dict["no_data_list"]:

oafuncs/oa_down/hycom_3hourly_proxy.py

@@ -1,20 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-17 15:16:02
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-17 15:16:04
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly copy.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
-
-
 import asyncio
 import datetime
 import logging

oafuncs/oa_down/idm.py

@@ -1,20 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-03-27 16:51:26
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-07 13:38:27
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\idm.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
-
-
 import datetime
 import os
 from subprocess import call

oafuncs/oa_down/literature.py

@@ -1,18 +1,3 @@
-#!/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: 2025-01-05 10:51:42
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\literature.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 import os
 import re
 import time

oafuncs/oa_down/read_proxy.py

@@ -1,18 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-17 13:59:14
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-17 14:00:38
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\read_proxy.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 import threading
 from queue import Queue
 import random

oafuncs/oa_down/user_agent.py

@@ -1,17 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2024-12-26 08:06:34
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-26 08:06:34
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\user_agent.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
 import os
 import random