Skip to content

Develop #533

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 29 commits into from
Nov 14, 2025
Merged

Develop #533

merged 29 commits into from
Nov 14, 2025

Conversation

@MarcelGeo
Copy link
Collaborator

@MarcelGeo MarcelGeo commented Nov 13, 2025

No description provided.

varmar05 and others added 29 commits August 5, 2025 10:52
@varmar05
Add new v2 push endpoint to create a project version
34e7f2a 
- refactor common logic for push in v1 and v2 API
- feature flag to use v2 push (for clients only)
- dry run option in v2 endpoint to only validate request
- use new error structure for v2 endpoint
@MarcelGeo
Added new endpoint for pushing chunks (#487)
e10729a 
* Added new endpoint for pushing chunks
- new variable for storing chunks - UPLOAD_CHUNKS_DIR, UPLOAD_CHUNKS_EXPIRATION

* cleanup

* cleanup api yaml
@varmar05
Merge branch 'dev-r84-concurrent-push' into v2-project-push
18abd45
@varmar05
Use new errors structure in v2 chunks endpoint
5e8c5a9
@varmar05
Add integration test for full v2 push
fb378ad
@varmar05
Address comments
b8afe5f
@varmar05
Cron job to remove outdated uploaded chunks (#489)
27647c8 
* Cron job to remove outdated uploaded chunks

* Run cleanup more frequently
@MarcelGeo
Merge pull request #488 from MerginMaps/v2-project-push
1897f3a 
Add new v2 push endpoint to create a project version
@varmar05
Fix create version with only removed files
bdb3da5
@MarcelGeo
Merge pull request #490 from MerginMaps/fix_push_only_delete
cd2fc80 
Fix v2 push with only deleted files
@MarcelGeo
resolveunhandled description
ec80700
@varmar05
Remove upload chunks only if push was successful
548ec3b
@varmar05
Fix integrity error handling in push
ea4d51d
@MarcelGeo
Merge pull request #495 from MerginMaps/fix_remove_chunks
c5a1008 
Remove upload chunks only if push was successful
@MarcelGeo
Merge branch 'dev-r84-concurrent-push' into fix-error-integrity-handling
38765c6
@MarcelGeo
Merge pull request #496 from MerginMaps/fix-error-integrity-handling
8765c8f 
Fix integrity error handling
@MarcelGeo
Return whole project nfo dump from project versions :(
84ba9dd
@MarcelGeo
Merge pull request #506 from MerginMaps/return-project-info-v2
9fa0a4b 
Return whole project nfo dump from project versions
@MarcelGeo
Do not validate diff files against mime type
b06423e
@MarcelGeo
Merge pull request #513 from MerginMaps/backport-mimetype-validation
640f578 
Backport mimetype validation
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into dev-r84-concurrent…
de2f3e7 
…-push
@varmar05
chore: upgrade geodiff to 2.x
707eaef
@varmar05
Fix click lib to 8.2 to avoid breaking changes
9290685
@MarcelGeo
Merge pull request #528 from MerginMaps/upgrade_geodiff
a64e78d 
Upgrade geodiff to 2.x
@MarcelGeo
fix import for timezone
d11228a
@varmar05
revert some updated deps from lockfile
be99455
@MarcelGeo
Merge pull request #530 from MerginMaps/upgrade_geodiff
417fbcd 
revert some updated deps from lockfile
@MarcelGeo
Merge remote-tracking branch 'origin/develop' into dev-r84-concurrent…
1f8ed4a 
…-push
@MarcelGeo
Merge pull request #529 from MerginMaps/dev-r84-concurrent-push
16aeab3 
Dev r84 concurrent push
@MarcelGeo MarcelGeo requested a review from varmar05 November 13, 2025 13:26
@coveralls
Copy link

coveralls commented Nov 13, 2025

Pull Request Test Coverage Report for Build 19333070558

Details

  • 637 of 677 (94.09%) changed or added relevant lines in 20 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.04%) to 94.281%
Changes Missing Coverage Covered Lines Changed/Added Lines %
server/mergin/sync/public_api_controller.py 78 79 98.73%
server/mergin/sync/tasks.py 10 11 90.91%
server/mergin/tests/test_public_api_v2.py 134 135 99.26%
server/mergin/sync/utils.py 17 20 85.0%
server/mergin/sync/errors.py 34 38 89.47%
server/mergin/sync/files.py 67 71 94.37%
server/mergin/sync/models.py 83 91 91.21%
server/mergin/sync/public_api_v2_controller.py 115 133 86.47%
Totals Coverage Status
Change from base Build 18839616580: -0.04%
Covered Lines: 7896
Relevant Lines: 8375
💛 - Coveralls

@MarcelGeo MarcelGeo merged commit 537429e into master Nov 14, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@varmar05 varmar05 varmar05 approved these changes

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

@MarcelGeo @coveralls @varmar05