-
Notifications
You must be signed in to change notification settings - Fork 363
feat(datasource/graphene): supervoxel splitting #985
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
Draft
chrisj
wants to merge
12
commits into
google:master
Choose a base branch
from
seung-lab:cj-ocdbt-rebase
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.
Draft
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
f8e4e9e
feat(kvstore/ocdbt): add cache invalidation for manifest/btree/version
akhileshh 8f1378c
feat(datasource/graphene): OCDBT segmentation support
akhileshh c71dd5d
feat(kvstore): add kvstack driver for key range-routed overlays
akhileshh 43e32e5
feat(datasource/graphene): consume server-provided ocdbt_kvstore_spec
akhileshh 3bb4b8b
refactor(kvstore/ocdbt): simplify invalidateOcdbtCaches via SimpleAsy…
akhileshh e501b36
fix(kvstore/kvstack): harden URL format and spec validation
akhileshh b27b862
fix(datasource/graphene): surface OCDBT scale-list failures with context
akhileshh 6fa6886
ran lint:fix
chrisj e1aa76b
fix(kvstore/kvstack): retry transient failures and wrap errors with r…
akhileshh 54711a5
fix(datasource/graphene): refresh 2D-picked supervoxel IDs from base …
akhileshh 57c6687
lint fix
chrisj 3a8074b
test gae deploy with share
chrisj 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| name: Build | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build-and-deploy: | ||
| permissions: | ||
| contents: "read" | ||
| id-token: "write" | ||
| deployments: "write" | ||
| strategy: | ||
| matrix: | ||
| os: | ||
| - "ubuntu-latest" | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| # Need full history to determine version number. | ||
| fetch-depth: 0 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 22.x | ||
| cache: "npm" | ||
| cache-dependency-path: | | ||
| package-lock.json | ||
| examples/**/package-lock.json | ||
| - run: npm install | ||
| - name: Typecheck with TypeScript | ||
| run: npm run typecheck | ||
| - name: Get branch name (merge) | ||
| if: github.event_name != 'pull_request' | ||
| shell: bash | ||
| run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV | ||
| - name: Get branch name (pull request) | ||
| if: github.event_name == 'pull_request' | ||
| shell: bash | ||
| run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV | ||
| - run: echo "BRANCH_NAME_URL=$(echo ${{ env.BRANCH_NAME }} | tr / - | tr _ -)" >> $GITHUB_ENV | ||
| - name: Get build info | ||
| run: echo "BUILD_INFO={\"tag\":\"$(git describe --always --tags)\", \"url\":\"https://github.com/${{github.repository}}/commit/$(git rev-parse HEAD)\", \"timestamp\":\"$(date)\", \"branch\":\"${{github.repository}}/${{env.BRANCH_NAME}}\"}" >> $GITHUB_ENV | ||
| shell: bash | ||
| # - name: Check for dirty working directory | ||
| # run: git diff --exit-code | ||
| - name: Build client bundles | ||
| run: npm run build -- --no-typecheck --no-lint --define STATE_SERVERS=$(cat config/state_servers.json | tr -d " \t\n\r") --define NEUROGLANCER_BUILD_INFO='${{ env.BUILD_INFO }}' --define NEUROGLANCER_CUSTOM_INPUT_BINDINGS=$(cat config/custom-keybinds.json | tr -d " \t\n\r") --define NEUROGLANCER_SEGMENT_LIST_COLOR_WIDGET=true | ||
| - name: Write build info | ||
| run: echo $BUILD_INFO > ./dist/client/version.json | ||
| shell: bash | ||
| - run: cp -r ./dist/client appengine/frontend/static/ | ||
| - name: start deployment | ||
| uses: bobheadxi/deployments@v1 | ||
| id: deployment | ||
| with: | ||
| step: start | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| env: ${{ env.BRANCH_NAME }} | ||
| desc: Setting up staging deployment for ${{ env.BRANCH_NAME }} | ||
| - id: "auth" | ||
| uses: "google-github-actions/auth@v1" | ||
| with: | ||
| workload_identity_provider: "projects/483670036293/locations/global/workloadIdentityPools/neuroglancer-github/providers/github" | ||
| service_account: "chris-apps-deploy@seung-lab.iam.gserviceaccount.com" | ||
| - id: deploy | ||
| uses: google-github-actions/deploy-appengine@main | ||
| with: | ||
| version: ${{ env.BRANCH_NAME_URL }} | ||
| deliverables: appengine/frontend/app.yaml | ||
| promote: false | ||
| - name: update deployment status | ||
| uses: bobheadxi/deployments@v1 | ||
| if: always() | ||
| with: | ||
| step: finish | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| env: ${{ steps.deployment.outputs.env }} | ||
| env_url: ${{ steps.deploy.outputs.url }} | ||
| status: ${{ job.status }} | ||
| deployment_id: ${{ steps.deployment.outputs.deployment_id }} |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| runtime: python312 | ||
|
|
||
| service: neuroglancer | ||
|
|
||
| handlers: | ||
| # Handle the main page by serving the index page. | ||
| # Note the $ to specify the end of the path, since app.yaml does prefix matching. | ||
| - url: /$ | ||
| static_files: static/index.html | ||
| upload: static/index.html | ||
| login: optional | ||
| secure: always | ||
| redirect_http_response_code: 301 | ||
|
|
||
| - url: / | ||
| static_dir: static | ||
| login: optional | ||
| secure: always | ||
| redirect_http_response_code: 301 |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "keym": { | ||
| "action": { | ||
| "layerType": "segmentation", | ||
| "tool": "grapheneMergeSegments", | ||
| "provider": "graphene" | ||
| } | ||
| }, | ||
| "keyc": { | ||
| "action": { | ||
| "layerType": "segmentation", | ||
| "tool": "grapheneMulticutSegments", | ||
| "provider": "graphene" | ||
| } | ||
| }, | ||
| "keyf": { | ||
| "action": { | ||
| "layerType": "segmentation", | ||
| "tool": "grapheneFindPath", | ||
| "provider": "graphene" | ||
| } | ||
| }, | ||
| "keyx": { | ||
| "action": false | ||
| }, | ||
| "control+shift+keyx": { | ||
| "action": "clear-segments" | ||
| }, | ||
| "bracketleft": [ | ||
| { "action": false, "context": "sliceView" }, | ||
| { "action": false, "context": "perspectiveView" }, | ||
| { "action": "select-previous" } | ||
| ], | ||
| "bracketright": [ | ||
| { "action": false, "context": "sliceView" }, | ||
| { "action": false, "context": "perspectiveView" }, | ||
| { "action": "select-next" } | ||
| ] | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "cave": { | ||
| "url": "middleauth+https://global.daf-apis.com/nglstate/api/v1/post", | ||
| "default": true | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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.
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.
move these two lines into an invalidateChunk method