Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change default CATALOG_DATA_READY to OnCat #164

Merged
merged 1 commit into from
May 5, 2024

Conversation

rosswhitfield
Copy link
Member

@rosswhitfield rosswhitfield commented May 3, 2024

EWM1262

I had originally suggested making the workflow check depend on CATALOG.COMPLETE or CATALOG.ONCAT.COMPLETE but I don't think that is necessary and it should only check for CATALOG.ONCAT.COMPLETE. This will ensure that the catalog has actually been done.

For a different story, but I am actually wondering if we actually need the tasks table, from what I can tell by looking at https://monitor.sns.gov/database/report/task/ we could just use the default tasks for everything?

To tests this, you can stand up the docker-compose (you probably need to prune the volumes so the database is initialized correctly docker volume prune -a and rebuild the packages) and if you look at ARCS (which has no tasks so wiil use the default) you should see everything working as expected, e.g. http://localhost/report/arcs/214583/

2024-05-03-131010_647x459_scrot

Short description of the changes:

Long description of the changes:

Check list for the pull request

  • I have read the [CONTRIBUTING]
  • I have read the [CODE_OF_CONDUCT]
  • I have added tests for my changes
  • I have updated the documentation accordingly

Check list for the reviewer

  • I have read the [CONTRIBUTING]
  • I have verified the proposed changes
  • best software practices
    • all internal functions have an underbar, as is python standard
    • clearly named variables (better to be verbose in variable names)
    • code comments explaining the intent of code blocks
  • All the tests are passing
  • The documentation is up to date
  • code comments added when explaining intent

Manual test for the reviewer

References

@codecov-commenter
Copy link

codecov-commenter commented May 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.16%. Comparing base (947c0ed) to head (a1a0584).

Additional details and impacted files
@@           Coverage Diff           @@
##             next     #164   +/-   ##
=======================================
  Coverage   77.16%   77.16%           
=======================================
  Files          50       50           
  Lines        4634     4634           
=======================================
  Hits         3576     3576           
  Misses       1058     1058           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rosswhitfield rosswhitfield force-pushed the update_default_catalog branch from b222639 to a1a0584 Compare May 3, 2024 03:41
@rosswhitfield rosswhitfield requested a review from backmari May 3, 2024 06:17
@backmari
Copy link
Contributor

backmari commented May 3, 2024

Looks good! I ran the manual test and verified that the default cataloging worked as expected for ARCS, which uses the default workflow since it has no tasks defined in the DB table Task.
image

@backmari
Copy link
Contributor

backmari commented May 3, 2024

@rosswhitfield I think the tasks table is for the instruments to be able to configure the post-processing workflow, but I agree that the default tasks would probably do the right things for most instruments. For the instruments wanting to use the new HIMEM autoreducer processor it will be necessary to define that in this table.

@rosswhitfield rosswhitfield merged commit 9ee319e into next May 5, 2024
4 checks passed
@rosswhitfield rosswhitfield deleted the update_default_catalog branch May 5, 2024 23:19
@backmari backmari mentioned this pull request Aug 27, 2024
11 tasks
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.

3 participants