lsst-felis 29.2025.1800__tar.gz → 29.2025.1900__tar.gz

{lsst_felis-29.2025.1800/python/lsst_felis.egg-info → lsst_felis-29.2025.1900}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-felis
-Version: 29.2025.1800
+Version: 29.2025.1900
 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-29.2025.1800 → lsst_felis-29.2025.1900}/python/felis/cli.py

@@ -63,7 +63,10 @@ loglevel_choices = ["CRITICAL", "FATAL", "ERROR", "WARNING", "INFO", "DEBUG"]
     help="Felis log file path",
 )
 @click.option(
-    "--id-generation", is_flag=True, help="Generate IDs for all objects that do not have them", default=False
+    "--id-generation/--no-id-generation",
+    is_flag=True,
+    help="Generate IDs for all objects that do not have them",
+    default=True,
 )
 @click.pass_context
 def cli(ctx: click.Context, log_level: str, log_file: str | None, id_generation: bool) -> None:
@@ -72,6 +75,8 @@ def cli(ctx: click.Context, log_level: str, log_file: str | None, id_generation:
     ctx.obj["id_generation"] = id_generation
     if ctx.obj["id_generation"]:
         logger.info("ID generation is enabled")
+    else:
+        logger.info("ID generation is disabled")
     if log_file:
         logging.basicConfig(filename=log_file, level=log_level)
     else:

{lsst_felis-29.2025.1800 → lsst_felis-29.2025.1900}/python/felis/datamodel.py

@@ -504,6 +504,26 @@ class Column(BaseObject):
         """
         return DataType(value)
 
+    @model_validator(mode="after")
+    def check_votable_xtype(self) -> Column:
+        """Set the default value for the ``votable_xtype`` field, which
+        corresponds to an Extended Datatype or ``xtype`` in the IVOA VOTable
+        standard.
+
+        Returns
+        -------
+        `Column`
+            The column being validated.
+
+        Notes
+        -----
+        This is currently only set automatically for the Felis ``timestamp``
+        datatype.
+        """
+        if self.datatype == DataType.timestamp and self.votable_xtype is None:
+            self.votable_xtype = "timestamp"
+        return self
+
 
 class Constraint(BaseObject):
     """Table constraint model."""

{lsst_felis-29.2025.1800 → lsst_felis-29.2025.1900/python/lsst_felis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-felis
-Version: 29.2025.1800
+Version: 29.2025.1900
 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-29.2025.1800 → lsst_felis-29.2025.1900}/tests/test_cli.py

@@ -82,16 +82,18 @@ class CliTestCase(unittest.TestCase):
         run_cli(["validate", TEST_YAML])
 
     def test_validate_with_id_generation(self) -> None:
-        """Test the ``--id-generation`` flag."""
+        """Test that loading a schema with IDs works if ID generation is
+        enabled. This is the default behavior.
+        """
         test_yaml = os.path.join(TEST_DIR, "data", "test_id_generation.yaml")
         run_cli(["--id-generation", "validate", test_yaml])
 
-    def test_validate_with_id_validation_error(self) -> None:
+    def test_validate_with_id_generation_error(self) -> None:
         """Test that loading a schema without IDs fails if ID generation is not
         enabled.
         """
         test_yaml = os.path.join(TEST_DIR, "data", "test_id_generation.yaml")
-        run_cli(["validate", test_yaml], expect_error=True)
+        run_cli(["--no-id-generation", "validate", test_yaml], expect_error=True)
 
     def test_validate_with_extra_checks(self) -> None:
         """Test schema validation flags."""

{lsst_felis-29.2025.1800 → lsst_felis-29.2025.1900}/tests/test_datamodel.py

@@ -231,6 +231,12 @@ class ColumnTestCase(unittest.TestCase):
         bool_coldata["value"] = True
         Column(**bool_coldata)
 
+    def test_timestamp(self) -> None:
+        """Test validation of timestamp columns."""
+        # Check that the votable_xtype is set correctly for timestamp columns.
+        col = Column(name="testColumn", id="#test_col_id", datatype="timestamp")
+        self.assertEqual(col.votable_xtype, "timestamp")
+
 
 class TableTestCase(unittest.TestCase):
     """Test Pydantic validation of the ``Table`` class."""