Skip to content

fix: Update rest session manager when logging in #1569

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

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

fix: Update rest session manager when logging in #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a3233
fix: Update rest session manager when logging in
tpoliaw Jun 25, 2026
f451651
Move error handling to startup commands
tpoliaw Jun 26, 2026
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
11 changes: 11 additions & 0 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ repl:
#!/usr/bin/env bash
uv run --with ptpython ptpython -i <(cat << EOF
from blueapi.client import BlueapiClient
from blueapi.client.rest import ServiceUnavailableError
bc = BlueapiClient.from_config_file("tests/system_tests/config.yaml").with_instrument_session("cm12345-1")
try:
bc.login()
except KeyboardInterrupt:
print("Login cancelled")
except ServiceUnavailableError:
print("Couldn't access blueapi server to log in")
except Exception as e:
import traceback
print("Couldn't log in")
traceback.print_exception(e, chain=False)
EOF
)
1 change: 1 addition & 0 deletions src/blueapi/client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ def login(self, token_path: Path | None = None):
oidc, cache_manager=SessionCacheManager(token_path)
)
auth.start_device_flow()
self._rest.session_manager = auth
else:
print("Server is not configured to use authentication!")

Expand Down
6 changes: 3 additions & 3 deletions src/blueapi/client/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def _response_json(response: requests.Response) -> Any:

class BlueapiRestClient:
_config: RestConfig
_session_manager: SessionManager | None
session_manager: SessionManager | None
_pool: requests.Session

def __init__(
Expand All @@ -195,7 +195,7 @@ def __init__(
session_manager: SessionManager | None = None,
) -> None:
self._config = config or RestConfig()
self._session_manager = session_manager
self.session_manager = session_manager
self._pool = requests.Session()

def get_plans(self) -> PlanResponse:
Expand Down Expand Up @@ -315,7 +315,7 @@ def _request_and_deserialize(
json=data,
params=params,
headers=carr,
auth=JWTAuth(self._session_manager),
auth=JWTAuth(self.session_manager),
)
except requests.exceptions.ConnectionError as ce:
raise ServiceUnavailableError() from ce
Expand Down
Loading