lsst-felis 27.2024.1800__tar.gz → 27.2024.2000__tar.gz

{lsst_felis-27.2024.1800/python/lsst_felis.egg-info → lsst_felis-27.2024.2000}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 27.2024.1800
+Version: 27.2024.2000
 Summary: A vocabulary for describing catalogs and acting on those descriptions
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: GNU General Public License v3 or later (GPLv3+)

{lsst_felis-27.2024.1800 → lsst_felis-27.2024.2000}/python/felis/datamodel.py

@@ -178,7 +178,7 @@ class Column(BaseObject):
     datatype: DataType
     """The datatype of the column."""
 
-    length: int | None = None
+    length: int | None = Field(None, gt=0)
     """The length of the column."""
 
     nullable: bool = True
@@ -276,6 +276,28 @@ class Column(BaseObject):
 
         return values
 
+    @model_validator(mode="before")
+    @classmethod
+    def check_length(cls, values: dict[str, Any]) -> dict[str, Any]:
+        """Check that a valid length is provided for sized types."""
+        datatype = values.get("datatype")
+        if datatype is None:
+            # Skip this validation if datatype is not provided
+            return values
+        length = values.get("length")
+        felis_type = FelisType.felis_type(datatype)
+        if felis_type.is_sized and length is None:
+            raise ValueError(
+                f"Length must be provided for type '{datatype}'"
+                + (f" in column '{values['@id']}'" if "@id" in values else "")
+            )
+        elif not felis_type.is_sized and length is not None:
+            logger.warning(
+                f"The datatype '{datatype}' does not support a specified length"
+                + (f" in column '{values['@id']}'" if "@id" in values else "")
+            )
+        return values
+
     @model_validator(mode="after")
     def check_datatypes(self, info: ValidationInfo) -> Column:
         """Check for redundant datatypes on columns."""
@@ -291,10 +313,7 @@ class Column(BaseObject):
         datatype_func = get_type_func(datatype)
         felis_type = FelisType.felis_type(datatype)
         if felis_type.is_sized:
-            if length is not None:
-                datatype_obj = datatype_func(length)
-            else:
-                raise ValueError(f"Length must be provided for sized type '{datatype}' in column '{self.id}'")
+            datatype_obj = datatype_func(length)
         else:
             datatype_obj = datatype_func()
 

{lsst_felis-27.2024.1800 → lsst_felis-27.2024.2000}/python/felis/metadata.py

@@ -342,7 +342,7 @@ class MetaDataBuilder:
         """
         args: dict[str, Any] = {
             "name": constraint_obj.name or None,
-            "info": constraint_obj.description or None,
+            "comment": constraint_obj.description or None,
             "deferrable": constraint_obj.deferrable or None,
             "initially": constraint_obj.initially or None,
         }

lsst_felis-27.2024.2000/python/felis/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "27.2024.2000"

{lsst_felis-27.2024.1800 → lsst_felis-27.2024.2000/python/lsst_felis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 27.2024.1800
+Version: 27.2024.2000
 Summary: A vocabulary for describing catalogs and acting on those descriptions
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: GNU General Public License v3 or later (GPLv3+)

{lsst_felis-27.2024.1800 → lsst_felis-27.2024.2000}/tests/test_datamodel.py

@@ -73,13 +73,13 @@ class ColumnTestCase(unittest.TestCase):
 
         # Setting name, id, and datatype should not throw an exception and
         # should load data correctly.
-        col = Column(name="testColumn", id="#test_id", datatype="string")
+        col = Column(name="testColumn", id="#test_id", datatype="string", length=256)
         self.assertEqual(col.name, "testColumn", "name should be 'testColumn'")
         self.assertEqual(col.id, "#test_id", "id should be '#test_id'")
         self.assertEqual(col.datatype, DataType.string, "datatype should be 'DataType.string'")
 
         # Creating from data dictionary should work and load data correctly.
-        data = {"name": "testColumn", "id": "#test_id", "datatype": "string"}
+        data = {"name": "testColumn", "id": "#test_id", "datatype": "string", "length": 256}
         col = Column(**data)
         self.assertEqual(col.name, "testColumn", "name should be 'testColumn'")
         self.assertEqual(col.id, "#test_id", "id should be '#test_id'")
@@ -422,7 +422,7 @@ class TableTestCase(unittest.TestCase):
         with self.assertRaises(ValidationError):
             Index(name="testTable", id="#test_id")
 
-        testCol = Column(name="testColumn", id="#test_id", datatype="string")
+        testCol = Column(name="testColumn", id="#test_id", datatype="string", length=256)
 
         # Setting name, id, and columns should not throw an exception and
         # should load data correctly.
@@ -453,7 +453,7 @@ class SchemaTestCase(unittest.TestCase):
         with self.assertRaises(ValidationError):
             Schema(name="testSchema", id="#test_id")
 
-        test_col = Column(name="testColumn", id="#test_col_id", datatype="string")
+        test_col = Column(name="testColumn", id="#test_col_id", datatype="string", length=256)
         test_tbl = Table(name="testTable", id="#test_tbl_id", columns=[test_col])
 
         # Setting name, id, and columns should not throw an exception and
@@ -491,7 +491,7 @@ class SchemaTestCase(unittest.TestCase):
 
     def test_schema_object_ids(self) -> None:
         """Test that the id_map is properly populated."""
-        test_col = Column(name="testColumn", id="#test_col_id", datatype="string")
+        test_col = Column(name="testColumn", id="#test_col_id", datatype="string", length=256)
         test_tbl = Table(name="testTable", id="#test_table_id", columns=[test_col])
         sch = Schema(name="testSchema", id="#test_schema_id", tables=[test_tbl])
 

{lsst_felis-27.2024.1800 → lsst_felis-27.2024.2000}/tests/test_validation.py

@@ -58,6 +58,7 @@ class RSPSchemaTestCase(unittest.TestCase):
                 "@id": "#test_col_id",
                 "datatype": "string",
                 "description": "test column",
+                "length": 256,
                 "tap:principal": 1,
             }
         )
@@ -191,6 +192,7 @@ class RSPSchemaTestCase(unittest.TestCase):
                                     "datatype": "string",
                                     "description": "test column",
                                     "tap:principal": 1,
+                                    "length": 256,
                                 }
                             )
                         ],
@@ -210,6 +212,7 @@ class RSPSchemaTestCase(unittest.TestCase):
                                     "datatype": "string",
                                     "description": "test column",
                                     "tap:principal": 1,
+                                    "length": 256,
                                 }
                             )
                         ],

lsst_felis-27.2024.1800/python/felis/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "27.2024.1800"