oafuncs 0.0.98.39__tar.gz → 0.0.98.41__tar.gz

{oafuncs-0.0.98.39/oafuncs.egg-info → oafuncs-0.0.98.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.39
+Version: 0.0.98.41
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -24,6 +24,7 @@ Requires-Dist: pandas
 Requires-Dist: xarray
 Requires-Dist: rich
 Requires-Dist: pathlib
+Requires-Dist: lxml
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: httpx

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41}/oafuncs/_script/cprogressbar.py

@@ -189,7 +189,8 @@ class ColorProgressBar:
         self._is_jupyter = "ipykernel" in sys.modules
 
         # 输出样式
-        filled_list = ["▊", "█", "▓", "▒", "░", "#", "=", ">", "▌", "▍", "▎", "▏", "*"]
+        # filled_list = ["▊", "█", "▓", "▒", "░", "#", "=", ">", "▌", "▍", "▎", "▏", "*"]
+        filled_list = ["█", "▓", "▒", "░", "#", "=", ">", "*"]
         self.filled = random.choice(filled_list)
 
     def _generate_gradient(self) -> Optional[List[str]]:

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41}/oafuncs/oa_draw.py

@@ -247,44 +247,41 @@ def setup_map(
     from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
     lon_formatter = LongitudeFormatter(zero_direction_label=False, number_format=f".{tick_decimals}f")
     lat_formatter = LatitudeFormatter(number_format=f".{tick_decimals}f")
-
-    # Handle gridlines and ticks
-    if show_gridlines:
-        # Add gridlines with labels
-        gl = axes.gridlines(crs=map_projection, draw_labels=show_labels, linewidth=grid_width, color=grid_color, alpha=grid_alpha, linestyle=grid_style)
-
-        # Configure label positions
-        gl.left_labels = left_labels
-        gl.bottom_labels = bottom_labels
-        gl.right_labels = right_labels
-        gl.top_labels = top_labels
-
-        # Set formatters
-        gl.xformatter = lon_formatter
-        gl.yformatter = lat_formatter
-
-        # Set custom tick positions if provided
-        if longitude_ticks is not None:
-            gl.xlocator = mticker.FixedLocator(np.array(longitude_ticks))
-        if latitude_ticks is not None:
-            gl.ylocator = mticker.FixedLocator(np.array(latitude_ticks))
-
-    elif show_labels:
+    
+        # 只要传入经纬度数据就自动设置范围
+    # 范围必须在cartopy添加地图特征之后设置，因为添加特征可能会改变axes的范围
+    if longitude_data is not None and latitude_data is not None:
+        # 过滤掉NaN，避免极端值影响
+        lon_data = np.asarray(longitude_data)
+        lat_data = np.asarray(latitude_data)
+        lon_valid = lon_data[~np.isnan(lon_data)]
+        lat_valid = lat_data[~np.isnan(lat_data)]
+        if lon_valid.size > 0 and lat_valid.size > 0:
+            lon_min, lon_max = np.min(lon_valid), np.max(lon_valid)
+            lat_min, lat_max = np.min(lat_valid), np.max(lat_valid)
+            axes.set_extent([lon_min, lon_max, lat_min, lat_max], crs=map_projection)
+        else:
+            # 若全是NaN则不设置范围
+            pass
+    
+    if show_labels:
         # Add tick labels without gridlines
         # Generate default tick positions based on current extent if not provided
         if longitude_ticks is None:
             current_extent = axes.get_extent(crs=map_projection)
             lon_range = current_extent[1] - current_extent[0]
             # Generate reasonable tick spacing
-            tick_spacing = 1 if lon_range <= 10 else (5 if lon_range <= 30 else (10 if lon_range <= 90 else 20))
-            longitude_ticks = np.arange(np.ceil(current_extent[0] / tick_spacing) * tick_spacing, current_extent[1] + tick_spacing, tick_spacing)
+            tick_spacing = 1 if lon_range <= 10 else (5 if lon_range <= 30 else (15 if lon_range <= 90 else (30 if lon_range <= 180 else 60)))
+            longitude_ticks = np.arange(np.ceil(current_extent[0] / tick_spacing) * tick_spacing, current_extent[1] + 0.1, tick_spacing)
+            # print(f"[green]Longitude ticks set to:[/green] {longitude_ticks}")
 
         if latitude_ticks is None:
             current_extent = axes.get_extent(crs=map_projection)
             lat_range = current_extent[3] - current_extent[2]
             # Generate reasonable tick spacing
-            tick_spacing = 1 if lat_range <= 10 else (5 if lat_range <= 30 else (10 if lat_range <= 90 else 20))
-            latitude_ticks = np.arange(np.ceil(current_extent[2] / tick_spacing) * tick_spacing, current_extent[3] + tick_spacing, tick_spacing)
+            tick_spacing = 1 if lat_range <= 10 else (5 if lat_range <= 30 else (15 if lat_range <= 90 else 30))
+            latitude_ticks = np.arange(np.ceil(current_extent[2] / tick_spacing) * tick_spacing, current_extent[3] + 0.1, tick_spacing)
+            # print(f"[green]Latitude ticks set to:[/green] {latitude_ticks}")
 
         # Set tick positions and formatters
         axes.set_xticks(longitude_ticks, crs=map_projection)
@@ -296,21 +293,27 @@ def setup_map(
         axes.tick_params(axis="x", labelbottom=bottom_labels, labeltop=top_labels)
         axes.tick_params(axis="y", labelleft=left_labels, labelright=right_labels)
 
-    # 只要传入经纬度数据就自动设置范围
-    # 范围必须在cartopy添加地图特征之后设置，因为添加特征可能会改变axes的范围
-    if longitude_data is not None and latitude_data is not None:
-        # 过滤掉NaN，避免极端值影响
-        lon_data = np.asarray(longitude_data)
-        lat_data = np.asarray(latitude_data)
-        lon_valid = lon_data[~np.isnan(lon_data)]
-        lat_valid = lat_data[~np.isnan(lat_data)]
-        if lon_valid.size > 0 and lat_valid.size > 0:
-            lon_min, lon_max = np.min(lon_valid), np.max(lon_valid)
-            lat_min, lat_max = np.min(lat_valid), np.max(lat_valid)
-            axes.set_extent([lon_min, lon_max, lat_min, lat_max], crs=map_projection)
-        else:
-            # 若全是NaN则不设置范围
-            pass
+    # Handle gridlines and ticks
+    if show_gridlines:
+        # Add gridlines with labels
+        gl = axes.gridlines(crs=map_projection, draw_labels=show_labels, linewidth=grid_width, color=grid_color, alpha=grid_alpha, linestyle=grid_style)
+
+        # Configure label positions
+        gl.left_labels = left_labels
+        gl.bottom_labels = bottom_labels
+        gl.right_labels = right_labels
+        gl.top_labels = top_labels
+
+        # Set formatters
+        gl.xformatter = lon_formatter
+        gl.yformatter = lat_formatter
+
+        # Set custom tick positions if provided
+        if longitude_ticks is not None:
+            gl.xlocator = mticker.FixedLocator(np.array(longitude_ticks))
+        if latitude_ticks is not None:
+            gl.ylocator = mticker.FixedLocator(np.array(latitude_ticks))
+            
     return axes
 
 

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41}/oafuncs/oa_file.py

@@ -160,14 +160,18 @@ def move_file(source_pattern: str, destination: str) -> None:
             if dst_dir:
                 os.makedirs(dst_dir, exist_ok=True)
 
-            # Remove existing destination if it exists
-            if os.path.exists(dst_file):
-                if os.path.isdir(dst_file):
-                    shutil.rmtree(dst_file)
-                else:
-                    os.remove(dst_file)
-            
-            shutil.move(src_file, dst_file)
+            if os.path.exists(src_file):
+                # Remove existing destination if it exists
+                if os.path.exists(dst_file):
+                    if os.path.isdir(dst_file):
+                        shutil.rmtree(dst_file)
+                    else:
+                        os.remove(dst_file)
+                
+                shutil.move(src_file, dst_file)
+            else:
+                print(f"[yellow]Source file not found:[/yellow] [bold]{src_file}[/bold]")
+                continue
             print(f"[green]Successfully moved:[/green] [bold]{src_file}[/bold] -> [bold]{dst_file}[/bold]")
         except Exception as e:
             print(f"[red]Failed to move:[/red] [bold]{src_file}[/bold]. Error: {e}")

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41}/oafuncs/oa_nc.py

@@ -207,14 +207,37 @@ def convert_longitude(
         >>> dataset = convert_longitude(dataset, longitude_name="lon", target_range=360)
     """
     if target_range not in [180, 360]:
-        raise ValueError("target_range value must be 180 or 360")
+        raise ValueError("target_range must be 180 or 360")
 
+    lon = dataset[longitude_name]
+    current_min, current_max = np.nanmin(lon), np.nanmax(lon)
+
+    # 检查是否已在目标范围
+    if target_range == 180:
+        if -180 <= current_min and current_max <= 180:
+            return dataset  # 已在[-180,180]范围
+    else:
+        if 0 <= current_min and current_max <= 360:
+            return dataset  # 已在[0,360]范围
+
+    # 执行转换（带边界平滑）
     if target_range == 180:
-        dataset = dataset.assign_coords({longitude_name: (dataset[longitude_name] + 180) % 360 - 180})
+        # 将 >180 的值减去360，保持连续性
+        new_lon = xr.where(lon > 180, lon - 360, lon)
+        # 处理负值（如-200 -> 160）
+        new_lon = xr.where(new_lon < -180, new_lon + 360, new_lon)
     else:
-        dataset = dataset.assign_coords({longitude_name: (dataset[longitude_name] + 360) % 360})
+        new_lon = lon % 360  # 自动处理负值
+
+    # 检查并处理重复坐标
+    if len(new_lon) != len(np.unique(new_lon)):
+        raise ValueError("转换导致经度坐标重复，请检查数据边界值")
+
+    # 仅当非单调时排序
+    if not new_lon.is_monotonic_increasing:
+        dataset = dataset.sortby(longitude_name)
 
-    return dataset.sortby(longitude_name)
+    return dataset.assign_coords({longitude_name: new_lon})
 
 
 def isel(

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.39
+Version: 0.0.98.41
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -24,6 +24,7 @@ Requires-Dist: pandas
 Requires-Dist: xarray
 Requires-Dist: rich
 Requires-Dist: pathlib
+Requires-Dist: lxml
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: httpx

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41}/oafuncs.egg-info/requires.txt

@@ -4,6 +4,7 @@ pandas
 xarray
 rich
 pathlib
+lxml
 requests
 bs4
 httpx

{oafuncs-0.0.98.39 → oafuncs-0.0.98.41}/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.10.0"  # 2025/03/13
-VERSION = "0.0.98.39"
+VERSION = "0.0.98.41"
 
 # What packages are required for this module to be executed?
 REQUIRED = [
@@ -32,6 +32,7 @@ REQUIRED = [
     # ------ Path ------
     "pathlib",
     # ------ Internet ------
+    "lxml",
     "requests",
     "bs4",
     "httpx",