From bc16cac58227eebc88384426b8495d680bc2eea5 Mon Sep 17 00:00:00 2001
From: svoboda <svoboda@ipp.cas.cz>
Date: Thu, 15 May 2025 12:22:27 +0200
Subject: [PATCH] Remove sal from jet.data and replace it with standard sal
 client

---
 cherab/jet/__init__.py                | 1 +
 cherab/jet/equilibrium/equilibrium.py | 2 +-
 cherab/jet/sal.py                     | 7 +++++++
 demos/diagnostic/ks5/camera_76666.py  | 2 +-
 demos/diagnostic/ks5/spectra_76666.py | 2 +-
 requirements.txt                      | 1 +
 setup.py                              | 2 +-
 7 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 cherab/jet/sal.py

diff --git a/cherab/jet/__init__.py b/cherab/jet/__init__.py
index ab49e04..5ea73d0 100644
--- a/cherab/jet/__init__.py
+++ b/cherab/jet/__init__.py
@@ -15,3 +15,4 @@
 # under the Licence.
 
 from .equilibrium import *
+from .sal import sal
diff --git a/cherab/jet/equilibrium/equilibrium.py b/cherab/jet/equilibrium/equilibrium.py
index 09eead8..f220a9e 100644
--- a/cherab/jet/equilibrium/equilibrium.py
+++ b/cherab/jet/equilibrium/equilibrium.py
@@ -24,7 +24,7 @@
 from raysect.core import Point2D
 from cherab.tools.equilibrium import EFITEquilibrium
 
-from jet.data import sal
+from cherab.jet.sal import sal
 from sal.core.exception import NodeNotFound
 
 
diff --git a/cherab/jet/sal.py b/cherab/jet/sal.py
new file mode 100644
index 0000000..bfb5784
--- /dev/null
+++ b/cherab/jet/sal.py
@@ -0,0 +1,7 @@
+import os
+
+from sal.client import SALClient
+
+
+sal_server = os.environ.get('JET_SAL_SERVER', 'https://sal.jetdata.eu')
+sal = SALClient(host=sal_server)
diff --git a/demos/diagnostic/ks5/camera_76666.py b/demos/diagnostic/ks5/camera_76666.py
index 5ac94e1..be79bfa 100644
--- a/demos/diagnostic/ks5/camera_76666.py
+++ b/demos/diagnostic/ks5/camera_76666.py
@@ -19,7 +19,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from scipy.constants import electron_mass, atomic_mass
-from jet.data import sal
 from raysect.core import Point3D, Vector3D, translate, rotate_basis
 from raysect.optical import World
 from raysect.optical.observer import PinholeCamera
@@ -35,6 +34,7 @@
 from cherab.jet.nbi import load_pini_from_ppf
 from cherab.jet.equilibrium import JETEquilibrium
 from cherab.jet.machine import import_jet_mesh
+from cherab.jet.sal import sal
 
 
 PULSE = 79666
diff --git a/demos/diagnostic/ks5/spectra_76666.py b/demos/diagnostic/ks5/spectra_76666.py
index 4e097ec..a61f97e 100644
--- a/demos/diagnostic/ks5/spectra_76666.py
+++ b/demos/diagnostic/ks5/spectra_76666.py
@@ -19,7 +19,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from scipy.constants import electron_mass, atomic_mass
-from jet.data import sal
 from raysect.core import Vector3D
 from raysect.optical import World
 
@@ -31,6 +30,7 @@
 from cherab.openadas import OpenADAS
 from cherab.jet.nbi import load_pini_from_ppf
 from cherab.jet.equilibrium import JETEquilibrium
+from cherab.jet.sal import sal
 from cherab.jet.spectroscopy.ks5 import load_ks5_sightlines
 
 
diff --git a/requirements.txt b/requirements.txt
index fdad365..1714dbf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 cherab
+sal >= 1.2.5
diff --git a/setup.py b/setup.py
index 688d27a..ff5f2a9 100644
--- a/setup.py
+++ b/setup.py
@@ -30,5 +30,5 @@
     long_description_content_type="text/markdown",
     packages=find_packages(),
     include_package_data=True,
-    install_requires=["cherab"],
+    install_requires=["cherab", "sal>=1.2.5"],
 )