lsst-felis 27.2024.1800__py3-none-any.whl → 27.2024.2000__py3-none-any.whl

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()
 

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,
         }

felis/version.py

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

{lsst_felis-27.2024.1800.dist-info → lsst_felis-27.2024.2000.dist-info}/METADATA

@@ -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.dist-info → lsst_felis-27.2024.2000.dist-info}/RECORD

@@ -1,20 +1,20 @@
 felis/__init__.py,sha256=THmRg3ylB4E73XhFjJX7YlnV_CM3lr_gZO_HqQFzIQ4,937
 felis/cli.py,sha256=l_4srdXPghBLAVuOvfJVdyIVhq45kTV5KYskmYSsIUA,10279
-felis/datamodel.py,sha256=Jf6WQLoxuERw61GFF9Q1Vl2hSr3-osym_FtJNlOZGFU,20540
-felis/metadata.py,sha256=R2mJgtupBDG_B7sPhV8NlAEa5XI6ezy8JhZjBT5Jme0,18907
+felis/datamodel.py,sha256=0LWiqjQgsgn0do4YjVWcf-_5JyJVT6UoFDuVMAULhPI,21351
+felis/metadata.py,sha256=df64ep8F7nY7wiO-Myo1jUJNaNOq12qctSWmyIjGN5k,18910
 felis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 felis/tap.py,sha256=fVYvvIFk_vccXqbcFYdgK2yOfp4P5E4guvsSGktsNxs,16795
 felis/types.py,sha256=z_ECfSxpqiFSGppjxKwCO4fPP7TLBaIN3Qo1AGF16Go,4418
 felis/validation.py,sha256=Zq0gyCvPCwRlhfQ-w_p6ccDTkjcyhxSA1-Gr5plXiZI,3465
-felis/version.py,sha256=2dU7WXKzRkyzGTBOBEcitF06p_bPRV6WQw9jHANDoDo,55
+felis/version.py,sha256=r595UnqkscsF4jOiY5JmQU_5vcab3hyxTNQu_BzY_K0,55
 felis/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 felis/db/_variants.py,sha256=zCuXDgU_x_pTZcWkBLgqQCiOhlA6y2tBt-PUQfafwmM,3368
 felis/db/sqltypes.py,sha256=yFlautQ1hv21MHF4AIfBp7_2m1-exKBfc76xYsMHBgk,5735
-lsst_felis-27.2024.1800.dist-info/COPYRIGHT,sha256=bUmNy19uUxqITMpjeHFe69q3IzQpjxvvBw6oV7kR7ho,129
-lsst_felis-27.2024.1800.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-lsst_felis-27.2024.1800.dist-info/METADATA,sha256=6iicjHwqksW8KOYVpkvhkfnzBkaojndCqHdRGTds_1M,1191
-lsst_felis-27.2024.1800.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-lsst_felis-27.2024.1800.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
-lsst_felis-27.2024.1800.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
-lsst_felis-27.2024.1800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_felis-27.2024.1800.dist-info/RECORD,,
+lsst_felis-27.2024.2000.dist-info/COPYRIGHT,sha256=bUmNy19uUxqITMpjeHFe69q3IzQpjxvvBw6oV7kR7ho,129
+lsst_felis-27.2024.2000.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+lsst_felis-27.2024.2000.dist-info/METADATA,sha256=Qm49lNoYGbRIYgdYduR0mn4S0ZD5hTC6EivMDB7h9co,1191
+lsst_felis-27.2024.2000.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+lsst_felis-27.2024.2000.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
+lsst_felis-27.2024.2000.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
+lsst_felis-27.2024.2000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_felis-27.2024.2000.dist-info/RECORD,,