imas-python 0.1.dev1648__py3-none-any.whl → 0.1.dev1651__py3-none-any.whl

imas/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.dev1648'
-__version_tuple__ = version_tuple = (0, 1, 'dev1648')
+__version__ = version = '0.1.dev1651'
+__version_tuple__ = version_tuple = (0, 1, 'dev1651')

imas/backends/imas_core/mdsplus_model.py

@@ -13,6 +13,7 @@ import tempfile
 import time
 import uuid
 from pathlib import Path
+from saxonche import PySaxonProcessor
 from subprocess import CalledProcessError, check_output
 from zlib import crc32
 
@@ -22,7 +23,6 @@ except ImportError:  # Python 3.8 support
     from importlib_resources import as_file, files
 
 import imas
-from imas.dd_helpers import get_saxon
 from imas.dd_zip import get_dd_xml, get_dd_xml_crc
 from imas.exception import MDSPlusModelError
 from imas.ids_factory import IDSFactory
@@ -241,35 +241,84 @@ def model_exists(path: Path) -> bool:
     )
 
 
-def create_model_ids_xml(cache_dir_path, fname, version):
-    """Use saxon to compile an ids.xml suitable for creating an mdsplus model."""
+# def create_model_ids_xml(cache_dir_path, fname, version):
+#     """Use saxon to compile an ids.xml suitable for creating an mdsplus model."""
+
+#     try:
+#         # we have to be careful to have the same version of this file as in the access
+#         # layer:
+#         with as_file(files(imas) / "assets" / "IDSDef2MDSpreTree.xsl") as xslfile:
+#             check_output(
+#                 [
+#                     "java",
+#                     "net.sf.saxon.Transform",
+#                     "-s:" + str(fname),
+#                     "-o:" + str(Path(cache_dir_path) / "ids.xml"),
+#                     "DD_GIT_DESCRIBE=" + str(version or fname),
+#                     # if this is expected as git describe it might break
+#                     # if we just pass a filename
+#                     "AL_GIT_DESCRIBE=" + os.environ.get("AL_VERSION", "0.0.0"),
+#                     "-xsl:" + str(xslfile),
+#                 ],
+#                 input=get_dd_xml(version) if version else None,
+#                 env={"CLASSPATH": get_saxon(), "PATH": os.environ.get("PATH", "")},
+#             )
+#     except CalledProcessError as e:
+#         if fname:
+#             logger.error("Error making MDSPlus model IDS.xml for %s", fname)
+#         else:
+#             logger.error("Error making MDSplus model IDS.xml for %s", version)
+#         raise e
+
 
+def create_model_ids_xml(cache_dir_path, fname, version):
+    """Use Saxon/C to compile an ids.xml suitable for creating an MDSplus model."""
     try:
-        # we have to be careful to have the same version of this file as in the access
-        # layer:
-        with as_file(files(imas) / "assets" / "IDSDef2MDSpreTree.xsl") as xslfile:
-            check_output(
-                [
-                    "java",
-                    "net.sf.saxon.Transform",
-                    "-s:" + str(fname),
-                    "-o:" + str(Path(cache_dir_path) / "ids.xml"),
-                    "DD_GIT_DESCRIBE=" + str(version or fname),
-                    # if this is expected as git describe it might break
-                    # if we just pass a filename
-                    "AL_GIT_DESCRIBE=" + os.environ.get("AL_VERSION", "0.0.0"),
-                    "-xsl:" + str(xslfile),
-                ],
-                input=get_dd_xml(version) if version else None,
-                env={"CLASSPATH": get_saxon(), "PATH": os.environ.get("PATH", "")},
-            )
-    except CalledProcessError as e:
+        # Locate the XSL file within the package
+        with as_file(files("imas") / "assets" / "IDSDef2MDSpreTree.xsl") as xslfile:
+            output_file = Path(cache_dir_path) / "ids.xml"
+            
+            # Initialize Saxon/C processor
+            with PySaxonProcessor(license=False) as proc:
+                xslt_processor = proc.new_xslt30_processor()
+
+                # Set the XSLT stylesheet
+                xslt_processor.compile_stylesheet(stylesheet_file=str(xslfile))
+
+                # Prepare the input XML source
+                input_xml = get_dd_xml(version) if version else None
+                if fname:
+                    source_file = str(fname)
+                elif input_xml:
+                    source_file = "-"  # Use standard input for the XML string
+                else:
+                    raise ValueError("Either 'fname' or 'version' must be provided to generate XML.")
+
+                # xdm_ddgit = proc.make_string_value(str(version or fname))
+                # xsltproc.set_parameter("DD_GIT_DESCRIBE", xdm_ddgit)
+                # xdm_algit = proc.make_string_value(os.environ.get("AL_VERSION", "0.0.0"))
+                # xsltproc.set_parameter("AL_GIT_DESCRIBE", xdm_algit)
+                # Transform XML
+                result = xslt_processor.transform_to_file(
+                    source_file=source_file,
+                    output_file=str(output_file),
+                    initial_template_params={
+                        "DD_GIT_DESCRIBE": str(version or fname),
+                        "AL_GIT_DESCRIBE": os.environ.get("AL_VERSION", "0.0.0"),
+                    },
+                )
+
+                if result is False:
+                    logger.error("Transformation failed: Check Saxon/C logs for details.")
+                    raise RuntimeError("Saxon/C XSLT transformation failed.")
+
+    except Exception as e:
         if fname:
-            logger.error("Error making MDSPlus model IDS.xml for %s", fname)
+            logger.error("Error making MDSplus model IDS.xml for %s", fname)
         else:
             logger.error("Error making MDSplus model IDS.xml for %s", version)
         raise e
-
+    
 
 def create_mdsplus_model(cache_dir_path: Path) -> None:
     """Use jtraverser to compile a valid MDS model file."""

{imas_python-0.1.dev1648.dist-info → imas_python-0.1.dev1651.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: imas-python
-Version: 0.1.dev1648
+Version: 0.1.dev1651
 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-0.1.dev1648.dist-info → imas_python-0.1.dev1651.dist-info}/RECORD

@@ -1,7 +1,7 @@
 imas/__init__.py,sha256=9OHpTf8gCl7BJVU7U2bf9kWatBNNAhFZdgoFPcHeNQU,878
 imas/__main__.py,sha256=2qXoC0HzV4xkPQAvdubHC4rnK3G6f_2PT9TkkCHYXk8,418
 imas/_util.py,sha256=FXX13glhmgSiw-0LtjH0xv3YlM3Pa9X4jl9yz9Uv7Vs,9484
-imas/_version.py,sha256=XXs7cQDnAk8OFDnF4Rrmyxr2_X5OCidm8hPEAxt02hM,425
+imas/_version.py,sha256=fSc98cUXRjUwffuOpTh7lfHV2cigveu6PnuuiBQ8mq8,425
 imas/db_entry.py,sha256=OnAgz0c97gbEizrDcuO909VFUzOzeU1OIwWe50PCCxw,31755
 imas/dd_helpers.py,sha256=IFRmOWw0VyLuR9Xpe9VeVy1ANq5XpFF4m1rj9RtETKI,6275
 imas/dd_zip.py,sha256=6gQ91rlVsDaU1U6XXaEnaGyvI3ZgQ659GOgIYJLZH6M,10322
@@ -22,7 +22,7 @@ imas/ids_toplevel.py,sha256=YHWZewK8JYf34pYzF_oooMILZAHgnuWCFtr0_JFjmzI,14915
 imas/setup_logging.py,sha256=McfIYupRQDxtL-lasTjH5F8BxBvncuZhcpzSDEwKtJQ,1872
 imas/training.py,sha256=JGYjpCubUJDb_Rg0QaaDhNkBHc4Qc376U9fRq24NVXc,1576
 imas/util.py,sha256=dG282-l7m2U_VhjZ0VnQ-BpsWrzgKSxUZ1AZf-_wDOY,17822
-imas/assets/IDSDef.zip,sha256=spXujog-c2Fi2VsFHKvQYo9HrAFryd56si1xeLqOyYg,27383258
+imas/assets/IDSDef.zip,sha256=9t6K2hD_cWqt_HIcEJ7YPBqf1DIjbPH3oh89e-CByf8,27383258
 imas/assets/IDSDef2MDSpreTree.xsl,sha256=V9eDmDnxe6oYhDP81gmdYip8cF2yST9dGxmZBaATLdA,7296
 imas/assets/IDS_fake_toplevel.xml,sha256=TJhukQuDHHVTW2U7fK_-KmTQiYOFZMY-ECZXBHQE2mk,18683
 imas/assets/IDS_minimal.xml,sha256=5B6c0J-WPzSChHWwpLPRkNawx9m6v8BM5nC0OQFnWcQ,1740
@@ -41,7 +41,7 @@ imas/backends/imas_core/al_context.py,sha256=D5PUg6o487kR9diRK9ZclkCpzbn-Brzhkf-
 imas/backends/imas_core/db_entry_al.py,sha256=7HeXVm2HCNh8f3Ob81GQIRyeWZ-qu6kORWI5OOtyOjQ,14893
 imas/backends/imas_core/db_entry_helpers.py,sha256=HwWTyY-IF5gEGBuL6BsPnHFL3EZtaLIxr-ctC-3u_A0,8047
 imas/backends/imas_core/imas_interface.py,sha256=c4OHvhw-aCO4O9sDSmYdcZcgeeBwu0-BcozYpVhsCuQ,7978
-imas/backends/imas_core/mdsplus_model.py,sha256=IWmRCsH_fbRWsxV-bE8NFXu_Nh-vUnP5PfwmmTEg5XE,14110
+imas/backends/imas_core/mdsplus_model.py,sha256=Y33BqScO3EiN1Rgj9ia6oLKe02tTSi-x-Nx7h23Hcdc,16405
 imas/backends/imas_core/uda_support.py,sha256=lxHzby6Fkkpn5j6yWpQrlqlwng-gA9O_hVK03Wf_Ij8,1770
 imas/backends/netcdf/__init__.py,sha256=pyETe19IpVVezOS7mNzF_Zbt_eGoK8IWnQfG8P7V4CA,191
 imas/backends/netcdf/db_entry_nc.py,sha256=xx3GDeRbTpbsi2GW2wyaUFmrUKXjFJ0q4sSbMI_-WrQ,6828
@@ -101,9 +101,9 @@ imas/test/test_str_1d.py,sha256=d6GrmV4OYG9f4ludjZBmuqyKOM9XIExTqMh8aQ1UJcQ,3453
 imas/test/test_time_slicing.py,sha256=FwbdggRJ75Suc268-89daCSaVXhzl8pZZm3Od13EiR4,6959
 imas/test/test_uda_support.py,sha256=AmakuexebZfJ2-vk_DHfNRPwHmNM2RnwzXqT0eWwWJ0,338
 imas/test/test_util.py,sha256=BW5EbL-QDIrJNH7tjBgqOacJY0TXvMidXVKpIVZlv1I,6775
-imas_python-0.1.dev1648.dist-info/LICENSE.txt,sha256=RzxtV7MG0zbF6dDvQsaZ1OKsHZ7CRyeILenjUIol5rs,7651
-imas_python-0.1.dev1648.dist-info/METADATA,sha256=stbhrI6KQ8RMsOK4q_yjOejWusUuXpkAPKe3zZix1XY,13630
-imas_python-0.1.dev1648.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-imas_python-0.1.dev1648.dist-info/entry_points.txt,sha256=e8oXj2SLwyFEiBeJRaAXRc9EYQ8eHWWn7NWdjixjeDM,99
-imas_python-0.1.dev1648.dist-info/top_level.txt,sha256=_WFOlA1rmpYm0T73sNo5Ntvs7S3x4cR7UE8Oy5I5eJA,5
-imas_python-0.1.dev1648.dist-info/RECORD,,
+imas_python-0.1.dev1651.dist-info/LICENSE.txt,sha256=RzxtV7MG0zbF6dDvQsaZ1OKsHZ7CRyeILenjUIol5rs,7651
+imas_python-0.1.dev1651.dist-info/METADATA,sha256=hlboOUl0tPYJDpMpZG3espwHaQFQ7dFNJOsOhc6fRFE,13630
+imas_python-0.1.dev1651.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+imas_python-0.1.dev1651.dist-info/entry_points.txt,sha256=e8oXj2SLwyFEiBeJRaAXRc9EYQ8eHWWn7NWdjixjeDM,99
+imas_python-0.1.dev1651.dist-info/top_level.txt,sha256=_WFOlA1rmpYm0T73sNo5Ntvs7S3x4cR7UE8Oy5I5eJA,5
+imas_python-0.1.dev1651.dist-info/RECORD,,