jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

refactor: Update mcp composer json (#9158)

Browse source 
* json update

* fix json formatting

* linter fix

* lint round 2

* lint fix attempt 3

* ignore rule instead
This commit is contained in:
Mike Fortman 2025-07-23 17:35:20 -05:00 • committed by GitHub
commit 0ed47065f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/backend/base/langflow/api/v1/mcp_projects.py
View file

@ -369,7 +369,6 @@ async def install_mcp_config(
os_type = platform.system()
command = "uvx"
mcp_tool = "mcp-composer" if FEATURE_FLAGS.mcp_composer else "mcp-proxy"
args = [mcp_tool, sse_url]
# Check if running on WSL (will appear as Linux but with Microsoft in release info)
is_wsl = os_type == "Linux" and "microsoft" in platform.uname().release.lower()
@ -400,21 +399,52 @@ async def install_mcp_config(
except OSError as e:
logger.warning("Failed to get WSL IP address: %s. Using default URL.", str(e))
# Configure args based on the MCP tool
oauth_env = None
if FEATURE_FLAGS.mcp_composer:
args = [mcp_tool, "--sse-url", sse_url]
# Check for auth settings and add auth parameters
if project.auth_settings:
from langflow.api.v1.schemas import AuthSettings
auth_settings = AuthSettings(**project.auth_settings)
args.extend(["--auth_type", auth_settings.auth_type])
oauth_env = {
"OAUTH_HOST": auth_settings.oauth_host,
"OAUTH_PORT": auth_settings.oauth_port,
"OAUTH_SERVER_URL": auth_settings.oauth_server_url,
"OAUTH_CALLBACK_PATH": auth_settings.oauth_callback_path,
"OAUTH_CLIENT_ID": auth_settings.oauth_client_id,
"OAUTH_CLIENT_SECRET": auth_settings.oauth_client_secret,
"OAUTH_AUTH_URL": auth_settings.oauth_auth_url,
"OAUTH_TOKEN_URL": auth_settings.oauth_token_url,
"OAUTH_MCP_SCOPE": auth_settings.oauth_mcp_scope,
"OAUTH_PROVIDER_SCOPE": auth_settings.oauth_provider_scope,
}
else:
args = [mcp_tool, sse_url]
if os_type == "Windows":
command = "cmd"
args = ["/c", "uvx", mcp_tool, sse_url]
args = ["/c", "uvx", *args]
logger.debug("Windows detected, using cmd command")
name = project.name
# Create the MCP configuration
server_config = {
"command": command,
"args": args,
}
# Add environment variables if mcp-composer feature flag is enabled and auth settings exist
if FEATURE_FLAGS.mcp_composer and oauth_env is not None:
server_config["env"] = oauth_env # type: ignore[assignment]
mcp_config = {
"mcpServers": {
f"lf-{sanitize_mcp_name(name)[: (MAX_MCP_SERVER_NAME_LENGTH - 4)]}": {
"command": command,
"args": args,
}
}
"mcpServers": {f"lf-{sanitize_mcp_name(name)[: (MAX_MCP_SERVER_NAME_LENGTH - 4)]}": server_config}
}
server_name = f"lf-{sanitize_mcp_name(name)[: (MAX_MCP_SERVER_NAME_LENGTH - 4)]}"

2
src/backend/base/langflow/services/settings/feature_flags.py
View file

@ -3,7 +3,7 @@ from pydantic_settings import BaseSettings
class FeatureFlags(BaseSettings):
mvp_components: bool = False
mcp_composer: bool = True
mcp_composer: bool = False
class Config:
env_prefix = "LANGFLOW_FEATURE_"

7
src/frontend/src/pages/MainPage/pages/homePage/components/McpServerTab.tsx
View file

@ -270,8 +270,9 @@ const McpServerTab = ({ folderName }: { folderName: string }) => {
"${currentAuthSettings.iam_endpoint || "YOUR_IAM_ENDPOINT"}",`;
case "oauth":
return `
"--auth-type",
"oauth"`;
"--auth_type",
"oauth",
"--sse-url",`;
default:
return "";
}
@ -292,7 +293,7 @@ const McpServerTab = ({ folderName }: { folderName: string }) => {
"OAUTH_AUTH_URL": "${currentAuthSettings.oauth_auth_url || "YOUR_OAUTH_AUTH_URL"}",
"OAUTH_TOKEN_URL": "${currentAuthSettings.oauth_token_url || "YOUR_OAUTH_TOKEN_URL"}",
"OAUTH_MCP_SCOPE": "${currentAuthSettings.oauth_mcp_scope || "YOUR_OAUTH_MCP_SCOPE"}",
"OAUTH_PROVIDER_SCOPE": "${currentAuthSettings.oauth_provider_scope || "YOUR_OAUTH_PROVIDER_SCOPE"}",
"OAUTH_PROVIDER_SCOPE": "${currentAuthSettings.oauth_provider_scope || "YOUR_OAUTH_PROVIDER_SCOPE"}"
}`;
}
return "";