Skip to content

Navigation Menu

Sign in
Sign up

🐛 fix(aio): avoid RuntimeError constructing AuthByWebBrowser on Py 3.14 #2989

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.

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
13steinj wants to merge 1 commit into snowflakedb:main
base: main
Choose a base branch
Loading
from chicagotrading:fix/py314-webbrowser-event-loop
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build_test.yml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ jobs:
download_name: macosx_x86_64
- image_name: windows-latest
download_name: win_amd64
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.14"]
cloud-provider: [aws, azure, gcp]
steps:
- uses: actions/checkout@v7
Expand Down
11 changes: 6 additions & 5 deletions src/snowflake/connector/aio/auth/_webbrowser.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def __init__(
port,
**kwargs,
)
self._event_loop = asyncio.get_event_loop()

async def reset_secrets(self) -> None:
AuthByWebBrowserSync.reset_secrets(self)
Expand Down Expand Up @@ -212,7 +211,7 @@ async def _receive_saml_token(

if read_sockets[0] is not None:
# Receive the data in small chunks and retransmit it
socket_client, _ = await self._event_loop.sock_accept(
socket_client, _ = await asyncio.get_running_loop().sock_accept(
socket_connection
)

Expand All @@ -226,7 +225,9 @@ async def _receive_saml_token(
# https://docs.python.org/3/library/asyncio-eventloop.html#asyncio.loop.sock_recv
socket_client.setblocking(False)
raw_data = await asyncio.wait_for(
self._event_loop.sock_recv(socket_client, BUF_SIZE),
asyncio.get_running_loop().sock_recv(
socket_client, BUF_SIZE
),
timeout=(
DEFAULT_SOCKET_CONNECT_TIMEOUT
if conn.socket_timeout is None
Expand Down Expand Up @@ -288,7 +289,7 @@ async def _process_options(
"",
"",
]
await self._event_loop.sock_sendall(
await asyncio.get_running_loop().sock_sendall(
socket_client, "\r\n".join(content).encode("utf-8")
)
return True
Expand Down Expand Up @@ -321,7 +322,7 @@ async def _process_receive_saml_token(
content.append("")
content.append(msg)

await self._event_loop.sock_sendall(
await asyncio.get_running_loop().sock_sendall(
socket_client, "\r\n".join(content).encode("utf-8")
)

Expand Down
78 changes: 40 additions & 38 deletions test/unit/aio/test_auth_webbrowser_async.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ async def test_auth_webbrowser_get(_, disable_console_login):
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -229,13 +229,13 @@ async def test_auth_webbrowser_post(_, disable_console_login):
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -295,13 +295,15 @@ async def test_auth_webbrowser_fail_webbrowser(
socket_pkg=mock_socket_pkg,
)
with patch("builtins.input", return_value=input_text), patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop, "sock_recv", side_effect=_mock_event_loop_sock_recv(recv_func)
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
await auth.prepare(
conn=rest._connection,
Expand Down Expand Up @@ -360,13 +362,13 @@ async def test_auth_webbrowser_fail_webserver(_, capsys, disable_console_login):
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -527,13 +529,13 @@ async def test_auth_webbrowser_socket_recv_retries_up_to_15_times_on_empty_bytea
socket_pkg=mock_socket_pkg,
)
with patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -581,11 +583,11 @@ async def test_auth_webbrowser_socket_recv_loop_fails_after_15_attempts():
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -636,13 +638,13 @@ async def sock_recv_timeout(*_):
)

with mock.patch.object(
auth._event_loop, "sock_recv", new=sock_recv_timeout
asyncio.get_running_loop(), "sock_recv", new=sock_recv_timeout
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
):
await auth.prepare(
conn=rest._connection,
Expand Down Expand Up @@ -692,11 +694,11 @@ async def sock_recv_timeout(*_):
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop, "sock_recv", new=sock_recv_timeout
asyncio.get_running_loop(), "sock_recv", new=sock_recv_timeout
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
):
Expand Down Expand Up @@ -743,13 +745,13 @@ async def test_auth_webbrowser_socket_reuseport_with_env_flag(monkeypatch):
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -799,13 +801,13 @@ async def test_auth_webbrowser_socket_reuseport_option_not_set_with_false_flag(
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -848,13 +850,13 @@ async def test_auth_webbrowser_socket_reuseport_option_not_set_with_no_flag(
socket_pkg=mock_socket_pkg,
)
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down Expand Up @@ -906,13 +908,13 @@ async def test_auth_webbrowser_force_auth_server(_, monkeypatch, force_auth_serv
if force_auth_server:
# When SNOWFLAKE_AUTH_FORCE_SERVER is true, should continue with server flow even if browser fails
with mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand All @@ -937,13 +939,13 @@ async def test_auth_webbrowser_force_auth_server(_, monkeypatch, force_auth_serv
"builtins.input",
return_value=f"http://example.com/sso?token={ref_token}",
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_accept",
side_effect=_mock_event_loop_sock_accept(),
), mock.patch.object(
auth._event_loop, "sock_sendall", return_value=None
asyncio.get_running_loop(), "sock_sendall", return_value=None
), mock.patch.object(
auth._event_loop,
asyncio.get_running_loop(),
"sock_recv",
side_effect=_mock_event_loop_sock_recv(recv_func),
):
Expand Down
Loading

AltStyle によって変換されたページ (->オリジナル) /