Skip to content
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

Feature/add Syftbox install comand #25

Merged
merged 22 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e0e91fa
feat(syftbox/app_manager): ADD new syftbox/app_manager submodule
IonesioJunior Oct 3, 2024
ca7680f
feat(syftbox/main.py): ADDS install as a valid arg for syftbox CLI
IonesioJunior Oct 3, 2024
87fee0f
Merge remote-tracking branch 'origin/main' into feature/add_syftbox_i…
IonesioJunior Oct 8, 2024
f3358bc
Merge remote-tracking branch 'origin/main' into feature/add_syftbox_i…
IonesioJunior Oct 8, 2024
c5bd408
feat(syftbox/main.py): ADD new app command to syftbox cli
IonesioJunior Oct 9, 2024
10d7fad
refactor(syftbox/app_manager): RENAME app_manager submodule to just app
IonesioJunior Oct 9, 2024
32bf893
feat(syftbox/install.py): ADD a new source file responsible for app i…
IonesioJunior Oct 9, 2024
e839d46
feat(syftbox/app/utils.py): ADD small syftbox/app/utils.py source file
IonesioJunior Oct 9, 2024
ac2c6f5
Merge branch 'main' into feature/add_syftbox_install
IonesioJunior Oct 9, 2024
d4039ba
fix(syftbox/app/manager.py): FIX SYFT_CLIENT_CONFIG path exception
IonesioJunior Oct 9, 2024
62a2d7a
refactor(syftbox/app/manager.py-syftbox/app/utils.py): REMOVE unused …
IonesioJunior Oct 9, 2024
d185fc8
feat(syftbox/apps/install.py): ADD the update_app_json at the end of …
IonesioJunior Oct 9, 2024
2e235e5
feat(syftbox/client/plugins/app.py): Empower each app to have their o…
IonesioJunior Oct 9, 2024
a1b562b
Merge branch 'main' into feature/add_syftbox_install
IonesioJunior Oct 9, 2024
4816283
fix(syftbox/app/install.py): Fix small uncovered workflows and handle…
IonesioJunior Oct 9, 2024
240e132
test(tests/client/app_manager/install_test.py): ADD a set of tests to…
IonesioJunior Oct 9, 2024
9c4edb3
style(syftbox/app/install.py): REMOVE unused/uncessary print statements
IonesioJunior Oct 9, 2024
7793ae8
fix(syftbox/client/plugins/app.py): Uncomment the copy_default_apps f…
IonesioJunior Oct 9, 2024
bdbc092
docs(syftbox/apps/install.py): ADD docstrings to install.py functions
IonesioJunior Oct 9, 2024
7fb9ffb
potential fix for /tmp/ in macos
yashgorana Oct 10, 2024
b46b836
Merge branch 'main' into feature/add_syftbox_install
madhavajay Oct 11, 2024
493ebba
Made app install less strict and tested against github_app_updater
madhavajay Oct 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,41 @@ run-client name port="auto" server="http://localhost:5001":

# ---------------------------------------------------------------------------------------------------------------------

# Run a local syftbox app command
[group('app')]
run-app name command subcommand="":
#!/bin/bash
set -eou pipefail

# generate a local email from name, but if it looks like an email, then use it as is
EMAIL="{{ name }}@openmined.org"
if [[ "{{ name }}" == *@*.* ]]; then EMAIL="{{ name }}"; fi

# Working directory for client is .clients/<email>
CONFIG_DIR=.clients/$EMAIL/config
SYNC_DIR=.clients/$EMAIL/sync
mkdir -p $CONFIG_DIR $SYNC_DIR

echo -e "Config Dir : $CONFIG_DIR"

uv run syftbox/main.py app {{ command }} {{ subcommand }} --config_path=$CONFIG_DIR/config.json

# ---------------------------------------------------------------------------------------------------------------------

# Build syftbox wheel
[group('build')]
build:
rm -rf dist
uv build


# Build syftbox wheel
[group('install')]
install:
rm -rf dist
uv build
uv tool install $(ls /Users/madhavajay/dev/syft/dist/*.whl) --reinstall

# Bump version, commit and tag
[group('build')]
bump-version level="patch":
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ dependencies = [
"pydantic-settings>=2.5.2",
"pytest>=8.3.3",
"httpx>=0.27.2",
"pyyaml>=6.0.2",
"psutil>=6.0.0",
]

[project.optional-dependencies]
Expand Down
Empty file added syftbox/app/__init__.py
Empty file.
Loading
Loading