From 7c9e47ba76bbb519192e60e07cbec67e2144eae7 Mon Sep 17 00:00:00 2001
From: Otto <otto@agpt.co>
Date: Mon, 9 Feb 2026 08:40:58 +0000
Subject: [PATCH] fix(mcp): Remove redundant exception handling and unnecessary
 str() cast
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- client.py: except (ValueError, Exception) → except Exception
  (Exception already catches ValueError, so it's redundant)
- oauth.py: SecretStr(str(tokens[...])) → SecretStr(tokens[...])
  (refresh_token is already a string, no cast needed)
---
 autogpt_platform/backend/backend/blocks/mcp/client.py | 2 +-
 autogpt_platform/backend/backend/blocks/mcp/oauth.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogpt_platform/backend/backend/blocks/mcp/client.py b/autogpt_platform/backend/backend/blocks/mcp/client.py
index 0d7860132e..65e4175ad9 100644
--- a/autogpt_platform/backend/backend/blocks/mcp/client.py
+++ b/autogpt_platform/backend/backend/blocks/mcp/client.py
@@ -139,7 +139,7 @@ class MCPClient:
         else:
             try:
                 body = response.json()
-            except (ValueError, Exception) as e:
+            except Exception as e:
                 raise MCPClientError(
                     f"MCP server returned non-JSON response: {e}"
                 ) from e
diff --git a/autogpt_platform/backend/backend/blocks/mcp/oauth.py b/autogpt_platform/backend/backend/blocks/mcp/oauth.py
index 72c6cd39b2..8cce1099e5 100644
--- a/autogpt_platform/backend/backend/blocks/mcp/oauth.py
+++ b/autogpt_platform/backend/backend/blocks/mcp/oauth.py
@@ -167,7 +167,7 @@ class MCPOAuthHandler(BaseOAuthHandler):
             title=credentials.title,
             access_token=SecretStr(tokens["access_token"]),
             refresh_token=(
-                SecretStr(str(tokens["refresh_token"]))
+                SecretStr(tokens["refresh_token"])
                 if tokens.get("refresh_token")
                 else credentials.refresh_token
             ),