oafuncs 0.0.98.6__tar.gz → 0.0.98.7__tar.gz

{oafuncs-0.0.98.6/oafuncs.egg-info → oafuncs-0.0.98.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.6
+Version: 0.0.98.7
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -27,6 +27,7 @@ Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: httpx
 Requires-Dist: matplotlib
+Requires-Dist: opencv-python
 Requires-Dist: netCDF4
 Requires-Dist: xlrd
 Requires-Dist: geopandas

{oafuncs-0.0.98.6 → oafuncs-0.0.98.7}/oafuncs/oa_down/hycom_3hourly.py

@@ -19,7 +19,6 @@ import logging
 import os
 import random
 import re
-import time
 import warnings
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
@@ -728,9 +727,15 @@ class _HycomDownloader:
 
                     elapsed = datetime.datetime.now() - start
                     # logging.info(f"File {file_name} downloaded, Time: {elapsed}")
-                    logging.info(f"Saving {file_name}, Time: {elapsed}")
+                    logging.info(f"Saving {file_name} ...")
+                    logging.info(f"Timing {elapsed} ...")
                     self.count["success"] += 1
                     count_dict["success"] += 1
+                    # 输出一条绿色的成功消息
+                    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")
                     return
 
             except Exception as e:
@@ -744,6 +749,10 @@ class _HycomDownloader:
                     logging.error(f"Giving up on {file_name}")
                     self.count["fail"] += 1
                     count_dict["fail"] += 1
+                    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")
                     return
 
     async def run(self):
@@ -757,8 +766,7 @@ class _HycomDownloader:
 
 def _download_file(target_url, store_path, file_name, cover=False):
     save_path = Path(store_path) / file_name
-    file_name_split = file_name.split("_")
-    file_name_split = file_name_split[:-1]
+    file_name_split = file_name.split("_")[:-1]
     same_file = "_".join(file_name_split) + "*nc"
 
     if match_time is not None:
@@ -775,10 +783,12 @@ def _download_file(target_url, store_path, file_name, cover=False):
                 print(f"[bold green]{file_name} is correct")
         return
 
-    if not cover and os.path.exists(save_path):
-        print(f"[bold #FFA54F]{save_path} exists, skipping ...")
-        count_dict["skip"] += 1
-        return
+    # if not cover and os.path.exists(save_path):
+    #     print(f"[bold #FFA54F]{save_path} exists, skipping ...")
+    #     count_dict["skip"] += 1
+    #     return
+    if cover and os.path.exists(save_path):
+        _clear_existing_file(save_path)
 
     if same_file not in fsize_dict.keys():
         check_nc(save_path, delete_if_invalid=True, print_messages=False)
@@ -786,6 +796,7 @@ def _download_file(target_url, store_path, file_name, cover=False):
     get_mean_size = _get_mean_size_move(same_file, save_path)
 
     if _check_existing_file(save_path, get_mean_size):
+        print(f"[bold #FFA54F]{save_path} exists, skipping ...")
         count_dict["skip"] += 1
         return
 
@@ -794,12 +805,12 @@ def _download_file(target_url, store_path, file_name, cover=False):
     if not use_idm:
         python_downloader = _HycomDownloader([(target_url, save_path)])
         asyncio.run(python_downloader.run())
-        time.sleep(3 + random.uniform(0, 10))
+        # time.sleep(3 + random.uniform(0, 10))
     else:
         idm_downloader(target_url, store_path, file_name, given_idm_engine)
         idm_download_list.append(save_path)
         # print(f"[bold #3dfc40]File [bold #dfff73]{save_path} [#3dfc40]has been submit to IDM for downloading")
-        time.sleep(3 + random.uniform(0, 10))
+        # time.sleep(3 + random.uniform(0, 10))
 
 
 def _check_hour_is_valid(ymdh_str):
@@ -890,7 +901,7 @@ def _prepare_url_to_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_ma
         else:
             if download_time < "2024081012":
                 varlist = [_ for _ in var]
-                for key, value in pbar(var_group.items(), description=f"Var_group {download_time} ->", total=len(var_group), cmap="bwr", next_line=True):
+                for key, value in pbar(var_group.items(), description=f"Var Group {download_time} ->", total=len(var_group), color="#d7feb9", next_line=True):
                     current_group = []
                     for v in varlist:
                         if v in value:
@@ -912,7 +923,7 @@ def _prepare_url_to_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_ma
                             file_name = f"HYCOM_{key}_{download_time}-{download_time_end}.nc"
                     _download_file(submit_url, store_path, file_name, cover)
             else:
-                for v in pbar(var,description=f'Var {download_time} ->', total=len(var), cmap='bwr', next_line=True):
+                for v in pbar(var, description=f"Var {download_time} ->", total=len(var), color="#d7feb9", next_line=True):
                     submit_url = _get_submit_url_var(v, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time, download_time_end)
                     file_name = f"HYCOM_{variable_info[v]['var_name']}_{download_time}.nc"
                     if download_time_end is not None:

{oafuncs-0.0.98.6 → oafuncs-0.0.98.7}/oafuncs/oa_draw.py

@@ -15,6 +15,7 @@ Python Version: 3.11
 
 import warnings
 
+import cv2
 import cartopy.crs as ccrs
 import cartopy.feature as cfeature
 import matplotlib as mpl
@@ -132,6 +133,70 @@ def gif(image_paths: list[str], output_gif_name: str, frame_duration: float = 20
     return
 
 
+def movie(image_files, output_video_path, fps):
+    """
+    从图像文件列表创建视频。
+
+    Args:
+        image_files (list): 按顺序排列的图像文件路径列表。
+        output_video_path (str): 输出视频文件的路径 (例如 'output.mp4')。
+        fps (int): 视频的帧率。
+    """
+    if not image_files:
+        print("错误：图像文件列表为空。")
+        return
+
+    # 读取第一张图片以获取帧尺寸
+    try:
+        frame = cv2.imread(image_files[0])
+        if frame is None:
+            print(f"错误：无法读取第一张图片：{image_files[0]}")
+            return
+        height, width, layers = frame.shape
+        size = (width, height)
+        print(f"视频尺寸设置为：{size}")
+    except Exception as e:
+        print(f"读取第一张图片时出错：{e}")
+        return
+
+    # 选择编解码器并创建VideoWriter对象
+    # 对于 .mp4 文件，常用 'mp4v' 或 'avc1'
+    # 对于 .avi 文件，常用 'XVID' 或 'MJPG'
+    fourcc = cv2.VideoWriter_fourcc(*"mp4v")  # 或者尝试 'avc1', 'XVID' 等
+    out = cv2.VideoWriter(output_video_path, fourcc, fps, size)
+
+    if not out.isOpened():
+        print(f"错误：无法打开视频文件进行写入：{output_video_path}")
+        print("请检查编解码器 ('fourcc') 是否受支持以及路径是否有效。")
+        return
+
+    print(f"开始将图像写入视频：{output_video_path}...")
+    for i, filename in enumerate(image_files):
+        try:
+            frame = cv2.imread(filename)
+            if frame is None:
+                print(f"警告：跳过无法读取的图像：{filename}")
+                continue
+            # 确保帧尺寸与初始化时相同，如果需要可以调整大小
+            current_height, current_width, _ = frame.shape
+            if (current_width, current_height) != size:
+                print(f"警告：图像 {filename} 的尺寸 ({current_width}, {current_height}) 与初始尺寸 {size} 不同。将调整大小。")
+                frame = cv2.resize(frame, size)
+
+            out.write(frame)
+            # 打印进度（可选）
+            if (i + 1) % 50 == 0 or (i + 1) == len(image_files):
+                print(f"已处理 {i + 1}/{len(image_files)} 帧")
+
+        except Exception as e:
+            print(f"处理图像 {filename} 时出错：{e}")
+            continue  # 跳过有问题的帧
+
+    # 释放资源
+    out.release()
+    print(f"视频创建成功：{output_video_path}")
+
+
 def add_lonlat_unit(longitudes: list[float] = None, latitudes: list[float] = None, decimal_places: int = 2) -> tuple[list[str], list[str]] | list[str]:
     """Convert longitude and latitude values to formatted string labels.
 

{oafuncs-0.0.98.6 → oafuncs-0.0.98.7/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.6
+Version: 0.0.98.7
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -27,6 +27,7 @@ Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: httpx
 Requires-Dist: matplotlib
+Requires-Dist: opencv-python
 Requires-Dist: netCDF4
 Requires-Dist: xlrd
 Requires-Dist: geopandas

{oafuncs-0.0.98.6 → oafuncs-0.0.98.7}/oafuncs.egg-info/requires.txt

@@ -8,6 +8,7 @@ requests
 bs4
 httpx
 matplotlib
+opencv-python
 netCDF4
 xlrd
 geopandas

{oafuncs-0.0.98.6 → oafuncs-0.0.98.7}/setup.py

@@ -18,7 +18,7 @@ URL = "https://github.com/Industry-Pays/OAFuncs"
 EMAIL = "liukun0312@stu.ouc.edu.cn"
 AUTHOR = "Kun Liu"
 REQUIRES_PYTHON = ">=3.9.0"  # 2025/03/13
-VERSION = "0.0.98.6"
+VERSION = "0.0.98.7"
 
 # What packages are required for this module to be executed?
 REQUIRED = [
@@ -37,6 +37,7 @@ REQUIRED = [
     "httpx",
     # ------ Picture ------
     "matplotlib",
+    "opencv-python",  # cv2
     # ------ File ------
     "netCDF4",
     "xlrd",