anemoi-utils 0.3.17__py3-none-any.whl → 0.4.0__py3-none-any.whl

anemoi/utils/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.17'
-__version_tuple__ = version_tuple = (0, 3, 17)
+__version__ = version = '0.4.0'
+__version_tuple__ = version_tuple = (0, 4, 0)

anemoi/utils/provenance.py

@@ -21,6 +21,7 @@ import os
 import subprocess
 import sys
 import sysconfig
+from functools import cache
 
 LOG = logging.getLogger(__name__)
 
@@ -143,6 +144,37 @@ def _module_versions(full):
     return versions, paths
 
 
+@cache
+def package_distributions() -> dict[str, list[str]]:
+    # Takes a significant amount of time to run
+    # so cache the result
+    from importlib import metadata
+
+    # For python 3.9 support
+    if not hasattr(metadata, "packages_distributions"):
+        import importlib_metadata as metadata
+
+    return metadata.packages_distributions()
+
+
+def import_name_to_distribution_name(packages: list):
+    distribution_names = {}
+    package_distribution_names = package_distributions()
+
+    for package in [p for p in packages if p in package_distribution_names]:
+        distr_name = package_distribution_names[package]
+        if isinstance(distr_name, list):
+            if len(distr_name) > 1:
+                # Multiple distributions for the same package, i.e. anemoi-graphs, anemoi-utils, ..., Don't know how to handle this
+                continue
+            distr_name = distr_name[0]
+
+        if distr_name != package:
+            distribution_names[package] = distr_name
+
+    return distribution_names
+
+
 def module_versions(full):
     versions, paths = _module_versions(full)
     git_versions = _check_for_git(paths, full)
@@ -339,6 +371,7 @@ def gather_provenance_info(assets=[], full=False) -> dict:
             time=datetime.datetime.utcnow().isoformat(),
             python=f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
             module_versions=versions,
+            distribution_names=import_name_to_distribution_name(versions.keys()),
             git_versions=git_versions,
         )
     else:
@@ -349,6 +382,7 @@ def gather_provenance_info(assets=[], full=False) -> dict:
             python_path=sys.path,
             config_paths=sysconfig.get_paths(),
             module_versions=versions,
+            distribution_names=import_name_to_distribution_name(versions.keys()),
             git_versions=git_versions,
             platform=platform_info(),
             gpus=gpu_info(),

anemoi/utils/{sanetize.py → sanitize.py}

@@ -5,6 +5,6 @@
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
 
-from .sanetise import sanetise as sanetize
+from .sanitise import sanitise as sanitize
 
-__all__ = ["sanetize"]
+__all__ = ["sanitize"]

{anemoi_utils-0.3.17.dist-info → anemoi_utils-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anemoi-utils
-Version: 0.3.17
+Version: 0.4.0
 Summary: A package to hold various functions to support training of ML models on ECMWF data.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License: Apache License
@@ -227,6 +227,7 @@ Requires-Dist: aniso8601
 Requires-Dist: pyyaml
 Requires-Dist: tomli
 Requires-Dist: tqdm
+Requires-Dist: importlib-metadata ; python_version < "3.10"
 Provides-Extra: all
 Requires-Dist: anemoi-utils[grib,provenance,text] ; extra == 'all'
 Provides-Extra: dev

{anemoi_utils-0.3.17.dist-info → anemoi_utils-0.4.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 anemoi/utils/__init__.py,sha256=zZZpbKIoGWwdCOuo6YSruLR7C0GzvzI1Wzhyqaa0K7M,456
 anemoi/utils/__main__.py,sha256=cLA2PidDTOUHaDGzd0_E5iioKYNe-PSTv567Y2fuwQk,723
-anemoi/utils/_version.py,sha256=EanR9QKHDmsyYNdsvPdG4re1cWDyd1A_td5gwFF-ouQ,413
+anemoi/utils/_version.py,sha256=j90u3VVU4UrJf1fgMUhaZarHK_Do2XGYXr-vZvOFzVo,411
 anemoi/utils/caching.py,sha256=bCOjP1jcDbwi7BID3XaR9BbkD1k3UipkP74NbgJuEFA,1974
 anemoi/utils/checkpoints.py,sha256=qWtqkQvMDlPIcfqz_GmOyUf0mmHZ6QEInpvgSJYIQjY,5275
 anemoi/utils/cli.py,sha256=9TrBXkDjBsos2d0z6wdFDRZIjft3HWGutSgAFi0zCK4,3712
@@ -9,19 +9,19 @@ anemoi/utils/dates.py,sha256=dgGbTqpGOpYDGgWfXL_69HutXTCHDFI2DhvG-9I9WQI,12341
 anemoi/utils/grib.py,sha256=mrk1drJm2jaPYERQX45QfX2MP4eUqRv0J-Y8IRSRTRE,3073
 anemoi/utils/hindcasts.py,sha256=X8k-81ltmkTDHdviY0SJgvMg7XDu07xoc5ALlUxyPoo,1453
 anemoi/utils/humanize.py,sha256=-xQraQWMLwNaLQAWfPi4K05qieQLgkiyYmV6bfhr10U,16611
-anemoi/utils/provenance.py,sha256=EtlQrubTpEGkTG2UpoRlNGGjKMDcJ-9H3j96vedGyaI,9673
+anemoi/utils/provenance.py,sha256=iSq4Y5eoWK_SNBMpMfInOB3shQlMZqE8iMBp-LgKtJk,10882
 anemoi/utils/s3.py,sha256=MuY-PrHpt6iKM2RK7v74YoCdqvVJ8UjBDJh0wxUR9Co,18720
-anemoi/utils/sanetize.py,sha256=cQ4r52bQuegMqsEzCN2flXYk_0y_amwpEhMx2-G78j4,488
 anemoi/utils/sanitise.py,sha256=VKIUiwm0EHPdkFUR6FkAxe94933yQx2obQtN6YROH5M,2862
+anemoi/utils/sanitize.py,sha256=6HJrfCMnrmH5lfxydcBc-AjxkmkFXdCc1wotzm9NBCw,488
 anemoi/utils/text.py,sha256=WvxkRlPpmK7HLOpWZmyqPQG29GMF8IFaCJp7frfIWNI,10436
 anemoi/utils/timer.py,sha256=EQcucuwUaGeSpt2S1APJlwSOu6kC47MK9f4h-r8c_AY,990
 anemoi/utils/commands/__init__.py,sha256=qAybFZPBBQs0dyx7dZ3X5JsLpE90pwrqt1vSV7cqEIw,706
 anemoi/utils/commands/config.py,sha256=KEffXZh0ZQfn8t6LXresfd94kDY0gEyulx9Wto5ttW0,824
 anemoi/utils/mars/__init__.py,sha256=RAeY8gJ7ZvsPlcIvrQ4fy9xVHs3SphTAPw_XJDtNIKo,1750
 anemoi/utils/mars/mars.yaml,sha256=R0dujp75lLA4wCWhPeOQnzJ45WZAYLT8gpx509cBFlc,66
-anemoi_utils-0.3.17.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-anemoi_utils-0.3.17.dist-info/METADATA,sha256=saT-_cFT11QQw7MU-ogdaBT1U_VKl_00zHqo5QRPVF4,15055
-anemoi_utils-0.3.17.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-anemoi_utils-0.3.17.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
-anemoi_utils-0.3.17.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
-anemoi_utils-0.3.17.dist-info/RECORD,,
+anemoi_utils-0.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+anemoi_utils-0.4.0.dist-info/METADATA,sha256=k5BeXc7ZFltIC92FqulfU0PnQ0wY3OwVmyHyQKXjj6g,15114
+anemoi_utils-0.4.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+anemoi_utils-0.4.0.dist-info/entry_points.txt,sha256=LENOkn88xzFQo-V59AKoA_F_cfYQTJYtrNTtf37YgHY,60
+anemoi_utils-0.4.0.dist-info/top_level.txt,sha256=DYn8VPs-fNwr7fNH9XIBqeXIwiYYd2E2k5-dUFFqUz0,7
+anemoi_utils-0.4.0.dist-info/RECORD,,