Skip to content

Fix Python 3.9 compatibility and formatting for lazy-loaded global context #182

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

Merged
RyanTheRobothead merged 3 commits into from
Nov 17, 2025
Merged

Fix Python 3.9 compatibility and formatting for lazy-loaded global context #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65c1c42
Initial plan
Copilot Nov 17, 2025
be5a856
Fix formatting issue in test_context.py
Copilot Nov 17, 2025
1ee2dfd
Fix Python 3.9 compatibility: replace pipe operator with Optional
Copilot Nov 17, 2025
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
6 changes: 3 additions & 3 deletions src/madsci_common/madsci/common/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import contextlib
import contextvars
from collections.abc import Generator
from typing import Any
from typing import Any, Optional

from madsci.common.types.context_types import MadsciContext

Expand All @@ -17,7 +17,7 @@ class GlobalMadsciContext:
to temporarily override values in the context.
"""

_context: MadsciContext | None = None
_context: Optional[MadsciContext] = None

@classmethod
def get_context(cls) -> MadsciContext:
Expand All @@ -42,7 +42,7 @@ def set_context(cls, context: MadsciContext) -> None:
cls._context = context


_current_madsci_context: contextvars.ContextVar[MadsciContext | None] = (
_current_madsci_context: contextvars.ContextVar[Optional[MadsciContext]] = (
contextvars.ContextVar(
"current_madsci_context",
default=None,
Expand Down
4 changes: 3 additions & 1 deletion src/madsci_common/tests/test_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def test_global_context_across_threads() -> None:
new_context = original_context.model_copy()
new_context.lab_server_url = test_url
GlobalMadsciContext.set_context(new_context)
assert str(GlobalMadsciContext.get_context().lab_server_url) == "http://test-lab:8000/"
assert (
str(GlobalMadsciContext.get_context().lab_server_url) == "http://test-lab:8000/"
)

def check_context() -> None:
"""Function to check context in a separate thread."""
Expand Down
Loading