Skip to content

Dev r85 v2 pull #538

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
Draft
varmar05 wants to merge 75 commits into
base: develop
Choose a base branch
from
Draft

Dev r85 v2 pull #538

varmar05 wants to merge 75 commits into from

Conversation

@varmar05
Copy link
Collaborator

@varmar05 varmar05 commented Nov 26, 2025

No description provided.

varmar05 and others added 30 commits July 17, 2025 10:34
@varmar05
Introduce file diff table
d7bbfc0 
Expand diff json column into separate table
@varmar05
Add alembic migration for file diff table
f50eb96
@MarcelGeo
Merge pull request #482 from MerginMaps/new_diffs_table
32b3c5b 
Introduce file diff table
@varmar05
Merge branch 'dev-r65-pull' into dev-r85-v2-pull
feeafd9
@varmar05
Utils for generating cached version levels from versions
8c18891
@varmar05
Add db hook to trigger caching on project version created
afb42e5
@varmar05
create celery task to generate diff checkpoint
b14e55b
@varmar05
Use diff checkpoint in gpkg restore function
4461ec9
@varmar05
API: Add new v2 endpoint to download diff file
dd6463e
@varmar05
Remove celery caching job and trigger on project push
85ef488 
Specification changed - rollback recent changes
@MarcelGeo
Initial migration
4ab69f6
@MarcelGeo
Modify changes table in name
71f9f0f
@varmar05
Merge branch 'dev-r84-concurrent-push' into dev-r85-v2-pull
a9d1119
@varmar05
Cosmetic changes
0025b3b
@varmar05
Merge branch 'dev-r85-v2-pull' into merged-diffs
30be795
@varmar05
Return custom error on failed diff download + small functions renamin…
3c2153a 
…g/refactor
@varmar05
Merge pull request #504 from MerginMaps/merged-diffs
202eae7 
Merged diffs
@MarcelGeo
Initial version for merging diffs
83f858f
@MarcelGeo
Merge remote-tracking branch 'origin/dev-r85-v2-pull' into cache-vers…
0bfd6b5 
…ions
@MarcelGeo
Adapt merge versions
3db1550
@MarcelGeo
Delta endpoints + logic improvements:
03f5098 
- introduce get_delta method with caching
- introduce delta contrller
@MarcelGeo
extract method for create checkpoint
4fb5c83 
- added tests for pull and checkpoints
@MarcelGeo
Final fixes and changing schema
63100a6 
- accept numbers in endpoint
- consider to store diff instead of diffs in db
@MarcelGeo
Fix missing import
29a9eef
@MarcelGeo
Fix tests and add checkpoints just i UPDATE_DIFF
c53b928
@MarcelGeo
add safe check for dwonloading
dce0e11
@MarcelGeo
Imporve tests
832603d
@MarcelGeo
Address comments @varmar05 1. part
a9140e8 
- rename table to project version delta with column changes
- rename classes
- add get_delta_changes to project instance (nice)
- fix migration to int
@varmar05
Fix alembic migration for file diff
8f13613
@MarcelGeo
Merge pull request #521 from MerginMaps/update_migration
c6b60ce 
Fix alembic migration for file diff
@coveralls
Copy link

coveralls commented Nov 26, 2025 •
edited
Loading

Pull Request Test Coverage Report for Build 21514078503

Details

  • 883 of 918 (96.19%) changed or added relevant lines in 33 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.2%) to 94.588%
Changes Missing Coverage Covered Lines Changed/Added Lines %
server/mergin/sync/private_api_controller.py 14 15 93.33%
server/mergin/sync/public_api_v2_controller.py 28 29 96.55%
server/mergin/sync/commands.py 25 27 92.59%
server/mergin/tests/test_middleware.py 2 4 50.0%
server/mergin/sync/utils.py 48 56 85.71%
server/mergin/sync/models.py 242 263 92.02%
Files with Coverage Reduction New Missed Lines %
server/mergin/sync/models.py 1 94.84%
Totals Coverage Status
Change from base Build 21513946911: 0.2%
Covered Lines: 8826
Relevant Lines: 9331
💛 - Coveralls

MarcelGeo and others added 29 commits November 27, 2025 09:53
@MarcelGeo
Publish v2 pull enabled flag
80adef2
@MarcelGeo
Merge pull request #539 from MerginMaps/v2-pull-flag
bac1498 
Publish v2 pull enabled flag
@varmar05
Chore: Upgrade Flask to 3.x and Sqlalchemy to 2.x
b230bb2 
Minimal changes to get server working without any migrations to alchemy new API
@varmar05
Update stats module to use SqlAlchemy 2.x syntax
aa64557
@MarcelGeo
Added to_version as latest project version to delta reponse for trans…
169492d 
…action integrity in clients:

- improve handling of empty delta if since equals to to (or latest project version) -> returns items: []
@MarcelGeo
Try to rename diff path to diff id
decf2b1
@MarcelGeo
Some tweaks to comments
81eb324
@MarcelGeo
Merge pull request #547 from MerginMaps/provide-to-version
ab7aeda 
Added to_version as latest project version to delta reponse + another response updates
@varmar05
Merge pull request #543 from MerginMaps/backend_libs_update_v2
60a4da4 
Backend libs update
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into dev-r85-v2-pull
2183811
@varmar05
Bump python to 3.12 and upgrade docker base image to ubuntu 24.04
8d306a6
@varmar05
Fix tests
8ac9214
@varmar05
Merge pull request #557 from MerginMaps/bump_python
15918da 
Bump python to 3.12 and upgrade docker base image to ubuntu 24.04
@varmar05
Merge branch 'master' into dev-r85-v2-pull
97a5a45
@varmar05
Fix broken yaml file
2c745fa
@varmar05
Merge branch 'dev-r85-v2-pull' into dev-backend-libs-upgrade
f1bdeef
@varmar05
Fix tests
d79696d
@MarcelGeo
Upgrade Node.js from 18 to 22 for Vue web applications
4b016cd 
- Update Dockerfile to use node:22-alpine
- Update package.json engines requirement to >=22
@MarcelGeo
Upgraded deps:
07398a9 
- axios
- vite
- form-data
@MarcelGeo
unify autoprefixer version
217850f
@MarcelGeo
bump node in code style
a302c83
@MarcelGeo
Merge pull request #563 from MerginMaps/upgrade-nodejs-22
9f2e121 
Upgrade Node.js from 18 to 22 for Vue web applications
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into dev-r85-v2-pull
612ed7d
@MarcelGeo
Merge remote-tracking branch 'origin/dev-r85-v2-pull' into dev-backen…
221c177 
…d-libs-upgrade
@MarcelGeo
upgrade pipfile lock
a443db7
@MarcelGeo
black
e292145
@MarcelGeo
upgrade docker file for pip_ignore_packages
8266f24
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into dev-r85-v2-pull
55e36e4
@MarcelGeo
Merge pull request #560 from MerginMaps/dev-backend-libs-upgrade
ecb34c5 
Dev backend libs upgrade
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@varmar05 @coveralls @MarcelGeo