exclude building vector_data slot, force rebuild of older models which apparently wasn't happening...

This commit is contained in:
sneakers-the-rat 2024-10-02 20:20:34 -07:00
parent 8f95d55790
commit 8449e9f742
Signed by untrusted user who does not match committer: jonny
GPG key ID: 6DCB96EF1E4D232D
3 changed files with 6 additions and 6 deletions

View file

@ -642,7 +642,7 @@ class MapNVectors(DatasetMap):
cls.name is None cls.name is None
and cls.neurodata_type_def is None and cls.neurodata_type_def is None
and cls.neurodata_type_inc and cls.neurodata_type_inc
and cls.neurodata_type_inc != "VectorData" and cls.neurodata_type_inc not in ("VectorData", "VectorIndex")
and cls.quantity in ("*", "+") and cls.quantity in ("*", "+")
) )
@ -681,10 +681,10 @@ class MapNVectorData(DatasetMap):
Check for being an unnamed multivalued vector class that IS VectorData Check for being an unnamed multivalued vector class that IS VectorData
""" """
return ( return (
(cls.name is None or cls.name == "vector_data") (cls.name is None or cls.name in ("vector_data", "vector_index"))
and cls.neurodata_type_def is None and cls.neurodata_type_def is None
and cls.neurodata_type_inc and cls.neurodata_type_inc
and cls.neurodata_type_inc == "VectorData" and cls.neurodata_type_inc in ("VectorData", "VectorIndex")
and cls.quantity in ("*", "+") and cls.quantity in ("*", "+")
) )

View file

@ -230,7 +230,7 @@ class GroupAdapter(ClassAdapter):
) )
if self.debug: # pragma: no cover - only used in development if self.debug: # pragma: no cover - only used in development
slot.annotations["group_adapter"] = { slot.annotations["slot_adapter"] = {
"tag": "slot_adapter", "tag": "slot_adapter",
"value": "container_value_slot", "value": "container_value_slot",
} }

View file

@ -102,7 +102,7 @@ def generate_versions(
build_progress.update(linkml_task, advance=1, action="Build LinkML") build_progress.update(linkml_task, advance=1, action="Build LinkML")
linkml_res = linkml_provider.build(core_ns) linkml_res = linkml_provider.build(core_ns, force=True)
build_progress.update(linkml_task, advance=1, action="Built LinkML") build_progress.update(linkml_task, advance=1, action="Built LinkML")
# build pydantic # build pydantic
@ -115,7 +115,7 @@ def generate_versions(
pbar_string = schema.parts[-3] pbar_string = schema.parts[-3]
build_progress.update(pydantic_task, action=pbar_string) build_progress.update(pydantic_task, action=pbar_string)
pydantic_provider.build( pydantic_provider.build(
schema, versions=core_ns.versions, split=True, parallel=True schema, versions=core_ns.versions, split=True, parallel=True, force=True
) )
build_progress.update(pydantic_task, advance=1) build_progress.update(pydantic_task, advance=1)
build_progress.update(pydantic_task, action="Built Pydantic") build_progress.update(pydantic_task, action="Built Pydantic")