caom2 2.6.2__tar.gz → 2.6.3__tar.gz

{caom2-2.6.2/caom2.egg-info → caom2-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: caom2
-Version: 2.6.2
+Version: 2.6.3
 Summary: CAOM-2.4 library
 Home-page: http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/caom2
 Author: Canadian Astronomy Data Centre
@@ -20,6 +20,15 @@ Requires-Dist: pytest>=4.6; extra == "test"
 Requires-Dist: pytest-cov>=2.5.1; extra == "test"
 Requires-Dist: flake8>=3.4.1; extra == "test"
 Requires-Dist: funcsigs>=1.0.2; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 caom2
 =====

{caom2-2.6.2 → caom2-2.6.3}/caom2/common.py

@@ -150,7 +150,7 @@ class CaomObject(object):
                           for arg in args])
 
     def __eq__(self, other):
-        if type(other) == type(self):
+        if isinstance(other, CaomObject):
             return self.__dict__ == other.__dict__
         else:
             return False

{caom2-2.6.2 → caom2-2.6.3}/caom2/diff.py

@@ -105,7 +105,7 @@ def get_differences(expected, actual, parent=None):
     """
     report = []
 
-    if type(expected) != type(actual):
+    if not isinstance(actual, expected.__class__):
         report.append(
             'Types:: expected \'{}\' actual \'{}\''.format(type(expected),
                                                            type(actual)))

{caom2-2.6.2 → caom2-2.6.3}/caom2/obs_reader_writer.py

@@ -3,7 +3,7 @@
 # ******************  CANADIAN ASTRONOMY DATA CENTRE  *******************
 # *************  CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES  **************
 #
-#  (c) 2022.                            (c) 2022.
+#  (c) 2025.                            (c) 2025.
 #  Government of Canada                 Gouvernement du Canada
 #  National Research Council            Conseil national de recherches
 #  Ottawa, Canada, K1A 0R6              Ottawa, Canada, K1A 0R6
@@ -631,6 +631,23 @@ class ObservationReader(object):
             data_quality = plane.DataQuality(plane.Quality(flag))
             return data_quality
 
+    def _get_observable(self, parent, ns):
+        """Build an Observable object from an XML representation
+
+        Arguments:
+        parent : element containing the Observable element
+        ns : namespace of the document
+        return : an Observable object or None if the document does not contain one
+        raise : ObservationParsingException
+        """
+        el = self._get_child_element("observable", parent, ns, False)
+        if el is None:
+            return None
+        else:
+            ucd = self._get_child_text("ucd", el, ns, True)
+            observable = plane.Observable(plane.Ucd(ucd))
+            return observable
+
     def _get_point(self, point, ns, required):
         """Build an Point object from an XML representation
         of an Point element.
@@ -1696,6 +1713,8 @@ class ObservationReader(object):
                 _plane.provenance = \
                     self._get_provenance("provenance", plane_element, ns,
                                          False)
+                _plane.observable = self._get_observable(plane_element, ns)
+
                 _plane.metrics = \
                     self._get_metrics("metrics", plane_element, ns, False)
                 _plane.quality = \
@@ -2080,6 +2099,7 @@ class ObservationWriter(object):
                                   _plane.calibration_level.value,
                                   plane_element)
             self._add_provenance_element(_plane.provenance, plane_element)
+            self._add_observable_element(_plane.observable, plane_element)
             self._add_metrics_element(_plane.metrics, plane_element)
             self._add_quality_element(_plane.quality, plane_element)
 
@@ -2131,9 +2151,9 @@ class ObservationWriter(object):
                         "Attempt to write CAOM2.4 element "
                         "(energy.resolving_power_bands) as "
                         "CAOM2.3 Observation")
-        else:
-            self._add_interval_element("resolvingPowerBounds",
-                                       energy.resolving_power_bounds, element)
+            else:
+                self._add_interval_element("resolvingPowerBounds",
+                                           energy.resolving_power_bounds, element)
         self._add_element("sampleSize", energy.sample_size, element)
         self._add_element("bandpassName", energy.bandpass_name, element)
         if energy.energy_bands:
@@ -2280,6 +2300,13 @@ class ObservationWriter(object):
         element = self._get_caom_element("quality", parent)
         self._add_element("flag", quality.flag.value, element)
 
+    def _add_observable_element(self, observable, parent):
+        if observable is None:
+            return
+
+        element = self._get_caom_element("observable", parent)
+        self._add_element("ucd", observable.ucd.value, element)
+
     def _add_transition_element(self, transition, parent):
         if transition is None:
             return

{caom2-2.6.2 → caom2-2.6.3}/caom2/plane.py

@@ -79,11 +79,9 @@ from . import caom_util
 from . import shape
 from . import wcs
 from .artifact import Artifact
-from .common import AbstractCaomEntity, CaomObject, ObservationURI,\
-    VocabularyTerm, OrderedEnum
+from .common import AbstractCaomEntity, CaomObject, ObservationURI, VocabularyTerm, OrderedEnum
 from .common import _CAOM_VOCAB_NS, _OBSCORE_VOCAB_NS
 import warnings
-from enum import Enum
 with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     from aenum import Enum, extend_enum
@@ -91,7 +89,7 @@ with warnings.catch_warnings():
 __all__ = ['CalibrationLevel', 'DataProductType', 'EnergyBand',
            'PolarizationState', 'Quality', 'Plane',
            'PlaneURI', 'DataQuality', 'Metrics', 'Provenance', 'Position',
-           'Energy', 'Polarization', 'Time', 'Observable']
+           'Energy', 'Polarization', 'Time', 'Observable', 'Ucd']
 
 
 class CalibrationLevel(Enum):
@@ -110,6 +108,14 @@ class CalibrationLevel(Enum):
     ANALYSIS_PRODUCT = int_32(4)
 
 
+class Ucd(CaomObject):
+    """ UCD - enum of UCDs"""
+    _UCD_VOCAB = "https://ivoa.net/documents/UCD1+/20230125/ucd-list.txt"
+
+    def __init__(self, value):
+        self.value = value
+
+
 class DataProductType(OrderedEnum):
     """ DataproductType - enum of data product types"""
 
@@ -208,10 +214,11 @@ class Quality(Enum):
     JUNK = VocabularyTerm(_CAOM_VOCAB_NS, "junk", True).get_value()
 
 
-class Observable():
+class Observable(CaomObject):
     """ Observable class"""
 
     def __init__(self, ucd):
+        super(Observable, self).__init__()
         self.ucd = ucd
 
     @property
@@ -220,7 +227,7 @@ class Observable():
 
     @ucd.setter
     def ucd(self, value):
-        caom_util.type_check(value, str, 'ucd', override=False)
+        caom_util.type_check(value, Ucd, 'ucd', override=False)
         self._ucd = value
 
 
@@ -487,7 +494,7 @@ class Plane(AbstractCaomEntity):
 
     @observable.setter
     def observable(self, value):
-        caom_util.type_check(value, str, 'observable')
+        caom_util.type_check(value, Observable, 'observable')
         self._observable = value
 
     @property