Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
teo-milea committed Jan 29, 2025
1 parent 717e9f2 commit 82d39d1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 23 deletions.
15 changes: 0 additions & 15 deletions syftbox/client/cli_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,21 +171,6 @@ def verify_installation(conf: SyftClientConfig, client: httpx.Client) -> None:
time.sleep(2)
response = client.get("/info")
response.raise_for_status()
# server_info = response.json()
# server_version = server_info["version"]
# local_version = __version__

# if server_version == local_version:
# return

# should_continue = Confirm.ask(
# f"\n[yellow]Server version ({server_version}) does not match your client version ({local_version}).\n"
# f"[bold](recommended)[/bold] To update, run:\n\n"
# f"[bold]curl -LsSf https://syftbox.openmined.org/install.sh | sh[/bold][/yellow]\n\n"
# f"Continue without updating?"
# )
# if not should_continue:
# raise typer.Exit()

except (httpx.HTTPError, KeyError):
should_continue = Confirm.ask(
Expand Down
1 change: 0 additions & 1 deletion syftbox/server/api/v1/sync_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ def get_metadata(
file_store: FileStore = Depends(get_file_store),
email: str = Depends(get_current_user),
) -> FileMetadata:
logger.debug("????")
try:
metadata = file_store.get_metadata(req.path, email)
return metadata
Expand Down
7 changes: 0 additions & 7 deletions tests/unit/server/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,12 @@
def get_access_token(client: TestClient, email: str) -> str:
response = client.post("/auth/request_email_token", json={"email": email})
email_token = response.json()["email_token"]
print(response.json())
response = client.post(
"/auth/validate_email_token",
headers={"Authorization": f"Bearer {email_token}"},
params={"email": email},
)

print(response.status_code)
print(response.content)
if response.status_code != 200:
raise ValueError(f"Failed to get access token, {response.text}")
return response.json()["access_token"]
Expand All @@ -49,9 +46,7 @@ def client(monkeypatch, tmp_path):
"""Every client gets their own snapshot folder at `tmp_path`"""
snapshot_folder = tmp_path / "snapshot"
settings = ServerSettings.from_data_folder(snapshot_folder)
print(settings.auth_enabled)
settings.auth_enabled = False
print(settings.auth_enabled)
monkeypatch.setenv("SYFTBOX_DATA_FOLDER", str(settings.data_folder))
monkeypatch.setenv("SYFTBOX_SNAPSHOT_FOLDER", str(settings.snapshot_folder))
monkeypatch.setenv("SYFTBOX_USER_FILE_PATH", str(settings.user_file_path))
Expand Down Expand Up @@ -94,9 +89,7 @@ def client_without_perms(monkeypatch, tmp_path):
"""Every client gets their own snapshot folder at `tmp_path`"""
settings = ServerSettings.from_data_folder(tmp_path)
settings.otel_enabled = False
print(settings.auth_enabled)
settings.auth_enabled = False
print(settings.auth_enabled)

monkeypatch.setenv("SYFTBOX_DATA_FOLDER", str(settings.data_folder))
monkeypatch.setenv("SYFTBOX_SNAPSHOT_FOLDER", str(settings.snapshot_folder))
Expand Down

0 comments on commit 82d39d1

Please sign in to comment.