Skip to content

Commit 9d65d3f

Browse files
authored
In datastore client, use main user auth token (#1366)
* In datastore client, use main user auth token * lint * changelog * update test snapshots * skip macos tests for the moment * remove macos test runs
1 parent a657b19 commit 9d65d3f

File tree

57 files changed

+3400
-6610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3400
-6610
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -308,46 +308,6 @@ jobs:
308308
MULTIPROCESSING_DEFAULT_START_METHOD: spawn
309309
run: ./test.sh --splits 3 --group ${{ matrix.group }} --splitting-algorithm least_duration
310310

311-
webknossos_macos:
312-
needs: changes
313-
if: |
314-
${{ needs.changes.outputs.cluster_tools == 'true' }} ||
315-
${{ needs.changes.outputs.webknossos == 'true' }}
316-
runs-on: macos-latest
317-
strategy:
318-
matrix:
319-
python-version: ["3.12"]
320-
group: [1, 2, 3]
321-
fail-fast: false
322-
defaults:
323-
run:
324-
working-directory: webknossos
325-
326-
steps:
327-
- uses: actions/checkout@v3
328-
329-
- name: Install uv
330-
uses: astral-sh/setup-uv@v3
331-
with:
332-
enable-cache: true
333-
cache-dependency-glob: "webknossos/uv.lock"
334-
335-
- name: Install proxay
336-
run: npm install -g proxay
337-
338-
- name: Install minio
339-
run: brew install minio/stable/minio
340-
341-
- name: Set up Python ${{ matrix.python-version }}
342-
run: uv python install ${{ matrix.python-version }}
343-
344-
- name: Python tests
345-
timeout-minutes: 30
346-
shell: bash
347-
env:
348-
PYTHON_VERSION: ${{ matrix.python-version }}
349-
run: ./test.sh --splits 3 --group ${{ matrix.group }} --splitting-algorithm least_duration
350-
351311

352312
coverage_report:
353313
needs: [webknossos_linux]
@@ -392,7 +352,6 @@ jobs:
392352
- cluster_tools_dask
393353
- webknossos_linux
394354
- webknossos_windows
395-
- webknossos_macos
396355
if: |
397356
always() &&
398357
!contains(needs.*.result, 'failure') &&
@@ -468,7 +427,6 @@ jobs:
468427
- cluster_tools_dask
469428
- webknossos_linux
470429
- webknossos_windows
471-
- webknossos_macos
472430
runs-on: ubuntu-latest
473431
if: |
474432
always() &&
@@ -528,7 +486,6 @@ jobs:
528486
- cluster_tools_dask
529487
- webknossos_linux
530488
- webknossos_windows
531-
- webknossos_macos
532489
if: |
533490
always() &&
534491
!contains(needs.*.result, 'failure') &&
@@ -568,7 +525,6 @@ jobs:
568525
- cluster_tools_slurm
569526
- webknossos_linux
570527
- webknossos_windows
571-
- webknossos_macos
572528
- webknossos_cli_docker
573529
- docs
574530
- pypi_and_gh_release

webknossos/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ For upgrade instructions, please check the respective _Breaking Changes_ section
1919
### Changed
2020

2121
### Fixed
22+
- Fixed that some operations that need an authentication token didn’t ask for it but just failed. [#1366](https://github.com/scalableminds/webknossos-libs/pull/1366)
2223

2324

2425
## [2.4.11](https://github.com/scalableminds/webknossos-libs/releases/tag/v2.4.11) - 2025-09-02

webknossos/tests/cassettes/test_annotation/test_annotation_upload_download_roundtrip.yml

Lines changed: 55 additions & 123 deletions
Large diffs are not rendered by default.

webknossos/tests/cassettes/test_annotation/test_bounding_box_roundtrip.yml

Lines changed: 27 additions & 73 deletions
Large diffs are not rendered by default.

webknossos/tests/cassettes/test_annotation/test_dataset_access_via_annotation.yml

Lines changed: 51 additions & 121 deletions
Large diffs are not rendered by default.

webknossos/tests/cassettes/test_annotation/test_remote_annotation_list.yml

Lines changed: 7 additions & 13 deletions
Large diffs are not rendered by default.

webknossos/tests/cassettes/test_api_client/test_annotation_info.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ http_interactions:
22
- request:
33
method: GET
44
path: >-
5-
/api/v10/annotations/570ba0092a7c0e980056fe9b/info?timestamp=1756493078000
5+
/api/v10/annotations/570ba0092a7c0e980056fe9b/info?timestamp=1757591333000
66
headers:
77
host: localhost:9000
88
accept: '*/*'
@@ -19,12 +19,10 @@ http_interactions:
1919
status:
2020
code: 200
2121
headers:
22-
x-powered-by: Express
2322
cache-control: no-cache
2423
referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin
2524
x-permitted-cross-domain-policies: master-only
26-
date: Fri, 29 Aug 2025 18:44:38 GMT
27-
connection: close
25+
date: Thu, 11 Sep 2025 11:48:53 GMT
2826
content-type: application/json
2927
content-length: '1911'
3028
body:

webknossos/tests/cassettes/test_api_client/test_build_info.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ http_interactions:
1818
status:
1919
code: 200
2020
headers:
21-
x-powered-by: Express
2221
referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin
2322
access-control-max-age: '600'
2423
access-control-allow-origin: '*'
2524
x-permitted-cross-domain-policies: master-only
26-
date: Fri, 29 Aug 2025 18:44:38 GMT
27-
connection: close
25+
date: Thu, 11 Sep 2025 11:48:54 GMT
2826
content-type: application/json
29-
content-length: '409'
27+
content-length: '400'
3028
body:
3129
encoding: utf8
3230
data: >-
33-
{"webknossos":{"name":"webknossos","ciTag":"","commitHash":"0858f84b3e03f2d4a45c4ce4665dcad8de43ae76","ciBuild":"","scalaVersion":"2.13.16","version":"dev","sbtVersion":"1.11.4","datastoreApiVersion":"2.0","commitDate":"Fri
34-
Aug 29 17:31:37 2025
35-
+0200"},"schemaVersion":138,"httpApiVersioning":{"currentApiVersion":10,"oldestSupportedApiVersion":5},"localDataStoreEnabled":true,"localTracingStoreEnabled":true}
31+
{"webknossos":{"name":"webknossos","ciTag":"","commitHash":"abcdb07363a32ee530a3c178debb499aae37769e","ciBuild":"17615971194","scalaVersion":"2.13.16","version":"17615971194","sbtVersion":"1.11.4","commitDate":"Wed
32+
Sep 10 13:50:33 2025
33+
+0000"},"schemaVersion":139,"httpApiVersioning":{"currentApiVersion":10,"oldestSupportedApiVersion":5},"localDataStoreEnabled":true,"localTracingStoreEnabled":true}
3634
compression: none

webknossos/tests/cassettes/test_api_client/test_current_user_info_and_user_logged_time.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ http_interactions:
1818
status:
1919
code: 200
2020
headers:
21-
x-powered-by: Express
2221
cache-control: no-cache
2322
referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin
2423
x-permitted-cross-domain-policies: master-only
25-
date: Fri, 29 Aug 2025 18:44:38 GMT
26-
connection: close
24+
date: Thu, 11 Sep 2025 11:48:53 GMT
2725
content-type: application/json
2826
content-length: '717'
2927
body:
@@ -50,16 +48,14 @@ http_interactions:
5048
status:
5149
code: 200
5250
headers:
53-
x-powered-by: Express
5451
cache-control: no-cache
5552
referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin
5653
x-permitted-cross-domain-policies: master-only
57-
date: Fri, 29 Aug 2025 18:44:38 GMT
58-
connection: close
54+
date: Thu, 11 Sep 2025 11:48:53 GMT
5955
content-type: application/json
6056
content-length: '691'
6157
body:
6258
encoding: utf8
6359
data: >-
64-
{"loggedTime":[{"paymentInterval":{"month":4,"year":2016},"durationInSeconds":58},{"paymentInterval":{"month":8,"year":2018},"durationInSeconds":265},{"paymentInterval":{"month":1,"year":2021},"durationInSeconds":112},{"paymentInterval":{"month":3,"year":2021},"durationInSeconds":24},{"paymentInterval":{"month":5,"year":2021},"durationInSeconds":158},{"paymentInterval":{"month":8,"year":2021},"durationInSeconds":14},{"paymentInterval":{"month":11,"year":2021},"durationInSeconds":12},{"paymentInterval":{"month":2,"year":2024},"durationInSeconds":114},{"paymentInterval":{"month":3,"year":2024},"durationInSeconds":200},{"paymentInterval":{"month":8,"year":2025},"durationInSeconds":0}]}
60+
{"loggedTime":[{"paymentInterval":{"month":4,"year":2016},"durationInSeconds":58},{"paymentInterval":{"month":8,"year":2018},"durationInSeconds":265},{"paymentInterval":{"month":1,"year":2021},"durationInSeconds":112},{"paymentInterval":{"month":3,"year":2021},"durationInSeconds":24},{"paymentInterval":{"month":5,"year":2021},"durationInSeconds":158},{"paymentInterval":{"month":8,"year":2021},"durationInSeconds":14},{"paymentInterval":{"month":11,"year":2021},"durationInSeconds":12},{"paymentInterval":{"month":2,"year":2024},"durationInSeconds":114},{"paymentInterval":{"month":3,"year":2024},"durationInSeconds":200},{"paymentInterval":{"month":9,"year":2025},"durationInSeconds":0}]}
6561
compression: none

webknossos/tests/cassettes/test_api_client/test_dataset_info.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ http_interactions:
1818
status:
1919
code: 200
2020
headers:
21-
x-powered-by: Express
2221
cache-control: no-cache
2322
referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin
2423
x-permitted-cross-domain-policies: master-only
25-
date: Fri, 29 Aug 2025 18:44:38 GMT
26-
connection: close
24+
date: Thu, 11 Sep 2025 11:48:54 GMT
2725
content-type: application/json
2826
content-length: '112'
2927
body:
@@ -50,16 +48,14 @@ http_interactions:
5048
status:
5149
code: 200
5250
headers:
53-
x-powered-by: Express
5451
cache-control: no-cache
5552
referrer-policy: origin-when-cross-origin, strict-origin-when-cross-origin
5653
x-permitted-cross-domain-policies: master-only
57-
date: Fri, 29 Aug 2025 18:44:38 GMT
58-
connection: close
54+
date: Thu, 11 Sep 2025 11:48:54 GMT
5955
content-type: application/json
6056
content-length: '1627'
6157
body:
6258
encoding: utf8
6359
data: >-
64-
{"id":"59e9cfbdba632ac2ab8b23b5","name":"l4_sample","dataSource":{"id":{"name":"l4_sample","team":"Organization_X"},"dataLayers":[{"name":"color","category":"color","boundingBox":{"topLeft":[3072,3072,512],"width":1024,"height":1024,"depth":1024},"resolutions":[[1,1,1],[2,2,1],[4,4,1],[8,8,2],[16,16,4]],"elementClass":"uint8","defaultViewConfiguration":{"color":[255,0,0]}},{"name":"segmentation","category":"segmentation","boundingBox":{"topLeft":[3072,3072,512],"width":1024,"height":1024,"depth":1024},"resolutions":[[1,1,1],[2,2,1],[4,4,1],[8,8,2],[16,16,4]],"elementClass":"uint32","largestSegmentId":2504697}],"scale":{"factor":[11.239999771118164,11.239999771118164,28],"unit":"nanometer"}},"dataStore":{"name":"localhost","url":"http://localhost:9000","allowsUpload":true,"jobsSupportedByAvailableWorkers":[],"jobsEnabled":false},"owningOrganization":"Organization_X","allowedTeams":[{"id":"570b9f4b2a7c0e3b008da6ec","name":"team_X1","organization":"Organization_X","isOrganizationTeam":true}],"allowedTeamsCumulative":[{"id":"570b9f4b2a7c0e3b008da6ec","name":"team_X1","organization":"Organization_X","isOrganizationTeam":true}],"isActive":true,"isPublic":true,"description":null,"directoryName":"l4_sample","created":1508495293789,"isEditable":true,"lastUsedByUser":1756493079131,"logoUrl":"/assets/images/mpi-logos.svg","sortingKey":1508495293789,"metadata":[{"key":"key","type":"string","value":"value"},{"key":"number","type":"number","value":42},{"key":"list","type":"string[]","value":["a","b","c"]}],"isUnreported":false,"tags":[],"folderId":"570b9f4e4bb848d0885ea917","publication":null,"usedStorageBytes":0}
60+
{"id":"59e9cfbdba632ac2ab8b23b5","name":"l4_sample","dataSource":{"id":{"name":"l4_sample","team":"Organization_X"},"dataLayers":[{"name":"color","category":"color","boundingBox":{"topLeft":[3072,3072,512],"width":1024,"height":1024,"depth":1024},"resolutions":[[1,1,1],[2,2,1],[4,4,1],[8,8,2],[16,16,4]],"elementClass":"uint8","defaultViewConfiguration":{"color":[255,0,0]}},{"name":"segmentation","category":"segmentation","boundingBox":{"topLeft":[3072,3072,512],"width":1024,"height":1024,"depth":1024},"resolutions":[[1,1,1],[2,2,1],[4,4,1],[8,8,2],[16,16,4]],"elementClass":"uint32","largestSegmentId":2504697}],"scale":{"factor":[11.239999771118164,11.239999771118164,28],"unit":"nanometer"}},"dataStore":{"name":"localhost","url":"http://localhost:9000","allowsUpload":true,"jobsSupportedByAvailableWorkers":[],"jobsEnabled":false},"owningOrganization":"Organization_X","allowedTeams":[{"id":"570b9f4b2a7c0e3b008da6ec","name":"team_X1","organization":"Organization_X","isOrganizationTeam":true}],"allowedTeamsCumulative":[{"id":"570b9f4b2a7c0e3b008da6ec","name":"team_X1","organization":"Organization_X","isOrganizationTeam":true}],"isActive":true,"isPublic":true,"description":null,"directoryName":"l4_sample","created":1508495293789,"isEditable":true,"lastUsedByUser":1757591334400,"logoUrl":"/assets/images/mpi-logos.svg","sortingKey":1508495293789,"metadata":[{"key":"key","type":"string","value":"value"},{"key":"number","type":"number","value":42},{"key":"list","type":"string[]","value":["a","b","c"]}],"isUnreported":false,"tags":[],"folderId":"570b9f4e4bb848d0885ea917","publication":null,"usedStorageBytes":0}
6561
compression: none

0 commit comments

Comments
 (0)