Skip to content

✨ Add ordering to function jobs inside a function job collection #8487

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 20 commits into from
Oct 14, 2025
Merged

✨ Add ordering to function jobs inside a function job collection #8487

merged 20 commits into from
Oct 14, 2025

Conversation

@wvangeit
Copy link
Contributor

@wvangeit wvangeit commented Oct 8, 2025 •
edited by pcrespov
Loading

What do these changes do?

This PR introduces an ordering in the the function jobs inside a the function job collection->function jobs table.
This is done by adding a column 'order'

It solves two cases:

  • it allows for the same function job uuid to be reused insided the same function job collection (because the primary key is now jc uuid and order instead of jc uuid and job uuid). This has a use case because a job collection can reuse function jobs (with same uuid) that have exactly the same input, for caching
  • when the function job collection is listed, the order can be made consistent if necessary.

Related issue/s

How to test

Create job collection with two exactly the same function job uuids, this should work now.

Dev-ops

Db migration

@wvangeit wvangeit added this to the Cheops milestone Oct 8, 2025
@wvangeit wvangeit requested a review from bisgaard-itis October 8, 2025 15:47
@wvangeit wvangeit self-assigned this Oct 8, 2025
@wvangeit wvangeit added a:webserver webserver's codebase. Assigning the area is particularly useful for bugs a:database associated to postgres service and postgres-database package 🤖-automerge marks PR as ready to be merged for Mergify labels Oct 8, 2025
@codecov
Copy link

codecov bot commented Oct 8, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.86%. Comparing base (95a633d) to head (8d3a66a).

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8487      +/-   ##
==========================================
+ Coverage   87.60%   89.86%   +2.26%     
==========================================
  Files        2001     1671     -330     
  Lines       77978    66160   -11818     
  Branches     1338      560     -778     
==========================================
- Hits        68309    59457    -8852     
+ Misses       9269     6555    -2714     
+ Partials      400      148     -252
Flag Coverage Δ
integrationtests 64.01% <0.00%> (-0.08%) ⬇️
unittests 88.35% <100.00%> (+2.05%) ⬆️
Components Coverage Δ
pkg_aws_library ∅ <ø> (∅)
pkg_celery_library ∅ <ø> (∅)
pkg_dask_task_models_library ∅ <ø> (∅)
pkg_models_library 93.08% <ø> (ø)
pkg_notifications_library 85.20% <ø> (ø)
pkg_postgres_database 87.95% <ø> (ø)
pkg_service_integration ∅ <ø> (∅)
pkg_service_library ∅ <ø> (∅)
pkg_settings_library ∅ <ø> (∅)
pkg_simcore_sdk 84.89% <ø> (-0.06%) ⬇️
agent 93.10% <ø> (ø)
api_server 91.86% <ø> (ø)
autoscaling 95.72% <ø> (ø)
catalog 92.06% <ø> (ø)
clusters_keeper 99.14% <ø> (ø)
dask_sidecar 91.82% <ø> (-0.56%) ⬇️
datcore_adapter 97.95% <ø> (ø)
director 75.81% <ø> (+0.08%) ⬆️
director_v2 90.91% <ø> (ø)
dynamic_scheduler 96.82% <ø> (ø)
dynamic_sidecar 90.44% <ø> (ø)
efs_guardian 89.83% <ø> (ø)
invitations 90.90% <ø> (ø)
payments 92.80% <ø> (ø)
resource_usage_tracker 92.11% <ø> (-0.06%) ⬇️
storage 86.41% <ø> (ø)
webclient ∅ <ø> (∅)
webserver 87.20% <100.00%> (-0.02%) ⬇️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 95a633d...8d3a66a. Read the comment docs.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@wvangeit wvangeit changed the title Fix duplicate map inputs 🐛 ✨ Add ordering to function jobs inside a function job collection ✨ Oct 8, 2025
@mergify
Copy link
Contributor

mergify bot commented Oct 8, 2025 •
edited
Loading

🧪 CI Insights

Here's what we observed from your CI run for 8d3a66a.

✅ Passed Jobs With Interesting Signals

Pipeline Job Signal Health on master Retries 🔍 CI Insights 📄 Logs
CI integration-tests Base branch is healthy, but retries were needed. Could be early signs of flakiness 👀 Healthy 1 View View

@wvangeit wvangeit removed the 🤖-automerge marks PR as ready to be merged for Mergify label Oct 9, 2025
@wvangeit wvangeit marked this pull request as ready for review October 9, 2025 07:38
@pcrespov pcrespov changed the title Add ordering to function jobs inside a function job collection ✨ ✨ Add ordering to function jobs inside a function job collection Oct 9, 2025
pcrespov
pcrespov approved these changes Oct 9, 2025
View reviewed changes
Copy link
Member

@pcrespov pcrespov left a comment

Choose a reason for hiding this comment

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

thx

matusdrobuliak66
matusdrobuliak66 approved these changes Oct 10, 2025
View reviewed changes
Copy link
Collaborator

@matusdrobuliak66 matusdrobuliak66 left a comment

Choose a reason for hiding this comment

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

THanks looking good

bisgaard-itis
bisgaard-itis approved these changes Oct 13, 2025
View reviewed changes
Copy link
Contributor

@bisgaard-itis bisgaard-itis left a comment

Choose a reason for hiding this comment

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

Cool, thanks a lot. Looks good to me

@wvangeit wvangeit added the 🤖-automerge marks PR as ready to be merged for Mergify label Oct 13, 2025
@wvangeit wvangeit enabled auto-merge (squash) October 13, 2025 07:31
@wvangeit
Copy link
Contributor Author

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2025 •
edited
Loading

queue

🟠 Waiting for conditions to match

  • -closed [📌 queue requirement]
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
      • #approved-reviews-by>=2
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0
      • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
      • #review-threads-unresolved=0
      • -conflict
      • -draft
      • base=master
      • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
      • label!=🤖-do-not-merge
      • label=🤖-automerge
      • any of: [🛡 GitHub branch protection]
        • check-skipped = deploy to dockerhub
        • check-neutral = deploy to dockerhub
        • check-success = deploy to dockerhub
      • any of: [🛡 GitHub branch protection]
        • check-success = system-tests
        • check-neutral = system-tests
        • check-skipped = system-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = unit-tests
        • check-neutral = unit-tests
        • check-skipped = unit-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = check OAS' are up to date
        • check-neutral = check OAS' are up to date
        • check-skipped = check OAS' are up to date
      • any of: [🛡 GitHub branch protection]
        • check-success = integration-tests
        • check-neutral = integration-tests
        • check-skipped = integration-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = build-test-images (frontend) / build-test-images
        • check-neutral = build-test-images (frontend) / build-test-images
        • check-skipped = build-test-images (frontend) / build-test-images
      • any of: [🛡 GitHub branch protection]
        • check-success = SonarCloud Code Analysis
        • check-neutral = SonarCloud Code Analysis
        • check-skipped = SonarCloud Code Analysis

@sonarqubecloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@wvangeit wvangeit merged commit 08daafc into ITISFoundation:master Oct 14, 2025
145 of 148 checks passed
@wvangeit wvangeit deleted the fix_duplicate_map_inputs branch October 14, 2025 08:05
This was referenced Oct 28, 2025
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GitHK GitHK GitHK approved these changes

@pcrespov pcrespov pcrespov approved these changes

@sanderegg sanderegg sanderegg approved these changes

@matusdrobuliak66 matusdrobuliak66 matusdrobuliak66 approved these changes

@bisgaard-itis bisgaard-itis bisgaard-itis approved these changes

Assignees

@wvangeit wvangeit

Labels

🤖-automerge marks PR as ready to be merged for Mergify a:database associated to postgres service and postgres-database package a:webserver webserver's codebase. Assigning the area is particularly useful for bugs

Projects

None yet

Milestone

Cheops

6 participants

@wvangeit @GitHK @pcrespov @sanderegg @matusdrobuliak66 @bisgaard-itis