geometamaker 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

geometamaker/geometamaker.py

@@ -39,6 +39,12 @@ PROTOCOLS = [
 DT_FMT = '%Y-%m-%d %H:%M:%S %Z'
 
 
+def _gdal_progress_callback(complete, message, data):
+    percentage = complete * 100
+    if (percentage > 0) & (percentage % 5 == 0):
+        LOGGER.info(f'{message} {percentage}%')
+
+
 # TODO: In the future we can remove these exception managers in favor of the
 # builtin gdal.ExceptionMgr. It was released in 3.7.0 and debugged in 3.9.1.
 # https://github.com/OSGeo/gdal/blob/v3.9.3/NEWS.md#gdalogr-391-release-notes
@@ -203,7 +209,10 @@ def detect_file_type(filepath, scheme):
     # We'll likely want a different data model for multi-dimensional arrays.
     # Frictionless supports a wide range of formats. The quickest way to
     # determine if a file is recognized as a table or archive is to call list.
-    info = frictionless.list(filepath)[0]
+    try:
+        info = frictionless.list(filepath)[0]
+    except frictionless.FrictionlessException:
+        raise RuntimeError(f'Cannot detect file type of "{filepath}"')
     if info.type == 'table':
         return 'table'
     # Frictionless doesn't recognize .tgz compression (but does recognize .tar.gz)
@@ -259,7 +268,7 @@ def describe_file(source_dataset_path, scheme):
     hash_func = hashlib.new('sha256')
     hash_func.update(
         f'{description["bytes"]}{description["last_modified"]}\
-        {description["path"]}'.encode('ascii'))
+        {description["path"]}'.encode('utf-8'))
     description['uid'] = f'sizetimestamp:{hash_func.hexdigest()}'
 
     # We don't have a use for including these attributes in our metadata:
@@ -388,18 +397,24 @@ def describe_raster(source_dataset_path, scheme, **kwargs):
     for i in range(info['n_bands']):
         b = i + 1
         band = raster.GetRasterBand(b)
+        band_gdal_metadata = band.GetMetadata()
         if compute_stats:
             try:
-                # 0=do not approximate stats, 1=calculate if they don't exist
-                # If exact stats exist they will be retrieved without
-                # computing them, otherwise, this forces computation.
-                # https://github.com/OSGeo/gdal/blob/master/gcore/gdalrasterband.cpp
-                _ = band.GetStatistics(0, 1)
+                if not 'STATISTICS_VALID_PERCENT' in band_gdal_metadata:
+                    # Sometimes some stats exist, but not all. If this one doesn't,
+                    # it's important enough that we want to force computation.
+                    _ = band.ComputeStatistics(0, callback=_gdal_progress_callback)
+                else:
+                    # 0=do not approximate stats, 1=calculate if they don't exist
+                    # If exact stats exist they will be retrieved without
+                    # computing them, otherwise, this forces computation.
+                    # https://github.com/OSGeo/gdal/blob/master/gcore/gdalrasterband.cpp
+                    _ = band.GetStatistics(0, 1)
+                band_gdal_metadata = band.GetMetadata()
             except RuntimeError as e:
                 LOGGER.warning(
                     f'Could not compute statistics for band {b} of '
                     f'{source_dataset_path}: {e}')
-        band_gdal_metadata = band.GetMetadata()
 
         bands.append(models.BandSchema(
             index=b,

{geometamaker-0.2.0.dist-info → geometamaker-0.2.1.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: geometamaker
-Version: 0.2.0
+Version: 0.2.1
 Summary: metadata creation for geospatial data
-Maintainer: Natural Capital Project Software Team
+Maintainer: Natural Capital Alliance Software Team
 License: 
                                          Apache License
                                    Version 2.0, January 2004
@@ -215,11 +215,11 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
-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 :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.9

{geometamaker-0.2.0.dist-info → geometamaker-0.2.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 geometamaker/__init__.py,sha256=fs8_0Wj-NfHHyK-wd5UHzMnCK2HxI0uWR_KtSbb8xXs,405
 geometamaker/cli.py,sha256=FGwrwBxJV269G509w2qvNNVbdMpxKHZv671M5ojeryE,10339
 geometamaker/config.py,sha256=KrDOFm_Wa15iZAmDxpy_yizBW3oIf0irqAVirFGWGLY,1964
-geometamaker/geometamaker.py,sha256=EuI1Nwgh6L1cNwNeyJhUm59JXWiqbc9XHKw7zpEWYLs,28344
+geometamaker/geometamaker.py,sha256=OrBAjjqyXQZvUjUI8lkWEbGNxjZ4Cxpj0S8JIRn69yk,29093
 geometamaker/models.py,sha256=TF47XNKBhnSUScNXC3jk1Op_Icu7otLahApF3Kv0Hz0,27232
 geometamaker/utils.py,sha256=RLFtobLdUAeJEKBnzsQmC2h-eJTYn22tjNPAq261EhE,932
-geometamaker-0.2.0.dist-info/licenses/LICENSE.txt,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
-geometamaker-0.2.0.dist-info/METADATA,sha256=-tSGY0ik9gLL_Lc0RpEf_RiPNRQoL41CP9MKZ53SrzE,19090
-geometamaker-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geometamaker-0.2.0.dist-info/entry_points.txt,sha256=fY8nmpxmOO5kA47EBpKBKzaq3uZ1tWPA1sBgRJKvVU4,54
-geometamaker-0.2.0.dist-info/top_level.txt,sha256=cm34aKGvrHyEgqNXi3Cx9LTU1Sm79r1RkpQZpy9MoxA,13
-geometamaker-0.2.0.dist-info/RECORD,,
+geometamaker-0.2.1.dist-info/licenses/LICENSE.txt,sha256=Pd-b5cKP4n2tFDpdx27qJSIq0d1ok0oEcGTlbtL6QMU,11560
+geometamaker-0.2.1.dist-info/METADATA,sha256=QOcEsvUNd4Zh-IRzkKBHwlSD5PrbLrCyKrL7F71Pd8s,19092
+geometamaker-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+geometamaker-0.2.1.dist-info/entry_points.txt,sha256=fY8nmpxmOO5kA47EBpKBKzaq3uZ1tWPA1sBgRJKvVU4,54
+geometamaker-0.2.1.dist-info/top_level.txt,sha256=cm34aKGvrHyEgqNXi3Cx9LTU1Sm79r1RkpQZpy9MoxA,13
+geometamaker-0.2.1.dist-info/RECORD,,

{geometamaker-0.2.0.dist-info → geometamaker-0.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any