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.

Sign up for GitHub

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

[WIP] Update to 0.2.12 #3

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] Update to 0.2.12 #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0d6601
use new permissions
eelcovdw Dec 11, 2024
a4eba67
adapt to new syftperm api
koenvanderveen Dec 12, 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
37 changes: 21 additions & 16 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import json
import os
import time
from datetime import UTC, datetime
from pathlib import Path
import json
from syftbox.lib import Client, SyftPermission
from statistics import mean

import diffprivlib.tools as dp
import time
import psutil
from statistics import mean
from datetime import datetime, UTC
from syftbox.lib import Client
from syftbox.lib.permissions import SyftPermission

API_NAME = "cpu_tracker_member"
AGGREGATOR_DATASITE = "[email protected]"
Expand All @@ -32,7 +34,7 @@ def get_cpu_usage_samples():
return cpu_usage_values


def create_restricted_public_folder(cpu_tracker_path: Path) -> None:
def create_restricted_public_folder(client: Client, cpu_tracker_dir: Path) -> None:
"""
Create an output folder for CPU tracker data within the specified path.

Expand All @@ -44,12 +46,19 @@ def create_restricted_public_folder(cpu_tracker_path: Path) -> None:
path (Path): The base path where the output folder should be created.

"""
os.makedirs(cpu_tracker_path, exist_ok=True)
os.makedirs(cpu_tracker_dir, exist_ok=True)

# Set default permissions for the created folder
permissions = SyftPermission.datasite_default(email=client.email)
permissions.read.append(AGGREGATOR_DATASITE)
permissions.save(cpu_tracker_path)
permissions = SyftPermission.datasite_default(
context=client,
dir=cpu_tracker_dir,
)
permissions.add_rule(
path="**",
user=AGGREGATOR_DATASITE,
permission="read",
)
permissions.save(cpu_tracker_dir)


def create_private_folder(path: Path) -> Path:
Expand All @@ -67,13 +76,9 @@ def create_private_folder(path: Path) -> Path:
Returns:
Path: The path to the created `cpu_tracker` directory.
"""
cpu_tracker_path: Path = client.workspace.data_dir / "private" / "cpu_tracker"
cpu_tracker_path: Path = client.workspace.data_dir / "private" / "cpu_tracker"
os.makedirs(cpu_tracker_path, exist_ok=True)

# Set default permissions for the created folder
permissions = SyftPermission.datasite_default(email=client.email)
permissions.save(cpu_tracker_path)

return cpu_tracker_path


Expand Down Expand Up @@ -137,7 +142,7 @@ def should_run() -> bool:

# Create an output file with proper read permissions
restricted_public_folder = client.api_data("cpu_tracker")
create_restricted_public_folder(restricted_public_folder)
create_restricted_public_folder(client, restricted_public_folder)

# Create private private folder
private_folder = create_private_folder(client.workspace.data_dir)
Expand Down