xtrack 0.85.0__tar.gz → 0.86.1__tar.gz

{xtrack-0.85.0/xtrack.egg-info → xtrack-0.86.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.85.0
+Version: 0.86.1
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack
@@ -14,6 +14,7 @@ Requires-Dist: numpy>=1.0
 Requires-Dist: pandas>=2.0
 Requires-Dist: scipy
 Requires-Dist: tqdm
+Requires-Dist: requests
 Requires-Dist: xobjects
 Requires-Dist: xdeps
 Provides-Extra: tests
@@ -23,6 +24,7 @@ Requires-Dist: PyHEADTAIL; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pymadng; extra == "tests"
+Requires-Dist: requests-mock; extra == "tests"
 Provides-Extra: notebooks
 Requires-Dist: jupyter; extra == "notebooks"
 Requires-Dist: ipympl; extra == "notebooks"

{xtrack-0.85.0 → xtrack-0.86.1}/pyproject.toml

@@ -3,4 +3,4 @@ build-backend = 'setuptools.build_meta'
 requires = [
     'setuptools >= 43.0.0',
     'numpy',
-    ]
+]

{xtrack-0.85.0 → xtrack-0.86.1}/setup.py

@@ -44,12 +44,13 @@ setup(
         "pandas>=2.0",
         'scipy',
         'tqdm',
+        'requests',
         'xobjects',
         'xdeps'
-        ],
+    ],
     extras_require={
         'tests': ['cpymad', 'nafflib', 'PyHEADTAIL', 'pytest', 'pytest-mock',
-                  'pymadng'],
+                  'pymadng', 'requests-mock'],
         'notebooks': ['jupyter', 'ipympl', 'xplt'],
     },
-    )
+)

xtrack-0.86.1/tests/test_load.py

@@ -0,0 +1,153 @@
+# copyright ############################### #
+# This file is part of the Xtrack Package.  #
+# Copyright (c) CERN, 2025.                 #
+# ######################################### #
+import pytest
+import xtrack as xt
+import json
+import textwrap
+
+
+@pytest.fixture
+def madx_sequence():
+    return """
+        seq: sequence, l=1;
+            quad: quadrupole, l=1, k1=0.5, at=0.5;
+        endsequence;
+    """
+
+
+@pytest.fixture
+def json_line():
+    dct = {
+        'elements': {
+            'quad': {
+                '__class__': 'Quadrupole',
+                'length': 1.0,
+                'k1': 0.5
+            }
+        },
+        'element_names': ['quad'],
+    }
+    return json.dumps(dct)
+
+
+@pytest.fixture
+def json_environment():
+    dct = {
+        'elements': {
+            'quad': {
+                '__class__': 'Quadrupole',
+                'length': 1.0,
+                'k1': 0.5,
+            }
+        },
+        'xsuite_data_type': 'Environment',
+        'lines': {
+            'seq': {
+                'element_names': ['quad'],
+            }
+        }
+    }
+    return json.dumps(dct)
+
+
+@pytest.fixture
+def python_file():
+    source = """
+        import xtrack as xt
+        env = xt.get_environment()
+        quad = env.new('quad', 'Quadrupole', length=1.0, k1=0.5)
+        env.new_line(name='seq', components=[quad])
+    """
+    return textwrap.dedent(source)
+
+
+@pytest.mark.parametrize(
+    'input_fixture,format', [
+        ('madx_sequence', 'madx'),
+        ('json_line', 'json'),
+        ('json_environment', 'json'),
+    ]
+)
+def test_load_string(input_fixture, format, request):
+    input_data = request.getfixturevalue(input_fixture)
+    loaded_entity = xt.load(string=input_data, format=format)  # noqa
+
+    quad = loaded_entity['quad']
+    assert quad.length == 1.0 and quad.k1 == 0.5
+
+
+@pytest.mark.parametrize(
+    'input_fixture,format,suffix', [
+        ('madx_sequence', 'madx', 'madx'),
+        ('json_line', 'json', 'json'),
+        ('json_environment', 'json', 'json'),
+        ('python_file', 'python', 'py'),
+    ]
+)
+@pytest.mark.parametrize('with_format', [True, False])
+def test_load_file(input_fixture, format, suffix, with_format, tmpdir, request):
+    input_data = request.getfixturevalue(input_fixture)
+
+    temp_file = tmpdir / f'test_input.{suffix}'
+    with open(temp_file, 'w') as f:
+        f.write(input_data)
+
+    kwargs = {'file': str(temp_file)}
+    if with_format:
+        kwargs['format'] = format
+    loaded_entity = xt.load(**kwargs)
+
+    quad = loaded_entity['quad']
+    assert quad.length == 1.0 and quad.k1 == 0.5
+
+
+@pytest.mark.parametrize(
+    'input_fixture,format,suffix', [
+        ('madx_sequence', 'madx', 'madx'),
+        ('json_line', 'json', 'json'),
+        ('json_environment', 'json', 'json'),
+    ]
+)
+@pytest.mark.parametrize('with_format', [True, False])
+def test_load_http(input_fixture, format, suffix, with_format, tmpdir, request, requests_mock):
+    input_data = request.getfixturevalue(input_fixture)
+
+    url = f'http://example.com/test_input.{suffix}'
+    requests_mock.get(url, text=input_data)
+
+    kwargs = {'file': url}
+    if with_format:
+        kwargs['format'] = format
+    loaded_entity = xt.load(**kwargs)
+
+    quad = loaded_entity['quad']
+    assert quad.length == 1.0 and quad.k1 == 0.5
+
+
+def test_load_single_element():
+    string = json.dumps({
+        '__class__': 'Quadrupole',
+        'length': 1.0,
+        'k1': 0.5
+    })
+    quad = xt.load(string=string, format='json')
+    assert quad.length == 1.0 and quad.k1 == 0.5
+
+
+def test_load_invalid_input():
+    with pytest.raises(ValueError, match='either file or string'):
+        xt.load()
+
+    with pytest.raises(ValueError, match='either file or string'):
+        xt.load(file='test.madx', string='quad: quadrupole, l=1, k1=0.5;')
+
+    with pytest.raises(ValueError, match='Format must be specified'):
+        xt.load(string='{}')
+
+    with pytest.raises(ValueError, match='one of'):
+        xt.load(string='{}', format='invalid_format')  # noqa
+
+    with pytest.raises(ValueError, match='Cannot determine class from json data'):
+        xt.load(string='{"length": 1.0, "k1": 0.5}', format='json')

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack/__init__.py

@@ -46,6 +46,7 @@ from .loss_location_refinement import _skip_in_loss_location_refinement
 from .trajectory_correction import TrajectoryCorrection
 from .mad_parser.loader import load_madx_lattice
 from . import json
+from .load import load
 
 from .multiline import Multiline
 

xtrack-0.86.1/xtrack/_version.py

@@ -0,0 +1 @@
+__version__ = '0.86.1'

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack/general.py

@@ -6,6 +6,7 @@
 from enum import Enum
 from pathlib import Path
 from xobjects.general import _print  # noqa: F401
+import requests
 
 _pkg_root = Path(__file__).parent.absolute()
 
@@ -20,3 +21,14 @@ class _LOC:
 
 START = _LOC('START')
 END = _LOC('END')
+
+def read_url(url, timeout=0.1):
+    """
+    Read content from a URL.
+    """
+    try:
+        response = requests.get(url, timeout=timeout)
+        response.raise_for_status()  # Raise an error for bad responses
+        return response.text
+    except requests.exceptions.RequestException as e:
+        raise RuntimeError(f"Failed to read from URL {url}: {e}")

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack/json.py

@@ -21,7 +21,16 @@ def dump(data, file, indent=1):
         fh.close()
 
 
-def load(file):
+def load(file=None, string=None):
+
+    if string is not None:
+        assert file is None, "Cannot specify both file and string"
+        data = json.loads(string)
+        return data
+
+    if file is None:
+        raise ValueError("Must specify either file or string")
+
     if isinstance(file, io.IOBase):
         fh, close = file, False
     elif (isinstance(file, str) and file.endswith(".gz")) or (

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack/line.py

@@ -5615,7 +5615,7 @@ class LineVars:
         self.__dict__.update(state)
         self.vars_to_update = WeakSet()
 
-    def set_from_madx_file(self, filename):
+    def set_from_madx_file(self, filename=None, string=None):
 
         '''
         Set variables veluas of expression from a MAD-X file.
@@ -5626,7 +5626,12 @@ class LineVars:
             Path to the MAD-X file(s) to load.
         '''
         loader = xt.mad_parser.MadxLoader(env=self.line)
-        loader.load_file(filename)
+        if filename is not None:
+            assert string is None, 'Cannot specify both filename and string'
+            loader.load_file(filename)
+        elif string is not None:
+            assert filename is None, 'Cannot specify both filename and string'
+            loader.load_string(string)
 
     def load_madx_optics_file(self, filename):
         self.set_from_madx_file(filename)
@@ -5664,6 +5669,37 @@ class LineVars:
             else:
                 self[kk] = kwargs[kk]
 
+    def load(self, file=None, string=None, format=None, timeout=5.):
+
+        if format is None and file is not None:
+            if file.endswith('.json'):
+                format = 'json'
+            elif file.endswith('.seq') or file.endswith('.madx') or file.endswith('.mad'):
+                format = 'madx'
+
+        if file.startswith('http://') or file.startswith('https://'):
+            assert string is None, 'Cannot specify both fname and string'
+            string = xt.general.read_url(file, timeout=timeout)
+            file = None
+
+        if file is not None:
+            assert string is None, 'Cannot specify both fname and string'
+
+        if string is not None:
+            assert file is None, 'Cannot specify both fname and string'
+            assert format is not None, 'Must specify format when using string'
+
+        assert format in ['json', 'madx'], f'Unknown format {format}'
+
+        if format == 'json':
+            ddd = xt.json.load(file=file, string=string)
+            self.update(ddd)
+        elif format == 'madx':
+            return self.set_from_madx_file(filename=file, string=string)
+        else:
+            raise ValueError(f'Unknown format {format}')
+
+
     def set(self, name, value):
         if isinstance(value, str):
             self[name] = self.line._xdeps_eval.eval(value)

xtrack-0.86.1/xtrack/load.py

@@ -0,0 +1,54 @@
+# copyright ############################### #
+# This file is part of the Xtrack Package.  #
+# Copyright (c) CERN, 2025.                 #
+# ######################################### #
+import xtrack as xt
+from typing import Literal
+
+
+def load(
+        file=None,
+        string=None,
+        format: Literal['json', 'madx', 'python'] = None,
+        timeout=5.,
+):
+    if (file is None) == (string is None):
+        raise ValueError('Must specify either file or string, but not both')
+
+    FORMATS = {'json', 'madx', 'python'}
+    if string and format not in FORMATS:
+        raise ValueError(f'Format must be specified to be one of {FORMATS} when '
+                         f'using string input')
+
+    if format is None and file is not None:
+        if file.endswith('.json'):
+            format = 'json'
+        elif file.endswith('.seq') or file.endswith('.madx'):
+            format = 'madx'
+        elif file.endswith('.py'):
+            format = 'python'
+
+    if file and (file.startswith('http://') or file.startswith('https://')):
+        string = xt.general.read_url(file, timeout=timeout)
+        file = None
+
+    if format == 'json':
+        ddd = xt.json.load(file=file, string=string)
+        if '__class__' in ddd:
+            cls_name = ddd.pop('__class__')
+            cls = getattr(xt, cls_name)
+            return cls.from_dict(ddd)
+        elif 'lines' in ddd: # is environment
+            return xt.Environment.from_dict(ddd)
+        elif 'element_names' in ddd:
+            return xt.Line.from_dict(ddd)
+        else:
+            raise ValueError('Cannot determine class from json data')
+    elif format == 'madx':
+        return xt.load_madx_lattice(file=file, string=string)
+    elif format == 'python':
+        if string is not None:
+            raise NotImplementedError('Loading from string not implemented for python format')
+        env = xt.Environment()
+        env.call(file)
+        return env

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack/mad_parser/loader.py

@@ -427,6 +427,16 @@ class MadxLoader:
                 params['ksl'] = ksl
             if params.pop('lrad', None):
                 _warn(f'Multipole `{name}` was specified with a length, ignoring!')
+            for kk in list(params.keys()):
+                if kk.startswith('k') and kk.endswith('l'):
+                    if kk == 'ksl' or kk == 'knl':
+                        continue
+                    order = int(kk[1:-1])
+                    if knl not in params:
+                        params['knl'] = []
+                    if len(params['knl']) <= order:
+                        params['knl'] += [0] * (order - len(params['knl']) + 1)
+                    params['knl'][order] = params.pop(kk)
 
         elif parent_name == 'vkicker':
             if (kick := params.pop('kick', None)):

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack/tapering.py

@@ -15,6 +15,10 @@ def compensate_radiation_energy_loss(line, delta0=0, rtol_eneloss=1e-12,
     assert line.particle_ref is not None, "Particle reference is not set"
     assert np.abs(line.particle_ref.q0) == 1, "Only |q0| = 1 is supported (for now)"
 
+    if len(set(line.element_names)) != len(line.element_names):
+        raise ValueError("Line must not contain repeated elements to use "
+                         "`compensate_radiation_energy_loss(...)`. ")
+
     if 'record_iterations' in kwargs:
         record_iterations = kwargs['record_iterations']
         kwargs.pop('record_iterations')

{xtrack-0.85.0 → xtrack-0.86.1/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.85.0
+Version: 0.86.1
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack
@@ -14,6 +14,7 @@ Requires-Dist: numpy>=1.0
 Requires-Dist: pandas>=2.0
 Requires-Dist: scipy
 Requires-Dist: tqdm
+Requires-Dist: requests
 Requires-Dist: xobjects
 Requires-Dist: xdeps
 Provides-Extra: tests
@@ -23,6 +24,7 @@ Requires-Dist: PyHEADTAIL; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pymadng; extra == "tests"
+Requires-Dist: requests-mock; extra == "tests"
 Provides-Extra: notebooks
 Requires-Dist: jupyter; extra == "notebooks"
 Requires-Dist: ipympl; extra == "notebooks"

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack.egg-info/SOURCES.txt

@@ -51,6 +51,7 @@ tests/test_legacy_multiline_to_env.py
 tests/test_lhc_env.py
 tests/test_lhc_match_phase_15.py
 tests/test_line.py
+tests/test_load.py
 tests/test_lumi.py
 tests/test_mad_writer.py
 tests/test_madloader.py
@@ -123,6 +124,7 @@ xtrack/internal_record.py
 xtrack/json.py
 xtrack/line.py
 xtrack/linear_normal_form.py
+xtrack/load.py
 xtrack/lumi.py
 xtrack/mad_loader.py
 xtrack/mad_writer.py

{xtrack-0.85.0 → xtrack-0.86.1}/xtrack.egg-info/requires.txt

@@ -2,6 +2,7 @@ numpy>=1.0
 pandas>=2.0
 scipy
 tqdm
+requests
 xobjects
 xdeps
 
@@ -17,3 +18,4 @@ PyHEADTAIL
 pytest
 pytest-mock
 pymadng
+requests-mock

xtrack-0.85.0/xtrack/_version.py

@@ -1 +0,0 @@
-__version__ = '0.85.0'