imas-python 2.1.0.post1__tar.gz → 2.2.0__tar.gz

{imas_python-2.1.0.post1/imas_python.egg-info → imas_python-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imas-python
-Version: 2.1.0.post1
+Version: 2.2.0
 Summary: Pythonic wrappers for the IMAS Access Layer
 Author: ITER Organization
 Author-email: Karel Lucas van de Plassche <karelvandeplassche@gmail.com>, Daan van Vugt <dvanvugt@ignitioncomputing.com>, Maarten Sebregts <msebregts@ignitioncomputing.com>, imas-support@iter.org

{imas_python-2.1.0.post1 → imas_python-2.2.0}/conftest.py

@@ -9,7 +9,6 @@
 import functools
 import logging
 import os
-import sys
 from copy import deepcopy
 from pathlib import Path
 
@@ -22,7 +21,6 @@ import numpy as np
 import pytest
 from packaging.version import Version
 
-from imas.backends.imas_core.imas_interface import has_imas as _has_imas
 from imas.backends.imas_core.imas_interface import ll_interface, lowlevel
 from imas.dd_zip import dd_etree, dd_xml_versions, latest_dd_version
 from imas.ids_defs import (
@@ -39,17 +37,7 @@ logger.setLevel(logging.INFO)
 
 os.environ["IMAS_AL_DISABLE_VALIDATE"] = "1"
 
-
-try:
-    import imas  # noqa
-except ImportError:
-
-    class SkipOnIMASAccess:
-        def __getattr__(self, attr):
-            pytest.skip("This test requires the `imas` HLI, which is not available.")
-
-    # Any test that tries to access an attribute from the `imas` package will be skipped
-    sys.modules["imas"] = SkipOnIMASAccess()
+import imas  # noqa
 
 
 def pytest_addoption(parser):
@@ -78,7 +66,6 @@ except ImasCoreBackendException as iex:
     if "not available" in str(iex.message):
         _BACKENDS.pop("mdsplus")
 
-
 try:
     import pytest_xdist
 except ImportError:
@@ -91,28 +78,11 @@ except ImportError:
 @pytest.fixture(params=_BACKENDS)
 def backend(pytestconfig: pytest.Config, request: pytest.FixtureRequest):
     backends_provided = any(map(pytestconfig.getoption, _BACKENDS))
-    if not _has_imas:
-        if backends_provided:
-            raise RuntimeError(
-                "Explicit backends are provided, but IMAS is not available."
-            )
-        pytest.skip("No IMAS available, skip tests using a backend")
     if backends_provided and not pytestconfig.getoption(request.param):
         pytest.skip(f"Tests for {request.param} backend are skipped.")
     return _BACKENDS[request.param]
 
 
-@pytest.fixture()
-def has_imas():
-    return _has_imas
-
-
-@pytest.fixture()
-def requires_imas():
-    if not _has_imas:
-        pytest.skip("No IMAS available")
-
-
 def pytest_generate_tests(metafunc):
     if "ids_name" in metafunc.fixturenames:
         if metafunc.config.getoption("ids"):
@@ -214,7 +184,7 @@ def _lowlevel_wrapper(original_method):
 
 
 @pytest.fixture
-def log_lowlevel_calls(monkeypatch, requires_imas):
+def log_lowlevel_calls(monkeypatch):
     """Debugging fixture to log calls to the imas lowlevel module."""
     for al_function in dir(lowlevel):
         if al_function.startswith("ual_") or al_function.startswith("al"):

{imas_python-2.1.0.post1 → imas_python-2.2.0}/docs/source/api.rst

@@ -7,16 +7,24 @@ This page provides an auto-generated summary of IMAS-Python's API. For more deta
 and examples, refer to the relevant chapters in the main part of the
 documentation.
 
-IMAS-Python IDS manipulation
-----------------------------
+IMAS-Python public API
+----------------------
 
 .. currentmodule:: imas
 
 .. autosummary::
 
+   convert_core_edge_plasma.convert_to_plasma_profiles
+   convert_core_edge_plasma.convert_to_plasma_sources
+   convert_core_edge_plasma.convert_to_plasma_transport
    db_entry.DBEntry
+   ids_convert.convert_ids
+   ids_data_type.IDSDataType
    ids_factory.IDSFactory
-   ids_toplevel.IDSToplevel
+   ids_identifiers.identifiers
+   ids_metadata.IDSMetadata
+   ids_metadata.IDSType
    ids_primitive.IDSPrimitive
-   ids_structure.IDSStructure
    ids_struct_array.IDSStructArray
+   ids_structure.IDSStructure
+   ids_toplevel.IDSToplevel

{imas_python-2.1.0.post1 → imas_python-2.2.0}/docs/source/multi-dd.rst

@@ -276,27 +276,110 @@ You need to explicitly convert the data, which you can do as follows:
       entry.put(imas.convert_ids(equilibrium, entry.dd_version))
 
 
+.. _`UDA backend and DD versions`:
 
-.. _`DD background`:
+UDA backend caching and Data Dictionary versions
+------------------------------------------------
 
-Background information
-----------------------
+If you try to load data from a different Data Dictionary version with the UDA backend,
+you may see the following error:
+
+.. code-block:: text
+
+  The Data Dictionary version of the data (3.38.1) is different from the Data
+  Dictionary version of the DBEntry (3.42.0). This is not supported when using the
+  UDA backend.
+
+There are three possible workarounds. The first two require passing an additional option
+in the IMAS UDA URI: please see the `imas-core documentation
+<https://imas-core.readthedocs.io/en/stable/user_guide/backends_guide.html#query-keys-specific-for-the-uda-backend>`__
+for more details on these URI options.
+
+1. Use UDA fetch to bypass the cache problem. You can do this by appending ``&fetch=1``
+   to the URI when you create the :py:class:`~imas.db_entry.DBEntry`.
+
+   Note that this will download the entire IDS files from the remote server, this may
+   not be desired if you only want to read a single time slice.
+2. Disable the UDA cache. You can do this by appending ``&cache_mode=none`` to the URI
+   when you create the :py:class:`~imas.db_entry.DBEntry`.
+
+   Note that this may make the ``get()`` (a lot) slower, since a separate request needs
+   to be sent to the remote UDA server for every data variable. However, this may still
+   be the best performing option if you are only interested in a subset of all the data
+   in an IDS (and use :ref:`lazy loading`).
+3. Explicitly provide the data dictionary version when you create the
+   :py:class:`~imas.db_entry.DBEntry`, setting it to match the Data Dictionary version
+   of the data you want to load. To obtain the version of the data on the remote server
+   from the field `ids_properties.put_version.data_dictionary` via a _lazy_ ``get()``
+   with ``autoconvert=False`` option and using the ``&cache_mode=none`` query in the URI.
+   
+   Note that you may need to call ``imas.convert_ids`` to convert the IDS to your
+   desired Data Dictionary version.
+
+All three possible workarounds are shown in the examples below:
+
+.. md-tab-set::
+
+    .. md-tab-item:: Original code
+
+      .. code-block:: python
+
+        import imas
+
+        URI = (
+            "imas://uda.iter.org:56565/uda?backend=hdf5"
+            "&path=/work/imas/shared/imasdb/ITER/3/121013/50"
+        )
+        with imas.DBEntry(URI, "r") as entry:
+            cp = entry.get("core_profiles")
 
-Since IMAS-Python needs to have access to multiple DD versions it was chosen to
-bundle these with the code at build-time, in setup.py. If a git clone of the
-Data Dictionary succeeds, the setup tools automatically download saxon and
-generate ``IDSDef.xml`` for each of the tagged versions in the DD git
-repository. These are then gathered into ``IDSDef.zip``, which is
-distributed inside the IMAS-Python package.
+    .. md-tab-item:: 1. Use UDA fetch
 
-To update the set of data dictionaries new versions can be added to the zipfile.
-A reinstall of the package will ensure that all available versions are included
-in IMAS-Python. Additionally an explicit path to an XML file can be specified, which
-is useful for development.
+      .. code-block:: python
 
-Automated tests have been provided that check the loading of all of the DD
-versions tagged in the data-dictionary git repository.
+        import imas
 
+        URI = (
+            "imas://uda.iter.org:56565/uda?backend=hdf5"
+            "&path=/work/imas/shared/imasdb/ITER/3/121013/50&fetch=1"
+        )
+        with imas.DBEntry(URI, "r") as entry:
+            cp = entry.get("core_profiles")
+
+    .. md-tab-item:: 2. Disable the UDA cache
+
+      .. code-block:: python
+
+        import imas
+
+        URI = (
+            "imas://uda.iter.org:56565/uda?backend=hdf5"
+            "&path=/work/imas/shared/imasdb/ITER/3/121013/50&cache_mode=none"
+        )
+        with imas.DBEntry(URI, "r") as entry:
+            cp = entry.get("core_profiles")
+
+    .. md-tab-item:: 3. Explicitly provide the DD version
+
+      .. code-block:: python
+
+        import imas
+
+        URI = (
+            "imas://uda.iter.org:56565/uda?backend=hdf5"
+            "&path=/work/imas/shared/imasdb/ITER/3/121013/50"
+        )
+        with imas.DBEntry(URI, "r", dd_version="3.38.1") as entry:
+            cp = entry.get("core_profiles")
+
+        # Optional: convert the IDS to your desired DD version
+        cp = imas.convert_ids(cp, "3.42.0")
+
+
+.. _`DD background`:
+
+Background information
+----------------------
 
 Data Dictionary definitions
 '''''''''''''''''''''''''''

imas_python-2.2.0/imas/__init__.py

@@ -0,0 +1,58 @@
+# This file is part of IMAS-Python.
+# You should have received the IMAS-Python LICENSE file with this project.
+
+from packaging.version import Version as _V
+
+# Import logging _first_
+# isort: off
+from . import setup_logging  # noqa: F401
+
+# isort: on
+
+# Ensure that `imas.util` is loaded when importing imas
+from . import util  # noqa: F401
+
+# Public API:
+from ._version import version as __version__
+from ._version import version_tuple
+from .convert_core_edge_plasma import (
+    convert_to_plasma_profiles,
+    convert_to_plasma_sources,
+    convert_to_plasma_transport,
+)
+from .db_entry import DBEntry
+from .ids_convert import convert_ids
+from .ids_data_type import IDSDataType
+from .ids_factory import IDSFactory
+from .ids_identifiers import identifiers
+from .ids_metadata import IDSMetadata, IDSType
+from .ids_primitive import IDSPrimitive
+from .ids_struct_array import IDSStructArray
+from .ids_structure import IDSStructure
+from .ids_toplevel import IDSToplevel
+
+PUBLISHED_DOCUMENTATION_ROOT = "https://imas-python.readthedocs.io/en/latest/"
+"""URL to the published documentation."""
+OLDEST_SUPPORTED_VERSION = _V("3.22.0")
+"""Oldest Data Dictionary version that is supported by IMAS-Python."""
+
+__all__ = [
+    "__version__",
+    "version_tuple",
+    "DBEntry",
+    "IDSDataType",
+    "IDSFactory",
+    "IDSMetadata",
+    "IDSPrimitive",
+    "IDSStructure",
+    "IDSStructArray",
+    "IDSToplevel",
+    "IDSType",
+    "convert_ids",
+    "convert_to_plasma_profiles",
+    "convert_to_plasma_sources",
+    "convert_to_plasma_transport",
+    "identifiers",
+    "PUBLISHED_DOCUMENTATION_ROOT",
+    "OLDEST_SUPPORTED_VERSION",
+]

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/_to_xarray.py

@@ -27,7 +27,7 @@ def to_xarray(ids: IDSToplevel, *paths: str) -> xarray.Dataset:
     # block checks if the paths are valid, and by using "metadata.path_string" we ensure
     # that / are used as separator.
     try:
-        paths = [ids.metadata[path].path_string for path in paths]
+        paths: list[str] = [ids.metadata[path].path_string for path in paths]
     except KeyError as exc:
         raise ValueError(str(exc)) from None
 

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.1.0.post1'
-__version_tuple__ = version_tuple = (2, 1, 0, 'post1')
+__version__ = version = '2.2.0'
+__version_tuple__ = version_tuple = (2, 2, 0)
 
-__commit_id__ = commit_id = 'g72d7ea383'
+__commit_id__ = commit_id = 'g049c5f765'

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/db_entry_impl.py

@@ -78,7 +78,7 @@ class DBEntryImpl(ABC):
         destination: IDSToplevel,
         lazy: bool,
         nbc_map: Optional[NBCPathMap],
-    ) -> None:
+    ) -> IDSToplevel:
         """Implement DBEntry.get/get_slice/get_sample. Load data from the data source.
 
         Args:

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/imas_core/al_context.py

@@ -115,7 +115,7 @@ class ALContext:
         tmin: float,
         tmax: float,
         dtime: Optional[numpy.ndarray],
-        interpolation_method: int,
+        interpolation_method: Optional[int],
     ) -> "ALContext":
         """Begin a new timerange action for use in a ``with`` context."""
         ctx = ll_interface.begin_timerange_action(
@@ -163,7 +163,7 @@ class ALContext:
         """Call ual_write_data with this context."""
         status = ll_interface.write_data(self.ctx, path, timebasepath, data)
         if status != 0:
-            raise LowlevelError(f"write data at {path!r}: {status=}")
+            raise LowlevelError(f"write data at {path!r}", status)
 
     def list_all_occurrences(self, ids_name: str) -> List[int]:
         """List all occurrences of this IDS."""
@@ -359,7 +359,7 @@ class LazyALContext:
         tmin: float,
         tmax: float,
         dtime: Optional[numpy.ndarray],
-        interpolation_method: int,
+        interpolation_method: Optional[int],
     ) -> Iterator["LazyALContext"]:
         """Lazily start a lowlevel timerange action, see
         :meth:`ALContext.timerange_action`.

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/imas_core/db_entry_al.py

@@ -38,8 +38,8 @@ from imas.ids_toplevel import IDSToplevel
 
 from .al_context import ALContext, LazyALContext
 from .db_entry_helpers import delete_children, get_children, put_children
-from .imas_interface import LLInterfaceError, has_imas, ll_interface
-from .mdsplus_model import mdsplus_model_dir
+from .imas_interface import LLInterfaceError, ll_interface
+from .mdsplus_model import mdsplus_model_dir, get_mdsplus_model_var
 from .uda_support import extract_idsdef, get_dd_version_from_idsdef_xml
 
 _OPEN_MODES = {
@@ -52,14 +52,6 @@ _OPEN_MODES = {
 logger = logging.getLogger(__name__)
 
 
-def require_imas_available():
-    if not has_imas:
-        raise RuntimeError(
-            "The IMAS Core library is not available. Please install 'imas_core', "
-            "or load a supported IMAS module if you use an HPC environment."
-        )
-
-
 class ALDBEntryImpl(DBEntryImpl):
     """DBEntry implementation using imas_core as a backend."""
 
@@ -86,7 +78,6 @@ class ALDBEntryImpl(DBEntryImpl):
 
     @classmethod
     def from_uri(cls, uri: str, mode: str, factory: IDSFactory) -> "ALDBEntryImpl":
-        require_imas_available()
         if mode not in _OPEN_MODES:
             modes = list(_OPEN_MODES)
             raise ValueError(f"Unknown mode {mode!r}, was expecting any of {modes}")
@@ -105,9 +96,6 @@ class ALDBEntryImpl(DBEntryImpl):
         options: Any,
         factory: IDSFactory,
     ) -> "ALDBEntryImpl":
-        # Raise an error if imas is not available
-        require_imas_available()
-
         # Set defaults
         user_name = user_name or getpass.getuser()
         data_version = data_version or factory.dd_version
@@ -131,7 +119,7 @@ class ALDBEntryImpl(DBEntryImpl):
                 # Building the MDS+ models is required when creating a new Data Entry
                 ids_path = mdsplus_model_dir(factory)
                 if ids_path:
-                    os.environ["ids_path"] = ids_path
+                    os.environ[get_mdsplus_model_var()] = ids_path
 
         elif backend == "uda":
             # Set IDSDEF_PATH to point the UDA backend to the selected DD version
@@ -149,7 +137,7 @@ class ALDBEntryImpl(DBEntryImpl):
             if idsdef_path is None:
                 # Extract XML from the DD zip and point UDA to it
                 idsdef_path = extract_idsdef(factory.version)
-            os.environ["IDSDEF_PATH"] = idsdef_path
+            os.environ["IDSDEF_PATH"] = str(idsdef_path)
 
         elif backend in ["hdf5", "memory", "ascii", "flexbuffers"]:
             pass  # nothing to set up
@@ -184,7 +172,7 @@ class ALDBEntryImpl(DBEntryImpl):
         destination: IDSToplevel,
         lazy: bool,
         nbc_map: Optional[NBCPathMap],
-    ) -> None:
+    ) -> IDSToplevel:
         if self._db_ctx is None:
             raise RuntimeError("Database entry is not open.")
         if lazy and self.backend == "ascii":
@@ -268,6 +256,22 @@ class ALDBEntryImpl(DBEntryImpl):
             raise DataEntryException(
                 f"IDS {ids_name!r}, occurrence {occurrence} is empty."
             )
+
+        # UDA caching doesn't play well when the DD version of the on-disk IDS doesn't
+        # match the DD version of this DBEntry. See GH#97
+        if self.backend == "uda" and dd_version != self._ids_factory.dd_version:
+            cache_mode = self._querydict.get("cache_mode")
+            fetch = self._querydict.get("fetch")
+            if cache_mode != "none" and fetch not in ("1", "true"):
+                raise RuntimeError(
+                    f"The Data Dictionary version of the data ({dd_version}) is "
+                    "different from the Data Dictionary version of the DBEntry "
+                    f"({self._ids_factory.dd_version}). This is not supported when "
+                    f"using the UDA backend. See {imas.PUBLISHED_DOCUMENTATION_ROOT}"
+                    "multi-dd.html#uda-backend-caching-and-data-dictionary-versions "
+                    "for more details and workarounds."
+                )
+
         return dd_version
 
     def put(self, ids: IDSToplevel, occurrence: int, is_slice: bool) -> None:
@@ -299,7 +303,7 @@ class ALDBEntryImpl(DBEntryImpl):
         if occurrence != 0:
             ll_path += f"/{occurrence}"
 
-        time_mode = ids.ids_properties.homogeneous_time
+        time_mode = int(ids.ids_properties.homogeneous_time)
         if is_slice:
             with self._db_ctx.global_action(ll_path, READ_OP) as read_ctx:
                 db_time_mode = read_ctx.read_data(
@@ -344,9 +348,12 @@ class ALDBEntryImpl(DBEntryImpl):
             ll_path += f"/{occurrence}"
         ids = self._ids_factory.new(ids_name)
         with self._db_ctx.global_action(ll_path, WRITE_OP) as write_ctx:
-            delete_children(ids.metadata, write_ctx, "")
+            delete_children(ids.metadata, write_ctx)
 
     def list_all_occurrences(self, ids_name: str) -> List[int]:
+        if self._db_ctx is None:
+            raise RuntimeError("Database entry is not open.")
+
         try:
             occurrence_list = self._db_ctx.list_all_occurrences(ids_name)
         except LLInterfaceError:

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/imas_core/imas_interface.py

@@ -12,30 +12,17 @@ import logging
 
 from packaging.version import Version
 
-logger = logging.getLogger(__name__)
+# Import the Access Layer module
+# First try to import imas_core, which is available since AL 5.2
+from imas_core import _al_lowlevel as lowlevel
+from imas_core import imasdef  # noqa: F401
 
+logger = logging.getLogger(__name__)
 
-# Import the Access Layer module
-has_imas = True
-try:
-    # First try to import imas_core, which is available since AL 5.2
-    from imas_core import _al_lowlevel as lowlevel
-    from imas_core import imasdef
-
-    # Enable throwing exceptions from the _al_lowlevel interface
-    enable_exceptions = getattr(lowlevel, "imas_core_config_enable_exceptions", None)
-    if enable_exceptions:
-        enable_exceptions()
-
-except ImportError as exc:
-    imas = None
-    has_imas = False
-    imasdef = None
-    lowlevel = None
-    logger.warning(
-        "Could not import 'imas_core': %s. Some functionality is not available.",
-        exc,
-    )
+# Enable throwing exceptions from the _al_lowlevel interface
+enable_exceptions = getattr(lowlevel, "imas_core_config_enable_exceptions", None)
+if enable_exceptions:
+    enable_exceptions()
 
 
 class LLInterfaceError(RuntimeError):

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/imas_core/mdsplus_model.py

@@ -14,6 +14,7 @@ import uuid
 from pathlib import Path
 from subprocess import CalledProcessError, check_output
 from zlib import crc32
+from packaging.version import Version
 
 try:
     from importlib.resources import as_file, files
@@ -24,6 +25,8 @@ from imas.dd_zip import get_dd_xml, get_dd_xml_crc
 from imas.exception import MDSPlusModelError
 from imas.ids_factory import IDSFactory
 
+from .imas_interface import ll_interface
+
 logger = logging.getLogger(__name__)
 
 
@@ -292,6 +295,20 @@ def create_model_ids_xml(cache_dir_path, fname, version):
         raise e
 
 
+def get_mdsplus_model_var() -> str:
+    """
+    Return the environemnt variable name used by IMAS-Core to locate models:
+
+    - 'ids_path' for IMAS-Core<5.6
+    - 'MDSPLUS_MODELS_PATH' for IMAS-Core>=5.6
+    """
+    return (
+        "ids_path"
+        if ll_interface._al_version < Version("5.6.0")
+        else "MDSPLUS_MODELS_PATH"
+    )
+
+
 def create_mdsplus_model(cache_dir_path: Path) -> None:
     """Use jtraverser to compile a valid MDS model file."""
     try:
@@ -322,7 +339,7 @@ def create_mdsplus_model(cache_dir_path: Path) -> None:
             env={
                 "PATH": os.environ.get("PATH", ""),
                 "LD_LIBRARY_PATH": os.environ.get("LD_LIBRARY_PATH", ""),
-                "ids_path": str(cache_dir_path),
+                get_mdsplus_model_var(): str(cache_dir_path),
             },
         )
         # Touch a file to show that we have finished the model
@@ -349,7 +366,7 @@ def jTraverser_jar() -> Path:
     for component in os.environ.get("CLASSPATH", "").split(":"):
         if component.endswith(".jar"):
             if re.search(".*jTraverser.jar", component):
-                return component
+                return Path(component)
         else:  # assume its a directory (strip any '*' suffix)
             search_dirs.append(component.rstrip("*"))
 

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/imas_core/uda_support.py

@@ -1,6 +1,6 @@
 import logging
 from pathlib import Path
-from typing import Union
+from typing import Union, Optional
 from xml.etree import ElementTree as ET
 
 from imas import dd_zip
@@ -10,7 +10,7 @@ from .mdsplus_model import _get_xdg_cache_dir
 logger = logging.getLogger(__name__)
 
 
-def get_dd_version_from_idsdef_xml(path: Union[str, Path]) -> str:
+def get_dd_version_from_idsdef_xml(path: Union[str, Path]) -> Optional[str]:
     """Parse the IDSDef.xml up to the point where the Data Dictionary version is set.
 
     Returns:

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/netcdf/db_entry_nc.py

@@ -100,7 +100,7 @@ class NCDBEntryImpl(DBEntryImpl):
         destination: IDSToplevel,
         lazy: bool,
         nbc_map: Optional[NBCPathMap],
-    ) -> None:
+    ) -> IDSToplevel:
         # Feature compatibility checks
         if parameters is not None:
             if isinstance(parameters, GetSliceParameters):

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/netcdf/nc2ids.py

@@ -157,6 +157,8 @@ class NC2IDS:
                     for index, node in indexed_tree_iter(self.ids, target_metadata):
                         value = data[index]
                         if value != getattr(var, "_FillValue", None):
+                            if isinstance(value, np.generic):
+                                value = value.item()
                             # NOTE: bypassing IDSPrimitive.value.setter logic
                             node._IDSPrimitive__value = value
 
@@ -166,10 +168,16 @@ class NC2IDS:
                 # here, we'll let IDSPrimitive.value.setter take care of it:
                 self.ids[target_metadata.path].value = data
 
-            else:
+            # We need to unpack 0D ints, floats and complex numbers. For better
+            # performance this check is done outside the for-loop:
+            elif metadata.ndim or metadata.data_type is IDSDataType.STR:
                 for index, node in indexed_tree_iter(self.ids, target_metadata):
                     # NOTE: bypassing IDSPrimitive.value.setter logic
                     node._IDSPrimitive__value = data[index]
+            else:
+                for index, node in indexed_tree_iter(self.ids, target_metadata):
+                    # NOTE: bypassing IDSPrimitive.value.setter logic
+                    node._IDSPrimitive__value = data[index].item()  # Unpack 0D value
 
     def validate_variables(self) -> None:
         """Validate that all variables in the netCDF Group exist and match the DD."""
@@ -365,7 +373,7 @@ class LazyContext:
                 value = var[self.index]
 
             if value is not None:
-                if isinstance(value, np.ndarray):
+                if isinstance(value, (np.ndarray, np.generic)):
                     if value.ndim == 0:  # Unpack 0D numpy arrays:
                         value = value.item()
                     else:

{imas_python-2.1.0.post1 → imas_python-2.2.0}/imas/backends/netcdf/nc_metadata.py

@@ -1,7 +1,6 @@
 # This file is part of IMAS-Python.
 # You should have received the IMAS-Python LICENSE file with this project.
-"""NetCDF metadata for dimensions and tensorization of IDSs.
-"""
+"""NetCDF metadata for dimensions and tensorization of IDSs."""
 
 from functools import lru_cache
 from typing import Dict, List, Optional, Set, Tuple
@@ -89,7 +88,7 @@ class NCMetadata:
         # Add cache for public API
         self.get_dimensions = lru_cache(maxsize=None)(self.get_dimensions)
 
-    def get_coordinates(self, path: str, homogeneous_time: bool) -> Tuple[str]:
+    def get_coordinates(self, path: str, homogeneous_time: bool) -> Tuple[str, ...]:
         """Get the coordinates (adhering to CF conventions) for a netCDF variable.
 
         Args:
@@ -109,7 +108,7 @@ class NCMetadata:
             for coord in self.coordinates[path]
         )
 
-    def get_dimensions(self, path: str, homogeneous_time: bool) -> Tuple[str]:
+    def get_dimensions(self, path: str, homogeneous_time: bool) -> Tuple[str, ...]:
         """Get the dimensions for a netCDF variable.
 
         Args: