Return all the parent catalogue columns in route

python/valis/db/models.py

@@ -197,9 +197,10 @@ class ParentCatalogModel(PeeweeBase):
 
     sdss_id: int
     catalogid: int
-    catalog: str
-    field_name: str
-    parent_catalog_id: int | str
+
+    # This model is usually instantiated with a dictionary of all the parent
+    # catalogue columns so we allow extra fields.
+    model_config = ConfigDict(extra='allow')
 
 
 class CatalogResponse(CatalogModel, SDSSidFlatBase):

python/valis/db/queries.py

@@ -701,24 +701,16 @@ def get_parent_catalog_data(sdss_id: int, catalog: str) -> peewee.ModelSelect:
 
     SID = cat.SDSS_ID_To_Catalog
 
-    cat_field: peewee.Field | None = None
-    cat_pk_name: str | None = None
-    for field in SID._meta.fields.values():
-        if '__' not in field.name:
-            continue
-        if field.name.split('__')[0] == catalog:
-            cat_field = field
-            cat_pk_name = field.name.split('__')[1]
-            break
-
-    if cat_field is None or cat_pk_name is None:
-        raise ValueError(f'Catalog {catalog} not found in SDSS_ID_To_Catalog table.')
+    fqtn = f'catalogdb.{catalog}'
+    if fqtn not in cat.database.models:
+        raise ValueError(f'Catalog {catalog} not found in catalogdb.')
+
+    ParentModel = cat.database.models[fqtn]
 
     return (SID.select(SID.sdss_id,
                        SID.catalogid,
-                       peewee.Value(catalog).alias('catalog'),
-                       peewee.Value(cat_pk_name).alias('field_name'),
-                       field.alias('parent_catalog_id'))
+                       ParentModel)
+               .join(ParentModel)
                .where(SID.sdss_id == sdss_id)
                .order_by(SID.catalogid))