Skip to content

Commit 7596802

Browse files
committed
fix(core): match unsupported protocol version in error dict and fix lint
1 parent 0b262b6 commit 7596802

5 files changed

Lines changed: 50 additions & 10 deletions

File tree

packages/toolbox-core/src/toolbox_core/mcp_transport/v20241105/mcp.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,18 @@ async def _send_request(
8787
)
8888
elif (
8989
isinstance(err_val, str)
90-
and "invalid protocol version" in err_val.lower()
90+
and (
91+
"invalid protocol version" in err_val.lower()
92+
or "unsupported protocol version" in err_val.lower()
93+
)
9194
) or (
9295
isinstance(err_val, dict)
93-
and "invalid protocol version" in str(err_val.get("message", "")).lower()
96+
and (
97+
"invalid protocol version"
98+
in str(err_val.get("message", "")).lower()
99+
or "unsupported protocol version"
100+
in str(err_val.get("message", "")).lower()
101+
)
94102
):
95103
client_supported = (
96104
self._supported_protocols

packages/toolbox-core/src/toolbox_core/mcp_transport/v20250326/mcp.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,18 @@ async def _send_request(
101101
)
102102
elif (
103103
isinstance(err_val, str)
104-
and "invalid protocol version" in err_val.lower()
104+
and (
105+
"invalid protocol version" in err_val.lower()
106+
or "unsupported protocol version" in err_val.lower()
107+
)
105108
) or (
106109
isinstance(err_val, dict)
107-
and "invalid protocol version" in str(err_val.get("message", "")).lower()
110+
and (
111+
"invalid protocol version"
112+
in str(err_val.get("message", "")).lower()
113+
or "unsupported protocol version"
114+
in str(err_val.get("message", "")).lower()
115+
)
108116
):
109117
client_supported = (
110118
self._supported_protocols

packages/toolbox-core/src/toolbox_core/mcp_transport/v20250618/mcp.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,18 @@ async def _send_request(
9292
)
9393
elif (
9494
isinstance(err_val, str)
95-
and "invalid protocol version" in err_val.lower()
95+
and (
96+
"invalid protocol version" in err_val.lower()
97+
or "unsupported protocol version" in err_val.lower()
98+
)
9699
) or (
97100
isinstance(err_val, dict)
98-
and "invalid protocol version" in str(err_val.get("message", "")).lower()
101+
and (
102+
"invalid protocol version"
103+
in str(err_val.get("message", "")).lower()
104+
or "unsupported protocol version"
105+
in str(err_val.get("message", "")).lower()
106+
)
99107
):
100108
client_supported = (
101109
self._supported_protocols

packages/toolbox-core/src/toolbox_core/mcp_transport/v20251125/mcp.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,18 @@ async def _send_request(
9292
)
9393
elif (
9494
isinstance(err_val, str)
95-
and "invalid protocol version" in err_val.lower()
95+
and (
96+
"invalid protocol version" in err_val.lower()
97+
or "unsupported protocol version" in err_val.lower()
98+
)
9699
) or (
97100
isinstance(err_val, dict)
98-
and "invalid protocol version" in str(err_val.get("message", "")).lower()
101+
and (
102+
"invalid protocol version"
103+
in str(err_val.get("message", "")).lower()
104+
or "unsupported protocol version"
105+
in str(err_val.get("message", "")).lower()
106+
)
99107
):
100108
client_supported = (
101109
self._supported_protocols

packages/toolbox-core/src/toolbox_core/mcp_transport/v20260618/mcp.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,18 @@ async def _send_request(
117117
)
118118
elif (
119119
isinstance(err_val, str)
120-
and "invalid protocol version" in err_val.lower()
120+
and (
121+
"invalid protocol version" in err_val.lower()
122+
or "unsupported protocol version" in err_val.lower()
123+
)
121124
) or (
122125
isinstance(err_val, dict)
123-
and "invalid protocol version" in str(err_val.get("message", "")).lower()
126+
and (
127+
"invalid protocol version"
128+
in str(err_val.get("message", "")).lower()
129+
or "unsupported protocol version"
130+
in str(err_val.get("message", "")).lower()
131+
)
124132
):
125133
# Cascading Fallback: Legacy servers throw this string error.
126134
# We pick the next version from the user's supported list.

0 commit comments

Comments
 (0)