xradio 0.0.59__py3-none-any.whl → 1.0.0__py3-none-any.whl

xradio/schema/bases.py

@@ -1,3 +1,20 @@
+"""
+Class decorators to generate schemas from suitably annotated Python
+class definition. This approach was essentially
+copied from https://pypi.org/project/xarray-dataclasses/, though our
+implementation differs in a number of critical ways:
+
+* We use custom decorators on the classes instead of base classes. This
+  especially overrides the existing constructor, which makes it easier to
+  directly construct instances and allows for extra data variables
+  and attributes.
+
+* We support multiple options for types and dimensions
+
+* We convert the schema definition into our own meta-model, which facilitates
+  generating documentation generation using Sphinx
+"""
+
 import xarray
 import inspect
 from . import dataclass, check, metamodel, typing
@@ -166,12 +183,12 @@ def xarray_dataarray_schema(cls):
     """Decorator for classes representing :py:class:`xarray.DataArray` schemas.
     The annotated class should exactly contain:
 
-    * one field called "``data``" annotated with :py:data:`~typing.Data`
+    * one field called "``data``" annotated with :py:data:`~xradio.schema.typing.Data`
       to indicate the array type
-    * fields annotated with :py:data:`~typing.Coord` to indicate mappings of
+    * fields annotated with :py:data:`~xradio.schema.typing.Coord` to indicate mappings of
       dimensions to coordinates (coordinates directly associated with dimensions
       should have the same name as the dimension)
-    * fields annotated with :py:data:`~typing.Attr` to declare attributes
+    * fields annotated with :py:data:`~xradio.schema.typing.Attr` to declare attributes
 
     Decorated schema classes can be used with
     :py:func:`~xradio.schema.check.check_array` for checking
@@ -254,10 +271,6 @@ def is_dataarray_schema(val: typing.Any):
     return type(val) == type and hasattr(val, "__xradio_array_schema")
 
 
-class AsDataArray:
-    __new__ = _dataarray_new
-
-
 def _dataset_new(cls, *args, data_vars=None, coords=None, attrs=None, **kwargs):
     # Get standard xarray parameters (data_vars, coords, attrs)
     # Note that we only support these as keyword arguments for now
@@ -379,12 +392,12 @@ def xarray_dataset_schema(cls):
     """Decorator for classes representing :py:class:`xarray.Dataset` schemas.
     The annotated class should exactly contain:
 
-    * fields annotated with :py:data:`~typing.Coord` to indicate mappings of
+    * fields annotated with :py:data:`~xradio.schema.typing.Coord` to indicate mappings of
       dimensions to coordinates (coordinates directly associated with dimensions
       should have the same name as the dimension)
-    * fields annotated with :py:data:`~typing.Data`
+    * fields annotated with :py:data:`~xradio.schema.typing.Data`
       to indicate data variables
-    * fields annotated with :py:data:`~typing.Attr` to declare attributes
+    * fields annotated with :py:data:`~xradio.schema.typing.Attr` to declare attributes
 
     Decorated schema classes can be used with
     :py:func:`~xradio.schema.check.check_dataset` for checking
@@ -413,15 +426,6 @@ def is_dataset_schema(val: typing.Any):
     return type(val) == type and hasattr(val, "__xradio_dataset_schema")
 
 
-class AsDataset:
-    """Mix-in class to indicate dataset data classes
-
-    Deprecated - use decorator :py:func:`xarray_dataset_schema` instead
-    """
-
-    __new__ = _dataset_new
-
-
 def _dict_new(cls, *args, **kwargs):
     # Get signature of __init__, map parameters and apply defaults. This
     # will raise an exception if there are any extra parameters.
@@ -466,12 +470,3 @@ def dict_schema(cls):
 
 def is_dict_schema(val: typing.Any):
     return type(val) == type and hasattr(val, "__xradio_dict_schema")
-
-
-class AsDict:
-    """Mix-in class to indicate dictionary data classes
-
-    Deprecated - use decorator :py:func:`dict_schema` instead
-    """
-
-    __new__ = _dict_new

xradio/schema/check.py

@@ -77,7 +77,7 @@ class SchemaIssues(Exception):
     in one go.
     """
 
-    issues: [SchemaIssue]
+    issues: list[SchemaIssue]
     """List of issues found"""
 
     def __init__(self, issues=None):
@@ -147,8 +147,8 @@ def check_array(
     Check whether an xarray DataArray conforms to a schema
 
     :param array: DataArray to check
-    :param schema: Schema to check against (possibly as :py:class:`AsDataset`)
-    :returns: List of :py:class:`SchemaIssue`s found
+    :param schema: Schema to check against
+    :returns: :py:class:`SchemaIssues` found
     """
 
     # Check that this is actually a DataArray
@@ -185,8 +185,8 @@ def check_dataset(
     Check whether an xarray DataArray conforms to a schema
 
     :param array: DataArray to check
-    :param schema: Schema to check against (possibly as :py:class:`AsDataArray` dataclass)
-    :returns: List of :py:class:`SchemaIssue`s found
+    :param schema: Schema to check against
+    :returns: :py:class:`SchemaIssues` found
     """
 
     # Check that this is actually a Dataset
@@ -233,7 +233,7 @@ def check_dimensions(
     :param array: Dimension list to check
     :param schema: Expected possibilities for dimension list
     :param check_order: Whether to check order of dimensions
-    :returns: List of :py:class:`SchemaIssue`s found
+    :returns: :py:class:`SchemaIssues` found
     """
 
     # Find a dimension list that matches
@@ -295,7 +295,7 @@ def check_dtype(dtype: numpy.dtype, expected: [numpy.dtype]) -> SchemaIssues:
 
     :param dtype: Numeric type to check
     :param schema: Expected possibilities for dtype
-    :returns: List of :py:class:`SchemaIssue`s found
+    :returns: :py:class:`SchemaIssues` found
     """
 
     for exp_dtype_str in expected:
@@ -333,7 +333,7 @@ def check_attributes(
 
     :param attrs: Dictionary of attributes
     :param attrs_schema: Expected schemas
-    :returns: List of :py:class:`SchemaIssue`s found
+    :returns: :py:class:`SchemaIssues` found
     """
 
     issues = SchemaIssues()
@@ -367,7 +367,7 @@ def check_data_vars(
     data_var_kind: str,
 ) -> SchemaIssues:
     """
-    Check whether an data variable set conforms to a schema
+    Check whether a data variable set conforms to a schema
 
     As data variables are data arrays, this will recurse into checking the
     array schemas
@@ -375,7 +375,7 @@ def check_data_vars(
     :param data_vars: Dictionary(-like) of data_varinates
     :param data_vars_schema: Expected schemas
     :param datavar_kind: Either 'coords' or 'data_vars'
-    :returns: List of :py:class:`SchemaIssue`s found
+    :returns: :py:class:`SchemaIssues` found
     """
 
     assert data_var_kind in ["coords", "data_vars"]
@@ -434,6 +434,14 @@ def check_data_vars(
 def check_dict(
     dct: dict, schema: typing.Union[type, metamodel.DictSchema]
 ) -> SchemaIssues:
+    """
+    Check whether a dictionary conforms to a schema
+
+    :param dct: Dictionary to check
+    :param schema: Dictionary schema to check against
+    :returns: :py:class:`SchemaIssues` found
+    """
+
     # Check that this is actually a dictionary
     if not isinstance(dct, dict):
         raise TypeError(f"check_dict: Expected dictionary, but got {type(dct)}!")
@@ -588,13 +596,13 @@ def check_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
+    This is the case if each contained :py:class:`~xarray.Dataset` conforms to a schema
+    registed with Xradio.
+    This works by looking for a ``type`` attribute in the :py:class:`~xarray.Dataset`, which
     must have a :py:class:`typing.Literal` type annotation specifying
-    the type name of the dataset
+    the name of the dataset schema.
 
-    :param schema: Schema to register
+    :param datatree: Data to check for schema conformance
     """
 
     # Loop through all groups in datatree

xradio/schema/common.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+from typing import Literal, Optional, Union, List
+from xradio.schema.bases import (
+    xarray_dataset_schema,
+    xarray_dataarray_schema,
+    dict_schema,
+)
+from xradio.schema.typing import Attr, Coord, Coordof, Data, Dataof, Name
+import numpy
+
+
+# Dimensions
+Time = Literal["time"]
+""" Observation time dimension """
+Frequency = Literal["frequency"]
+""" Frequency dimension """
+FrequencySystemCal = Literal["frequency_system_cal"]
+""" Frequency dimension in the system calibration dataset """
+Polarization = Literal["polarization"]
+""" Polarization dimension """
+UvwLabel = Literal["uvw_label"]
+""" Coordinate dimension of UVW data (typically shape 3 for 'u', 'v', 'w') """
+SkyDirLabel = Literal["sky_dir_label"]
+""" Coordinate labels of sky directions (typically shape 2 and 'ra', 'dec') """
+LocalSkyDirLabel = Literal["local_sky_dir_label"]
+""" Coordinate labels of local sky directions (typically shape 2 and 'az', 'alt') """
+SphericalDirLabel = Literal["spherical_dir_label"]
+""" Coordinate labels of spherical directions (shape 2 and 'lon', 'lat1' """
+SkyPosLabel = Literal["sky_pos_label"]
+""" Coordinate labels of sky positions (typically shape 3 and 'ra', 'dec', 'dist') """
+SphericalPosLabel = Literal["spherical_pos_label"]
+""" Coordinate labels of spherical positions (shape shape 3 and 'lon', 'lat1', 'dist2') """
+EllipsoidPosLabel = Literal["ellipsoid_pos_label"]
+""" Coordinate labels of geodetic earth location data (typically shape 3 and 'lon', 'lat', 'height')"""
+CartesianPosLabel = Literal["cartesian_pos_label"]
+""" Coordinate labels of geocentric earth location data (typically shape 3 and 'x', 'y', 'z')"""
+nPolynomial = Literal["n_polynomial"]
+""" For data that is represented as variable in time using Taylor expansion """
+PolyTerm = Literal["poly_term"]
+""" Polynomial term used in VLBI GAIN_CURVE """
+LineLabel = Literal["line_label"]
+""" Line labels (for line names and variables). """
+FieldName = Literal["field_name"]
+""" Field names dimension. """

xradio/schema/export.py

@@ -1,3 +1,9 @@
+"""
+Functions to import and export :py:class:`xradio.schema.metamodel.DatasetSchema`
+as JSON representation. This can be used to externalise schema checks, or
+generate documentation from schemas in JSON representation.
+"""
+
 import dataclasses
 import json
 
@@ -9,6 +15,8 @@ from xradio.schema import (
     xarray_dataclass_to_dict_schema,
 )
 
+__all__ = ["export_schema_json_file", "import_schema_json_file"]
+
 CLASS_ATTR = "$class"
 
 
@@ -75,9 +83,12 @@ class DataclassDecoder(json.JSONDecoder):
         return obj
 
 
-def export_schema_json_file(schema, fname):
+def export_schema_json_file(schema: "DatasetSchema", fname: str):
     """
     Exports given schema as a JSON file
+
+    :param schema: Dataset schema. Dataclasses will be converted automatically.
+    :param fname: File name to write serialised schema to
     """
 
     # Check that this is actually a Dataset
@@ -93,7 +104,17 @@ def export_schema_json_file(schema, fname):
         json.dump(schema, f, cls=DataclassEncoder, ensure_ascii=False, indent="  ")
 
 
-def import_schema_json_file(fname):
+def import_schema_json_file(fname: str):
+    """
+    Imports a schema from a JSON file
+
+    For JSON files generated by
+    :py:func:`export_schema_json_file`, this will return a
+    :py:class:`~xradio.schema.metamodel.DatasetSchema`.
+
+    :param fname: File name to load
+    :returns: Deserialised object
+    """
 
     with open(fname, "r", encoding="utf8") as f:
         return json.load(f, cls=DataclassDecoder, dataclass_map=DATACLASS_MAP)

xradio/schema/metamodel.py

@@ -1,3 +1,7 @@
+"""
+Data classes used by Xradio routines to represent dataset schemas.
+"""
+
 from __future__ import annotations
 
 from dataclasses import dataclass, MISSING
@@ -62,7 +66,7 @@ class AttrSchemaRef(ValueSchema):
     name: str = ""
     """Name of attribute as given in data array / dataset."""
     default: typing.Optional[typing.Any] = None
-    """If optional: What is the default value?"""
+    """If optional: what is the default value?"""
     docstring: str = ""
     """Documentation string of attribute reference"""
 
@@ -108,7 +112,7 @@ class ArraySchema:
         """
         return not self.coordinates
 
-    def required_dimensions(self) -> [str]:
+    def required_dimensions(self) -> list[str]:
         """
         Returns set of dimensions that is always required
         """
@@ -133,7 +137,7 @@ class ArraySchemaRef(ArraySchema):
     optional: bool
     """Is the data array optional?"""
     default: typing.Optional[typing.Any] = None
-    """If optional: What is the default value?"""
+    """If optional: what is the default value?"""
     docstring: typing.Optional[str] = None
     """Documentation string of array reference"""
 
@@ -147,13 +151,13 @@ class DatasetSchema:
     schema_name: str
     """(Class) name of the schema"""
 
-    dimensions: [[str]]
+    dimensions: list[list[str]]
     """List of possible dimensions (derived from data arrays)"""
-    coordinates: [ArraySchemaRef]
+    coordinates: list[ArraySchemaRef]
     """List of coordinate data arrays"""
-    data_vars: [ArraySchemaRef]
+    data_vars: list[ArraySchemaRef]
     """List of data arrays"""
-    attributes: [AttrSchemaRef]
+    attributes: list[AttrSchemaRef]
     """List of attributes"""
 
     class_docstring: typing.Optional[str]
@@ -169,7 +173,7 @@ class DictSchema:
     schema_name: str
     """(Class) name of the schema"""
 
-    attributes: [AttrSchemaRef]
+    attributes: list[AttrSchemaRef]
     """List of attributes"""
 
     class_docstring: typing.Optional[str]

xradio/schema/typing.py

@@ -117,7 +117,7 @@ Example:
     ::
 
         @dataclass
-        class Image(AsDataArray):
+        class Image():
             data: Data[tuple[X, Y], float]
             long_name: Attr[str] = "luminance"
             units: Attr[str] = "cd / m^2"
@@ -140,7 +140,7 @@ Example:
     ::
 
         @dataclass
-        class Image(AsDataArray):
+        class Image():
             data: Data[tuple[X, Y], float]
             mask: Coord[tuple[X, Y], bool]
             x: Coord[X, int] = 0
@@ -174,14 +174,11 @@ Example:
 
 
         @dataclass
-        class Image(AsDataArray):
+        class Image():
             data: Data[tuple[X, Y], float]
             x: Coordof[XAxis] = 0
             y: Coordof[YAxis] = 0
 
-Hint:
-    A class used in ``Coordof`` does not need to inherit ``AsDataArray``.
-
 """
 
 Data = Annotated[Union[Labeled[TDims], Collection[TDType], TDType], Role.DATA]
@@ -192,13 +189,13 @@ Example:
     (the second and subsequent data fields are just ignored)::
 
         @dataclass
-        class Image(AsDataArray):
+        class Image():
             data: Data[tuple[X, Y], float]
 
     Multiple data fields are allowed in a Dataset class::
 
         @dataclass
-        class ColorImage(AsDataset):
+        class ColorImage():
             red: Data[tuple[X, Y], float]
             green: Data[tuple[X, Y], float]
             blue: Data[tuple[X, Y], float]
@@ -222,14 +219,11 @@ Example:
 
 
         @dataclass
-        class ColorImage(AsDataset):
+        class ColorImage():
             red: Dataof[Image]
             green: Dataof[Image]
             blue: Dataof[Image]
 
-Hint:
-    A class used in ``Dataof`` does not need to inherit ``AsDataArray``.
-
 """
 
 Name = Annotated[THashable, Role.NAME]
@@ -239,7 +233,7 @@ Example:
     ::
 
         @dataclass
-        class Image(AsDataArray):
+        class Image():
             data: Data[tuple[X, Y], float]
             name: Name[str] = "image"
 

{xradio-0.0.59.dist-info → xradio-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xradio
-Version: 0.0.59
+Version: 1.0.0
 Summary:  Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>, Federico Montesino Pouzols <pouzols@eso.edu>, Dave Mehringer <dmehring@nrao.edu>, Peter Wortmann <peter.wortmann@skao.int>
 License: BSD 3-Clause License
@@ -110,10 +110,10 @@ Xarray Radio Astronomy Data IO is still in development.
 # Installing
 XRADIO can be installed in virtual environments via pip. It is recommended to use the conda environment manager from [miniforge](https://github.com/conda-forge/miniforge) to create a clean, self-contained runtime where XRADIO and all its dependencies can be installed, for example:
 ```sh
-conda create --name xradio python=3.12 --no-default-packages
+conda create --name xradio python=3.13 --no-default-packages
 conda activate xradio
 ```
-> 📝 On macOS it is required to pre-install `python-casacore` using `conda install -c conda-forge python-casacore`.
+> 📝 On macOS, if one wants to use the functions to convert MSv2=>MSv4, it is required to pre-install `python-casacore`. That can be done using `conda install -c conda-forge python-casacore`. See more alternatives below.
 
 XRADIO can now be installed using:
 ```sh

{xradio-0.0.59.dist-info → xradio-1.0.0.dist-info}/RECORD

@@ -2,14 +2,14 @@ xradio/__init__.py,sha256=YTpM274ZBWK14HmIXyah27yiKPsmR6xCILvlXkQrYG4,387
 xradio/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/_utils/coord_math.py,sha256=ZdbgStXqQ_HS7qQ9UBPk8Z3Zse5P_DrYQsgn2UCf22U,3342
 xradio/_utils/dict_helpers.py,sha256=a4veG6Dgwmtb9yO0kV9qvcQ9IZAKKrC9rAJ_m4EukcE,4072
-xradio/_utils/list_and_array.py,sha256=fW0LDSXlPrSQguSUcZM5oy2Zw-KQVqq9vmmLS8jhc70,4340
+xradio/_utils/list_and_array.py,sha256=eRatx-Tt6IQC6NCxK38WHP5OlloQcKZWxEoNDHeTAOE,4375
 xradio/_utils/schema.py,sha256=OYfAljwNU94KyxGSpKuKxSzSdebW6T43RkMA13aTaeU,7615
 xradio/_utils/_casacore/casacore_from_casatools.py,sha256=ugmWEIzJbuXsPDgJbtuzv0qSXx5Vybu8Sp73NAFt5oQ,31207
 xradio/_utils/_casacore/tables.py,sha256=puRidbjtVx6caEG_Z5TebTLdTUbtBUhzvqByKLQTHfo,1389
 xradio/_utils/zarr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/_utils/zarr/common.py,sha256=rqqGAogp75xCE9ZiUvV-cU2n4aOw2qHycKh0F_EW518,2964
 xradio/image/__init__.py,sha256=HAD0GfopIbhdxOYckyW6S9US_dSWmZrwIl3FHUzZwrE,435
-xradio/image/image.py,sha256=L-6hhAbO6Bm1zbPRzcl_P3REjHyjFd2rjQvnpYO5Q8Q,16726
+xradio/image/image.py,sha256=qhmacJ1C60ccpSEpz6ofWMP3fg47VO9rCGyh9OSHTao,16774
 xradio/image/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/image/_util/casacore.py,sha256=_o8767_zYGbXMqqN4k4clq2VhfgEls09h2WXInKEFe0,4615
 xradio/image/_util/common.py,sha256=VGJ21x-Uifk9kf_O6o7URwesYInVZeMh1RLCXQOlgq0,8428
@@ -18,29 +18,29 @@ xradio/image/_util/zarr.py,sha256=lhQqVRC1GEWClG3zRbuDr2IlQBfXeDqaLUJIN-MVMxA,16
 xradio/image/_util/_casacore/__init__.py,sha256=OlsiRE40o1jSbBI4khgQQzgfDYbAlOMKIhO4UFlbGhg,41
 xradio/image/_util/_casacore/common.py,sha256=2a88YrveQY9x8bcM7SQSn-L5y60W92rLW34OXC5VwSs,1764
 xradio/image/_util/_casacore/xds_from_casacore.py,sha256=egL5pavyYs66sAHuWQGywnZUmaSle1IPtHSPeG25F1M,43731
-xradio/image/_util/_casacore/xds_to_casacore.py,sha256=RO8xOU2DwjNyLfAmAZAz9dCAf_RSlLotRVYRBLhnGOI,17938
+xradio/image/_util/_casacore/xds_to_casacore.py,sha256=Z4wZJ4A9nydiLJyf49XTu64Ii3rxVCAB026UA-PVZwg,18276
 xradio/image/_util/_fits/xds_from_fits.py,sha256=DsuKAer43rWwDjA9gFNs2sCqFrFVdFW6O0i21RVZzzE,34654
 xradio/image/_util/_zarr/common.py,sha256=ltlj3uFa-uv8lXlDtV79QnfNmfm0tyhXN5FDAjZtjzg,308
 xradio/image/_util/_zarr/xds_from_zarr.py,sha256=KMsfaSSm9kyVoztS6pUzGNxMZzQnCxkk0kDv2GxW5Kw,4451
 xradio/image/_util/_zarr/xds_to_zarr.py,sha256=nsDvDD-kuMuMF2dDlj0jTxSW4mdR-jjIsvXHi5uIERU,2373
 xradio/image/_util/_zarr/zarr_low_level.py,sha256=xnYm6EmVbmLxMlOSXH32SABfQBLHfr2H9ch9gYwFNXs,13338
 xradio/measurement_set/__init__.py,sha256=rGhy9tz5d60hln-SSWFLieDrZ2sodli3npKuCEQc8bc,1127
-xradio/measurement_set/convert_msv2_to_processing_set.py,sha256=ffdqpNQE01YHP_rXR74EvNtGVYaxBlY646vzh3Aimeo,9666
+xradio/measurement_set/convert_msv2_to_processing_set.py,sha256=B-TpUHtouokl3sdwEVqreBmgQOtmLSG7i6bQ5Jj3FQw,10519
 xradio/measurement_set/load_processing_set.py,sha256=r_eO7DTr-3EphujOEh-P_VfcVRpYzx1M-tGBwpxFC-8,8201
-xradio/measurement_set/measurement_set_xdt.py,sha256=KHfm0AvjpLDLXHCOCtp51oFGwbrUVA2vKh6ZZ2sWK2M,12234
-xradio/measurement_set/open_processing_set.py,sha256=yfXhs1co8UBf4-m7LLAnc7lV2hFvGKV-HwQ_yAcusH8,5243
-xradio/measurement_set/processing_set_xdt.py,sha256=4ZnYT-hYw2upEil_jViOKptmi4JWrnbPOyAOQffd5Ek,34295
-xradio/measurement_set/schema.py,sha256=C32tb7gNIgOZvvr9b3uF5tODqXfbpOQPECI3dgr-udA,90729
+xradio/measurement_set/measurement_set_xdt.py,sha256=xzn61zznJ7r3rGdeFMPA9Syy3i06ML4PZJy5iB9RbvY,12598
+xradio/measurement_set/open_processing_set.py,sha256=LA9eTN0M9SzK0yrWeHHVVRxrqHq1MF0eHkqR46OOLm8,5296
+xradio/measurement_set/processing_set_xdt.py,sha256=J4RB58xBcONLxkyFa5d8FDzSINxF9hJfZeJBrHLRXG4,36837
+xradio/measurement_set/schema.py,sha256=ZH0n8lZTD8fi3JEZV2SEwdh1oRo1ric__uZ9o8p3AUE,89149
 xradio/measurement_set/_utils/__init__.py,sha256=iTbgPiQPw9hyXSdQYPcwGRrP2PFXgF6CZi8A3KNKya0,43
 xradio/measurement_set/_utils/_msv2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xradio/measurement_set/_utils/_msv2/conversion.py,sha256=rPokAkZ7_4oJOOZ_byEv4nSL14L9oV5kbpj1yopgTjw,54089
+xradio/measurement_set/_utils/_msv2/conversion.py,sha256=og8-gu9fMSXfW2a1l9hWZhE8HNNNukHX4o1ROyNFk7w,54871
 xradio/measurement_set/_utils/_msv2/create_antenna_xds.py,sha256=s3HnTbyOl7h6pAocJ4dpd095s7qHSSngeQ34Ygo8Uk0,17650
-xradio/measurement_set/_utils/_msv2/create_field_and_source_xds.py,sha256=HSmeR2BZvsVBPp7ySUgFIR_LXQ0-fLu9cFd_ScsJgZ0,33523
+xradio/measurement_set/_utils/_msv2/create_field_and_source_xds.py,sha256=k5pJhIafu9QANaX9-pdJ1fOqGOtplHxR2Ve9xBCf3dA,33557
 xradio/measurement_set/_utils/_msv2/msv2_to_msv4_meta.py,sha256=ZpxJJ2yTjjEy6A4XWS9eT-1J92jLwR8CNyoDBfhAVm8,1572
-xradio/measurement_set/_utils/_msv2/msv4_info_dicts.py,sha256=s7K4MUWtrxKG9e6brNSXXJ6EYvsUf30PYEkkb1P13Mc,7320
+xradio/measurement_set/_utils/_msv2/msv4_info_dicts.py,sha256=cMgD6EB1pRShL6TBVSpom0VhkqTnsYNi9vxz_gfgGtU,11952
 xradio/measurement_set/_utils/_msv2/msv4_sub_xdss.py,sha256=6BXZkypfe1C4n5bQDtxMdY0qnVuO3DDjtwDLUwtUOow,30453
 xradio/measurement_set/_utils/_msv2/optimised_functions.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xradio/measurement_set/_utils/_msv2/partition_queries.py,sha256=1dzwAVraEktkMl8MYn6bzhjlpCCSgy6KTqlTmjeC3nQ,5661
+xradio/measurement_set/_utils/_msv2/partition_queries.py,sha256=_eWxxgxEYRX1Pj1ZFHD_HIcrF9Rpfe6OJmp3uYJ2UiY,11970
 xradio/measurement_set/_utils/_msv2/subtables.py,sha256=mrf7g7mbC4crtnQ0wFocPcFRNlvq_7e7iDzE5B6ugl4,843
 xradio/measurement_set/_utils/_msv2/_tables/read.py,sha256=tW0ROevR4tXpydIWuj2UyNhWNtvkKU9NkYxMi1ZoVKc,45421
 xradio/measurement_set/_utils/_msv2/_tables/read_main_table.py,sha256=FFoTVpY8JNvcXnTvUiraWNU9gB9-_9GR7he0NbODabg,3168
@@ -49,17 +49,18 @@ xradio/measurement_set/_utils/_utils/interpolate.py,sha256=LlDYi-h7aj_tsuZqAu5Kr
 xradio/measurement_set/_utils/_utils/partition_attrs.py,sha256=JaePHts_A0EbB4K-0a_uC98RZ2EmfjB9pDSEI11oAwk,3401
 xradio/measurement_set/_utils/_utils/stokes_types.py,sha256=DMa8TmmS7BQ99Xm8c7ZjcRapMtLbrKVxrt4f0qUIOvg,561
 xradio/measurement_set/_utils/_zarr/encoding.py,sha256=ze5ncHEBa-sVwJCayJa2irOdaxZEkYfBKObuij7uVRc,371
-xradio/schema/__init__.py,sha256=EzEMnOtN8G_wdjo8QBRKfq5MrYgfr_nt1pfunlI6i6Q,733
-xradio/schema/bases.py,sha256=dk24pFhugCe5RjaR41xxP38FxVVsIC9bdmBdsarwFvk,17162
-xradio/schema/check.py,sha256=JJg8x0PiNQ7zX04XBqg8l_AIAK1SDv8mRp8HJxYd1Rw,21942
+xradio/schema/__init__.py,sha256=tJqTUSwkwvkak_6eAZqhT5BQqunlfxciG07-y8uSrMY,683
+xradio/schema/bases.py,sha256=TRwvOo2UA7ki-yV1Vcb5aDxAAxH2lTKtwoGx2m5VB4o,17512
+xradio/schema/check.py,sha256=oMOEeI4S_PTvWdMJA-_-LRUULykxZmy7cu3o-F5NZog,22128
+xradio/schema/common.py,sha256=Hi2vT8s0za0J7FfA0OhzrGdtwjJ5eQWH7x3hfhBCOuo,2016
 xradio/schema/dataclass.py,sha256=gzNqXzkBLV7ETEyddNOd_jRgP8rkivCkfUlURLz8z5c,19300
-xradio/schema/export.py,sha256=_dqUToirb_T6eC_x2b4bzhUtDSB6VmvLTC8kW9z2XOI,2781
-xradio/schema/metamodel.py,sha256=4Pnymp34Pli2mQU_3LEBIx-2TUtlza-ZRwXLzBm1SjA,4859
-xradio/schema/typing.py,sha256=BJactfOKXgnIm4Y7BZE72lLKYhPt-N0xxlMjkTL6ecY,10438
+xradio/schema/export.py,sha256=qN8O8Wc9FtrYbiEmg1u66cN4coY_8QVHrZfb-oHhYp0,3510
+xradio/schema/metamodel.py,sha256=F0lxnn0wLrsT2HrBo2zfIcmRLxD2yQwh7XfDciPNwVs,4963
+xradio/schema/typing.py,sha256=RLFeMEPPHetc__kDaql1N1AcVuHArfk57DsUw2rZ5CE,10204
 xradio/sphinx/__init__.py,sha256=VGY-7Ty3q67qpnBee0-znbiJ-Iy0F93UO--IpjEdHXc,380
 xradio/sphinx/schema_table.py,sha256=CrhWMDYHwB7CbBMGfWtW20bLoBkeQZHd6l91cihvaBA,10709
-xradio-0.0.59.dist-info/licenses/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
-xradio-0.0.59.dist-info/METADATA,sha256=ZBTavpFX7VvjtRZkANWIZO1jKxsRc2WrXwETbo91JN4,7513
-xradio-0.0.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xradio-0.0.59.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
-xradio-0.0.59.dist-info/RECORD,,
+xradio-1.0.0.dist-info/licenses/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
+xradio-1.0.0.dist-info/METADATA,sha256=NBGVwySGd_pgdAUW1b54iErJc7gioqSn53vaAawONI4,7617
+xradio-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xradio-1.0.0.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
+xradio-1.0.0.dist-info/RECORD,,