Skip to content

Commit 6b18772

Browse files
madhavajaymadhavajay
committed
fixes
1 parent 20d3183 commit 6b18772

35 files changed

+529
-229
lines changed

‎.github/workflows/test.yml‎

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,46 @@ jobs:
4646
fail-fast: false
4747
matrix:
4848
include:
49+
# flows-collab smoke test (linux)
50+
- scenario: flows-collab
51+
platform: linux-x86_64
52+
runner: namespace-profile-linux-medium
53+
client_mode: rust
54+
tauri_binary: src-tauri/target/release/bv-desktop
55+
run_prefix: "xvfb-run -a"
56+
57+
# flows-collab smoke test (windows)
58+
- scenario: flows-collab
59+
platform: windows-x86_64
60+
runner: namespace-profile-windows-medium
61+
client_mode: rust
62+
tauri_binary: src-tauri/target/release/bv-desktop
63+
run_prefix: ""
64+
65+
# jupyter-collab smoke test (linux)
66+
- scenario: jupyter-collab
67+
platform: linux-x86_64
68+
runner: namespace-profile-linux-large
69+
client_mode: rust
70+
tauri_binary: src-tauri/target/release/bv-desktop
71+
run_prefix: "xvfb-run -a"
72+
73+
# jupyter-collab smoke test (macOS)
74+
- scenario: jupyter-collab
75+
platform: macos-arm64
76+
runner: namespace-profile-mac-medium
77+
client_mode: rust
78+
tauri_binary: src-tauri/target/release/bv-desktop
79+
run_prefix: ""
80+
81+
# jupyter-collab smoke test (windows)
82+
- scenario: jupyter-collab
83+
platform: windows-x86_64
84+
runner: namespace-profile-windows-medium
85+
client_mode: rust
86+
tauri_binary: src-tauri/target/release/bv-desktop
87+
run_prefix: ""
88+
4989
# pipelines-multiparty-flow smoke test (linux)
5090
- scenario: pipelines-multiparty-flow
5191
platform: linux-x86_64
@@ -105,7 +145,7 @@ jobs:
105145
path: |
106146
${{ github.workspace }}/../biovault
107147
${{ github.workspace }}/../syftbox-sdk
108-
${{ github.workspace }}/../syft-crypto-core
148+
${{ github.workspace }}/../syftbox-crypto
109149
${{ github.workspace }}/../syftbox
110150
${{ github.workspace }}/../biovault-beaver
111151
${{ github.workspace }}/../sbenv
@@ -116,12 +156,20 @@ jobs:
116156
workspace-deps-${{ runner.os }}-
117157
118158
- name: Setup workspace
159+
if: runner.os != 'Windows'
119160
env:
120161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
121162
BV_SKIP_SYQURE: ${{ contains(matrix.scenario, 'syqure') && '0' || '1' }}
122163
run: |
123164
chmod +x scripts/setup-workspace.sh
124165
./scripts/setup-workspace.sh
166+
- name: Setup workspace (Windows)
167+
if: runner.os == 'Windows'
168+
shell: pwsh
169+
env:
170+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
171+
BV_SKIP_SYQURE: ${{ contains(matrix.scenario, 'syqure') && '0' || '1' }}
172+
run: .\win.ps1 ./scripts/setup-workspace.sh
125173

126174
- name: Setup Rust
127175
uses: dtolnay/rust-toolchain@stable
@@ -442,7 +490,7 @@ jobs:
442490
run: ${{ matrix.run_prefix }} ./test-scenario.sh --flows-pause-resume
443491

444492
- name: Run flows collab scenario
445-
if: matrix.scenario == 'flows-collab'
493+
if: runner.os != 'Windows' && matrix.scenario == 'flows-collab'
446494
env:
447495
SKIP_PLAYWRIGHT_INSTALL: "1"
448496
AUTO_REBUILD_TAURI: "0"
@@ -452,9 +500,16 @@ jobs:
452500
else
453501
./test-scenario.sh --flows-collab
454502
fi
503+
- name: Run flows collab scenario (Windows)
504+
if: runner.os == 'Windows' && matrix.scenario == 'flows-collab'
505+
shell: pwsh
506+
env:
507+
SKIP_PLAYWRIGHT_INSTALL: "1"
508+
AUTO_REBUILD_TAURI: "0"
509+
run: .\win.ps1 ./test-scenario.sh --flows-collab
455510

456511
- name: Run jupyter collab scenario
457-
if: matrix.scenario == 'jupyter-collab'
512+
if: runner.os != 'Windows' && matrix.scenario == 'jupyter-collab'
458513
env:
459514
SKIP_PLAYWRIGHT_INSTALL: "1"
460515
AUTO_REBUILD_TAURI: "0"
@@ -464,6 +519,13 @@ jobs:
464519
else
465520
./test-scenario.sh --jupyter-collab biovault-beaver/notebooks/02-advanced-features.json
466521
fi
522+
- name: Run jupyter collab scenario (Windows)
523+
if: runner.os == 'Windows' && matrix.scenario == 'jupyter-collab'
524+
shell: pwsh
525+
env:
526+
SKIP_PLAYWRIGHT_INSTALL: "1"
527+
AUTO_REBUILD_TAURI: "0"
528+
run: .\win.ps1 ./test-scenario.sh --jupyter-collab biovault-beaver/notebooks/02-advanced-features.json
467529

468530
- name: Run pipelines multiparty flow scenario
469531
if: matrix.scenario == 'pipelines-multiparty-flow'
@@ -531,7 +593,7 @@ jobs:
531593
path: |
532594
${{ github.workspace }}/../biovault
533595
${{ github.workspace }}/../syftbox-sdk
534-
${{ github.workspace }}/../syft-crypto-core
596+
${{ github.workspace }}/../syftbox-crypto
535597
${{ github.workspace }}/../syftbox
536598
${{ github.workspace }}/../biovault-beaver
537599
${{ github.workspace }}/../sbenv
@@ -705,7 +767,7 @@ jobs:
705767
path: |
706768
${{ github.workspace }}/../biovault
707769
${{ github.workspace }}/../syftbox-sdk
708-
${{ github.workspace }}/../syft-crypto-core
770+
${{ github.workspace }}/../syftbox-crypto
709771
${{ github.workspace }}/../syftbox
710772
${{ github.workspace }}/../biovault-beaver
711773
${{ github.workspace }}/../sbenv
@@ -853,7 +915,7 @@ jobs:
853915
path: |
854916
${{ github.workspace }}/../biovault
855917
${{ github.workspace }}/../syftbox-sdk
856-
${{ github.workspace }}/../syft-crypto-core
918+
${{ github.workspace }}/../syftbox-crypto
857919
${{ github.workspace }}/../syftbox
858920
${{ github.workspace }}/../biovault-beaver
859921
${{ github.workspace }}/../sbenv

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ templates-dev/
4848
# Sibling repo symlinks (created by setup-workspace.sh)
4949
/biovault/
5050
/syftbox-sdk/
51-
/syft-crypto-core/
51+
/syftbox-crypto/
5252
/syftbox/
5353
/biovault-beaver/
5454
/sbenv/
@@ -64,7 +64,7 @@ bioscript/
6464
biovault-beaver/
6565
syftbox/
6666
syftbox-sdk/
67-
syft-crypto-core/
67+
syftbox-crypto/
6868
sbenv/
6969

7070
# repo tool workspace metadata

‎.prettierignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ biovault
44
bioscript
55
biovault-beaver
66
sbenv
7-
syft-crypto-core
7+
syftbox-crypto
88
syftbox
99
syftbox-sdk
1010
syqure

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This repo is a kind of mono-repo for BioVault but uses Google's repo tool so the
1616

1717
- Preferred layout is sibling repos at the repo root:
1818
`biovault/`, `biovault-beaver/`, `bioscript/`, `syftbox/`, `syftbox-sdk/`,
19-
`syft-crypto-core/`, `sbenv/`
19+
`syftbox-crypto/`, `sbenv/`
2020
- Scripts and Rust code accept overrides via env vars (examples):
2121
`WORKSPACE_ROOT`, `BIOVAULT_DIR`, `BIOVAULT_BEAVER_DIR`, `SYFTBOX_DIR`,
2222
`SYFTBOX_SDK_DIR`, `SBENV_DIR`
@@ -26,7 +26,7 @@ This repo is a kind of mono-repo for BioVault but uses Google's repo tool so the
2626
### Nested repo (libsignal)
2727

2828
- The libsignal repo is checked out under
29-
`syft-crypto-core/vendor/libsignal-protocol-syft`
29+
`syftbox-crypto/vendor/libsignal-protocol-syft`
3030
- It is pinned in `manifest.xml` to avoid submodule workflows.
3131

3232
### Notes for CI
@@ -39,7 +39,7 @@ This repo is a kind of mono-repo for BioVault but uses Google's repo tool so the
3939
### Dependency Graph
4040

4141
```
42-
syft-crypto-core (foundational crypto)
42+
syftbox-crypto (foundational crypto)
4343
↓
4444
syftbox-sdk (depends on syft-crypto-protocol)
4545
↓
@@ -54,7 +54,7 @@ biovault-beaver (independent Python, but uses syftbox conventions)
5454

5555
When making changes that span multiple repos, release in this order:
5656

57-
1. **syft-crypto-core** - Foundational crypto library
57+
1. **syftbox-crypto** - Foundational crypto library
5858

5959
- Contains `syft-crypto-protocol` crate
6060
- Must be released first if crypto changes
@@ -103,7 +103,7 @@ cd .. && git add -A && git commit -m "feat: integrate X"
103103

104104
When releasing, update versions in this order:
105105

106-
1. `syft-crypto-core/protocol/Cargo.toml` - bump version
106+
1. `syftbox-crypto/protocol/Cargo.toml` - bump version
107107
2. `syftbox-sdk/Cargo.toml` - bump version, update `syft-crypto-protocol` dep
108108
3. `biovault/cli/Cargo.toml` - bump version, update `syftbox-sdk` dep
109109
4. `src-tauri/Cargo.toml` - bump version (auto-triggers release)
@@ -137,7 +137,7 @@ Each repo has a `lint.sh` script that runs all checks in parallel:
137137
| biovault-desktop | Rust + JS/TS | `cargo fmt` + `clippy` + `prettier` + `eslint` |
138138
| biovault | Rust | `cargo fmt` + `clippy` |
139139
| syftbox-sdk | Rust | `cargo fmt` + `clippy` |
140-
| syft-crypto-core | Rust | `cargo fmt` + `clippy` |
140+
| syftbox-crypto | Rust | `cargo fmt` + `clippy` |
141141
| biovault-beaver | Python | `ruff format` + `ruff check` + `mypy` + `vulture` |
142142

143143
With `--test`: adds `cargo test` (Rust) or `pytest` (Python)

‎dev-desktop-live.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export SYFTBOX_AUTH_ENABLED
4949
export SYFTBOX_EMAIL
5050
export SYFTBOX_CONFIG_PATH="$BIOVAULT_HOME/syftbox/config.json"
5151
export SYFTBOX_DATA_DIR="$BIOVAULT_HOME"
52-
export SYC_VAULT="$SYFTBOX_DATA_DIR/.syc"
52+
export SBC_VAULT="$SYFTBOX_DATA_DIR/.sbc"
5353

5454
export BIOVAULT_DEV_MODE=1
5555
export BIOVAULT_DEV_SYFTBOX=1

‎dev-three.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ launch_desktop_instance() {
416416
export SYFTBOX_SERVER_URL="$server"
417417
export SYFTBOX_CONFIG_PATH="$config"
418418
export SYFTBOX_DATA_DIR="$data_dir"
419-
export SYC_VAULT="$SYFTBOX_DATA_DIR/.syc"
419+
export SBC_VAULT="$SYFTBOX_DATA_DIR/.sbc"
420420
export DEV_WS_BRIDGE=1
421421
export DEV_WS_BRIDGE_PORT="$ws_port"
422422

@@ -453,7 +453,7 @@ launch_desktop_instance() {
453453
echo -e "${YELLOW} BIOVAULT_HOME: $BIOVAULT_HOME${NC}"
454454
echo -e "${YELLOW} SYFTBOX_DATA_DIR: $SYFTBOX_DATA_DIR${NC}"
455455
echo -e "${YELLOW} SYFTBOX_CONFIG: $SYFTBOX_CONFIG_PATH${NC}"
456-
echo -e "${YELLOW} SYC_VAULT: $SYC_VAULT${NC}"
456+
echo -e "${YELLOW} SBC_VAULT: $SBC_VAULT${NC}"
457457
echo -e "${YELLOW} SyftBox backend: $BV_SYFTBOX_BACKEND${NC}"
458458
echo -e "${YELLOW} Server: $SYFTBOX_SERVER_URL${NC}"
459459
echo -e "${YELLOW} WS Bridge Port: $DEV_WS_BRIDGE_PORT${NC}"
@@ -540,7 +540,7 @@ preseed_onboarding_for_bootstrap() {
540540
SYFTBOX_SERVER_URL="$server" \
541541
SYFTBOX_CONFIG_PATH="$config" \
542542
SYFTBOX_DATA_DIR="$data_dir" \
543-
SYC_VAULT="$data_dir/.syc" \
543+
SBC_VAULT="$data_dir/.sbc" \
544544
"$BV_CLI_BIN" init --quiet "$email" >/dev/null
545545
done
546546

‎dev-two-live.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ import_bundle() {
206206
SYFTBOX_EMAIL="$dst_email" \
207207
SYFTBOX_SERVER_URL="$SYFTBOX_URL" \
208208
SYFTBOX_AUTH_ENABLED="$SYFTBOX_AUTH_ENABLED" \
209-
"$BV_CLI_BIN" syc import "$src_bundle" --expected-identity "$src_email" || true
209+
"$BV_CLI_BIN" sbc import "$src_bundle" --expected-identity "$src_email" || true
210210
}
211211

212212
ensure_bundle_under_datasites() {
@@ -286,7 +286,7 @@ launch_instance() {
286286
"SYFTBOX_AUTH_ENABLED=$SYFTBOX_AUTH_ENABLED"
287287
"SYFTBOX_CONFIG_PATH=$env_config"
288288
"SYFTBOX_DATA_DIR=$env_data"
289-
"SYC_VAULT=$SYFTBOX_DATA_DIR/.syc"
289+
"SBC_VAULT=$SYFTBOX_DATA_DIR/.sbc"
290290
"BIOVAULT_DEBUG_BANNER=1"
291291
)
292292
if [[ "$backend" == "process" ]]; then

‎dev-two.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ launch_desktop_instance() {
398398
export SYFTBOX_SERVER_URL="$server"
399399
export SYFTBOX_CONFIG_PATH="$config"
400400
export SYFTBOX_DATA_DIR="$data_dir"
401-
export SYC_VAULT="$SYFTBOX_DATA_DIR/.syc"
401+
export SBC_VAULT="$SYFTBOX_DATA_DIR/.sbc"
402402
export DEV_WS_BRIDGE=1
403403
export DEV_WS_BRIDGE_PORT="$ws_port"
404404

@@ -411,7 +411,7 @@ launch_desktop_instance() {
411411
echo -e "${YELLOW} BIOVAULT_HOME: $BIOVAULT_HOME${NC}"
412412
echo -e "${YELLOW} SYFTBOX_DATA_DIR: $SYFTBOX_DATA_DIR${NC}"
413413
echo -e "${YELLOW} SYFTBOX_CONFIG: $SYFTBOX_CONFIG_PATH${NC}"
414-
echo -e "${YELLOW} SYC_VAULT: $SYC_VAULT${NC}"
414+
echo -e "${YELLOW} SBC_VAULT: $SBC_VAULT${NC}"
415415
echo -e "${YELLOW} SyftBox backend: $BV_SYFTBOX_BACKEND${NC}"
416416
echo -e "${YELLOW} Server: $SYFTBOX_SERVER_URL${NC}"
417417
echo -e "${YELLOW} WS Bridge Port: $DEV_WS_BRIDGE_PORT${NC}"
@@ -514,7 +514,7 @@ ensure_client_identity() {
514514
syftbox_data="$(parse_data_dir "$config")"
515515
[[ -z "$syftbox_data" ]] && { log_error "Could not read data_dir from $config"; exit 1; }
516516

517-
vault_dir="$home/.syc"
517+
vault_dir="$home/.sbc"
518518
mkdir -p "$vault_dir/keys" "$vault_dir/bundles" "$vault_dir/config"
519519
local has_keys=0
520520
if [[ -d "$vault_dir/keys" ]]; then
@@ -573,7 +573,7 @@ import_bundle_pair() {
573573
BIOVAULT_HOME="$(client_field "$dst_email" home)" \
574574
SYFTBOX_CONFIG_PATH="$(client_field "$dst_email" config)" \
575575
SYFTBOX_DATA_DIR="$(parse_data_dir "$(client_field "$dst_email" config)")" \
576-
"$BV_CLI_BIN" syc import "$bundle" --expected-identity "$src_email" \
576+
"$BV_CLI_BIN" sbc import "$bundle" --expected-identity "$src_email" \
577577
|| log_warn "Bundle import $src_email -> $dst_email failed (continuing)"
578578
}
579579

‎docs/agent-api.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,7 +2280,7 @@
22802280
},
22812281
"readOnly": false,
22822282
"async": false,
2283-
"sideEffects": ["Stops daemons", "Deletes BIOVAULT_HOME (preserves .syc)"],
2283+
"sideEffects": ["Stops daemons", "Deletes BIOVAULT_HOME (preserves .sbc)"],
22842284
"dangerous": true
22852285
},
22862286
"reset_everything": {
@@ -2292,7 +2292,7 @@
22922292
},
22932293
"readOnly": false,
22942294
"async": false,
2295-
"sideEffects": ["Deletes all data including .syc", "Recreates empty database"],
2295+
"sideEffects": ["Deletes all data including .sbc", "Recreates empty database"],
22962296
"dangerous": true
22972297
},
22982298
"get_files": {

‎manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<project name="OpenMined/biovault" path="biovault" revision="main" />
77
<project name="OpenMined/biovault-beaver" path="biovault-beaver" revision="main" />
88
<project name="OpenMined/sbenv" path="sbenv" revision="main" />
9-
<project name="OpenMined/syft-crypto-core" path="syft-crypto-core" revision="main" />
9+
<project name="OpenMined/syftbox-crypto" path="syftbox-crypto" revision="main" />
1010
<project name="OpenMined/syftbox" path="syftbox" revision="madhava/biovault" />
1111
<project name="OpenMined/syftbox-sdk" path="syftbox-sdk" revision="main" />
1212
<project name="madhavajay/syqure" path="syqure" revision="main" />

0 commit comments

Comments
 (0)