lsst-felis 27.2024.2800__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/db/dialects.py

@@ -30,11 +30,11 @@ from sqlalchemy import dialects
 from sqlalchemy.engine import Dialect
 from sqlalchemy.engine.mock import create_mock_engine
 
-from .sqltypes import MYSQL, ORACLE, POSTGRES, SQLITE
+from .sqltypes import MYSQL, POSTGRES, SQLITE
 
 __all__ = ["get_supported_dialects", "get_dialect_module"]
 
-_DIALECT_NAMES = (MYSQL, POSTGRES, SQLITE, ORACLE)
+_DIALECT_NAMES = (MYSQL, POSTGRES, SQLITE)
 """List of supported dialect names.
 
 This list is used to create the dialect and module dictionaries.

felis/db/sqltypes.py

@@ -28,7 +28,7 @@ from collections.abc import Callable, Mapping
 from typing import Any
 
 from sqlalchemy import SmallInteger, types
-from sqlalchemy.dialects import mysql, oracle, postgresql
+from sqlalchemy.dialects import mysql, postgresql
 from sqlalchemy.ext.compiler import compiles
 
 __all__ = [
@@ -49,7 +49,6 @@ __all__ = [
 ]
 
 MYSQL = "mysql"
-ORACLE = "oracle"
 POSTGRES = "postgresql"
 SQLITE = "sqlite"
 
@@ -88,21 +87,18 @@ def compile_tinyint(type_: Any, compiler: Any, **kwargs: Any) -> str:
 
 _TypeMap = Mapping[str, types.TypeEngine | type[types.TypeEngine]]
 
-boolean_map: _TypeMap = {MYSQL: mysql.BOOLEAN, ORACLE: oracle.NUMBER(1), POSTGRES: postgresql.BOOLEAN()}
+boolean_map: _TypeMap = {MYSQL: mysql.BOOLEAN, POSTGRES: postgresql.BOOLEAN()}
 
 byte_map: _TypeMap = {
     MYSQL: mysql.TINYINT(),
-    ORACLE: oracle.NUMBER(3),
     POSTGRES: postgresql.SMALLINT(),
 }
 
 short_map: _TypeMap = {
     MYSQL: mysql.SMALLINT(),
-    ORACLE: oracle.NUMBER(5),
     POSTGRES: postgresql.SMALLINT(),
 }
 
-# Skip Oracle
 int_map: _TypeMap = {
     MYSQL: mysql.INTEGER(),
     POSTGRES: postgresql.INTEGER(),
@@ -110,49 +106,41 @@ int_map: _TypeMap = {
 
 long_map: _TypeMap = {
     MYSQL: mysql.BIGINT(),
-    ORACLE: oracle.NUMBER(38, 0),
     POSTGRES: postgresql.BIGINT(),
 }
 
 float_map: _TypeMap = {
     MYSQL: mysql.FLOAT(),
-    ORACLE: oracle.BINARY_FLOAT(),
     POSTGRES: postgresql.FLOAT(),
 }
 
 double_map: _TypeMap = {
     MYSQL: mysql.DOUBLE(),
-    ORACLE: oracle.BINARY_DOUBLE(),
     POSTGRES: postgresql.DOUBLE_PRECISION(),
 }
 
 char_map: _TypeMap = {
     MYSQL: mysql.CHAR,
-    ORACLE: oracle.CHAR,
     POSTGRES: postgresql.CHAR,
 }
 
 string_map: _TypeMap = {
     MYSQL: mysql.VARCHAR,
-    ORACLE: oracle.VARCHAR2,
     POSTGRES: postgresql.VARCHAR,
 }
 
 unicode_map: _TypeMap = {
     MYSQL: mysql.NVARCHAR,
-    ORACLE: oracle.NVARCHAR2,
     POSTGRES: postgresql.VARCHAR,
 }
 
 text_map: _TypeMap = {
     MYSQL: mysql.LONGTEXT,
-    ORACLE: oracle.CLOB,
     POSTGRES: postgresql.TEXT,
 }
 
 binary_map: _TypeMap = {
     MYSQL: mysql.LONGBLOB,
-    ORACLE: oracle.BLOB,
     POSTGRES: postgresql.BYTEA,
 }
 

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.2800"
+__version__ = "27.2024.3000"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 27.2024.2800
+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.3000.dist-info/RECORD

@@ -0,0 +1,21 @@
+felis/__init__.py,sha256=THmRg3ylB4E73XhFjJX7YlnV_CM3lr_gZO_HqQFzIQ4,937
+felis/cli.py,sha256=i5FlA9OBecqHP4SISngaveQ7YbWH8pxRGHeOzMOOMyg,14086
+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=pyLHBWzXCw4F1wDbQiyxyJYPQcye4It2yRuVFoQQK5I,21746
+felis/types.py,sha256=m80GSGfNHQ3-NzRuTzKOyRXLJboPxdk9kzpp1SO8XdY,5510
+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.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.2800.dist-info → lsst_felis-27.2024.3000.dist-info}/WHEEL

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

lsst_felis-27.2024.2800.dist-info/RECORD

@@ -1,21 +0,0 @@
-felis/__init__.py,sha256=THmRg3ylB4E73XhFjJX7YlnV_CM3lr_gZO_HqQFzIQ4,937
-felis/cli.py,sha256=i5FlA9OBecqHP4SISngaveQ7YbWH8pxRGHeOzMOOMyg,14086
-felis/datamodel.py,sha256=BajYwp2rk0j3P4KSc2T9Acnk9p9pjzXiKgZG2c_OuZI,26517
-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/types.py,sha256=m80GSGfNHQ3-NzRuTzKOyRXLJboPxdk9kzpp1SO8XdY,5510
-felis/version.py,sha256=yUl4M-EIGpU6iDSDVfXNp4Wf1kDc1_9Neo9VCBg7Ph8,55
-felis/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-felis/db/dialects.py,sha256=IsjdD_2n7tucUdR7TMyRd2gWtnD-2kXPAJUUQdbUe_Q,3526
-felis/db/sqltypes.py,sha256=VuBfstnBGOnr0RuSN0XhzXjSr2MaAmgJWuiWuf_7g2A,11418
-felis/db/utils.py,sha256=_vWVsPsq_kVl-WQuDeoLY3ZxElGCCEzPp3tfBTENGB8,10200
-felis/db/variants.py,sha256=o5m101upQQbWZD_l8qlB8gt-ZQ9-VqsWZrmxQO1eEQA,5246
-lsst_felis-27.2024.2800.dist-info/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
-lsst_felis-27.2024.2800.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-lsst_felis-27.2024.2800.dist-info/METADATA,sha256=B5KUETflTJuITLE5h9ljJ6aDsA9mtlHemnxJfi7StW4,1288
-lsst_felis-27.2024.2800.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-lsst_felis-27.2024.2800.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
-lsst_felis-27.2024.2800.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
-lsst_felis-27.2024.2800.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_felis-27.2024.2800.dist-info/RECORD,,