moreniius 0.4.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

moreniius/mccode/instr.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass, field
 from mccode_antlr.instr import Instr
 from mccode_antlr.common import Expr
 from nexusformat.nexus import NXfield, NXgroup, NXcollection
+from typing import Union, Any
 
 
 @dataclass
@@ -51,12 +52,11 @@ class NXInstr:
         # quick and very dirty:
         return NXfield(str(self.instr))
 
-    def expr2nx(self, expr: Expr):
+    def expr2nx(self, expr: Union[str, Expr, Any]):
         from moreniius.utils import link_specifier
-        if isinstance(expr, list):
-            return [self.expr2nx(x) for x in expr]
-        if isinstance(expr, tuple):
-            return tuple([self.expr2nx(x) for x in expr])
+        if not isinstance(expr, str) and hasattr(expr, '__iter__'):
+            parts = [self.expr2nx(x) for x in expr]
+            return tuple(parts) if isinstance(expr, tuple) else parts
         if not isinstance(expr, Expr):
             return expr
 

moreniius/nexus_structure.py

@@ -8,17 +8,19 @@ from mccode_antlr.instr import Instr
 
 def load_instr(filepath: str | Path) -> Instr:
     """Loads an Instr object from a .instr file or a HDF5 file"""
-    from mccode_antlr.loader import load_mcstas_instr
-    from mccode_antlr.io import load_hdf5
-
     if not isinstance(filepath, Path):
         filepath = Path(filepath)
     if not filepath.exists() or not filepath.is_file():
         raise ValueError('The provided filepath does not exist or is not a file')
 
     if filepath.suffix == '.instr':
+        from mccode_antlr.loader import load_mcstas_instr
         return load_mcstas_instr(filepath)
+    elif filepath.suffix.lower() == '.json':
+        from mccode_antlr.io.json import load_json
+        return load_json(filepath)
 
+    from mccode_antlr.io import load_hdf5
     return load_hdf5(filepath)
 
 
@@ -30,9 +32,9 @@ def to_nexus_structure(instr: Instr) -> dict:
 
 
 def convert():
-    """Convert an Instr (HDF5) or .instr (text) file to an equivalent NeXus Structure JSON string"""
+    """Convert an Instr (HDF5|JSON) or .instr (text) file to an equivalent NeXus Structure JSON string"""
     import argparse
-    parser = argparse.ArgumentParser(description='Convert an Instr (HDF5) or .instr (text) file to an equivalent NeXus Structure JSON string')
+    parser = argparse.ArgumentParser(description='Convert an Instr (HDF5|JSON) or .instr (text) file to an equivalent NeXus Structure JSON string')
     parser.add_argument('filename', type=str, help='the file to convert')
     parser.add_argument('--format', type=str, default='json', help='the output format, currently only json')
     args = parser.parse_args()

moreniius/writer.py

@@ -9,10 +9,13 @@ def convert_types(obj, only_nx=True):
     if np_data_type.name == 'object':
         if isinstance(obj, ndarray):
             vl = obj.tolist()
-            el = vl[0]
-            for ii in range(1, len(obj.shape)):
-                el = el[0]
-            tp = dtype(type(el)).name
+            if len(vl):
+                el = vl[0]
+                for ii in range(1, len(obj.shape)):
+                    el = el[0]
+                tp = dtype(type(el)).name
+            else:
+                tp = obj.dtype.name
         elif obj is None:
             (tp, vl) = ('string', 'None')
         elif isinstance(obj, NXattr):

{moreniius-0.4.0.dist-info → moreniius-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moreniius
-Version: 0.4.0
+Version: 0.5.1
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
-Requires-Dist: mccode-antlr[hdf5]>=0.14.0
+Requires-Dist: mccode-antlr[hdf5]>=0.15.1
 Requires-Dist: nexusformat>=1.0.6
 
 # moreniius

{moreniius-0.4.0.dist-info → moreniius-0.5.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
 moreniius/__init__.py,sha256=33SUBkXWhH5rog5oaGJr1Kwqjhwz97w4E0Da7rArYi4,154
 moreniius/additions.py,sha256=6Hhhc4LDUsnBj27Iil-EFFzQm1xd2M45hfcVQYEjxiI,17615
 moreniius/moreniius.py,sha256=cU3CrfMC1kOnHO77yq5sZfDqRuA38G5kA3RUXFNGP2U,1455
-moreniius/nexus_structure.py,sha256=i9CxYwJl4eKP9IIYR80MI3f54Yh0RPDFviZaulE5IOc,1709
+moreniius/nexus_structure.py,sha256=C_ohhilsE6xdfSpFVhsFEK9EC3sBXPGWxCIGk_4UFvI,1853
 moreniius/nxoff.py,sha256=WHp9wYNn_4Hcx8Nzi9rpX1p8_iwI-AdgTQouSAEG8N4,3288
 moreniius/utils.py,sha256=R81eHjc0EWjMsP-Z8WI9sZkc_QY357z_aYziflQAUEU,9238
-moreniius/writer.py,sha256=rZSOpSmCAiY1KS3YAWKBXZUWTJFLyrkZT-zeZfyENV8,6178
+moreniius/writer.py,sha256=BwAyc2_QCUir-zhELYl9OHItXepF3w7nRPTnbZ73XNU,6272
 moreniius/mccode/__init__.py,sha256=1QiZdh90G3gp_WlVpdJB_ZGauoW0GJEQ13Nelaqa5JE,151
 moreniius/mccode/comp.py,sha256=uR1L5nLfYPHhMKd3XnDbqf5xhkfwfPLRnttREc3jqBg,7382
 moreniius/mccode/instance.py,sha256=yydYeMGITlZrVWBVYregBWQ0Sd_2A71hgoyCrLLW-Jk,8058
-moreniius/mccode/instr.py,sha256=G00MuwhH1QS7gZvABG5BdywFOB2AtqViwbSLyG_u0wk,6104
+moreniius/mccode/instr.py,sha256=D4B3ylD4BMfkiP5t2hx5xop9c7yk7QVSleT1wvpK17E,6161
 moreniius/mccode/mccode.py,sha256=6NEXovuG-6itzlPgPklNOiZQ-MlldKF20p4TxV8n4BA,3228
 moreniius/mccode/orientation.py,sha256=khT0jTMXyXkPCoEpDg-eLKulF-J2wIqNhUi1NzFWvto,3907
-moreniius-0.4.0.dist-info/METADATA,sha256=FrFAozg136Ajg8-Z-1whxPwNXwBFoDMTjZlK2D1kngg,921
-moreniius-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moreniius-0.4.0.dist-info/entry_points.txt,sha256=Ga3k4P4fyBt5_dJ03Oapic2Qlgqv9jufQGdxWiz_j2A,63
-moreniius-0.4.0.dist-info/top_level.txt,sha256=RzMo23UfVhgQeuOYeS5P9I0qVbxx4Gbe6Roc29Mr02c,10
-moreniius-0.4.0.dist-info/RECORD,,
+moreniius-0.5.1.dist-info/METADATA,sha256=AFxEFIXmnSGTR7sH8oq2AGWym5Msl26KVS58HFpBZ00,921
+moreniius-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moreniius-0.5.1.dist-info/entry_points.txt,sha256=Ga3k4P4fyBt5_dJ03Oapic2Qlgqv9jufQGdxWiz_j2A,63
+moreniius-0.5.1.dist-info/top_level.txt,sha256=RzMo23UfVhgQeuOYeS5P9I0qVbxx4Gbe6Roc29Mr02c,10
+moreniius-0.5.1.dist-info/RECORD,,