Skip to content

fix: Revert flag-engine v10 revert to re-apply engine upgrade#6741

Merged
gagantrivedi merged 2 commits intomainfrom
revert-pr-6674
Feb 24, 2026
Merged

fix: Revert flag-engine v10 revert to re-apply engine upgrade#6741
gagantrivedi merged 2 commits intomainfrom
revert-pr-6674

Conversation

@gagantrivedi
Copy link
Copy Markdown
Member

Thanks for submitting a PR! Please check the boxes below:

  • I have read the Contributing Guide.
  • I have added information to docs/ if required so people know about the feature.
  • I have filled in the "Changes" section below.
  • I have filled in the "How did you test this code" section below.

Changes

Reverts #6674

This PR reverts the flag-engine v10 revert, effectively re-applying the original upgrade from #6653, including:

  • Upgrading flagsmith-flag-engine from the fix/missing-export branch back to ^10.0.3
  • Upgrading flagsmith SDK from ^3.10.0 back to ^5.1.1
  • Restoring pydantic-collections dependency
  • Restoring all vendored Pydantic models in util/engine_models/
  • Restoring updated imports across the codebase

How did you test this code?

  • CI tests should pass

This reverts commit faa031c,
effectively re-applying the flag-engine v10 upgrade from #6653.
@gagantrivedi gagantrivedi requested review from a team as code owners February 20, 2026 07:49
@gagantrivedi gagantrivedi requested review from Zaimwa9 and removed request for a team February 20, 2026 07:49
@vercel
Copy link
Copy Markdown

vercel bot commented Feb 20, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
flagsmith-frontend-preview Ready Ready Preview, Comment Feb 23, 2026 7:10pm
flagsmith-frontend-staging Ready Ready Preview, Comment Feb 23, 2026 7:10pm
1 Skipped Deployment
Project Deployment Actions Updated (UTC)
docs Ignored Ignored Preview Feb 23, 2026 7:10pm

Request Review

@github-actions github-actions bot added api Issue related to the REST API fix labels Feb 20, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 20, 2026

Docker builds report

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-e2e:pr-6741 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-frontend:pr-6741 Finished ✅ Results
ghcr.io/flagsmith/flagsmith:pr-6741 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-private-cloud:pr-6741 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-api:pr-6741 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-api-test:pr-6741 Finished ✅ Skipped

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 20, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.26%. Comparing base (deee405) to head (70fe68c).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6741      +/-   ##
==========================================
+ Coverage   98.25%   98.26%   +0.01%     
==========================================
  Files        1312     1327      +15     
  Lines       48568    48877     +309     
==========================================
+ Hits        47722    48031     +309     
  Misses        846      846              

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Zaimwa9
Copy link
Copy Markdown
Contributor

Zaimwa9 commented Feb 23, 2026

The branch is almost identical to the reverted one. Can I re-ask the reason why we reverted, was it out of safety during the hackaton or because we identified a regression?

@gagantrivedi
Copy link
Copy Markdown
Member Author

The branch is almost identical to the reverted one. Can I re-ask the reason why we reverted, was it out of safety during the hackaton or because we identified a regression?

Yeah, it was because the e2e tests that you wrote for Edge, when running against staging, were failing. We later realised that the failure was caused by Core not having access to identity override data, and not because something was wrong with the evaluation engine/logic.

khvn26
khvn26 previously approved these changes Feb 23, 2026
@khvn26 khvn26 changed the title fix: revert flag-engine v10 revert to re-apply engine upgrade fix: Revert flag-engine v10 revert to re-apply engine upgrade Feb 23, 2026
@khvn26 khvn26 removed their assignment Feb 23, 2026
@github-actions github-actions bot added fix and removed fix labels Feb 23, 2026
@gagantrivedi gagantrivedi requested review from Zaimwa9 and removed request for Zaimwa9 February 24, 2026 02:05
@gagantrivedi gagantrivedi merged commit cccf7bd into main Feb 24, 2026
33 checks passed
@gagantrivedi gagantrivedi deleted the revert-pr-6674 branch February 24, 2026 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api Issue related to the REST API fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants