uda-xarray 0.2.1__tar.gz → 0.2.3__tar.gz

{uda_xarray-0.2.1/uda_xarray.egg-info → uda_xarray-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uda-xarray
-Version: 0.2.1
+Version: 0.2.3
 Summary: UDA backend for xarray
 Author-email: Samuel Jackson <samuel.jackson@ukaea.uk>
 Maintainer-email: Samuel Jackson <samuel.jackson@ukaea.uk>

{uda_xarray-0.2.1 → uda_xarray-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uda-xarray"
-version = "0.2.1"
+version = "0.2.3"
 description = "UDA backend for xarray"
 readme = "README.md"
 requires-python = ">=3.9, <3.13"
@@ -47,7 +47,7 @@ dev = [
 uda = "uda_xarray.main:UDABackendEntrypoint"
 
 [tool.bumpversion]
-current_version = "0.2.1"
+current_version = "0.2.3"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{uda_xarray-0.2.1 → uda_xarray-0.2.3}/tests/test_backend.py

@@ -1,3 +1,4 @@
+import pytest
 import xarray as xr
 import numpy as np
 import pyuda
@@ -74,7 +75,7 @@ def test_open_uda_dataset_2d(mocker):
     mock_client.get.assert_called_once_with("AYE_TE", 30421)
 
     assert ds["data"].name == "data"
-    assert ds["data"].dims == ("channel", "time")
+    assert ds["data"].dims == ("time", "channel")
     assert "time" in ds.coords
     assert "channel" in ds.coords
 
@@ -229,7 +230,7 @@ def test_open_datatree_2d(mocker):
     # Access the dataset from the root node
     ds = dt.to_dataset()
     assert ds["data"].name == "data"
-    assert ds["data"].dims == ("channel", "time")
+    assert ds["data"].dims == ("time", "channel")
     assert "time" in ds.coords
     assert "channel" in ds.coords
 
@@ -272,3 +273,23 @@ def test_open_datatree_video(mocker):
     assert ds["data"].dims == ("time", "height", "width")
     assert "time" in ds.coords
     assert ds.sizes["time"] == 3
+
+
+@pytest.mark.skip(reason="Requires access to real UDA server with video data")
+def test_open_uda_dataset_video_frame(mocker):
+    ds = xr.open_dataset(
+        "uda://rba:30421", engine="uda", drop_variables=None, frame_number=1
+    )
+    assert ds["data"].name == "data"
+    assert ds["data"].dims == ("time", "height", "width")
+    assert "time" in ds.coords
+    assert ds.sizes["time"] == 1
+
+
+@pytest.mark.skip(reason="Requires access to real UDA server with video data")
+def test_real_data_2d():
+    ds = xr.open_dataset("uda://AYE_TE:30421", engine="uda")
+    assert ds["data"].name == "data"
+    assert ds["data"].dims == ("time", "radial_index")
+    assert "time" in ds.coords
+    assert "radial_index" in ds.coords

{uda_xarray-0.2.1 → uda_xarray-0.2.3}/uda_xarray/main.py

@@ -3,6 +3,7 @@
 from enum import Enum
 from typing import Optional
 
+import os
 import numpy as np
 import pyuda
 import xarray as xr
@@ -10,6 +11,15 @@ from mast.mast_client import ListType
 from xarray.backends import BackendEntrypoint
 
 
+# Set up UDA environment variables with defaults if not already set. This is required for
+# the pyuda client to work correctly outside of Freia.
+os.environ["UDA_HOST"] = os.environ.get("UDA_HOST", "uda2.mast.l")
+os.environ["UDA_META_PLUGINNAME"] = os.environ.get("UDA_META_PLUGINNAME", "MASTU_DB")
+os.environ["UDA_METANEW_PLUGINNAME"] = os.environ.get(
+    "UDA_METANEW_PLUGINNAME", "MAST_DB"
+)
+
+
 class SignalType(str, Enum):
     """Enum for UDA signal types."""
 
@@ -30,6 +40,7 @@ class UDABackendEntrypoint(BackendEntrypoint):
         *,
         drop_variables=None,
         frame_number: Optional[int] = None,  # noqa: F821
+        **kwargs,
     ) -> xr.Dataset:
         """Open a UDA dataset given a signal name and shot number.
 
@@ -81,7 +92,7 @@ class UDABackendEntrypoint(BackendEntrypoint):
 
         # Rename time dimension to just "time" if we can.
         if signal.time.label in dim_data:
-            dim_data["time"] = dim_data.pop(signal.time.label)
+            dim_data = {"time": dim_data.pop(signal.time.label), **dim_data}
 
         item = xr.DataArray(
             signal.data,
@@ -151,15 +162,17 @@ class UDABackendEntrypoint(BackendEntrypoint):
             return SignalType.IMAGE
         return SignalType.SIGNAL
 
-    def open_datatree(self, filename_or_obj, *, drop_variables=None):
-        dataset = self.open_dataset(filename_or_obj, drop_variables=drop_variables)
+    def open_datatree(self, filename_or_obj, *, drop_variables=None, **kwargs):
+        dataset = self.open_dataset(
+            filename_or_obj, drop_variables=drop_variables, **kwargs
+        )
         return xr.DataTree(dataset)
 
     def open_groups_as_dict(self, filename_or_obj, **kwargs):
         """Open groups as a dictionary (not supported for UDA backend)."""
         raise NotImplementedError("UDA backend does not support opening groups")
 
-    open_dataset_parameters = ["filename_or_obj", "drop_variables"]
+    open_dataset_parameters = ["filename_or_obj", "drop_variables", "frame_number"]
     supports_groups = True
 
     def guess_can_open(self, filename_or_obj):

{uda_xarray-0.2.1 → uda_xarray-0.2.3/uda_xarray.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uda-xarray
-Version: 0.2.1
+Version: 0.2.3
 Summary: UDA backend for xarray
 Author-email: Samuel Jackson <samuel.jackson@ukaea.uk>
 Maintainer-email: Samuel Jackson <samuel.jackson@ukaea.uk>