xradio 0.0.47__py3-none-any.whl → 0.0.49__py3-none-any.whl

xradio/schema/bases.py

@@ -397,11 +397,15 @@ def xarray_dataset_schema(cls):
     cls = dataclasses.dataclass(cls, init=True, repr=False, eq=False, frozen=True)
 
     # Make schema
-    cls.__xradio_dataset_schema = dataclass.xarray_dataclass_to_dataset_schema(cls)
+    schema = dataclass.xarray_dataclass_to_dataset_schema(cls)
+    cls.__xradio_dataset_schema = schema
 
     # Replace __new__
     cls.__new__ = _dataset_new
 
+    # Register type
+    check.register_dataset_type(schema)
+
     return cls
 
 

xradio/schema/check.py

@@ -2,6 +2,7 @@ import dataclasses
 import typing
 import inspect
 import functools
+import warnings
 
 import xarray
 import numpy
@@ -173,7 +174,9 @@ def check_array(
 
 
 def check_dataset(
-    dataset: xarray.Dataset, schema: typing.Union[type, metamodel.DatasetSchema]
+    dataset: xarray.Dataset,
+    schema: typing.Union[type, metamodel.DatasetSchema],
+    allow_superflous_dims: typing.Set[str] = frozenset(),
 ) -> SchemaIssues:
     """
     Check whether an xarray DataArray conforms to a schema
@@ -196,7 +199,12 @@ def check_dataset(
         )
 
     # Check dimensions. Order does not matter on datasets
-    issues = check_dimensions(dataset.dims, schema.dimensions, check_order=False)
+    issues = check_dimensions(
+        dataset.dims,
+        schema.dimensions,
+        check_order=False,
+        allow_superflous=allow_superflous_dims,
+    )
 
     # Check attributes
     issues += check_attributes(dataset.attrs, schema.attributes)
@@ -211,7 +219,10 @@ def check_dataset(
 
 
 def check_dimensions(
-    dims: [str], expected: [[str]], check_order: bool = True
+    dims: [str],
+    expected: [[str]],
+    check_order: bool = True,
+    allow_superflous: typing.Set[str] = frozenset(),
 ) -> SchemaIssues:
     """
     Check whether a dimension list conforms to a schema
@@ -230,7 +241,7 @@ def check_dimensions(
         exp_dims_set = set(exp_dims)
 
         # No match? Continue, but take note of best match
-        if exp_dims_set != dims_set:
+        if exp_dims_set - allow_superflous != dims_set - allow_superflous:
             diff = len(dims_set.symmetric_difference(exp_dims_set))
             if best is None or diff < best_diff:
                 best = exp_dims_set
@@ -253,7 +264,7 @@ def check_dimensions(
         )
 
     # Dimensionality not supported - try to give a helpful suggestion
-    hint_remove = [f"'{hint}'" for hint in dims_set - best]
+    hint_remove = [f"'{hint}'" for hint in (dims_set - best) - allow_superflous]
     hint_add = [f"'{hint}'" for hint in best - dims_set]
     if hint_remove and hint_add:
         message = f"Unexpected coordinates, replace {','.join(hint_remove)} by {','.join(hint_add)}?"
@@ -560,6 +571,87 @@ def _check_value_union(val, ann):
     return args_issues
 
 
+_DATASET_TYPES = {}
+
+
+def register_dataset_type(schema: metamodel.DatasetSchema):
+    """
+    Registers the given schema for usage with :py:meth:`check_datatree`
+
+    This looks for a ``type`` attribute in the dataset schema, which
+    must have a :py:class:`typing.Literal` type annotation specifying
+    the type name of the dataset
+
+    :param schema: Schema to register
+    """
+
+    # Find type attribute
+    for attr in schema.attributes:
+        if attr.name != "type":
+            continue
+
+        # Type should be a kind of literal
+        if typing.get_origin(attr.typ) is not typing.Literal:
+            warnings.warn(
+                f"In dataset schema {schema.schema_name}:"
+                'Attribute "type" should be a literal!'
+            )
+            continue
+
+        # Register type names
+        for typ in typing.get_args(attr.typ):
+            _DATASET_TYPES[typ] = schema
+
+
+def check_datatree(
+    datatree: xarray.DataTree,
+):
+    """
+    Check datatree for schema conformance
+
+    This is the case if all nodes containing data
+
+    This looks for a ``type`` attribute in the dataset schema, which
+    must have a :py:class:`typing.Literal` type annotation specifying
+    the type name of the dataset
+
+    :param schema: Schema to register
+    """
+
+    # Loop through all groups in datatree
+    issues = SchemaIssues()
+    for xds_name in datatree.groups:
+
+        # Ignore any leaf without data
+        node = datatree[xds_name]
+        if not node.has_data:
+            continue
+
+        # Look up schema
+        schema = _DATASET_TYPES.get(node.attrs.get("type"))
+        if schema is None:
+            issues.add(
+                SchemaIssue(
+                    [("", xds_name)],
+                    message="Unknown dataset type!",
+                    found=typ,
+                    expected=list(schemas.keys()),
+                )
+            )
+            continue
+
+        # Determine dimensions inherited from parent
+        # (they might show up as "superflous" for the child schema)
+        parent_dims = frozenset()
+        if node.parent is not None:
+            parent_dims = set(node.parent.dims)
+
+        # Check schema
+        issues += check_dataset(node.dataset, schema, parent_dims).at_path("", xds_name)
+
+    return issues
+
+
 def schema_checked(fn, check_parameters: bool = True, check_return: bool = True):
     """
     Function decorator to check parameters and return value for

xradio/sphinx/schema_table.py

@@ -212,6 +212,18 @@ def format_attr_model_text(state, attr) -> StringList:
                 state.nested_parse(vl, 0, line)
             return line
 
+        if typing.get_origin(attr.typ) == typing.Union:
+            vl = StringList()
+            type_args = typing.get_args(attr.typ)
+            options = []
+            for i, arg in enumerate(type_args):
+                vl.append(f":py:class:`~{arg.__module__}.{arg.__name__}`", "")
+                if i + 1 < len(type_args):
+                    vl.append(" or ", "")
+            with switch_source_input(state, vl):
+                state.nested_parse(vl, 0, line)
+            return line
+
         # Derived type, e.g. list of types?
         if typing.get_origin(attr.typ) == list and all(
             [isinstance(arg, type) for arg in type_args]

{xradio-0.0.47.dist-info → xradio-0.0.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xradio
-Version: 0.0.47
+Version: 0.0.49
 Summary:  Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>
 License: BSD 3-Clause License
@@ -37,7 +37,7 @@ License: BSD 3-Clause License
         OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
         OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         
-Requires-Python: <3.13,>=3.9
+Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: astropy
@@ -55,7 +55,6 @@ Requires-Dist: xarray
 Requires-Dist: zarr<3,>=2
 Requires-Dist: pyarrow
 Requires-Dist: python_casacore>=3.6.1; sys_platform != "darwin"
-Requires-Dist: typing_extensions; python_version < "3.10"
 Requires-Dist: typeguard
 Provides-Extra: interactive
 Requires-Dist: matplotlib; extra == "interactive"
@@ -74,6 +73,7 @@ Requires-Dist: sphinx-autosummary-accessors; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"
 Requires-Dist: twine; extra == "docs"
 Requires-Dist: pandoc; extra == "docs"
+Dynamic: license-file
 
 # xradio
 Xarray Radio Astronomy Data IO is still in development.

{xradio-0.0.47.dist-info → xradio-0.0.49.dist-info}/RECORD

@@ -1,58 +1,58 @@
-xradio/__init__.py,sha256=WHBhQWQie3YQqfIxQBL3LKiKuUcN7ZL7sPMEcdWOp5E,382
+xradio/__init__.py,sha256=82picDsKDBYZRlIpp5JjWsBEf_daXgiLVM7zq6rY_6Q,383
 xradio/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/_utils/coord_math.py,sha256=n4Td6jcEX4vM49Xseuwrg6USylTGsySS6CND93DEG_8,3587
-xradio/_utils/dict_helpers.py,sha256=mQqMxrzIXRchS4W_GMYl1H0T4B7zY4R7FnnkUlp0uTc,346
-xradio/_utils/list_and_array.py,sha256=epw4IRnQUWP9x5mdsZPstECD7jUjXx7y9RgMdCDolEg,4291
-xradio/_utils/schema.py,sha256=p6Iet4Lfs1qUI3vWMUr-Sh2PsilSoSz9tqSP43U_0uQ,7398
+xradio/_utils/dict_helpers.py,sha256=rUiZhicKu0rptWwXpEwo1fHdAf7hCF4yyoXpRoDrjcU,2162
+xradio/_utils/list_and_array.py,sha256=fW0LDSXlPrSQguSUcZM5oy2Zw-KQVqq9vmmLS8jhc70,4340
+xradio/_utils/schema.py,sha256=XJwJNCenkgK0tjxJmMO_F-8VDqHiutDX2K1iP9kBgIA,7472
 xradio/_utils/_casacore/tables.py,sha256=aq6E_4RRAHdTBCwMKrVil1cWhFU2O980DNH9IlRKXLw,1280
 xradio/_utils/zarr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/_utils/zarr/common.py,sha256=egj3Zma0BUK0msOBDozMa-62rHrcxrjCNE5XkkZUq70,5332
 xradio/image/__init__.py,sha256=HAD0GfopIbhdxOYckyW6S9US_dSWmZrwIl3FHUzZwrE,435
-xradio/image/image.py,sha256=QoJ_BTLoMfeXJzU1yvtidBIhaMmjNA5_-6C3FWJRUeI,15635
-xradio/image/_util/__init__.py,sha256=M9lxD1Gc7kv0ucDEDbjLRuIEuESev-IG8j9EaCKUAkA,77
-xradio/image/_util/casacore.py,sha256=DmBTHUQ6870N5ARuFnYSfjZSLniJYgsjrsICUlCREYM,4234
-xradio/image/_util/common.py,sha256=AFGizSIuimd5QzKaf4jgEnuDWRPOUJK66zmIEz1qR2I,8995
+xradio/image/image.py,sha256=j2Rhya35RRR5NIq1kYzXHbYvKlhtKLhD28sZq_2AtPo,14042
+xradio/image/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xradio/image/_util/casacore.py,sha256=3gF720wtbU0_L6ZWZlKTvBTHFKWNdTgI4_uCwVYwnWE,4353
+xradio/image/_util/common.py,sha256=y2QJXTHowvjqwNPG5a-cOzl0WneH7c8c9jAVSKQeK2w,8429
 xradio/image/_util/fits.py,sha256=gyGm06fuCKqVGK7uv-ObvQNfFawUDsIOa_nQyklM3Aw,329
-xradio/image/_util/image_factory.py,sha256=vHomBKjFA0WXLirLMclA404qrHAr9ZNbDnm0xYyUr0I,10323
+xradio/image/_util/image_factory.py,sha256=Mm0ZDraD0WoNpGqy98EneFr1PxgfyNZNQwquIH2t0nc,8610
 xradio/image/_util/zarr.py,sha256=lhQqVRC1GEWClG3zRbuDr2IlQBfXeDqaLUJIN-MVMxA,1652
 xradio/image/_util/_casacore/__init__.py,sha256=OlsiRE40o1jSbBI4khgQQzgfDYbAlOMKIhO4UFlbGhg,41
-xradio/image/_util/_casacore/common.py,sha256=ky999eTCWta8w-uIs-7P7rPhZRLuh9yTuQXAxPvaPm4,1579
-xradio/image/_util/_casacore/xds_from_casacore.py,sha256=xAJE83-Ty0fjB79XAEvRsIUO8MEumO64dVvMemrBT_I,42077
-xradio/image/_util/_casacore/xds_to_casacore.py,sha256=U21bCfJMm0SYEO-VyTnysjS2qnPY8yiHCnqKaBZ87Bw,15424
-xradio/image/_util/_fits/xds_from_fits.py,sha256=2qB8xWrO3vU5DQYF5ffZ0eZ_BOE3Oay8FAaF-PIgffQ,28255
+xradio/image/_util/_casacore/common.py,sha256=Z7Jl3AU7jVcgjNtCnvL7CCXJQAxXeEtowXBmSShuAv4,1329
+xradio/image/_util/_casacore/xds_from_casacore.py,sha256=-y-VluzdvdnoK3swCDgA0UFhhajCRoPD6eY9e8c42F8,42462
+xradio/image/_util/_casacore/xds_to_casacore.py,sha256=Oh1Uve0y7R54VOqchm8JAxrmx4n1oHEvae7zJrVHMFg,16054
+xradio/image/_util/_fits/xds_from_fits.py,sha256=vadDxBvLYJudlUwLQcR7cX23hRIDMJZUHP0adKwh1WU,29853
 xradio/image/_util/_zarr/common.py,sha256=apMX_bF4Hr3pFGjnDFpp36KgmhTYAPBZquNkjBHrsXk,307
 xradio/image/_util/_zarr/xds_from_zarr.py,sha256=4b6KHmAcnrhBbCi-Z7e3Lm6l6wziJL1zaNIohmPAYDk,3601
 xradio/image/_util/_zarr/xds_to_zarr.py,sha256=wogXbwX8n3Sl9PHoc3_Y_LBowQsQ-94HZQFZ5NcxUZA,1624
-xradio/image/_util/_zarr/zarr_low_level.py,sha256=fVaPnxYazz6UDLBZuyUOekZKQ945OwhfBHeNeDgnW0w,13338
-xradio/measurement_set/__init__.py,sha256=dTrX1Rki43UGz0srfGh07lm-zcUXJdSdSPbS3QPaMpg,662
-xradio/measurement_set/convert_msv2_to_processing_set.py,sha256=KQomjZtfrahMZFHH9XV0xfw4jlNvEuveUgLSEmeBo80,8173
-xradio/measurement_set/load_processing_set.py,sha256=RedC4i4dOHzgYiz_C0P-3F0PwvEGUomvq_ilpcfUCco,5540
-xradio/measurement_set/measurement_set_xds.py,sha256=slZ4Nj3io3WkspjUqY4E-JO3LR2X7g9w2e88yjxcDQ8,4621
-xradio/measurement_set/open_processing_set.py,sha256=533fwEP4pJIBB-NdwFttbobVb8zEXsblvDTjF4ptTDU,3831
-xradio/measurement_set/processing_set.py,sha256=uVc8PpG_7ivGYqTZpDCLCfuXBOwTLMFj3TebbEpKMRI,29904
-xradio/measurement_set/schema.py,sha256=oETmqrBoaVE0xS36yQIXe9Yo3YjOBkIndWB76v8wlc0,77022
+xradio/image/_util/_zarr/zarr_low_level.py,sha256=xnYm6EmVbmLxMlOSXH32SABfQBLHfr2H9ch9gYwFNXs,13338
+xradio/measurement_set/__init__.py,sha256=Vrr1Py50TvbzeZ_VMCswYNz0Wcccbf-iJDj4ArlfcJ0,870
+xradio/measurement_set/convert_msv2_to_processing_set.py,sha256=uLZjXplVPXa0XnNa-Fty85k_-fsw6ZC98Hfiwd1WF-U,9704
+xradio/measurement_set/load_processing_set.py,sha256=8EPApyGy0Tmzu6Seeby7dKxvtxtAFA585kK50DYVHas,8164
+xradio/measurement_set/measurement_set_xdt.py,sha256=t9CKwgZlnogE6KoGQSVDwHel9FzYiOlA0ldoRyt5jZo,7636
+xradio/measurement_set/open_processing_set.py,sha256=kMODJmXT2KU12L6Y2NdTV8shvLGb5PgLIOqJgMCzlHI,5308
+xradio/measurement_set/processing_set_xdt.py,sha256=fIsfhhnBg5uq7KU0dDRJpyP12jpHo6f4ppbRJTqUAAc,59342
+xradio/measurement_set/schema.py,sha256=ppH-iibynbCw3kp_Ms_scpCanJNKnBHYdXC4GMwbLAU,85646
 xradio/measurement_set/_utils/__init__.py,sha256=XE-h1yMfr6tVD6gdUwXO1CVq5SQ6kD_oj-e5TFwslds,97
 xradio/measurement_set/_utils/msv2.py,sha256=7hnZMFoQ-s1g0ATjEupLvtdqQCdroPv-Rl5OwjqXjh8,4430
 xradio/measurement_set/_utils/zarr.py,sha256=ehXlu0Xh_UZ5Xm2RnHCxESsRZ26c3DQAO5rqMK5MwTk,3947
 xradio/measurement_set/_utils/_msv2/chunks.py,sha256=JTPk3il6fk570BjWZMoOAtsbvnLmqPcBv9EPY6A2yOs,2964
-xradio/measurement_set/_utils/_msv2/conversion.py,sha256=9At2ytmBWp1tKuGPYD6ONcnl1ymW8QpdpouwQDFUs8k,52215
+xradio/measurement_set/_utils/_msv2/conversion.py,sha256=KH6DQ9HKeAaIkXBjDNKKnUuQI7xp647ucLqu9m_TsFE,52931
 xradio/measurement_set/_utils/_msv2/create_antenna_xds.py,sha256=qLUDxbkJBOaD7EaVx7ufiU0CL5f8VVxK-923-j4XpXc,17758
-xradio/measurement_set/_utils/_msv2/create_field_and_source_xds.py,sha256=MNO1M6o8i-_L9I26mx20jkMRNKU4ymxLCohbSTpZwLo,34167
-xradio/measurement_set/_utils/_msv2/descr.py,sha256=dYK8mhXxODIh-dfqaOm-YZb7kmoN1N2golX_RFncO94,5215
+xradio/measurement_set/_utils/_msv2/create_field_and_source_xds.py,sha256=iyR5LzCupA6ZJmIOjIylwCQRI1EU4JEofBL7sbDWzwA,37069
+xradio/measurement_set/_utils/_msv2/descr.py,sha256=PGY39PYQj0K4th5RUv0jOWszcHlZDt6VQRTOuntCeYI,5213
 xradio/measurement_set/_utils/_msv2/msv2_msv3.py,sha256=9AKs2HWly7Ivv_Cjr11dIPGmm33_rtSBoGF9wN5ZwEQ,116
 xradio/measurement_set/_utils/_msv2/msv2_to_msv4_meta.py,sha256=gk9gU7g2Lk7dmaiLW8qecOEt574pRtGsCHnUnHXM3D0,1614
-xradio/measurement_set/_utils/_msv2/msv4_info_dicts.py,sha256=kQpKNvgIki_ZIpC-lbKRqCKah7aLBoy5Q_NH1Q2vz3g,6895
-xradio/measurement_set/_utils/_msv2/msv4_sub_xdss.py,sha256=MSmwDj72IXTSSlv8qyZNWK5R40lFE2Bc6iWkDb-6zUw,21879
+xradio/measurement_set/_utils/_msv2/msv4_info_dicts.py,sha256=5-T-C5wPAPHIUY1eQXvfdLQxPPuTy6UJIZhLlMyfMqA,7213
+xradio/measurement_set/_utils/_msv2/msv4_sub_xdss.py,sha256=Y_YjSOvH5A1Ij2x5lAC7FAL6C0mEbWvbGRPYpBIay7w,21958
 xradio/measurement_set/_utils/_msv2/optimised_functions.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/measurement_set/_utils/_msv2/partition_queries.py,sha256=6toOYRE6lay78r24kgUgQHOngQLuIGqQKcBTZcCk4lE,14709
 xradio/measurement_set/_utils/_msv2/partitions.py,sha256=_KhRq8bSx2QxuWp9K57fLoLxcU6kvJ35e6wvJ-THbwc,12979
 xradio/measurement_set/_utils/_msv2/subtables.py,sha256=_mpOOtHexqhiqEKt7S4LVqImJoNMJKSY18vNVw83r_U,3945
 xradio/measurement_set/_utils/_msv2/_tables/load.py,sha256=IR3fdKlq8rgH4bHmB1JTtB5gSGuITIvErJEVjUA8rWM,1799
 xradio/measurement_set/_utils/_msv2/_tables/load_main_table.py,sha256=IOGHMyemLbc6kJZC81LE6l0gVdgXuIFmDty2pxb5rr0,14806
-xradio/measurement_set/_utils/_msv2/_tables/read.py,sha256=OV6Zfoz1mhOK4Fv4SeQ_M9f600nHK-BQfJ551Wmr5hA,42947
+xradio/measurement_set/_utils/_msv2/_tables/read.py,sha256=31GvjuaH_FjoaL-ffbN3m3KxGGQdFBCoCp8yACPg4pc,46983
 xradio/measurement_set/_utils/_msv2/_tables/read_main_table.py,sha256=8AbNt-AxrhPK3EPRa7xqJXffxzIgfVsv1BDfoVJEXLU,26056
 xradio/measurement_set/_utils/_msv2/_tables/read_subtables.py,sha256=JM6pGUQtjQR881u9VqakmbJjppEFq-EVKnEZ14JqnAw,12438
-xradio/measurement_set/_utils/_msv2/_tables/table_query.py,sha256=q8EGFf_zIwHcHnvFJOn8hPh8zFZQ3f7BGbXvL3bHad4,555
+xradio/measurement_set/_utils/_msv2/_tables/table_query.py,sha256=9fNIpYLOHvomsFqZ42NTr_EYiIcVCvMrlKFI0qa4erE,1217
 xradio/measurement_set/_utils/_msv2/_tables/write.py,sha256=43XQ-tHhbhex0eUTRknNpPEEOnNR-w1lGCox9WZ9NHE,9540
 xradio/measurement_set/_utils/_msv2/_tables/write_exp_api.py,sha256=GDEll8nMwkQGc6vosu4UddFL5_ld7WurRgF9hYFTRmU,15511
 xradio/measurement_set/_utils/_utils/cds.py,sha256=OpvKowSheIthUbcPEv2AoKmxlEt3DqJZS5C1AYh5z10,1179
@@ -63,15 +63,15 @@ xradio/measurement_set/_utils/_zarr/encoding.py,sha256=GENIlThV6a9CUCL6gIGlu9c6N
 xradio/measurement_set/_utils/_zarr/read.py,sha256=O9DiwD2Gn8WiatQ-Q6WGGSwjsXwFktG4f81lM-mgcSg,7596
 xradio/measurement_set/_utils/_zarr/write.py,sha256=k5IfqtI44Dm4KBDiKFGhL5hN7kwNOulvVHmeP5Mi7N4,10043
 xradio/schema/__init__.py,sha256=EzEMnOtN8G_wdjo8QBRKfq5MrYgfr_nt1pfunlI6i6Q,733
-xradio/schema/bases.py,sha256=5BiE6gAq2xmaJEyiaGbpCSoNek83ly9f0R0Rv1rx9DM,17081
-xradio/schema/check.py,sha256=AWdqGwcbH1wW3_sWSAeILZd9L8_e3Ae5L9TURt3ns1k,19304
+xradio/schema/bases.py,sha256=dk24pFhugCe5RjaR41xxP38FxVVsIC9bdmBdsarwFvk,17162
+xradio/schema/check.py,sha256=nIvGpXWkKei5cS14PvbYL29R6_YnrI1NjOPQHkUFOZY,21857
 xradio/schema/dataclass.py,sha256=w6FbFtmGnAX4SYwYar7v8-YFf6j40G7g_jvIfVCuxjc,14087
 xradio/schema/metamodel.py,sha256=WjtW7pAVzcjLRWifRH3sQoOiN6TV810hARpOIz1M_gw,3845
 xradio/schema/typing.py,sha256=8-o6fZd99kJ4FVdgBYRTIRJ-wDqpcUNXzCTfJvl3TIw,10439
 xradio/sphinx/__init__.py,sha256=VGY-7Ty3q67qpnBee0-znbiJ-Iy0F93UO--IpjEdHXc,380
-xradio/sphinx/schema_table.py,sha256=YTQvK-VOBIpFtcx7sjcaMod4OSbl0uowelYIcdP3oVg,11878
-xradio-0.0.47.dist-info/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
-xradio-0.0.47.dist-info/METADATA,sha256=KAix-ctdEBi-LKGLqSiJw64oCKjrZUl5LyrbCwjbJak,4476
-xradio-0.0.47.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-xradio-0.0.47.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
-xradio-0.0.47.dist-info/RECORD,,
+xradio/sphinx/schema_table.py,sha256=uq33habbAbReqnEG6ASKSd4UOMZGUzA3qoTX45rq84U,12373
+xradio-0.0.49.dist-info/licenses/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
+xradio-0.0.49.dist-info/METADATA,sha256=-rwVHT0ItsA4EO7VmVQ0gmCmVrUpgOvufSxEhcIPfbc,4441
+xradio-0.0.49.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+xradio-0.0.49.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
+xradio-0.0.49.dist-info/RECORD,,

{xradio-0.0.47.dist-info → xradio-0.0.49.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

xradio/measurement_set/measurement_set_xds.py

@@ -1,117 +0,0 @@
-import pandas as pd
-from xradio._utils.list_and_array import to_list
-import xarray as xr
-import numbers
-import os
-from collections.abc import Mapping, Iterable
-from typing import Any, Union
-
-
-class MeasurementSetXds(xr.Dataset):
-    __slots__ = ()
-
-    def __init__(self, xds):
-        super().__init__(xds.data_vars, xds.coords, xds.attrs)
-
-    def to_store(self, store, **kwargs):
-        """
-        Write the MeasurementSetXds to a Zarr store.
-        Does not write to cloud storage yet.
-
-        Args:
-            store (str): The path to the Zarr store.
-            **kwargs: Additional keyword arguments to be passed to `xarray.Dataset.to_zarr`. See https://docs.xarray.dev/en/latest/generated/xarray.Dataset.to_zarr.html for more information.
-
-        Returns:
-            None
-        """
-
-        copy_cor_xds = self.copy()  # No deep copy
-
-        # Remove field_and_source_xds from all correlated_data (VISIBILITY/SPECTRUM) data variables
-        # and save them as separate zarr files.
-        for data_group_name, data_group in self.attrs["data_groups"].items():
-            del copy_cor_xds[data_group["correlated_data"]].attrs[
-                "field_and_source_xds"
-            ]
-
-            # print("data_group_name", data_group_name)
-            xr.Dataset.to_zarr(
-                self[data_group["correlated_data"]].attrs["field_and_source_xds"],
-                os.path.join(store, "field_and_source_xds_" + data_group_name),
-                **kwargs,
-            )
-
-        # Remove xds attributes from copy_cor_xds and save xds attributes as separate zarr files.
-        for attrs_name in self.attrs:
-            if "xds" in attrs_name:
-                del copy_cor_xds.attrs[attrs_name]
-                xr.Dataset.to_zarr(
-                    self.attrs[attrs_name], os.path.join(store, attrs_name), **kwargs
-                )
-
-        # Save copy_cor_xds as zarr file.
-        xr.Dataset.to_zarr(
-            copy_cor_xds, os.path.join(store, "correlated_xds"), **kwargs
-        )
-
-    def sel(
-        self,
-        indexers: Union[Mapping[Any, Any], None] = None,
-        method: Union[str, None] = None,
-        tolerance: Union[int, float, Iterable[Union[int, float]], None] = None,
-        drop: bool = False,
-        **indexers_kwargs: Any,
-    ):
-        """
-        Select data along dimension(s) by label. Overrides `xarray.Dataset.sel <https://xarray.pydata.org/en/stable/generated/xarray.Dataset.sel.html>`__ so that a data group can be selected by name by using the `data_group_name` parameter.
-        For more information on data groups see `Data Groups <https://xradio.readthedocs.io/en/latest/measurement_set_overview.html#Data-Groups>`__ section. See `xarray.Dataset.sel <https://xarray.pydata.org/en/stable/generated/xarray.Dataset.sel.html>`__ for parameter descriptions.
-
-        Returns:
-            MeasurementSetXds
-
-        Examples
-        --------
-        >>> # Select data group 'corrected' and polarization 'XX'.
-        >>> selected_ms_xds = ms_xds.sel(data_group_name='corrected', polarization='XX')
-
-        >>> # Select data group 'corrected' and polarization 'XX' using a dict.
-        >>> selected_ms_xds = ms_xds.sel({'data_group_name':'corrected', 'polarization':'XX')
-        """
-
-        if "data_group_name" in indexers_kwargs:
-            data_group_name = indexers_kwargs["data_group_name"]
-            del indexers_kwargs["data_group_name"]
-        elif (indexers is not None) and ("data_group_name" in indexers):
-            data_group_name = indexers["data_group_name"]
-            del indexers["data_group_name"]
-        else:
-            data_group_name = None
-
-        if data_group_name is not None:
-            sel_data_group_set = set(
-                self.attrs["data_groups"][data_group_name].values()
-            )
-
-            data_variables_to_drop = []
-            for dg in self.attrs["data_groups"].values():
-                temp_set = set(dg.values()) - sel_data_group_set
-                data_variables_to_drop.extend(list(temp_set))
-
-            data_variables_to_drop = list(set(data_variables_to_drop))
-
-            sel_ms_xds = MeasurementSetXds(
-                super()
-                .sel(indexers, method, tolerance, drop, **indexers_kwargs)
-                .drop_vars(data_variables_to_drop)
-            )
-
-            sel_ms_xds.attrs["data_groups"] = {
-                data_group_name: self.attrs["data_groups"][data_group_name]
-            }
-
-            return sel_ms_xds
-        else:
-            return MeasurementSetXds(
-                super().sel(indexers, method, tolerance, drop, **indexers_kwargs)
-            )