imas-python 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

imas/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.3.1'
+__version_tuple__ = version_tuple = (2, 3, 1)
 
-__commit_id__ = commit_id = None
+__commit_id__ = commit_id = 'gdc78cc36c'

imas/backends/imas_core/mdsplus_model.py

@@ -12,7 +12,7 @@ import tempfile
 import time
 import uuid
 from pathlib import Path
-from subprocess import CalledProcessError, check_output
+from subprocess import STDOUT, CalledProcessError, check_output
 from zlib import crc32
 from packaging.version import Version
 
@@ -324,12 +324,19 @@ def create_mdsplus_model(cache_dir_path: Path) -> None:
                 "Could not determine CompileTree class in jTraverser.jar."
             )
         compiletree = compiletree_class.rpartition(".class")[0].replace("/", ".")
+        # only add option to suppress warning if the JVM supports it
+        native_access = ["--enable-native-access=ALL-UNNAMED"]
+        try:
+            check_output(["java", *native_access, "-version"], stderr=STDOUT)
+        except CalledProcessError:
+            native_access = []
         check_output(
             [
                 "java",
                 "-Xms1g",  # what do these do?
                 "-Xmx8g",  # what do these do?
                 "-XX:+UseG1GC",  # what do these do?
+                *native_access,
                 "-cp",
                 jarfile,
                 compiletree,
@@ -339,13 +346,14 @@ def create_mdsplus_model(cache_dir_path: Path) -> None:
             env={
                 "PATH": os.environ.get("PATH", ""),
                 "LD_LIBRARY_PATH": os.environ.get("LD_LIBRARY_PATH", ""),
-                get_mdsplus_model_var(): str(cache_dir_path),
+                # MDSplus locates models through '<tree>_path' (tree='ids')
+                "ids_path": str(cache_dir_path),
             },
         )
         # Touch a file to show that we have finished the model
         (cache_dir_path / "done.txt").touch()
     except CalledProcessError as e:
-        logger.error("Error making MDSPlus model in {path}", cache_dir_path)
+        logger.error("Error making MDSPlus model in %s", cache_dir_path)
         raise e
 
 

imas/ids_coordinates.py

@@ -81,7 +81,7 @@ class IDSCoordinate:
                     logger.debug(
                         f"Ignoring invalid coordinate specifier {spec}", exc_info=True
                     )
-        self.references: "tuple[IDSPath]" = tuple(refs)
+        self.references: "tuple[IDSPath, ...]" = tuple(refs)
         """A tuple paths that this coordinate refers to.
         """
 
@@ -357,7 +357,6 @@ class IDSCoordinates:
         IDSPath.goto().
         """
         did_capture = []
-        path = self._node._path
         try:
             yield did_capture
         except CoordinateLookupError as exc:
@@ -365,6 +364,7 @@ class IDSCoordinates:
         except IndexError as exc:
             # Can happen in IDSPath.goto when an invalid index is encountered.
             coordinate_refs = coordinate.format_refs(self._node)
+            path = self._node._path
             raise ValidationError(
                 f"Error while validating element `{path}`: dimension {dim + 1} has an "
                 f"invalid index for coordinate(s) {coordinate_refs}."
@@ -372,13 +372,14 @@ class IDSCoordinates:
         except Exception as exc:
             # Ignore all other exceptions and log them
             if "Unexpected index" in str(exc):
-                logger.debug(
-                    "Ignored AoS coordinate outside our tree (see IMAS-4675) of "
-                    "element `%s`, dimension %s, coordinate `%s`",
-                    path,
-                    dim,
-                    coordinate.references,
-                )
+                if logger.isEnabledFor(logging.DEBUG):
+                    logger.debug(
+                        "Ignored AoS coordinate outside our tree (see IMAS-4675) "
+                        "of element `%s`, dimension %s, coordinate `%s`",
+                        self._node._path,
+                        dim,
+                        coordinate.references,
+                    )
             else:
                 if self._node._version <= "3.38.1":
                     version_error = (
@@ -395,7 +396,7 @@ class IDSCoordinates:
                     coordinate.references,
                     dim,
                     version_error,
-                    exc_info=1,
+                    exc_info=True,
                 )
             # Flag to the caller that an error was suppressed
             did_capture.append(1)

imas/ids_structure.py

@@ -57,7 +57,7 @@ class IDSStructure(IDSBase):
     def __getattr__(self, name):
         if name not in self._children:
             raise AttributeError(
-                f"IDS structure '{self._path}' has no attribute '{name}'"
+                f"IDS structure '{self.metadata.path_string}' has no attribute '{name}'"
             )
         # Create child node
         child_meta = self._children[name]

imas/test/test_hash.py

@@ -27,7 +27,7 @@ def test_hash_str1d(minimal):
         "multiple entries to test!",
     ]
     minimal.str_1d = string_list
-    hashes = list(map(xxh3_64_digest, string_list))
+    hashes = [xxh3_64_digest(s.encode("utf-8")) for s in string_list]
     expected = xxh3_64_digest(struct.pack("<Q", len(string_list)) + b"".join(hashes))
     assert expected == b"\x98\x011\x9dx+\x0e\xc0"
     assert imas.util.calc_hash(minimal.str_1d) == expected

{imas_python-2.3.0.dist-info → imas_python-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imas-python
-Version: 2.3.0
+Version: 2.3.1
 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.3.0.dist-info → imas_python-2.3.1.dist-info}/RECORD

@@ -2,14 +2,14 @@ imas/__init__.py,sha256=VTV46C_bCi6ODs6LMee0WeGrUElNIAmDZ_oKM3_rJmo,1630
 imas/__main__.py,sha256=nei61YSa3KE4V601qcApNQYgv9hKMenoMJyZLWmsHRQ,418
 imas/_to_xarray.py,sha256=zxHNmKEk_7NRcWHwhWgBMTyy312DrsSC69RxuGs3itk,3060
 imas/_util.py,sha256=3CwP5yoyXNipyaUdMb-IwzVDlqV35VjTFxfaronO1AI,9484
-imas/_version.py,sha256=MrWYRYfolpd3nMW8K6V8c2KLgTXCmV5o8cpGKFOPmaM,520
+imas/_version.py,sha256=Mmte4PyEwEwp7yPmOH-H0YLZXIrr0ShJ4zHbarTXHEg,528
 imas/convert_core_edge_plasma.py,sha256=WcBOrYcepw-sixZWrFKFqvG1SdBDO0MGaQoN1xtj4Fg,4967
 imas/db_entry.py,sha256=0REHHrC_u56TJoBvWsyf6ih0ug2YNJIMCV6x8_PrYpI,34503
 imas/dd_zip.py,sha256=Fiu81NjIyQ-4tdmpaUNJtgKohiNYWIzYcNz96S9zrZ4,3988
 imas/exception.py,sha256=IuANFtLz1jRHgbS9SERcK9bSFiGFcBSmNkWbQwNPVuo,3293
 imas/ids_base.py,sha256=tgBUoV0Mf-3xdzs2qnD9EnmCXqzbX-pm06Ha7Xq9X04,5489
 imas/ids_convert.py,sha256=qaGiogQq1tW2RMfYQhMWqqdusyKxGFXT2LDcpuA1KVM,57412
-imas/ids_coordinates.py,sha256=kDph5YTrlGsEMa8ZvOWDHIl1dYzIx7NIIvidyMr09sI,16993
+imas/ids_coordinates.py,sha256=wXFwrGNOl4PQ6YKaX5t4OVLNAodkuYkLHphd9PSqt4I,17100
 imas/ids_data_type.py,sha256=N3nQXmIht0q8BbqE99sPsTmZ62CTUHv10Pfj_rtYi54,3302
 imas/ids_defs.py,sha256=sOZpuAnJT9VJPJoTWwATUOirmPsWhcK38B7K222xbik,3779
 imas/ids_factory.py,sha256=dMNy0-B7IbfhZ13QE0G2S0nVonmbqUmhprCbFYtKltw,4670
@@ -18,7 +18,7 @@ imas/ids_metadata.py,sha256=LkZ7-BQ9EB1X4w4Ocp0frk4eSJImmWWsfL0mp9m79Xg,12283
 imas/ids_path.py,sha256=jJzp7jmIMQr6ZeQJvLEEIIf0cF9NKIcv2DkCP-HNrt4,10446
 imas/ids_primitive.py,sha256=nve5n1p43nQTYLL0BvaFfgGpTI-Glu1kKMnSVVePuu4,16862
 imas/ids_struct_array.py,sha256=o9xgl_K0SDlqIapmhAT7dQ997RGW2cPAYQFI4P_h59w,8292
-imas/ids_structure.py,sha256=7E-sLhfQx8SCGmVHRVswZku8IZRAHuhcpRlKSyaEQns,13185
+imas/ids_structure.py,sha256=m886jxpBP9guN3HU-juFLFdwaZisq7jY83ZwInpNch8,13200
 imas/ids_toplevel.py,sha256=2UiA06C6amyRxTePzpMIUakTYvzeq1Xt1t_09sj4oYg,14572
 imas/setup_logging.py,sha256=0v4_haGLsUJr8fHkl46UmTEgMImBzvfL2xU5kudB9ac,1872
 imas/training.py,sha256=J3Zpx_86V1USz-_1KvCsCe7MEwBrf5LAo_8-aM5Stu8,1067
@@ -41,7 +41,7 @@ imas/backends/imas_core/al_context.py,sha256=uDAe3boSKvOQBhtUo4dSUJeduXZ2MSEmKd_
 imas/backends/imas_core/db_entry_al.py,sha256=lhuIllXs32qy73QF3bIzLwZKm6pBnQ_hR7ScprJ3U6I,16233
 imas/backends/imas_core/db_entry_helpers.py,sha256=fjvb3gEBiAzexDCyIsoGTwEcWuvPwhjZ0epXa-p_9hA,7883
 imas/backends/imas_core/imas_interface.py,sha256=so2DlmRdUHdgwfU-euoB7dLeeWwiyiOhfal_aoL1lWQ,6470
-imas/backends/imas_core/mdsplus_model.py,sha256=RDycMYOAKWevutDR75964GKBAcQM4Rzdu-zB5gv_f1U,14590
+imas/backends/imas_core/mdsplus_model.py,sha256=UthFelK9-R3JoS0jQzGjh6mFHzAYWz3ScXb7l2AVQ1g,14978
 imas/backends/imas_core/uda_support.py,sha256=m2IJSvVFnaOLjz3ZIftX_eBNa7BY48V-G3kW6rrZ42g,1790
 imas/backends/netcdf/__init__.py,sha256=T1xOq4F7fJtFKYtzQQwVOV_9r9plNH6kgpUsDx6vDN0,191
 imas/backends/netcdf/db_entry_nc.py,sha256=qmYGraRXlo8YeEQ1VQ8LI4sQo5-cUh5Ow64txhJH-hw,8010
@@ -64,7 +64,7 @@ imas/test/test_dd_zip.py,sha256=SgKPufIvk3tK_Q4JpHKq57g0lKthEj1IgcdZ2c-IzwI,820
 imas/test/test_deepcopy.py,sha256=vYTwpEqRpi-G-xVSRWVIwLL_jBY7f6v31QPOU0e_FKs,606
 imas/test/test_exception.py,sha256=AMFlZGy0-gG9MlYTs8WeAuO3m0holk4kG3HicrqP4HQ,395
 imas/test/test_get_sample.py,sha256=BMoVJS4PgtV3S-AUnH6MJO2F8og1TZQk3KzOxGVa0as,16031
-imas/test/test_hash.py,sha256=l4yoTBOm4QFsOTYxbhC3v5Ll7ytfEcbL4aVsu3wBEfc,6122
+imas/test/test_hash.py,sha256=JubQXiIwvqF0YErn5KMcuWu9OGqjK2J4vBHjVOW2GMM,6140
 imas/test/test_helpers.py,sha256=M6rTG9C-0lV4P7h7uxQ_DAszn-iqUHir-wy97I4nySM,14919
 imas/test/test_identifiers.py,sha256=abdg8JdcDbuctL5teZwyMf5zR3N99y63XMq1f0_0xI8,11344
 imas/test/test_ids2nc.py,sha256=zLp0F6GW04gU6HYp63bWivFS3Let_dwMohYy6Rgbis0,6040
@@ -106,9 +106,9 @@ imas/test/test_time_slicing.py,sha256=gq9L4VolKpTdleqQpTahZDYPn0VHkKEwOFQjlkGxR9
 imas/test/test_to_xarray.py,sha256=yuqqP_VEdftJyFiC1BEeKpcXaKszOATU5QE94q2NZX4,3853
 imas/test/test_uda_support.py,sha256=AmakuexebZfJ2-vk_DHfNRPwHmNM2RnwzXqT0eWwWJ0,338
 imas/test/test_util.py,sha256=BW5EbL-QDIrJNH7tjBgqOacJY0TXvMidXVKpIVZlv1I,6775
-imas_python-2.3.0.dist-info/licenses/LICENSE.txt,sha256=RzxtV7MG0zbF6dDvQsaZ1OKsHZ7CRyeILenjUIol5rs,7651
-imas_python-2.3.0.dist-info/METADATA,sha256=W7ySJZRL3ZlIAaC8IS1jjbhDj47AMesrtrObDmqwhUc,14193
-imas_python-2.3.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-imas_python-2.3.0.dist-info/entry_points.txt,sha256=PI0yiL4MmzUS-sIQjt4gSEnBCdL-rB_XHGASKNsTf6g,46
-imas_python-2.3.0.dist-info/top_level.txt,sha256=_WFOlA1rmpYm0T73sNo5Ntvs7S3x4cR7UE8Oy5I5eJA,5
-imas_python-2.3.0.dist-info/RECORD,,
+imas_python-2.3.1.dist-info/licenses/LICENSE.txt,sha256=RzxtV7MG0zbF6dDvQsaZ1OKsHZ7CRyeILenjUIol5rs,7651
+imas_python-2.3.1.dist-info/METADATA,sha256=3_iOWzC_ukMROb9v2S1I69mGilYTL52taNDJSB0JA1k,14193
+imas_python-2.3.1.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+imas_python-2.3.1.dist-info/entry_points.txt,sha256=PI0yiL4MmzUS-sIQjt4gSEnBCdL-rB_XHGASKNsTf6g,46
+imas_python-2.3.1.dist-info/top_level.txt,sha256=_WFOlA1rmpYm0T73sNo5Ntvs7S3x4cR7UE8Oy5I5eJA,5
+imas_python-2.3.1.dist-info/RECORD,,

{imas_python-2.3.0.dist-info → imas_python-2.3.1.dist-info}/WHEEL

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