shancx 1.9.33.227__tar.gz → 1.9.33.228__tar.gz

{shancx-1.9.33.227 → shancx-1.9.33.228}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shancx
-Version: 1.9.33.227
+Version: 1.9.33.228
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx

{shancx-1.9.33.227 → shancx-1.9.33.228}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 setup(
     name="shancx",
-    version="1.9.33.227",
+    version="1.9.33.228",
     packages=find_packages(),
     description="A simple timer decorator",
     long_description=open("README.md").read(),

{shancx-1.9.33.227 → shancx-1.9.33.228}/shancx/Read.py

@@ -55,30 +55,9 @@ result = getGrib(input_Path)
 import pygrib
 import numpy as np
 import pandas as pd
-import gzip
-import tempfile
-def readGrib(filepath, target_param=None):
-    filepath= filepath  
-    if filepath.endswith('.gz'):
-        with gzip.open(filepath, 'rb') as f:
-            with tempfile.NamedTemporaryFile(suffix='.grib2', delete=False) as tmp:
-                tmp.write(f.read())
-                filepath = tmp.name  
+def readGrib(file_path, target_param=None):
     try:
-        with pygrib.open(filepath) as grbs:         
-            if target_param:
-                try:
-                    grb = grbs.select(shortName=target_param)[0]
-                except:
-                    try:
-                        grb = grbs.select(parameterName=target_param)[0]
-                    except:
-                        raise ValueError(f"未找到参数: {target_param}")
-            else:
-                grb = grbs[1]
-            data = grb.values
-            lats, lons = grb.latlons() 
-            #data2 
+        with pygrib.open(file_path) as grbs:
             field_info = []
             for grb in grbs:
                 field_info.append({
@@ -91,6 +70,18 @@ def readGrib(filepath, target_param=None):
                                    'units': getattr(grb, 'units', 'N/A'),
                                    'shape': grb.values.shape
                                  })             
+            if target_param:
+                try:
+                    grb = grbs.select(shortName=target_param)[0]
+                except:
+                    try:
+                        grb = grbs.select(parameterName=target_param)[0]
+                    except:
+                        raise ValueError(f"未找到参数: {target_param}")
+            else:
+                grb = grbs[1]
+            data = grb.values
+            lats, lons = grb.latlons()            
             return {
                 'data': data,
                 'lats': lats,
@@ -99,8 +90,7 @@ def readGrib(filepath, target_param=None):
                     'parameterName': grb.parameterName,
                     'level': grb.level,
                     'validDate': grb.validDate,
-                    'units': grb.units,
-                    "field_info":field_info                    
+                    'units': grb.units
                 }
             }            
     except Exception as e:

{shancx-1.9.33.227 → shancx-1.9.33.228}/shancx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shancx
-Version: 1.9.33.227
+Version: 1.9.33.228
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx