From 13da0d7b752b83818b390d189fe4fd984e5aecf6 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Fri, 25 Oct 2024 13:32:40 -0700 Subject: [PATCH] Fix mypy warning and use felis.datamodel explicitly --- python/lsst/dax/obscore/obscore_exporter.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/python/lsst/dax/obscore/obscore_exporter.py b/python/lsst/dax/obscore/obscore_exporter.py index d1c92ba..b1776c6 100644 --- a/python/lsst/dax/obscore/obscore_exporter.py +++ b/python/lsst/dax/obscore/obscore_exporter.py @@ -31,11 +31,10 @@ import astropy.io.votable import astropy.table +import felis.datamodel import pyarrow import sqlalchemy import yaml -from felis.datamodel import FelisType -from felis.datamodel import Schema as FelisSchema from lsst.daf.butler import Butler, DataCoordinate, Dimension, Registry, ddl from lsst.daf.butler.formatters.parquet import arrow_to_numpy from lsst.daf.butler.registry.obscore import ( @@ -71,11 +70,11 @@ @cache -def _get_obscore_schema() -> FelisSchema: +def _get_obscore_schema() -> felis.datamodel.Schema: """Read the ObsCore schema definition.""" obscore_defn = ResourcePath("resource://lsst.dax.obscore/configs/obscore_nominal.yaml").read() obscore_data = yaml.safe_load(obscore_defn) - schema = FelisSchema.model_validate(obscore_data) + schema: felis.datamodel.Schema = felis.datamodel.Schema.model_validate(obscore_data) return schema @@ -356,7 +355,7 @@ def to_votable(self, limit: int | None = None) -> astropy.io.votable.tree.VOTabl for arrow_field in self.schema: if arrow_field.name in obscore_columns: ffield = obscore_columns[arrow_field.name] - votable_datatype = FelisType.felis_type(ffield.datatype.value).votable_name + votable_datatype = felis.datamodel.FelisType.felis_type(ffield.datatype.value).votable_name field = astropy.io.votable.tree.Field( votable, name=ffield.name,