lsst-felis 29.2025.2000__py3-none-any.whl → 29.2025.2200__py3-none-any.whl

felis/cli.py

@@ -198,6 +198,12 @@ def create(
 @click.option("--dry-run", "-D", is_flag=True, help="Execute dry run only. Does not insert any data.")
 @click.option("--echo", "-e", is_flag=True, help="Print out the generated insert statements to stdout")
 @click.option("--output-file", "-o", type=click.Path(), help="Write SQL commands to a file")
+@click.option(
+    "--force-unbounded-arraysize",
+    is_flag=True,
+    help="Use unbounded arraysize by default for all variable length string columns"
+    ", e.g., ``votable:arraysize: *`` (workaround for astropy bug #18099)",
+)  # DM-50899: Variable-length bounded strings are not handled correctly in astropy
 @click.option(
     "--unique-keys",
     "-u",
@@ -216,6 +222,7 @@ def load_tap_schema(
     dry_run: bool,
     echo: bool,
     output_file: str | None,
+    force_unbounded_arraysize: bool,
     unique_keys: bool,
     file: IO[str],
 ) -> None:
@@ -256,7 +263,13 @@ def load_tap_schema(
         table_name_postfix=tap_tables_postfix,
     )
 
-    schema = Schema.from_stream(file, context={"id_generation": ctx.obj["id_generation"]})
+    schema = Schema.from_stream(
+        file,
+        context={
+            "id_generation": ctx.obj["id_generation"],
+            "force_unbounded_arraysize": force_unbounded_arraysize,
+        },
+    )
 
     DataLoader(
         schema,

felis/datamodel.py

@@ -421,7 +421,7 @@ class Column(BaseObject):
 
     @model_validator(mode="before")
     @classmethod
-    def check_votable_arraysize(cls, values: dict[str, Any]) -> dict[str, Any]:
+    def check_votable_arraysize(cls, values: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
         """Set the default value for the ``votable_arraysize`` field, which
         corresponds to ``arraysize`` in the IVOA VOTable standard.
 
@@ -429,6 +429,8 @@ class Column(BaseObject):
         ----------
         values
             Values of the column.
+        info
+            Validation context used to determine if the check is enabled.
 
         Returns
         -------
@@ -443,6 +445,7 @@ class Column(BaseObject):
         if values.get("name", None) is None or values.get("datatype", None) is None:
             # Skip bad column data that will not validate
             return values
+        context = info.context if info.context else {}
         arraysize = values.get("votable:arraysize", None)
         if arraysize is None:
             length = values.get("length", None)
@@ -452,7 +455,14 @@ class Column(BaseObject):
                 if datatype == "char":
                     arraysize = str(length)
                 elif datatype in ("string", "unicode", "binary"):
-                    arraysize = f"{length}*"
+                    if context.get("force_unbounded_arraysize", False):
+                        arraysize = "*"
+                        logger.debug(
+                            f"Forced VOTable's 'arraysize' to '*' on column '{values['name']}' with datatype "
+                            + f"'{values['datatype']}' and length '{length}'"
+                        )
+                    else:
+                        arraysize = f"{length}*"
             elif datatype in ("timestamp", "text"):
                 arraysize = "*"
             if arraysize is not None:

{lsst_felis-29.2025.2000.dist-info → lsst_felis-29.2025.2200.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-felis
-Version: 29.2025.2000
+Version: 29.2025.2200
 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-29.2025.2000.dist-info → lsst_felis-29.2025.2200.dist-info}/RECORD

@@ -1,6 +1,6 @@
 felis/__init__.py,sha256=HnwWzLaPOSnPzAoppSIHzTrGfixEgvkzJdBxa8-03cw,1294
-felis/cli.py,sha256=hHixypAU3y0y4DiZ1vyKHp0QvMLWiR6_jVLl6st3Sgg,15668
-felis/datamodel.py,sha256=iKL-B2CkiVLKDrlHFkRC9UXGg9uEEwsMEg34Hyws2tM,43686
+felis/cli.py,sha256=jx3yBMEFPgvZTJsTKmWMAx--vBuRBDIOJNBbxMZR6fY,16132
+felis/datamodel.py,sha256=NYTmxuuU6DqL3r2e137sN9xS_WmD_xYeEYKAQjVA6Qs,44245
 felis/diff.py,sha256=z4ZzUocFYVa2y22BWUAMkeeLORmMtaWIDGTVaUE1OIM,7181
 felis/metadata.py,sha256=cYx_qizkLBqcoxWV46h4TbwTi1KVJAkuA2OuUmD-K5k,13536
 felis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,11 +16,11 @@ felis/schemas/tap_schema_std.yaml,sha256=sPW-Vk72nY0PFpCvP5d8L8fWvhkif-x32sGtcfD
 felis/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 felis/tests/postgresql.py,sha256=B_xk4fLual5-viGDqP20r94okuc0pbSvytRH_L0fvMs,4035
 felis/tests/run_cli.py,sha256=Gg8loUIGj9t6KlkRKrEc9Z9b5dtlkpJy94ORuj4BrxU,2503
-lsst_felis-29.2025.2000.dist-info/licenses/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
-lsst_felis-29.2025.2000.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-lsst_felis-29.2025.2000.dist-info/METADATA,sha256=BpOjZ_it4ujO_yJN32ThbBXXevrLlXOxFFZ3lELJ1GE,1433
-lsst_felis-29.2025.2000.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-lsst_felis-29.2025.2000.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
-lsst_felis-29.2025.2000.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
-lsst_felis-29.2025.2000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_felis-29.2025.2000.dist-info/RECORD,,
+lsst_felis-29.2025.2200.dist-info/licenses/COPYRIGHT,sha256=vJAFLFTSF1mhy9eIuA3P6R-3yxTWKQgpig88P-1IzRw,129
+lsst_felis-29.2025.2200.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+lsst_felis-29.2025.2200.dist-info/METADATA,sha256=w4HQCcDRzaf11WrNQCDb5nB2xGRFibRcxaLpHo3BmBU,1433
+lsst_felis-29.2025.2200.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_felis-29.2025.2200.dist-info/entry_points.txt,sha256=Gk2XFujA_Gp52VBk45g5kim8TDoMDJFPctsMqiq72EM,40
+lsst_felis-29.2025.2200.dist-info/top_level.txt,sha256=F4SvPip3iZRVyISi50CHhwTIAokAhSxjWiVcn4IVWRI,6
+lsst_felis-29.2025.2200.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_felis-29.2025.2200.dist-info/RECORD,,

{lsst_felis-29.2025.2000.dist-info → lsst_felis-29.2025.2200.dist-info}/WHEEL

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