lsst-felis 29.2025.2600__py3-none-any.whl → 29.2025.2800__py3-none-any.whl

felis/datamodel.py

@@ -618,7 +618,9 @@ class ForeignKeyConstraint(Constraint):
     """Table foreign key constraint model.
 
     This constraint is used to define a foreign key relationship between two
-    tables in the schema.
+    tables in the schema. There must be at least one column in the
+    `columns` list, and at least one column in the `referenced_columns` list
+    or a validation error will be raised.
 
     Notes
     -----
@@ -629,10 +631,10 @@ class ForeignKeyConstraint(Constraint):
     type: Literal["ForeignKey"] = Field("ForeignKey", alias="@type")
     """Type of the constraint."""
 
-    columns: list[str]
+    columns: list[str] = Field(min_length=1)
     """The columns comprising the foreign key."""
 
-    referenced_columns: list[str] = Field(alias="referencedColumns")
+    referenced_columns: list[str] = Field(alias="referencedColumns", min_length=1)
     """The columns referenced by the foreign key."""
 
     on_delete: Literal["CASCADE", "SET NULL", "SET DEFAULT", "RESTRICT", "NO ACTION"] | None = None
@@ -657,6 +659,28 @@ class ForeignKeyConstraint(Constraint):
         """
         return value
 
+    @model_validator(mode="after")
+    def check_column_lengths(self) -> ForeignKeyConstraint:
+        """Check that the `columns` and `referenced_columns` lists have the
+        same length.
+
+        Returns
+        -------
+        `ForeignKeyConstraint`
+            The foreign key constraint being validated.
+
+        Raises
+        ------
+        ValueError
+            Raised if the `columns` and `referenced_columns` lists do not have
+            the same length.
+        """
+        if len(self.columns) != len(self.referenced_columns):
+            raise ValueError(
+                "Columns and referencedColumns must have the same length for a ForeignKey constraint"
+            )
+        return self
+
 
 _ConstraintType = Annotated[
     CheckConstraint | ForeignKeyConstraint | UniqueConstraint, Field(discriminator="type")

felis/diff.py

@@ -112,8 +112,10 @@ class FormattedSchemaDiff(SchemaDiff):
                 handler(self.diff[change_type])
 
     def _print_header(self, id_dict: dict[str, Any], keys: list[int | str]) -> None:
-        id = self._get_id(id_dict, keys)
-        print(f"{id} @ {self._get_key_display(keys)}")
+        # id = self._get_id(id_dict, keys)
+        # Don't display ID here for now; it is always just the schema ID.
+        print(f"{self._get_key_display(keys)}")
+        # print(f"{id} @ {self._get_key_display(keys)}")
 
     def _handle_values_changed(self, changes: dict[str, Any]) -> None:
         for key in changes:
@@ -156,13 +158,21 @@ class FormattedSchemaDiff(SchemaDiff):
 
     @staticmethod
     def _get_id(values: dict, keys: list[str | int]) -> str:
-        value = values
+        # Unused for now, pending updates to diff tool in DM-49446.
+        value: list | dict = values
         last_id = None
 
         for key in keys:
+            logger.debug(f"Processing key <{key}> with type {type(key)}")
+            logger.debug(f"Type of value: {type(value)}")
             if isinstance(value, dict) and "id" in value:
                 last_id = value["id"]
-            value = value[key]
+            elif isinstance(value, list) and isinstance(key, int):
+                if 0 <= key < len(value):
+                    value = value[key]
+                else:
+                    raise ValueError(f"Index '{key}' is out of range for list of length {len(value)}")
+                value = value[key]
 
         if isinstance(value, dict) and "id" in value:
             last_id = value["id"]

felis/tap_schema.py

@@ -470,7 +470,7 @@ class DataLoader:
             logger.info("Dry run - not loading data into database")
 
     def _insert_schemas(self) -> None:
-        """Insert the schema data into the schemas table."""
+        """Insert the schema data into the ``schemas`` table."""
         schema_record = {
             "schema_name": self.schema.name,
             "utype": self.schema.votable_utype,
@@ -495,7 +495,7 @@ class DataLoader:
         return f"{self.schema.name}.{table.name}"
 
     def _insert_tables(self) -> None:
-        """Insert the table data into the tables table."""
+        """Insert the table data into the ``tables`` table."""
         for table in self.schema.tables:
             table_record = {
                 "schema_name": self.schema.name,
@@ -508,7 +508,7 @@ class DataLoader:
             self._insert("tables", table_record)
 
     def _insert_columns(self) -> None:
-        """Insert the column data into the columns table."""
+        """Insert the column data into the ``columns`` table."""
         for table in self.schema.tables:
             for column in table.columns:
                 felis_type = FelisType.felis_type(column.datatype.value)
@@ -563,11 +563,15 @@ class DataLoader:
         return key_id
 
     def _insert_keys(self) -> None:
-        """Insert the foreign keys into the keys and key_columns tables."""
+        """Insert the foreign keys into the ``keys`` and ``key_columns``
+        tables.
+        """
         for table in self.schema.tables:
             for constraint in table.constraints:
                 if isinstance(constraint, datamodel.ForeignKeyConstraint):
+                    ###########################################################
                     # Handle keys table
+                    ###########################################################
                     referenced_column = self.schema.find_object_by_id(
                         constraint.referenced_columns[0], datamodel.Column
                     )
@@ -582,17 +586,23 @@ class DataLoader:
                     }
                     self._insert("keys", key_record)
 
+                    ###########################################################
                     # Handle key_columns table
-                    from_column = self.schema.find_object_by_id(constraint.columns[0], datamodel.Column)
-                    target_column = self.schema.find_object_by_id(
-                        constraint.referenced_columns[0], datamodel.Column
-                    )
-                    key_columns_record = {
-                        "key_id": key_id,
-                        "from_column": from_column.name,
-                        "target_column": target_column.name,
-                    }
-                    self._insert("key_columns", key_columns_record)
+                    ###########################################################
+                    # Loop over the corresponding columns and referenced
+                    # columns and insert a record for each pair. This is
+                    # necessary for proper handling of composite keys.
+                    for from_column_id, target_column_id in zip(
+                        constraint.columns, constraint.referenced_columns
+                    ):
+                        from_column = self.schema.find_object_by_id(from_column_id, datamodel.Column)
+                        target_column = self.schema.find_object_by_id(target_column_id, datamodel.Column)
+                        key_columns_record = {
+                            "key_id": key_id,
+                            "from_column": from_column.name,
+                            "target_column": target_column.name,
+                        }
+                        self._insert("key_columns", key_columns_record)
 
     def _generate_all_inserts(self) -> None:
         """Generate the inserts for all the data."""

{lsst_felis-29.2025.2600.dist-info → lsst_felis-29.2025.2800.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-felis
-Version: 29.2025.2600
+Version: 29.2025.2800
 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.2600.dist-info → lsst_felis-29.2025.2800.dist-info}/RECORD

@@ -1,10 +1,10 @@
 felis/__init__.py,sha256=HnwWzLaPOSnPzAoppSIHzTrGfixEgvkzJdBxa8-03cw,1294
 felis/cli.py,sha256=g6OrBrIylNLiflSvrLlef86BjoiehV3L5eAvVPrxPog,16911
-felis/datamodel.py,sha256=HKg4Ut0qPX7sV6q-Mw9U3BKgjVQFAnhhAUmo9Woh7v8,51228
-felis/diff.py,sha256=z4ZzUocFYVa2y22BWUAMkeeLORmMtaWIDGTVaUE1OIM,7181
+felis/datamodel.py,sha256=VAJ9DqOBtfu3fWtpDOcpg4Ca1jfq8NMG6MHH8GbHpl0,52135
+felis/diff.py,sha256=ZzjOJ57p5ZwFn6eem7CYoPjSnxti5OZY33B6Ds5Q-Rg,7797
 felis/metadata.py,sha256=79YcaIqeFP-pj9zhWpqXlvw_piUTUwuLrV5_8eVYalQ,13763
 felis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-felis/tap_schema.py,sha256=uu2imuzxyuIUbmW4liC6_h4TW5MW2t4SI9rjtMxcyfI,26372
+felis/tap_schema.py,sha256=Kfpnv6AO_ni_B-DEgi3PRSkGKkTEybuYfWlA9gOMM_I,27071
 felis/types.py,sha256=ifZQjc-Uw5CM3L7hmFUb7wcHY1O_HgJCw6HPqyUkHvk,5510
 felis/config/tap_schema/columns.csv,sha256=9RsyuPObUQ_6myux9vKtlQ-aJgs7rvvxoLf6yYSRWqc,3272
 felis/config/tap_schema/key_columns.csv,sha256=dRezco5ltcM1mG--2DvPsbOxB6cwVaBwczwi3It2vag,210
@@ -21,11 +21,11 @@ felis/db/variants.py,sha256=eahthrbVeV8ZdGamWQccNmWgx6CCscGrU0vQRs5HZK8,5260
 felis/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 felis/tests/postgresql.py,sha256=B_xk4fLual5-viGDqP20r94okuc0pbSvytRH_L0fvMs,4035
 felis/tests/run_cli.py,sha256=Gg8loUIGj9t6KlkRKrEc9Z9b5dtlkpJy94ORuj4BrxU,2503
-lsst_felis-29.2025.2600.dist-info/licenses/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
-lsst_felis-29.2025.2600.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-lsst_felis-29.2025.2600.dist-info/METADATA,sha256=olXZcNPImhvS5QjMr8uoEyq_Br5GjLRaBjE4OsujeJM,1433
-lsst_felis-29.2025.2600.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_felis-29.2025.2600.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
-lsst_felis-29.2025.2600.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
-lsst_felis-29.2025.2600.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_felis-29.2025.2600.dist-info/RECORD,,
+lsst_felis-29.2025.2800.dist-info/licenses/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
+lsst_felis-29.2025.2800.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+lsst_felis-29.2025.2800.dist-info/METADATA,sha256=Vj9HPVwpzi8ozYwAD0xVyrGvKzBEtKBK-9FiAR_eoBM,1433
+lsst_felis-29.2025.2800.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_felis-29.2025.2800.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
+lsst_felis-29.2025.2800.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
+lsst_felis-29.2025.2800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_felis-29.2025.2800.dist-info/RECORD,,