-
Notifications
You must be signed in to change notification settings - Fork 24
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
Unified annotation versioning #7917
Open
fm3
wants to merge
402
commits into
master
Choose a base branch
from
unified-annotation-versioning
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 250 commits
Commits
Show all changes
402 commits
Select commit
Hold shift + click to select a range
ce14718
duplicate editable mapping
fm3 ba47647
do not report layer changes to postgres when loading an older version
fm3 b3f9a2c
some cleanup
fm3 8a0d637
use new annotation duplicate in task assignment
fm3 3d92ae3
move old routes to new update actions
6498050
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
41cada1
spelling of layer type proto
fm3 aef7d33
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
fm3 05b7e40
ensure loading newest annotation version from tracing store and patch…
8d5be05
send update annotation name and description as update actions
3155f6c
Merge branch 'master' into unified-annotation-versioning
fm3 85dece0
WIP task creation
fm3 a543415
fix task creation without base
fm3 d8d7fd4
wip task creation from base id
fm3 41a326c
fix volume task creation with base id
fm3 9549ad1
Merge branch 'master' into unified-annotation-versioning
fm3 11cbcd2
rename annotation.proto layers to annotationLayers, simplify duplicat…
fm3 65f2ebd
wip merge
fm3 e55768d
merge skeletons
fm3 63c8e6f
merge volume data
fm3 74c679b
small renamings
fm3 1a59e62
always use only data layers sent by tracing store and disregard layer…
ec8cd74
Merge branch 'master' into unified-annotation-versioning
fm3 0e9fffc
earliestAccessibleVersion; always fetch all layers; wip resetToBase
fm3 02f78b7
call resetToBase
fm3 bc51deb
remove volume tracing downsampling feature (backend)
fm3 7150c25
also duplicate annotation v0
fm3 3ffdf3b
use SequenceUtils
fm3 fb1b595
cleanup todo comments
fm3 89c4ec2
remap action tracing ids in duplicate
fm3 b89a7f6
re-add accidentally deleted function
636a34d
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
2d922b0
Merge branch 'master' into unified-annotation-versioning
fm3 5089c69
update todo comments
fm3 6dfc1ba
adapt e2e tests
fm3 cb46fca
rename sendUpdateActions in e2e test
fm3 c81f28b
skip flushing tracings with no changes
fm3 b1ae06c
remove (broken) morton index from volume bucket keys
fm3 8b5e2db
flush all tracings if a revert or resetToBase action is present
fm3 89216a5
Merge branch 'master' into unified-annotation-versioning
fm3 913d21a
re-connect tracing migration service
fm3 322ffaa
wip merge editable mappings
fm3 1cc0774
wip mergedFromContents
fm3 4b6ccc0
wip merged from contents
fm3 69d1a16
create editable mapping info when applying UpdateMappingName action
fm3 f95a3fd
Merge branch 'master' into unified-annotation-versioning
fm3 5ec9697
batching in duplicate updates
fm3 f6f83b8
resolve some small todo comments
fm3 fbadb93
adjust frontend editable mapping initialization
b48191d
Merge branch 'master' into unified-annotation-versioning
fm3 04dccff
first set mapping to editable before forcing sending all updates ton …
2b3c841
re-connect initializeWithData
fm3 bf2da97
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
fm3 184eff4
loglevel for pekko.event
fm3 a07404b
fix skeleton lookup
fm3 ab056ce
wip merge editable mappings
fm3 689e728
instantiate updater
fm3 01bc252
save linearized updates after merging editable mappings
fm3 39936d4
use newVersion also for tracing layers in merged
fm3 91449a8
fix volume version
fm3 8f30c3f
adapt parsing bucket keys (no more morton index)
fm3 11ffa47
WIP iron out reversion fold during merge
fm3 9eb780c
iron out reversion folds in update history before merging editable ma…
fm3 7a67500
Merge branch 'master' into unified-annotation-versioning
fm3 669a557
add docstrings, remove applyUpdates bool
fm3 4eb3911
fix merging skeleton-only, remove makeMappingEditable route
fm3 f422831
remove CompactVolumeUpdateAction
fm3 8671a7f
remove outdated todo comments
fm3 4d0a813
unify naming, no more persist, use toTemporaryStore
fm3 c7316fc
further unify naming
fm3 1cd857f
fix storing tracing after AddLayer action. skip reporting annotation …
fm3 9b904d6
never rely on editable mapping update action agglomerateIds
fm3 c60c713
wip temporary tracings
fm3 f0c35ba
use temporary store when loading annotations
fm3 03d62c8
fix mergedFromIds params
fm3 2ef2b32
fix lookup in annotationStore
fm3 01276f4
create segment index for compound again
fm3 f8f397a
remove outdated comments
fm3 b66423d
add todo comment for tracing stats
14bd8aa
single version param for download route
fm3 16aae92
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
fm3 42b9bf2
Merge branch 'master' into unified-annotation-versioning
fm3 8549b21
Fix unit tests, add two-level caching for materialized annotationWith…
fm3 ac5bd22
unify logging
fm3 e7a464f
cleanup
fm3 d6a8e8e
init fossildb migration
fm3 14d44c8
update frontend to newest annotation stats schema and fix typing & li…
cc8382b
include annotation stats per layer in time tracking api response json
fm3 aa02568
continue if a layer’s stats couldn’t be updated
fm3 03de53e
add some function stubs to migration
fm3 247fe9c
wip migration: read annotations from postgres
fm3 44bf6fc
fetch annotation info from postgres
fm3 c7af0fb
iterate on migration
fm3 caeb16a
Merge branch 'master' into unified-annotation-versioning
fm3 4cb9b75
wip migrate updates
fm3 aa86dad
migrate updates in stupid concat strategy
fm3 fbd5ac8
migrate skeleton + volume proto
fm3 fce6576
restructure migration code
fm3 187eed0
cleanup
fm3 5dbaceb
add two frontend TODO comments
7f96b42
migration: renamings for update actions, insert actionTracingId
fm3 e95bbc6
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
fm3 9b72b15
migration: add generaetd code
fm3 6c08032
migration: set tracing proto fields, create annotationProto
fm3 2772692
migrate volume buckets
fm3 dcc08e6
migration: annotation layer name, volume segment index
fm3 b5d3b48
migrate editable mapping distributed elements
fm3 93b0c6c
Merge branch 'master' into unified-annotation-versioning
fm3 ef191d1
migration: remove morton index, migrate editablemappinginfo objects
fm3 ab5cddb
migration: switch from orjson to msgspec
fm3 e2e513f
migration: add cli args, actually write to target fossilDB
fm3 d314f8a
parallelize, add postgres connection parameter
fm3 35a0e48
avoid redundant calls in task creation (regression introduced in cba7…
philippotto 7036656
migration: humanize time diff add previous-start argument
fm3 4585043
migration: wip handle compacted update actions, add error logging + c…
fm3 171d853
fix removeAllButLastUpdateTracingAction
philippotto 97e02e8
adapt some todo comments
philippotto ca3fb72
Merge branch 'master' into unified-annotation-versioning
fm3 7897f25
change renameTracing to use old editAnnotation route
philippotto 115adc5
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 5fc5813
more comments
philippotto 122ed14
Merge branch 'master' into unified-annotation-versioning
fm3 6344552
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 7734391
fix merge conflicts
philippotto a9fdce3
fix types for editAnnotation
philippotto b9cb2d9
Merge branch 'master' into unified-annotation-versioning
fm3 62dc283
handle UpdatTdCamera updates, migration: mark more as compacted
fm3 9c1373c
fix parsing CompactVolumeUpdateActions
fm3 bf91832
fix migration for proofreading, add some more error messages to backend
fm3 f380807
when initializing an annotation in the front-end use annotation.versi…
philippotto fe1ce0b
remove max handling of versions
philippotto da5a84c
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 3fbdf01
wip: allow updating annotation name from dashboard
fm3 f48f080
migration use passed pg password, add ETR, remove debug logging
fm3 402403a
fix version handling in model initialization etc
philippotto e0d5894
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto be8cdcd
adapt the types so that update actions that need isolation cannot be …
philippotto 3ca9833
remove downsampling feature volume annotations
philippotto 3654217
use editableMappingId == volumeTracingId constraint
philippotto 01953aa
fix deletion of layer
philippotto 1dcd33e
fix importVolumeData
philippotto 2a639d2
improve labels for proofreading entries in version restore view
philippotto 56bb6eb
remove/fix some more todo comments
philippotto 31bb491
pass tracingId directly to update actions instead of magically adding…
philippotto bb9f146
get rid of unused-tracing-id and superfluous passing of relevant trac…
philippotto 8759bb3
fix stuck 'Activating Mapping' message
philippotto cc3ecb1
Merge branch 'master' into unified-annotation-versioning
fm3 e0267c9
do not include name in annotationProto and updateAnnotationMetadata a…
fm3 8bf55fa
add version parameter to editableMapping agglomerateIdsForSegments
fm3 f256b6f
option to count versions
fm3 f340b14
migration: add verbose flag, log also to file
fm3 19888f3
add error for missing layers
fm3 c8dfaec
migration: randomize order with md5 hash
fm3 9299f71
get rid of tracing.version in frontend
philippotto ca2767f
fix linting
philippotto 0113f9a
remove remaining version properties
philippotto 94670e5
fix save saga spec
philippotto ca61fb8
fix skeletontracing saga spec
philippotto 3be7d8c
mock annotation proto in specs
philippotto 4d870cb
fix wkstore adapter spec
philippotto dd9dadc
fix more incorrectly passed transactionIds; fix save_reducer spec
philippotto d08621d
fix last frontend tests :tm:
philippotto b903187
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 0d48f4a
fix linting
philippotto 656561a
format backend
fm3 71bf9a4
Merge branch 'master' of github.com:scalableminds/webknossos into uni…
philippotto d553524
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto a0d536b
WIP: migration: merge updates in a less naive way
fm3 ca1ce9f
incorporate version parameter in agglomeratesForSegments route; refac…
philippotto eaef5a1
migration: iron out reverts, merge updates by timestamp
fm3 8a57621
migration: adapt to changed annotationProto format
fm3 e46df33
small cleanup in migration
fm3 25cf990
fix version restore preview for editable mappings
philippotto 5f25d9f
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 130ef67
fix that restoring to another version broke the loading of mesh files
philippotto 6f140d9
fix ordering in updateActionLog
fm3 05ca4aa
migration: wip select which to materialize
fm3 1b419a4
Merge branch 'master' into unified-annotation-versioning
fm3 408bb52
reload page when switching to a version in the version restore view t…
philippotto 4dffaf6
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 3dca73c
revert temporary sorting fix in FE
philippotto d160263
respect earliestAccessibleVersion in version restore view
philippotto 625403d
fix editing of annotation name
philippotto 39cc656
fix that newest version was also requested even when no annotation ex…
philippotto 70988b7
fix tooltip for segment stats
philippotto 856f11b
require passing annotationid to some tracingstore routes
fm3 f24d123
Revert "require passing annotationid to some tracingstore routes"
fm3 a34c774
introduce skeletonMayHavePendingUpdates property to annotation proto …
fm3 4f90eaa
Revert "Revert "require passing annotationid to some tracingstore rou…
fm3 950cb17
Merge branch 'master' into unified-annotation-versioning
fm3 406d7ee
set skeletonMayHavePendingUpdates to None after applying updates
fm3 0fecca6
migration: set the bool only where it makes sense
fm3 d0248b4
migration: set earliest_accessible_version for editable mapping annot…
fm3 f4b6068
don't fail on loading addSegmentIndex and compactVolumeActions
fm3 f6d7554
checkpoints for migration
fm3 a0ff64e
cleanup in migration
fm3 2109a68
pass annotationId to routes that require it (back-end cannot find the…
philippotto e688945
also require annotation id in volume data request
fm3 bbdd8b7
fix annotationId param for data route
philippotto 9237bda
use annotation id also for access request
fm3 5af55d8
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
fm3 bd1fd1b
fix switched ids
fm3 d92472b
adapt e2e tests
fm3 282084f
unused import
fm3 6e3709a
fix that version restore view didnt open when loading a version that …
philippotto 5b16fed
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto f8b830b
remove unused imports
philippotto 05a5956
use toasts related to proofreading undo
philippotto 7a1ecd9
Merge branch 'master' into unified-annotation-versioning
fm3 47eda78
add custom start time argument to migration
fm3 bfc5cf6
set editableMappingsMayHavePendingUpdates in migration
fm3 aa327d0
fetch extra editable mapping updates if needed
fm3 2c74668
fix downloading older volumes. changelog + migration guide.
fm3 29dd282
Merge branch 'master' into unified-annotation-versioning
fm3 7695e46
fix assertion in volume download
fm3 7332d78
remove debug logging
fm3 78eb6ff
fix typing and CI
philippotto 7013ca8
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 192e4b3
fix requesting volume data from older version
fm3 49406a5
if allDataZip is requested with annotationId, use that one also for t…
fm3 9582dff
fix test
philippotto aea43c6
clean up editAnnotation
philippotto e0be98c
rename to getUnversionedAnnotationInformation
philippotto e8da52d
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto a6f476c
fix annotation stats and linting
philippotto 63ffe8a
fix superfluous request with empty annotation id
philippotto e7776bf
fix type check test
philippotto 5f07292
resnap freshshots
fm3 8a8e88c
add e2e test for updating metadata
philippotto 1e91979
clean up typing of update actions
philippotto 20ea661
update todo comment
philippotto 1e093eb
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto d7cb2e2
unused import
fm3 9585319
save one lookup of annotationProto
fm3 e7b071f
fix sandbox view
philippotto c134fed
Merge branch 'unified-annotation-versioning' of github.com:scalablemi…
philippotto 5ed14b0
more verbose bucket loading errors, include Failure message
fm3 b27b78b
set editableMappingsMayHavePendingUpdates to None after are updates a…
fm3 fe31b44
implement migrationf feedback part1
fm3 25bb7c2
Update MIGRATIONS.unreleased.md
fm3 b2dfcaa
wip: clean-up older migration run in case of reverts. use new fossilD…
fm3 5c264ec
migration: fix cleanup of previous, use multi-version put
fm3 e948743
pin versions in requirements.txt
fm3 6b80d2b
iterate on migration guide
fm3 c44560c
bump fossildb version to 0.1.33 (master_504)
fm3 601032f
migration: fix mapping id lookup
fm3 f3a2eeb
rename type to typ in AnnotationLayerProto and DeleteLayerAnnotationA…
fm3 fc48bfc
fix applying extraSkeletonActions on older requested annotation versions
fm3 df88f4d
remove debug logging
fm3 60139a0
Merge branch 'master' into unified-annotation-versioning
fm3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[codespell] | ||
# Ref: https://github.com/codespell-project/codespell#using-a-config-file | ||
skip = *.svg,*.sublime-workspace,*.lock,.codespellrc,./util/target/,./binaryData,./node_modules,./pg,./project/target,./target,./webknossos-datastore/target,./webknossos-jni/target,./webknossos-tracingstore/target,./util/target,./coverage,./public-test,./tools/proxy/node_modules,./docs/publications.md,./public/bundle | ||
skip = *.svg,*.sublime-workspace,*.lock,.codespellrc,./util/target/,./binaryData,./node_modules,./pg,./project/target,./target,./webknossos-datastore/target,./webknossos-jni/target,./webknossos-tracingstore/target,./util/target,./coverage,./public-test,./tools/proxy/node_modules,./docs/publications.md,./public/bundle,./tools/migration-unified-annotation-versioning/venv | ||
# some names and camelCased variables etc | ||
ignore-regex = \b([a-z]+[A-Z][a-zA-Z]*|H Mattern|Manuel|Nat Commun)\b | ||
ignore-words-list = lod,nd,ue |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it would also be helpful to explain how to start a second fossildb instance.