lsst-felis 27.2024.2900__py3-none-any.whl → 27.2024.3000__py3-none-any.whl

felis/datamodel.py

@@ -26,7 +26,7 @@ from __future__ import annotations
 import logging
 from collections.abc import Mapping, Sequence
 from enum import StrEnum, auto
-from typing import Annotated, Any, Literal, TypeAlias
+from typing import Annotated, Any, TypeAlias
 
 from astropy import units as units  # type: ignore
 from astropy.io.votable import ucd  # type: ignore
@@ -178,7 +178,7 @@ class Column(BaseObject):
     tap_principal: int | None = Field(0, alias="tap:principal", ge=0, le=1)
     """Whether this is a TAP_SCHEMA principal column."""
 
-    votable_arraysize: int | Literal["*"] | None = Field(None, alias="votable:arraysize")
+    votable_arraysize: int | str | None = Field(None, alias="votable:arraysize")
     """VOTable arraysize of the column."""
 
     tap_std: int | None = Field(0, alias="tap:std", ge=0, le=1)
@@ -711,7 +711,7 @@ class SchemaIdVisitor:
 class Schema(BaseObject):
     """Database schema model.
 
-    This is the root object of the Felis data model.
+    This represents a database schema, which contains one or more tables.
     """
 
     version: SchemaVersion | str | None = None

felis/tap.py

@@ -24,6 +24,7 @@
 from __future__ import annotations
 
 import logging
+import re
 from collections.abc import Iterable, MutableMapping
 from typing import Any
 
@@ -125,7 +126,7 @@ def init_tables(
         arraysize = Column(String(10))
         xtype = Column(String(SIMPLE_FIELD_LENGTH))
         # Size is deprecated
-        # size = Column(Integer(), quote=True)
+        size = Column("size", Integer(), quote=True)
         description = Column(String(TEXT_FIELD_LENGTH))
         utype = Column(String(SIMPLE_FIELD_LENGTH))
         unit = Column(String(SIMPLE_FIELD_LENGTH))
@@ -406,12 +407,28 @@ class TapLoadingVisitor:
         felis_type = FelisType.felis_type(felis_datatype.value)
         column.datatype = column_obj.votable_datatype or felis_type.votable_name
 
-        arraysize = None
-        if felis_type.is_sized:
-            arraysize = column_obj.votable_arraysize or column_obj.length or "*"
-        if felis_type.is_timestamp:
-            arraysize = column_obj.votable_arraysize or "*"
-        column.arraysize = arraysize
+        column.arraysize = column_obj.votable_arraysize or column_obj.length
+        if (felis_type.is_timestamp or column_obj.datatype == "text") and column.arraysize is None:
+            column.arraysize = "*"
+
+        def _is_int(s: str) -> bool:
+            try:
+                int(s)
+                return True
+            except ValueError:
+                return False
+
+        # Handle the deprecated size attribute
+        arraysize = column_obj.votable_arraysize
+        if arraysize is not None and arraysize != "":
+            if isinstance(arraysize, int):
+                column.size = arraysize
+            elif _is_int(arraysize):
+                column.size = int(arraysize)
+            elif bool(re.match(r"^[0-9]+\*$", arraysize)):
+                column.size = int(arraysize.replace("*", ""))
+            if column.size is not None:
+                logger.debug(f"Set size to {column.size} for {column.column_name} from arraysize {arraysize}")
 
         column.xtype = column_obj.votable_xtype
         column.description = column_obj.description

felis/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "27.2024.2900"
+__version__ = "27.2024.3000"

{lsst_felis-27.2024.2900.dist-info → lsst_felis-27.2024.3000.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 27.2024.2900
+Version: 27.2024.3000
 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.2900.dist-info → lsst_felis-27.2024.3000.dist-info}/RECORD

@@ -1,21 +1,21 @@
 felis/__init__.py,sha256=THmRg3ylB4E73XhFjJX7YlnV_CM3lr_gZO_HqQFzIQ4,937
 felis/cli.py,sha256=i5FlA9OBecqHP4SISngaveQ7YbWH8pxRGHeOzMOOMyg,14086
-felis/datamodel.py,sha256=BajYwp2rk0j3P4KSc2T9Acnk9p9pjzXiKgZG2c_OuZI,26517
+felis/datamodel.py,sha256=vvktocPqJ3SqPXTtYZ_JE9JuP34657-XlXLfOPg_QvE,26520
 felis/metadata.py,sha256=8r2LM86kdJLSuI0_t--oE3OtRPf-s5aH3FeIDDDAPZ8,13414
 felis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-felis/tap.py,sha256=YBWl1CicdN4jW_KhPJQ7-TuhOfFFTIYIH4tTJ8P_o1c,21035
+felis/tap.py,sha256=pyLHBWzXCw4F1wDbQiyxyJYPQcye4It2yRuVFoQQK5I,21746
 felis/types.py,sha256=m80GSGfNHQ3-NzRuTzKOyRXLJboPxdk9kzpp1SO8XdY,5510
-felis/version.py,sha256=IrpaDaI-IyY9Sbo84xgm9VHx9dydDb3gMPiEsDfHl6s,55
+felis/version.py,sha256=SUmRuZYe-__IIcDzR7okIYXuK8vDY9fWnke_sK6YOz4,55
 felis/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 felis/db/dialects.py,sha256=x9ehMbW6OW-v18lwf3v614zdykhTZv0I1a0_gI_ojB0,3510
 felis/db/sqltypes.py,sha256=UNxKCRQU-pAIIGbrXcKUkx6-JwPGqxeqd_fLyN9Oyog,11053
 felis/db/utils.py,sha256=_vWVsPsq_kVl-WQuDeoLY3ZxElGCCEzPp3tfBTENGB8,10200
 felis/db/variants.py,sha256=o5m101upQQbWZD_l8qlB8gt-ZQ9-VqsWZrmxQO1eEQA,5246
-lsst_felis-27.2024.2900.dist-info/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
-lsst_felis-27.2024.2900.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-lsst_felis-27.2024.2900.dist-info/METADATA,sha256=1IpNFJvTYCTbm2qIYrb098nVe4RVW2VkBiATRjDw6vg,1288
-lsst_felis-27.2024.2900.dist-info/WHEEL,sha256=FZ75kcLy9M91ncbIgG8dnpCncbiKXSRGJ_PFILs6SFg,91
-lsst_felis-27.2024.2900.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
-lsst_felis-27.2024.2900.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
-lsst_felis-27.2024.2900.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_felis-27.2024.2900.dist-info/RECORD,,
+lsst_felis-27.2024.3000.dist-info/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
+lsst_felis-27.2024.3000.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+lsst_felis-27.2024.3000.dist-info/METADATA,sha256=K9MvbIiUxcXP5SJn75HCLZx4fShI9MLtMZnlRlzO3mQ,1288
+lsst_felis-27.2024.3000.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+lsst_felis-27.2024.3000.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
+lsst_felis-27.2024.3000.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
+lsst_felis-27.2024.3000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_felis-27.2024.3000.dist-info/RECORD,,

{lsst_felis-27.2024.2900.dist-info → lsst_felis-27.2024.3000.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.1)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any