Skip to content

DM-54017: Use Felis for loading the APDB schemas#57

Merged
bsmartradio merged 3 commits into
mainfrom
tickets/DM-54017
May 6, 2026
Merged

DM-54017: Use Felis for loading the APDB schemas#57
bsmartradio merged 3 commits into
mainfrom
tickets/DM-54017

Conversation

@isullivan
Copy link
Copy Markdown
Contributor

No description provided.

@bsmartradio bsmartradio self-assigned this Feb 18, 2026
Copy link
Copy Markdown

@gpdf gpdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In commit b04b4ce, "Update schema to v11.0 and swap to Felis", a new schema is combined on the same commit with a new schema. We would encourage decoupling these so that it's possible to validate the new avsc-generation using Felis first against an existing one, and then separately committing the result of the schema generation in a different PR.

I also have some comments on the units in the generated schema, which probably need to be fed back to changes in the upstream Felis, where I do see that the "d" units are missing on the attributes corresponding to the comments below.

]
},
{
"doc": "Time when this record was generated, expressed as Modified Julian Date, International Atomic Time.",
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add units "[d]"

"type": "double"
},
{
"doc": "Time when this record was marked invalid, expressed as Modified Julian Date, International Atomic Time.",
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add units "[d]"

"type": "long"
},
{
"doc": "Processing time when validity of this diaObject starts, expressed as Modified Julian Date, International Atomic Time.",
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add units "[d]"

Copy link
Copy Markdown

@gpdf gpdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In commit b04b4ce, "Update schema to v11.0 and swap to Felis", a new schema is combined on the same commit with a new schema. We would encourage decoupling these so that it's possible to validate the new avsc-generation using Felis first against an existing one, and then separately committing the result of the actual schema generation in a different PR.

I also have some comments on the units in the generated schema, which probably need to be fed back to changes in the upstream Felis YAML rather than being fixed on this ticket. I'll submit a bug ticket to Jira for that.

@bsmartradio
Copy link
Copy Markdown
Contributor

bsmartradio commented Apr 2, 2026

In commit b04b4ce, "Update schema to v11.0 and swap to Felis", a new schema is combined on the same commit with a new schema. We would encourage decoupling these so that it's possible to validate the new avsc-generation using Felis first against an existing one, and then separately committing the result of the actual schema generation in a different PR.

I also have some comments on the units in the generated schema, which probably need to be fed back to changes in the upstream Felis YAML rather than being fixed on this ticket. I'll submit a bug ticket to Jira for that.

Unfortunately, we cannot separate the Felis change and the schema change. We use Felis in updatSchema.py, which builds from the current sdm_schemas. The schema change is needed because a change was made a while back to updating fields were non-nullable. It wasn't caught that the change would have also required a major schema update. This currently does not cause issues, but still is a needed change.

Additionally, the missing units will require a change to sdm_schemas, as we build everything from there. I can open a branch on sdm_schemas to make this change, assuming it needs to be present in all the documentation. I'd just like to confirm that that is what you are asking before making the changes there.

@gpdf gpdf self-requested a review April 23, 2026 21:39
Copy link
Copy Markdown

@gpdf gpdf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I see that it's not realistic at this point to deploy things the way that I'd have preferred, in two steps.

I would still have preferred the code change and the new v11 schema to be on separate commits, for a clearer history, though.

If you have time to do that today, I'd appreciate it; otherwise you can proceed. We can fix up the units soon as another change. Please go ahead and make an sdm_schemas PR for that.

Thanks!

isullivan and others added 3 commits May 6, 2026 15:58
@bsmartradio bsmartradio merged commit 0e68e3e into main May 6, 2026
8 checks passed
@bsmartradio bsmartradio deleted the tickets/DM-54017 branch May 6, 2026 23:05
@andy-slac
Copy link
Copy Markdown

Did this merge break ap_association unit tests? My Jenkins builds seem to be failing, and I don't think it's due to my changes: https://ci.lsst.cloud/blue/organizations/jenkins/stack-os-matrix/detail/stack-os-matrix/8870/tests

@andy-slac
Copy link
Copy Markdown

Looks like weekly build will be broken due to this, but it may be too late to revert.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants