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

Refactor/SK-1225 | Use api/v1 in APIClient start_session #758

Merged
merged 6 commits into from
Nov 26, 2024
Merged

Refactor/SK-1225 | Use api/v1 in APIClient start_session #758

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
601b59c
Use api/v1 in APIClient start_session
benjaminastrand Nov 22, 2024
7050bdc
Ruff linting
benjaminastrand Nov 22, 2024
eb8592a
Ruff
benjaminastrand Nov 22, 2024
dac41b9
Set helper based on file extension of seed model
benjaminastrand Nov 25, 2024
c9dd124
Use active model if model_id not in session_config
benjaminastrand Nov 26, 2024
bad5237
Use autogenerated session id when starting session
benjaminastrand Nov 26, 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
7 changes: 4 additions & 3 deletions examples/monai-2D-mednist/client/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def validate(in_model_path, out_json_path, data_path=None, client_settings_path=

image_list = clients["client " + str(split_index)]["validation"]

val_ds = MedNISTDataset(data_path=data_path+"/MedNIST/", transforms=val_transforms, image_files=image_list)
val_ds = MedNISTDataset(data_path=data_path + "/MedNIST/", transforms=val_transforms, image_files=image_list)

val_loader = DataLoader(val_ds, batch_size=batch_size, shuffle=True, num_workers=num_workers)

Expand Down Expand Up @@ -86,8 +86,9 @@ def validate(in_model_path, out_json_path, data_path=None, client_settings_path=

# JSON schema
report.update({"test_accuracy": accuracy_score(y_true, y_pred), "test_f1_score": f1_score(y_true, y_pred, average="macro")})
for r in report:
print(r, ": ", report[r])

for key, value in report.items():
print(f"{key}: {value}")

# Save JSON
save_metrics(report, out_json_path)
Expand Down
51 changes: 37 additions & 14 deletions fedn/network/api/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,18 @@ def set_active_model(self, path):
:return: A dict with success or failure message.
:rtype: dict
"""
if path.endswith(".npz"):
helper = "numpyhelper"
elif path.endswith(".bin"):
helper = "binaryhelper"

if helper:
response = requests.put(self._get_url_api_v1("helpers/active"), json={"helper": helper}, verify=self.verify, headers=self.headers)

with open(path, "rb") as file:
response = requests.post(self._get_url("set_initial_model"), files={"file": file}, verify=self.verify, headers=self.headers)
response = requests.post(
self._get_url("set_initial_model"), files={"file": file}, data={"helper": helper}, verify=self.verify, headers=self.headers
)
return response.json()

# --- Packages --- #
Expand Down Expand Up @@ -607,26 +617,39 @@ def start_session(
:rtype: dict
"""
response = requests.post(
self._get_url("start_session"),
self._get_url_api_v1("sessions"),
json={
"session_id": id,
"aggregator": aggregator,
"aggregator_kwargs": aggregator_kwargs,
"model_id": model_id,
"round_timeout": round_timeout,
"rounds": rounds,
"round_buffer_size": round_buffer_size,
"delete_models": delete_models,
"validate": validate,
"helper": helper,
"min_clients": min_clients,
"requested_clients": requested_clients,
"server_functions": None if server_functions is None else inspect.getsource(server_functions),
"session_config": {
"aggregator": aggregator,
"aggregator_kwargs": aggregator_kwargs,
"round_timeout": round_timeout,
"buffer_size": round_buffer_size,
"model_id": model_id,
"delete_models_storage": delete_models,
"clients_required": min_clients,
"requested_clients": requested_clients,
"validate": validate,
"helper_type": helper,
"server_functions": None if server_functions is None else inspect.getsource(server_functions),
},
},
verify=self.verify,
headers=self.headers,
)

if response.status_code == 201:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! An improvement could be to indicate to the user what has gone wrong if status code != 201.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The method will return the result from the first request, so the user already has access to this information.

response = requests.post(
self._get_url_api_v1("sessions/start"),
json={
"session_id": id,
"rounds": rounds,
"round_timeout": round_timeout,
},
verify=self.verify,
headers=self.headers,
)

_json = response.json()

return _json
Expand Down
Loading