lsst-felis 27.2024.2900__tar.gz → 27.2024.3000__tar.gz

{lsst_felis-27.2024.2900/python/lsst_felis.egg-info → lsst_felis-27.2024.3000}/PKG-INFO

@@ -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 → lsst_felis-27.2024.3000}/python/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

{lsst_felis-27.2024.2900 → lsst_felis-27.2024.3000}/python/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

lsst_felis-27.2024.3000/python/felis/version.py

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

{lsst_felis-27.2024.2900 → lsst_felis-27.2024.3000/python/lsst_felis.egg-info}/PKG-INFO

@@ -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 → lsst_felis-27.2024.3000}/tests/test_tap.py

@@ -23,8 +23,6 @@ import os
 import shutil
 import tempfile
 import unittest
-from collections.abc import MutableMapping
-from typing import Any
 
 import sqlalchemy
 import yaml
@@ -39,7 +37,7 @@ TEST_YAML = os.path.join(TESTDIR, "data", "test.yml")
 class VisitorTestCase(unittest.TestCase):
     """Test the TAP loading visitor."""
 
-    schema_obj: MutableMapping[str, Any] = {}
+    schema_obj: Schema
 
     def setUp(self) -> None:
         """Load data from a test file."""

lsst_felis-27.2024.2900/python/felis/version.py

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