chore(🦾): bump python python-dotenv 1.1.0 -> 1.1.1

.devcontainer/README.md

@@ -1,5 +0,0 @@
-# Superset Development with GitHub Codespaces
-
-For complete documentation on using GitHub Codespaces with Apache Superset, please see:
-
-**[Setting up a Development Environment - GitHub Codespaces](https://superset.apache.org/docs/contributing/development#github-codespaces-cloud-development)**

.devcontainer/default/devcontainer.json

@@ -1,19 +0,0 @@
-{
-  // Extend the base configuration
-  "extends": "../devcontainer-base.json",
-
-  "name": "Apache Superset Development (Default)",
-
-  // Forward ports for development
-  "forwardPorts": [9001],
-  "portsAttributes": {
-    "9001": {
-      "label": "Superset (via Webpack Dev Server)",
-      "onAutoForward": "notify",
-      "visibility": "public"
-    }
-  },
-
-  // Auto-start Superset on Codespace resume
-  "postStartCommand": ".devcontainer/start-superset.sh"
-}

.devcontainer/devcontainer-base.json

@@ -1,39 +0,0 @@
-{
-  "name": "Apache Superset Development",
-  // Keep this in sync with the base image in Dockerfile (ARG PY_VER)
-  // Using the same base as Dockerfile, but non-slim for dev tools
-  "image": "python:3.11.13-bookworm",
-
-  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "moby": true,
-      "dockerDashComposeVersion": "v2"
-    },
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
-    },
-    "ghcr.io/devcontainers/features/git:1": {},
-    "ghcr.io/devcontainers/features/common-utils:2": {
-      "configureZshAsDefaultShell": true
-    },
-    "ghcr.io/devcontainers/features/sshd:1": {
-      "version": "latest"
-    }
-  },
-
-  // Run commands after container is created
-  "postCreateCommand": "chmod +x .devcontainer/setup-dev.sh && .devcontainer/setup-dev.sh",
-
-  // VS Code customizations
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "charliermarsh.ruff",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-      ]
-    }
-  }
-}

.devcontainer/devcontainer.json.old

@@ -1,52 +0,0 @@
-{
-  "name": "Apache Superset Development",
-  // Keep this in sync with the base image in Dockerfile (ARG PY_VER)
-  // Using the same base as Dockerfile, but non-slim for dev tools
-  "image": "python:3.11.13-bookworm",
-
-  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "moby": true,
-      "dockerDashComposeVersion": "v2"
-    },
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
-    },
-    "ghcr.io/devcontainers/features/git:1": {},
-    "ghcr.io/devcontainers/features/common-utils:2": {
-      "configureZshAsDefaultShell": true
-    },
-    "ghcr.io/devcontainers/features/sshd:1": {
-      "version": "latest"
-    }
-  },
-
-  // Forward ports for development
-  "forwardPorts": [9001],
-  "portsAttributes": {
-    "9001": {
-      "label": "Superset (via Webpack Dev Server)",
-      "onAutoForward": "notify",
-      "visibility": "public"
-    }
-  },
-
-  // Run commands after container is created
-  "postCreateCommand": "chmod +x .devcontainer/setup-dev.sh && .devcontainer/setup-dev.sh",
-
-  // Auto-start Superset on Codespace resume
-  "postStartCommand": ".devcontainer/start-superset.sh",
-
-  // VS Code customizations
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "charliermarsh.ruff",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-      ]
-    }
-  }
-}

.devcontainer/setup-dev.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-# Setup script for Superset Codespaces development environment
-
-echo "🔧 Setting up Superset development environment..."
-
-# The universal image has most tools, just need Superset-specific libs
-echo "📦 Installing Superset-specific dependencies..."
-sudo apt-get update
-sudo apt-get install -y \
-    libsasl2-dev \
-    libldap2-dev \
-    libpq-dev \
-    tmux \
-    gh
-
-# Install uv for fast Python package management
-echo "📦 Installing uv..."
-curl -LsSf https://astral.sh/uv/install.sh | sh
-
-# Add cargo/bin to PATH for uv
-echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> ~/.bashrc
-echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> ~/.zshrc
-
-# Install Claude Code CLI via npm
-echo "🤖 Installing Claude Code..."
-npm install -g @anthropic-ai/claude-code
-
-# Make the start script executable
-chmod +x .devcontainer/start-superset.sh
-
-echo "✅ Development environment setup complete!"
-echo "🚀 Run '.devcontainer/start-superset.sh' to start Superset"

.devcontainer/start-superset.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-# Startup script for Superset in Codespaces
-
-echo "🚀 Starting Superset in Codespaces..."
-echo "🌐 Frontend will be available at port 9001"
-
-# Check if MCP is enabled
-if [ "$ENABLE_MCP" = "true" ]; then
-    echo "🤖 MCP Service will be available at port 5008"
-fi
-
-# Find the workspace directory (Codespaces clones as 'superset', not 'superset-2')
-WORKSPACE_DIR=$(find /workspaces -maxdepth 1 -name "superset*" -type d | head -1)
-if [ -n "$WORKSPACE_DIR" ]; then
-    cd "$WORKSPACE_DIR"
-    echo "📁 Working in: $WORKSPACE_DIR"
-else
-    echo "📁 Using current directory: $(pwd)"
-fi
-
-# Check if docker is running
-if ! docker info > /dev/null 2>&1; then
-    echo "⏳ Waiting for Docker to start..."
-    sleep 5
-fi
-
-# Clean up any existing containers
-echo "🧹 Cleaning up existing containers..."
-docker-compose -f docker-compose-light.yml --profile mcp down
-
-# Start services
-echo "🏗️  Building and starting services..."
-echo ""
-echo "📝 Once started, login with:"
-echo "   Username: admin"
-echo "   Password: admin"
-echo ""
-echo "📋 Running in foreground with live logs (Ctrl+C to stop)..."
-
-# Run docker-compose and capture exit code
-if [ "$ENABLE_MCP" = "true" ]; then
-    echo "🤖 Starting with MCP Service enabled..."
-    docker-compose -f docker-compose-light.yml --profile mcp up
-else
-    docker-compose -f docker-compose-light.yml up
-fi
-EXIT_CODE=$?
-
-# If it failed, provide helpful instructions
-if [ $EXIT_CODE -ne 0 ] && [ $EXIT_CODE -ne 130 ]; then  # 130 is Ctrl+C
-    echo ""
-    echo "❌ Superset startup failed (exit code: $EXIT_CODE)"
-    echo ""
-    echo "🔄 To restart Superset, run:"
-    echo "   .devcontainer/start-superset.sh"
-    echo ""
-    echo "🔧 For troubleshooting:"
-    echo "   # View logs:"
-    echo "   docker-compose -f docker-compose-light.yml logs"
-    echo ""
-    echo "   # Clean restart (removes volumes):"
-    echo "   docker-compose -f docker-compose-light.yml down -v"
-    echo "   .devcontainer/start-superset.sh"
-    echo ""
-    echo "   # Common issues:"
-    echo "   - Network timeouts: Just retry, often transient"
-    echo "   - Port conflicts: Check 'docker ps'"
-    echo "   - Database issues: Try clean restart with -v"
-fi

.devcontainer/with-mcp/devcontainer.json

@@ -1,29 +0,0 @@
-{
-  // Extend the base configuration
-  "extends": "../devcontainer-base.json",
-
-  "name": "Apache Superset Development with MCP",
-
-  // Forward ports for development
-  "forwardPorts": [9001, 5008],
-  "portsAttributes": {
-    "9001": {
-      "label": "Superset (via Webpack Dev Server)",
-      "onAutoForward": "notify",
-      "visibility": "public"
-    },
-    "5008": {
-      "label": "MCP Service (Model Context Protocol)",
-      "onAutoForward": "notify",
-      "visibility": "private"
-    }
-  },
-
-  // Auto-start Superset with MCP on Codespace resume
-  "postStartCommand": "ENABLE_MCP=true .devcontainer/start-superset.sh",
-
-  // Environment variables
-  "containerEnv": {
-    "ENABLE_MCP": "true"
-  }
-}

CHART_METADATA_API.md

@@ -1,215 +0,0 @@
-# Chart Metadata API Reference
-
-The Superset MCP service provides rich metadata alongside chart generation to enable better UI integration and user experiences.
-
-## Background & Design Philosophy
-
-Modern chart systems need to provide more than just visual output. Inspired by contemporary web standards and LLM integration patterns, this metadata system addresses several key needs:
-
-**Accessibility-First Design**: Following WCAG guidelines and `aria-*` attribute patterns, charts include semantic descriptions and accessibility metadata to ensure inclusive experiences.
-
-**Rich Context for AI Systems**: Similar to how platforms like social media generate rich previews (OpenGraph, Twitter Cards), charts provide semantic understanding beyond just visual representation - enabling AI agents to reason about and describe visualizations meaningfully.
-
-**Performance-Aware Integration**: Modern web APIs emphasize performance transparency (Core Web Vitals, etc.). Charts include execution metrics and optimization suggestions to help UIs make informed decisions about rendering and user feedback.
-
-**Capability-Driven UX**: Rather than requiring UIs to hardcode chart type behaviors, the system exposes what each chart can actually do - enabling dynamic, contextual interfaces that adapt to chart capabilities.
-
-## Overview
-
-When generating charts via `generate_chart`, the response includes structured metadata that helps UIs:
-- Present appropriate controls and interactions
-- Generate accessible descriptions
-- Optimize rendering performance
-- Guide user workflows
-
-## Metadata Types
-
-### ChartCapabilities
-
-Describes what interactions and features the chart supports.
-
-```python
-{
-  "supports_interaction": bool,      # User can interact (zoom, pan, hover)
-  "supports_real_time": bool,        # Chart can update with live data
-  "supports_drill_down": bool,       # Can navigate to more detailed views
-  "supports_export": bool,           # Can be exported to other formats
-  "optimal_formats": [               # Recommended preview formats
-    "url",           # Static image URL
-    "interactive",   # HTML with JavaScript controls
-    "ascii",         # Text-based representation
-    "vega_lite"      # Vega-Lite specification
-  ],
-  "data_types": [                    # Types of data visualized
-    "time_series",   # Time-based data
-    "categorical",   # Discrete categories
-    "metric"         # Numeric measurements
-  ]
-}
-```
-
-**UI Integration:**
-- Show/hide interaction controls based on `supports_interaction`
-- Enable real-time updates if `supports_real_time`
-- Display drill-down options for `supports_drill_down`
-- Choose optimal preview format from `optimal_formats`
-
-### ChartSemantics
-
-Provides semantic understanding of what the chart represents and reveals.
-
-```python
-{
-  "primary_insight": "Shows trends and changes over time",
-  "data_story": "This line chart analyzes sales, revenue over Q1-Q4",
-  "recommended_actions": [
-    "Review data patterns and trends",
-    "Consider filtering for more detail",
-    "Export chart for reporting"
-  ],
-  "anomalies": [],                   # Notable outliers (future enhancement)
-  "statistical_summary": {}         # Key statistics (future enhancement)
-}
-```
-
-**UI Integration:**
-- Display `primary_insight` as chart description
-- Use `data_story` for accessibility and tooltips
-- Show `recommended_actions` as suggested next steps
-- Highlight `anomalies` in the visualization
-
-### AccessibilityMetadata
-
-Information for creating inclusive, accessible chart experiences.
-
-```python
-{
-  "color_blind_safe": bool,          # Uses colorblind-friendly palette
-  "alt_text": "Chart showing Sales Data over time",
-  "high_contrast_available": bool    # High contrast version available
-}
-```
-
-**UI Integration:**
-- Use `alt_text` for screen readers
-- Show accessibility indicators if `color_blind_safe`
-- Offer high contrast mode if available
-
-### PerformanceMetadata
-
-Performance information for optimization and user feedback.
-
-```python
-{
-  "query_duration_ms": 1250,        # Time to generate chart data
-  "cache_status": "hit|miss|error", # Whether data came from cache
-  "optimization_suggestions": [      # Performance improvement tips
-    "Consider adding date filters to reduce data volume",
-    "Chart complexity may impact load time"
-  ]
-}
-```
-
-**UI Integration:**
-- Show loading indicators based on `query_duration_ms`
-- Display cache status for debugging
-- Present `optimization_suggestions` to users
-- Warn about slow queries
-
-## Example Response
-
-```json
-{
-  "chart": {
-    "id": 123,
-    "slice_name": "Sales Trends Q1-Q4",
-    "viz_type": "echarts_timeseries_line",
-    "url": "/explore/?slice_id=123"
-  },
-  "capabilities": {
-    "supports_interaction": true,
-    "supports_real_time": false,
-    "supports_drill_down": false,
-    "supports_export": true,
-    "optimal_formats": ["url", "interactive", "ascii"],
-    "data_types": ["time_series", "metric"]
-  },
-  "semantics": {
-    "primary_insight": "Shows trends and changes over time",
-    "data_story": "This line chart analyzes sales over Q1-Q4",
-    "recommended_actions": [
-      "Review seasonal patterns",
-      "Export for quarterly report"
-    ]
-  },
-  "accessibility": {
-    "color_blind_safe": true,
-    "alt_text": "Line chart showing sales trends from Q1 to Q4",
-    "high_contrast_available": false
-  },
-  "performance": {
-    "query_duration_ms": 450,
-    "cache_status": "miss",
-    "optimization_suggestions": []
-  }
-}
-```
-
-## Usage Examples
-
-### React Component Integration
-
-```jsx
-function ChartComponent({ chartData }) {
-  const { capabilities, semantics, accessibility, performance } = chartData;
-
-  return (
-    <div>
-      {/* Accessibility */}
-      <img
-        src={chartData.chart.url}
-        alt={accessibility.alt_text}
-        aria-describedby="chart-description"
-      />
-
-      {/* Semantic description */}
-      <p id="chart-description">{semantics.primary_insight}</p>
-
-      {/* Conditional controls based on capabilities */}
-      {capabilities.supports_interaction && (
-        <InteractiveControls />
-      )}
-
-      {capabilities.supports_export && (
-        <ExportButton />
-      )}
-
-      {/* Performance feedback */}
-      {performance.query_duration_ms > 2000 && (
-        <SlowQueryWarning suggestions={performance.optimization_suggestions} />
-      )}
-
-      {/* Recommended actions */}
-      <ActionSuggestions actions={semantics.recommended_actions} />
-    </div>
-  );
-}
-```
-
-## Chart Type Mapping
-
-Different chart types provide different capabilities:
-
-| Chart Type | Interaction | Real-time | Drill-down | Optimal Formats |
-|------------|------------|-----------|------------|-----------------|
-| `echarts_timeseries_line` | ✅ | ✅ | ❌ | url, interactive, ascii |
-| `echarts_timeseries_bar` | ✅ | ✅ | ❌ | url, interactive, ascii |
-| `table` | ❌ | ❌ | ✅ | url, table, ascii |
-| `pie` | ✅ | ❌ | ❌ | url, interactive |
-
-## Future Enhancements
-
-- **Statistical Summary**: Automatic calculation of mean, median, trends
-- **Anomaly Detection**: Identification of outliers and unusual patterns
-- **Smart Recommendations**: ML-powered suggestions for chart improvements
-- **Accessibility Scoring**: Automated accessibility compliance checking

Dockerfile

@@ -59,7 +59,7 @@ RUN mkdir -p /app/superset/static/assets \
 # NOTE: we mount packages and plugins as they are referenced in package.json as workspaces
 # ideally we'd COPY only their package.json. Here npm ci will be cached as long
 # as the full content of these folders don't change, yielding a decent cache reuse rate.
-# Note that it's not possible to selectively COPY or mount using blobs.
+# Note that's it's not possible selectively COPY of mount using blobs.
 RUN --mount=type=bind,source=./superset-frontend/package.json,target=./package.json \
     --mount=type=bind,source=./superset-frontend/package-lock.json,target=./package-lock.json \
     --mount=type=cache,target=/root/.cache \
@@ -74,7 +74,7 @@ RUN --mount=type=bind,source=./superset-frontend/package.json,target=./package.j
 COPY superset-frontend /app/superset-frontend
 
 ######################################################################
-# superset-node is used for compiling frontend assets
+# superset-node used for compile frontend assets
 ######################################################################
 FROM superset-node-ci AS superset-node
 
@@ -90,7 +90,7 @@ RUN --mount=type=cache,target=/root/.npm \
 # Copy translation files
 COPY superset/translations /app/superset/translations
 
-# Build translations if enabled, then cleanup localization files
+# Build the frontend if not in dev mode
 RUN if [ "$BUILD_TRANSLATIONS" = "true" ]; then \
         npm run build-translation; \
     fi; \

LLMS.md

@@ -180,7 +180,6 @@ pre-commit run eslint            # Frontend linting
 
 ## Platform-Specific Instructions
 
-- **[LLMS.md](LLMS.md)** - General LLM development guide (READ THIS FIRST)
 - **[CLAUDE.md](CLAUDE.md)** - For Claude/Anthropic tools
 - **[.github/copilot-instructions.md](.github/copilot-instructions.md)** - For GitHub Copilot  
 - **[GEMINI.md](GEMINI.md)** - For Google Gemini tools

docker-compose-light.yml

@@ -25,12 +25,6 @@
 # - Volumes are isolated by project name (e.g., project1_db_home_light, project2_db_home_light)
 # - Database name is intentionally different (superset_light) to prevent accidental cross-connections
 #
-# MCP Service (Model Context Protocol):
-# - Optional service for LLM agent integration, available under 'mcp' profile
-# - To include MCP: docker-compose -f docker-compose-light.yml --profile mcp up
-# - MCP runs on port 5008 by default (customize with MCP_PORT=5009)
-# - Enable SQL debugging with MCP_SQL_DEBUG=true
-#
 # For verbose logging during development:
 # - Set SUPERSET_LOG_LEVEL=debug in docker/.env-local for detailed Superset logs
 # -----------------------------------------------------------------------
@@ -156,37 +150,6 @@ services:
         required: false
     volumes: *superset-volumes
 
-  superset-mcp-light:
-    profiles:
-      - mcp
-    build:
-      <<: *common-build
-    command: ["/app/docker/docker-bootstrap.sh", "mcp"]
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:${MCP_PORT:-5008}:5008"  # Parameterized port
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    user: *superset-user
-    depends_on:
-      superset-init-light:
-        condition: service_completed_successfully
-    volumes: *superset-volumes
-    env_file:
-      - path: docker/.env # default
-        required: true
-      - path: docker/.env-local # optional override
-        required: false
-    environment:
-      # Override DB connection for light service
-      DATABASE_HOST: db-light
-      DATABASE_DB: superset_light
-      POSTGRES_DB: superset_light
-      # Use light-specific config that disables Redis
-      SUPERSET_CONFIG_PATH: /app/docker/pythonpath_dev/superset_config_docker_light.py
-      # Enable SQL debugging for MCP if needed
-      SQLALCHEMY_DEBUG: ${MCP_SQL_DEBUG:-false}
-
 volumes:
   superset_home_light:
     external: false

docker/docker-bootstrap.sh

@@ -78,10 +78,6 @@ case "${1}" in
     echo "Starting web app..."
     /usr/bin/run-server.sh
     ;;
-  mcp)
-    echo "Starting MCP service..."
-    superset mcp run --host 0.0.0.0 --port ${MCP_PORT:-5008} --debug
-    ;;
   *)
     echo "Unknown Operation!!!"
     ;;

docs/docs/contributing/development.mdx

@@ -120,78 +120,6 @@ docker volume rm superset_db_home
 docker-compose up
 ```
 
-## GitHub Codespaces (Cloud Development)
-
-GitHub Codespaces provides a complete, pre-configured development environment in the cloud. This is ideal for:
-- Quick contributions without local setup
-- Consistent development environments across team members
-- Working from devices that can't run Docker locally
-- Safe experimentation in isolated environments
-
-:::info
-We're grateful to GitHub for providing this excellent cloud development service that makes
-contributing to Apache Superset more accessible to developers worldwide.
-:::
-
-### Getting Started with Codespaces
-
-1. **Create a Codespace**: Use this pre-configured link that sets up everything you need:
-
-   [**Launch Superset Codespace →**](https://github.com/codespaces/new?skip_quickstart=true&machine=standardLinux32gb&repo=39464018&ref=codespaces&geo=UsWest&devcontainer_path=.devcontainer%2Fdevcontainer.json)
-
-   :::caution
-   **Important**: You must select at least the **4 CPU / 16GB RAM** machine type (pre-selected in the link above).
-   Smaller instances will not have sufficient resources to run Superset effectively.
-   :::
-
-2. **Wait for Setup**: The initial setup takes several minutes. The Codespace will:
-   - Build the development container
-   - Install all dependencies
-   - Start all required services (PostgreSQL, Redis, etc.)
-   - Initialize the database with example data
-
-3. **Access Superset**: Once ready, check the **PORTS** tab in VS Code for port `9001`.
-   Click the globe icon to open Superset in your browser.
-   - Default credentials: `admin` / `admin`
-
-### Key Features
-
-- **Auto-reload**: Both Python and TypeScript files auto-refresh on save
-- **Pre-installed Extensions**: VS Code extensions for Python, TypeScript, and database tools
-- **Multiple Instances**: Run multiple Codespaces for different branches/features
-- **SSH Access**: Connect via terminal using `gh cs ssh` or through the GitHub web UI
-- **VS Code Integration**: Works seamlessly with VS Code desktop app
-
-### Managing Codespaces
-
-- **List active Codespaces**: `gh cs list`
-- **SSH into a Codespace**: `gh cs ssh`
-- **Stop a Codespace**: Via GitHub UI or `gh cs stop`
-- **Delete a Codespace**: Via GitHub UI or `gh cs delete`
-
-### Debugging and Logs
-
-Since Codespaces uses `docker-compose-light.yml`, you can monitor all services:
-
-```bash
-# Stream logs from all services
-docker compose -f docker-compose-light.yml logs -f
-
-# Stream logs from a specific service
-docker compose -f docker-compose-light.yml logs -f superset
-
-# View last 100 lines and follow
-docker compose -f docker-compose-light.yml logs --tail=100 -f
-
-# List all running services
-docker compose -f docker-compose-light.yml ps
-```
-
-:::tip
-Codespaces automatically stop after 30 minutes of inactivity to save resources.
-Your work is preserved and you can restart anytime.
-:::
-
 ## Installing Development Tools
 
 :::note

docs/docs/mcp-service/api-reference.mdx

@@ -1,741 +0,0 @@
----
-title: API Reference
-sidebar_position: 3
-version: 1
----
-
-# MCP Tools API Reference
-
-Complete reference for all 16 MCP tools with request/response examples.
-
-> 🚀 **First time here?** Start with [Dashboard Tools](#dashboard-tools) or [Chart Tools](#chart-tools) to see the most commonly used features.
->
-> 🔐 **Need authentication?** See the [Authentication Guide](./authentication) for JWT setup.
->
-> 🔧 **Want to add tools?** Check the [Development Guide](./development#adding-new-tools) for step-by-step instructions.
-
-## Dashboard Tools
-
-### list_dashboards
-
-List dashboards with search, filtering, and pagination support.
-
-**Request Schema:**
-```json
-{
-  "search": "sales",              // Optional: Search term
-  "filters": [                    // Optional: Advanced filters
-    {
-      "col": "published",
-      "opr": "eq",
-      "value": true
-    }
-  ],
-  "page": 1,                      // Optional: Page number (default: 1)
-  "page_size": 20,                // Optional: Items per page (default: 20)
-  "select_columns": [             // Optional: Specific columns
-    "id", "dashboard_title", "uuid"
-  ],
-  "use_cache": true               // Optional: Use cached data (default: true)
-}
-```
-
-**Response Example:**
-```json
-{
-  "dashboards": [
-    {
-      "id": 1,
-      "uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
-      "dashboard_title": "Sales Performance",
-      "url": "/superset/dashboard/1/",
-      "published": true,
-      "owners": ["admin"],
-      "created_on": "2024-01-15T10:30:00Z",
-      "changed_on": "2024-01-20T14:15:00Z"
-    }
-  ],
-  "total_count": 45,
-  "page": 1,
-  "page_size": 20,
-  "cache_status": {
-    "cache_hit": true,
-    "cache_age_seconds": 300
-  }
-}
-```
-
-### get_dashboard_info
-
-Get detailed information about a specific dashboard.
-
-**Request Schema:**
-```json
-{
-  "identifier": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",  // ID, UUID, or slug
-  "use_cache": true
-}
-```
-
-**Response Example:**
-```json
-{
-  "dashboard_id": 1,
-  "uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
-  "dashboard_title": "Sales Performance Dashboard",
-  "slug": "sales-performance",
-  "url": "/superset/dashboard/1/",
-  "published": true,
-  "owners": ["admin", "analyst"],
-  "roles": ["Sales Team"],
-  "charts": [
-    {
-      "id": 10,
-      "slice_name": "Monthly Revenue",
-      "viz_type": "line"
-    },
-    {
-      "id": 11,
-      "slice_name": "Regional Sales",
-      "viz_type": "bar"
-    }
-  ],
-  "filters": [
-    {
-      "column": "region",
-      "type": "select"
-    }
-  ],
-  "created_on": "2024-01-15T10:30:00Z",
-  "changed_on": "2024-01-20T14:15:00Z"
-}
-```
-
-### generate_dashboard
-
-Create a new dashboard with multiple charts.
-
-**Request Schema:**
-```json
-{
-  "chart_ids": [10, 11, 12, 13],
-  "dashboard_title": "Q4 Performance Dashboard",
-  "description": "Quarterly performance metrics and KPIs",
-  "published": true,
-  "layout_type": "grid"          // Optional: "grid" or "tabs"
-}
-```
-
-**Response Example:**
-```json
-{
-  "dashboard_id": 25,
-  "uuid": "new-dash-uuid-here",
-  "dashboard_title": "Q4 Performance Dashboard",
-  "url": "/superset/dashboard/25/",
-  "charts_added": 4,
-  "layout": {
-    "type": "grid",
-    "columns": 2,
-    "rows": 2
-  },
-  "created_on": "2024-01-25T16:45:00Z"
-}
-```
-
-## Chart Tools
-
-### list_charts
-
-List charts with advanced filtering and search capabilities.
-
-**Request Schema:**
-```json
-{
-  "search": "revenue",
-  "filters": [
-    {
-      "col": "viz_type",
-      "opr": "in",
-      "value": ["line", "bar", "area"]
-    }
-  ],
-  "page": 1,
-  "page_size": 25,
-  "select_columns": ["id", "slice_name", "viz_type", "uuid"],
-  "use_cache": true
-}
-```
-
-**Response Example:**
-```json
-{
-  "charts": [
-    {
-      "id": 10,
-      "uuid": "chart-uuid-1",
-      "slice_name": "Monthly Revenue Trend",
-      "viz_type": "line",
-      "datasource_name": "sales_data",
-      "owners": ["admin"],
-      "created_on": "2024-01-10T09:15:00Z"
-    }
-  ],
-  "total_count": 125,
-  "page": 1,
-  "page_size": 25
-}
-```
-
-### get_chart_info
-
-Get comprehensive chart information including configuration.
-
-**Request Schema:**
-```json
-{
-  "identifier": 10,                // ID or UUID
-  "include_form_data": true,       // Include chart configuration
-  "use_cache": true
-}
-```
-
-**Response Example:**
-```json
-{
-  "chart_id": 10,
-  "uuid": "chart-uuid-1",
-  "slice_name": "Monthly Revenue Trend",
-  "viz_type": "line",
-  "datasource_id": 5,
-  "datasource_name": "sales_data",
-  "datasource_type": "table",
-  "form_data": {
-    "viz_type": "line",
-    "x_axis": "month",
-    "metrics": ["sum__revenue"],
-    "time_range": "Last 12 months"
-  },
-  "query_context": {
-    "datasource": {"id": 5, "type": "table"},
-    "queries": [{"columns": [], "metrics": ["sum__revenue"]}]
-  },
-  "explore_url": "/superset/explore/?form_data=%7B%22slice_id%22%3A10%7D",
-  "owners": ["admin"],
-  "created_on": "2024-01-10T09:15:00Z",
-  "changed_on": "2024-01-15T11:30:00Z"
-}
-```
-
-### generate_chart
-
-Create a new chart with specified configuration.
-
-**Request Schema:**
-```json
-{
-  "dataset_id": "5",
-  "config": {
-    "chart_type": "xy",
-    "x": {"name": "month", "label": "Month"},
-    "y": [
-      {
-        "name": "revenue",
-        "aggregate": "SUM",
-        "label": "Total Revenue"
-      },
-      {
-        "name": "orders",
-        "aggregate": "COUNT",
-        "label": "Order Count"
-      }
-    ],
-    "kind": "line",
-    "x_axis": {
-      "title": "Month",
-      "format": "smart_date"
-    },
-    "y_axis": {
-      "title": "Revenue ($)",
-      "format": "$,.0f"
-    },
-    "legend": {
-      "show": true,
-      "position": "top"
-    }
-  },
-  "slice_name": "Revenue and Orders Trend",
-  "description": "Monthly revenue and order count comparison",
-  "save_chart": true,
-  "generate_preview": true,
-  "preview_formats": ["url", "ascii"]
-}
-```
-
-**Response Example:**
-```json
-{
-  "chart_id": 45,
-  "uuid": "new-chart-uuid",
-  "slice_name": "Revenue and Orders Trend",
-  "viz_type": "echarts_timeseries_line",
-  "datasource_id": 5,
-  "explore_url": "/superset/explore/?form_data=%7B%22slice_id%22%3A45%7D",
-  "query_executed": true,
-  "query_result": {
-    "status": "success",
-    "row_count": 12,
-    "execution_time": 0.145
-  },
-  "preview": {
-    "url": {
-      "preview_url": "http://localhost:5008/screenshot/chart/45.png",
-      "width": 800,
-      "height": 600
-    },
-    "ascii": {
-      "ascii_content": "Revenue Trend\n==============\nJan |████████████████ $125K\nFeb |██████████████████ $140K\n...",
-      "width": 80,
-      "height": 20
-    }
-  },
-  "created_on": "2024-01-25T14:20:00Z"
-}
-```
-
-### get_chart_data
-
-Export chart data in multiple formats.
-
-**Request Schema:**
-```json
-{
-  "identifier": 10,
-  "format": "json",               // "json", "csv", "excel"
-  "limit": 1000,                  // Optional: Row limit
-  "offset": 0,                    // Optional: Row offset
-  "filters": [                    // Optional: Additional filters
-    {
-      "column": "region",
-      "op": "=",
-      "value": "US"
-    }
-  ],
-  "use_cache": true,
-  "force_refresh": false
-}
-```
-
-**Response Example:**
-```json
-{
-  "data": [
-    {
-      "month": "2024-01",
-      "revenue": 125000,
-      "orders": 450
-    },
-    {
-      "month": "2024-02",
-      "revenue": 140000,
-      "orders": 520
-    }
-  ],
-  "total_rows": 12,
-  "columns": [
-    {"name": "month", "type": "DATE"},
-    {"name": "revenue", "type": "BIGINT"},
-    {"name": "orders", "type": "BIGINT"}
-  ],
-  "query": {
-    "sql": "SELECT month, SUM(revenue) as revenue, COUNT(*) as orders FROM sales_data GROUP BY month ORDER BY month",
-    "execution_time": 0.089
-  },
-  "cache_status": {
-    "cache_hit": false,
-    "cache_type": "query",
-    "refreshed": true
-  }
-}
-```
-
-### get_chart_preview
-
-Generate chart previews in multiple formats.
-
-**Request Schema:**
-```json
-{
-  "identifier": 10,
-  "format": "url",                // "url", "base64", "ascii", "table"
-  "width": 800,                   // For image formats
-  "height": 600,                  // For image formats
-  "ascii_width": 80,              // For ASCII format
-  "ascii_height": 20,             // For ASCII format
-  "use_cache": true
-}
-```
-
-**Response Examples:**
-
-**URL Format:**
-```json
-{
-  "format": "url",
-  "preview_url": "http://localhost:5008/screenshot/chart/10.png",
-  "width": 800,
-  "height": 600,
-  "supports_interaction": false,
-  "expires_at": "2024-01-26T14:20:00Z"
-}
-```
-
-**ASCII Format:**
-```json
-{
-  "format": "ascii",
-  "ascii_content": "Monthly Revenue Trend\n=====================\n\nJan |████████████████████ $125K\nFeb |██████████████████████ $140K\nMar |███████████████████ $135K\nApr |█████████████████████████ $155K\n\nRange: $125K to $155K\n▁▃▂▅▇▆▄▃▂▄▅▆▇▅▃▂",
-  "width": 80,
-  "height": 20,
-  "supports_color": false
-}
-```
-
-**Table Format:**
-```json
-{
-  "format": "table",
-  "table_data": "Monthly Revenue Data\n====================\n\nMonth    | Revenue  | Orders\n---------|----------|--------\nJan 2024 | $125,000 |    450\nFeb 2024 | $140,000 |    520\nMar 2024 | $135,000 |    495\n\nTotal: 12 rows × 3 columns",
-  "row_count": 12,
-  "supports_sorting": true
-}
-```
-
-## Dataset Tools
-
-### list_datasets
-
-List available datasets with columns and metrics.
-
-**Request Schema:**
-```json
-{
-  "search": "sales",
-  "filters": [
-    {
-      "col": "is_active",
-      "opr": "eq",
-      "value": true
-    }
-  ],
-  "include_columns": true,        // Include column metadata
-  "include_metrics": true,        // Include metric metadata
-  "page": 1,
-  "page_size": 15
-}
-```
-
-**Response Example:**
-```json
-{
-  "datasets": [
-    {
-      "id": 1,
-      "uuid": "dataset-uuid-1",
-      "table_name": "sales_data",
-      "database_name": "main_warehouse",
-      "schema": "public",
-      "owners": ["admin"],
-      "columns": [
-        {
-          "column_name": "region",
-          "type": "VARCHAR",
-          "is_active": true,
-          "is_dttm": false
-        },
-        {
-          "column_name": "revenue",
-          "type": "DECIMAL",
-          "is_active": true,
-          "is_dttm": false
-        }
-      ],
-      "metrics": [
-        {
-          "metric_name": "sum__revenue",
-          "expression": "SUM(revenue)",
-          "metric_type": "sum"
-        }
-      ],
-      "created_on": "2024-01-05T08:00:00Z"
-    }
-  ],
-  "total_count": 23,
-  "page": 1,
-  "page_size": 15
-}
-```
-
-### get_dataset_info
-
-Get detailed dataset information with full column/metric metadata.
-
-**Request Schema:**
-```json
-{
-  "identifier": "dataset-uuid-1",  // ID or UUID
-  "include_columns": true,
-  "include_metrics": true,
-  "use_cache": true
-}
-```
-
-**Response Example:**
-```json
-{
-  "dataset_id": 1,
-  "uuid": "dataset-uuid-1",
-  "table_name": "sales_data",
-  "database_name": "main_warehouse",
-  "database_id": 1,
-  "schema": "public",
-  "sql": null,
-  "is_active": true,
-  "owners": ["admin", "data_team"],
-  "columns": [
-    {
-      "id": 101,
-      "column_name": "region",
-      "type": "VARCHAR",
-      "is_active": true,
-      "is_dttm": false,
-      "groupby": true,
-      "filterable": true,
-      "description": "Geographic region"
-    },
-    {
-      "id": 102,
-      "column_name": "order_date",
-      "type": "DATE",
-      "is_active": true,
-      "is_dttm": true,
-      "groupby": true,
-      "filterable": true
-    }
-  ],
-  "metrics": [
-    {
-      "id": 201,
-      "metric_name": "sum__revenue",
-      "expression": "SUM(revenue)",
-      "metric_type": "sum",
-      "is_active": true,
-      "description": "Total revenue"
-    }
-  ],
-  "created_on": "2024-01-05T08:00:00Z",
-  "changed_on": "2024-01-18T12:30:00Z"
-}
-```
-
-## System Tools
-
-### get_superset_instance_info
-
-Get Superset instance information and statistics.
-
-**Request Schema:**
-```json
-{
-  "include_statistics": true,     // Include usage statistics
-  "include_tools": true,          // Include available MCP tools
-  "use_cache": true
-}
-```
-
-**Response Example:**
-```json
-{
-  "version": "4.1.0",
-  "build": "apache-superset-4.1.0",
-  "mcp_service_version": "1.0.0",
-  "authentication": {
-    "enabled": true,
-    "type": "jwt_bearer",
-    "required_scopes": ["dashboard:read", "chart:read"]
-  },
-  "statistics": {
-    "dashboards": {
-      "total": 45,
-      "published": 32
-    },
-    "charts": {
-      "total": 125,
-      "by_viz_type": {
-        "line": 35,
-        "bar": 28,
-        "table": 42,
-        "pie": 20
-      }
-    },
-    "datasets": {
-      "total": 23,
-      "active": 18
-    },
-    "users": {
-      "total": 15,
-      "active": 12
-    }
-  },
-  "mcp_tools": [
-    {
-      "name": "list_dashboards",
-      "description": "List dashboards with search and filtering",
-      "category": "dashboard"
-    },
-    {
-      "name": "generate_chart",
-      "description": "Create new charts programmatically",
-      "category": "chart"
-    }
-  ],
-  "database_connections": [
-    {
-      "id": 1,
-      "database_name": "main_warehouse",
-      "backend": "postgresql",
-      "status": "healthy"
-    }
-  ],
-  "cache_status": {
-    "enabled": true,
-    "backend": "redis",
-    "hit_rate": 0.85
-  }
-}
-```
-
-### generate_explore_link
-
-Generate Superset explore URLs with pre-configured chart settings.
-
-**Request Schema:**
-```json
-{
-  "dataset_id": "1",
-  "chart_config": {
-    "viz_type": "line",
-    "x_axis": "month",
-    "metrics": ["sum__revenue"],
-    "time_range": "Last 6 months"
-  },
-  "title": "Revenue Analysis",
-  "cache_form_data": true
-}
-```
-
-**Response Example:**
-```json
-{
-  "explore_url": "/superset/explore/?form_data_key=abc123def456",
-  "full_url": "http://localhost:8088/superset/explore/?form_data_key=abc123def456",
-  "form_data_key": "abc123def456",
-  "expires_at": "2024-01-26T16:45:00Z",
-  "chart_config": {
-    "viz_type": "line",
-    "datasource": "1__table",
-    "x_axis": "month",
-    "metrics": ["sum__revenue"],
-    "time_range": "Last 6 months"
-  }
-}
-```
-
-## SQL Lab Tools
-
-### open_sql_lab_with_context
-
-Open SQL Lab with pre-configured database, schema, and SQL.
-
-**Request Schema:**
-```json
-{
-  "database_connection_id": 1,
-  "schema": "public",
-  "dataset_in_context": "sales_data",
-  "sql": "SELECT region, SUM(revenue) as total_revenue\nFROM sales_data \nWHERE order_date >= '2024-01-01'\nGROUP BY region\nORDER BY total_revenue DESC",
-  "title": "Regional Sales Analysis"
-}
-```
-
-**Response Example:**
-```json
-{
-  "sql_lab_url": "/superset/sqllab/?dbid=1&schema=public&sql_template=encoded_sql_here",
-  "full_url": "http://localhost:8088/superset/sqllab/?dbid=1&schema=public&sql_template=encoded_sql_here",
-  "database_connection": {
-    "id": 1,
-    "database_name": "main_warehouse",
-    "backend": "postgresql"
-  },
-  "schema": "public",
-  "sql_template": "SELECT region, SUM(revenue) as total_revenue...",
-  "context": {
-    "dataset": "sales_data",
-    "title": "Regional Sales Analysis"
-  }
-}
-```
-
-## Error Responses
-
-All tools can return error responses with this structure:
-
-```json
-{
-  "error": "Chart not found with identifier: 999",
-  "error_type": "NotFound",
-  "suggestions": [
-    "Verify the chart ID exists",
-    "Check if you have permission to access this chart",
-    "Try using the chart UUID instead of ID"
-  ],
-  "details": {
-    "identifier": 999,
-    "identifier_type": "id"
-  }
-}
-```
-
-## Cache Status
-
-Many responses include cache status information:
-
-```json
-{
-  "cache_status": {
-    "cache_hit": true,           // Data served from cache
-    "cache_type": "query",       // Type: query, metadata, form_data
-    "cache_age_seconds": 300,    // Age of cached data
-    "refreshed": false           // Whether cache was refreshed
-  }
-}
-```
-
-This API reference provides complete documentation for integrating with the Superset MCP service, including all request schemas, response formats, and error handling patterns.
-
-## What's Next?
-
-### 🔐 **Ready for Production?**
-Set up authentication and security with the [Authentication Guide](./authentication).
-
-### 🔧 **Want to Add More Tools?**
-Learn how to extend the MCP service in the [Development Guide](./development).
-
-### 🏗️ **Need Architecture Details?**
-Understand the system design in the [Architecture Overview](./architecture).
-
-### 🏢 **Enterprise Features?**
-Explore advanced capabilities in the [Preset Integration Guide](./preset-integration).
-
-> 📖 **Back to Documentation Index**: [MCP Service](./intro)

docs/docs/mcp-service/architecture.mdx

@@ -1,191 +0,0 @@
----
-title: Architecture Overview
-sidebar_position: 5
-version: 1
----
-
-# Architecture Overview
-
-The Superset Model Context Protocol (MCP) service provides a modular, schema-driven interface for programmatic access to Superset dashboards, charts, datasets, and instance metadata. Built on FastMCP for LLM agents and automation tools.
-
-**Status:** Phase 1 Complete. Core functionality stable, authentication production-ready. See [SIP-171](https://github.com/apache/superset/issues/33870) for roadmap.
-
-## Core Architecture
-
-### Tool Structure
-- **16 MCP tools** organized by domain: `dashboard/`, `chart/`, `dataset/`, `system/`
-- All tools decorated with `@mcp.tool` and `@mcp_auth_hook`
-- **Import inside functions**: All Superset DAOs/commands imported in function body to ensure proper app context
-- Pydantic v2 schemas with LLM/OpenAPI-compatible field descriptions
-
-### Request Schema Pattern
-Eliminates LLM parameter validation issues using structured request objects:
-```python
-# New approach - single request object
-get_dataset_info(request={"identifier": 123})  # ID
-get_dataset_info(request={"identifier": "uuid-string"})  # UUID
-
-# Old approach - replaced
-get_dataset_info(dataset_id=123)
-```
-
-### Multi-Identifier Support
-- **Charts/Datasets**: ID (numeric) or UUID (string)
-- **Dashboards**: ID (numeric), UUID (string), or slug (string)
-- Validation prevents conflicting parameters (search + filters)
-
-## Available Tools
-
-### Dashboard Tools (5)
-- `list_dashboards` - List with search/filters/pagination
-- `get_dashboard_info` - Get by ID/UUID/slug
-- `get_dashboard_available_filters` - Discover filterable columns
-- `generate_dashboard` - Create dashboards with multiple charts
-- `add_chart_to_existing_dashboard` - Add charts to existing dashboards
-
-### Chart Tools (8)
-- `list_charts` - List with search/filters/pagination
-- `get_chart_info` - Get by ID/UUID
-- `get_chart_available_filters` - Discover filterable columns
-- `generate_chart` - Create charts (table, line, bar, area, scatter)
-- `update_chart` - Update saved charts
-- `update_chart_preview` - Update cached previews
-- `get_chart_data` - Export data (JSON/CSV/Excel)
-- `get_chart_preview` - Screenshots, ASCII art, table previews
-
-### Dataset Tools (3)
-- `list_datasets` - List with columns/metrics
-- `get_dataset_info` - Get by ID/UUID with metadata
-- `get_dataset_available_filters` - Discover filterable columns
-
-### System Tools (2)
-- `get_superset_instance_info` - Instance statistics and version
-- `generate_explore_link` - Generate chart exploration URLs
-
-### SQL Lab Tools (1)
-- `open_sql_lab_with_context` - Pre-configured SQL Lab sessions
-
-## Authentication & Security
-
-### JWT Bearer Authentication
-Production-ready authentication with configurable factory pattern:
-```python
-# In superset_config.py
-MCP_AUTH_ENABLED = True
-MCP_JWKS_URI = "https://auth.company.com/.well-known/jwks.json"
-MCP_JWT_ISSUER = "https://auth.company.com/"
-MCP_JWT_AUDIENCE = "superset-mcp-api"
-```
-
-### Scope-Based Authorization
-| Tool Category | Required Scope |
-|---------------|----------------|
-| Dashboard ops | `dashboard:read` |
-| Chart ops | `chart:read` / `chart:write` |
-| Dataset ops | `dataset:read` |
-| System ops | `instance:read` |
-
-### Audit Logging
-All operations logged with MCP context:
-- User impersonation tracking
-- Tool execution details
-- Sanitized payloads (sensitive data redacted)
-
-## Cache Control
-
-Leverages Superset's existing cache layers with comprehensive control:
-
-### Cache Types
-1. **Query Result Cache** - Database query results
-2. **Metadata Cache** - Table schemas, columns, metrics
-3. **Form Data Cache** - Chart configurations
-4. **Dashboard Cache** - Rendered components
-
-### Cache Parameters
-Tools support cache control through request schemas:
-- `use_cache`: Enable/disable caching (default: true)
-- `force_refresh`: Force cache refresh (default: false)
-- `cache_timeout`: Override timeout in seconds
-- `refresh_metadata`: Force metadata refresh
-
-### Cache Status Reporting
-```json
-{
-  "cache_status": {
-    "cache_hit": true,
-    "cache_type": "query",
-    "cache_age_seconds": 300,
-    "refreshed": false
-  }
-}
-```
-
-## Tool Abstractions
-
-### Generic Base Classes
-- **ModelListTool**: Handles list/search/filter operations with pagination
-- **ModelGetInfoTool**: Single object retrieval by multiple identifier types
-- **ModelGetAvailableFiltersTool**: Returns filterable columns/operators
-
-### Implementation Pattern
-```python
-@mcp.tool
-@mcp_auth_hook
-def my_tool(request: MyRequest) -> MyResponse:
-    # Import Superset modules inside function
-    from superset.daos.dashboard import DashboardDAO
-    from superset.commands.chart.create import CreateChartCommand
-
-    # Tool implementation
-    return response
-```
-
-## Configuration
-
-### URL Configuration
-Centralized URL management for consistent link generation:
-```python
-# In superset_config.py
-SUPERSET_WEBSERVER_ADDRESS = "http://localhost:8088"  # Development
-SUPERSET_WEBSERVER_ADDRESS = "https://superset.company.com"  # Production
-```
-
-### Schema Design Principles
-- **Minimal columns** in list responses
-- **Optional fields** in info schemas for missing data handling
-- **Null exclusion** for cleaner JSON responses
-- **Type safety** with clear Pydantic validation
-
-## Adding New Tools
-
-1. **Choose domain folder**: `dashboard/`, `chart/`, `dataset/`, or `system/`
-2. **Define schemas**: Use Pydantic with field descriptions
-3. **Implement tool**:
-   - Decorate with `@mcp.tool` and `@mcp_auth_hook`
-   - Import Superset modules inside function body
-   - Use generic abstractions where applicable
-4. **Register**: Add to appropriate `__init__.py`
-5. **Test**: Add unit tests in `tests/unit_tests/mcp_service/`
-
-## Current Status
-
-### ✅ Phase 1 Complete
-- FastMCP server with CLI
-- JWT authentication with RBAC
-- All 16 core tools implemented
-- Request schema pattern
-- Cache control system
-- Audit logging
-- 194+ unit tests
-
-### 🎯 Future Enhancements
-- Demo notebooks and video examples
-- OAuth integration for user impersonation
-- Enhanced chart rendering formats
-- Advanced security features
-
-**Production Ready**: Core functionality stable with comprehensive testing and authentication.
-
----
-
-For setup and usage, see the [MCP Service overview](./intro).

docs/docs/mcp-service/authentication.mdx

@@ -1,434 +0,0 @@
----
-title: Authentication & Security
-sidebar_position: 4
-version: 1
----
-
-# Authentication & Security
-
-The MCP service provides enterprise-grade JWT Bearer authentication with flexible configuration options and comprehensive security controls.
-
-## Quick Start
-
-### Development Mode (Default)
-
-:::tip
-Authentication is **disabled by default** for local development - no configuration needed.
-:::
-
-```bash
-# No configuration needed - service runs without authentication
-superset mcp run --port 5008 --debug
-```
-
-### Production Mode
-
-:::warning
-Always enable authentication for production deployments to secure your Superset instance.
-:::
-
-Enable JWT authentication in your Superset configuration:
-
-```python
-# In superset_config.py
-MCP_AUTH_ENABLED = True
-MCP_JWKS_URI = "https://auth.company.com/.well-known/jwks.json"
-MCP_JWT_ISSUER = "https://auth.company.com/"
-MCP_JWT_AUDIENCE = "superset-mcp-api"
-MCP_REQUIRED_SCOPES = ["dashboard:read", "chart:read", "dataset:read"]
-```
-
-## Configuration Options
-
-### Option 1: Simple Configuration
-
-Add to your `superset_config.py`:
-
-```python
-# Enable authentication
-MCP_AUTH_ENABLED = True
-
-# JWT settings
-MCP_JWKS_URI = "https://auth.company.com/.well-known/jwks.json"
-MCP_JWT_ISSUER = "https://auth.company.com/"
-MCP_JWT_AUDIENCE = "superset-mcp-api"
-MCP_REQUIRED_SCOPES = ["dashboard:read", "chart:read"]
-
-# Optional: User resolution
-MCP_JWT_USER_CLAIM = "sub"              # JWT claim for username (default: "sub")
-MCP_JWT_EMAIL_CLAIM = "email"           # JWT claim for email (default: "email")
-MCP_FALLBACK_USER = "admin"             # Fallback user if JWT user not found
-```
-
-### Option 2: Custom Factory
-
-For advanced authentication requirements:
-
-```python
-def create_custom_mcp_auth(app):
-    """Custom auth factory for enterprise environments."""
-    from fastmcp.server.auth.providers.bearer import BearerAuthProvider
-
-    return BearerAuthProvider(
-        jwks_uri=app.config["MCP_JWKS_URI"],
-        issuer=app.config["MCP_JWT_ISSUER"],
-        audience=app.config["MCP_JWT_AUDIENCE"],
-        required_scopes=app.config.get("MCP_REQUIRED_SCOPES", []),
-        user_resolver=custom_user_resolver,
-        cache_ttl=300  # Cache JWKS for 5 minutes
-    )
-
-MCP_AUTH_FACTORY = create_custom_mcp_auth
-```
-
-### Option 3: Environment Variables
-
-For containerized deployments:
-
-```bash
-# Environment variables
-export MCP_AUTH_ENABLED=true
-export MCP_JWKS_URI=https://auth.company.com/.well-known/jwks.json
-export MCP_JWT_ISSUER=https://auth.company.com/
-export MCP_JWT_AUDIENCE=superset-mcp-api
-export MCP_REQUIRED_SCOPES=dashboard:read,chart:read,dataset:read
-```
-
-## Identity Provider Integration
-
-### Auth0
-
-```python
-# Auth0 configuration
-MCP_JWKS_URI = "https://your-tenant.auth0.com/.well-known/jwks.json"
-MCP_JWT_ISSUER = "https://your-tenant.auth0.com/"
-MCP_JWT_AUDIENCE = "superset-mcp-api"
-```
-
-### Okta
-
-```python
-# Okta configuration
-MCP_JWKS_URI = "https://your-org.okta.com/oauth2/default/v1/keys"
-MCP_JWT_ISSUER = "https://your-org.okta.com/oauth2/default"
-MCP_JWT_AUDIENCE = "api://superset-mcp"
-```
-
-### AWS Cognito
-
-```python
-# Cognito configuration
-MCP_JWKS_URI = "https://cognito-idp.{region}.amazonaws.com/{userPoolId}/.well-known/jwks.json"
-MCP_JWT_ISSUER = "https://cognito-idp.{region}.amazonaws.com/{userPoolId}"
-MCP_JWT_AUDIENCE = "your-app-client-id"
-```
-
-### Azure AD
-
-```python
-# Azure AD configuration
-MCP_JWKS_URI = "https://login.microsoftonline.com/{tenant}/discovery/v2.0/keys"
-MCP_JWT_ISSUER = "https://login.microsoftonline.com/{tenant}/v2.0"
-MCP_JWT_AUDIENCE = "api://superset-mcp"
-```
-
-## Scope-Based Authorization
-
-### Standard Scopes
-
-The MCP service defines these standard scopes:
-
-| Scope | Description | Required For |
-|-------|-------------|--------------|
-| `dashboard:read` | Read dashboard information | `list_dashboards`, `get_dashboard_info` |
-| `dashboard:write` | Create/modify dashboards | `generate_dashboard`, `add_chart_to_existing_dashboard` |
-| `chart:read` | Read chart information | `list_charts`, `get_chart_info`, `get_chart_data` |
-| `chart:write` | Create/modify charts | `generate_chart`, `update_chart` |
-| `dataset:read` | Read dataset information | `list_datasets`, `get_dataset_info` |
-| `instance:read` | Read instance information | `get_superset_instance_info` |
-
-### Custom Scopes
-
-Define custom scopes for specific use cases:
-
-```python
-# Custom scope definitions
-CUSTOM_MCP_SCOPES = {
-    "analytics:export": "Export analytical data",
-    "reports:generate": "Generate automated reports",
-    "admin:config": "Access administrative configuration"
-}
-
-# Map tools to custom scopes
-def get_custom_required_scopes(tool_name: str) -> List[str]:
-    scope_map = {
-        "get_chart_data": ["chart:read", "analytics:export"],
-        "generate_dashboard": ["dashboard:write", "reports:generate"],
-        "get_superset_instance_info": ["instance:read", "admin:config"]
-    }
-    return scope_map.get(tool_name, [])
-
-MCP_SCOPE_RESOLVER = get_custom_required_scopes
-```
-
-## JWT Token Format
-
-### Required Claims
-
-Your JWT tokens must include these standard claims:
-
-```json
-{
-  "iss": "https://auth.company.com/",      // Issuer
-  "aud": "superset-mcp-api",               // Audience
-  "sub": "user@company.com",               // Subject (username)
-  "exp": 1704118800,                       // Expiration timestamp
-  "iat": 1704115200,                       // Issued at timestamp
-  "scope": "dashboard:read chart:read"     // Space-separated scopes
-}
-```
-
-### Optional Claims
-
-Additional claims for enhanced functionality:
-
-```json
-{
-  "email": "user@company.com",             // User email
-  "name": "John Doe",                      // Full name
-  "groups": ["analysts", "sales_team"],    // User groups
-  "tenant_id": "company_123",              // Multi-tenant ID
-  "role": "analyst"                        // User role
-}
-```
-
-## Client Integration
-
-### API Client Usage
-
-```python
-import requests
-
-# Get JWT token from your identity provider
-token = get_jwt_token()
-
-# Call MCP service with Bearer authentication
-headers = {
-    "Authorization": f"Bearer {token}",
-    "Content-Type": "application/json"
-}
-
-response = requests.post(
-    "http://localhost:5008/call_tool",
-    headers=headers,
-    json={
-        "tool": "list_dashboards",
-        "arguments": {"search": "sales"}
-    }
-)
-
-data = response.json()
-```
-
-### Claude Desktop with Authentication
-
-For Claude Desktop, the proxy script handles authentication:
-
-```bash
-#!/bin/bash
-# run_proxy_with_auth.sh
-
-# Get token from environment or file
-if [ -f ~/.superset_mcp_token ]; then
-    TOKEN=$(cat ~/.superset_mcp_token)
-else
-    TOKEN=${SUPERSET_MCP_TOKEN}
-fi
-
-# Export token for proxy
-export MCP_AUTH_TOKEN="$TOKEN"
-
-cd /path/to/superset
-source venv/bin/activate
-exec fastmcp proxy http://localhost:5008 --auth-header "Authorization: Bearer $TOKEN"
-```
-
-## User Resolution
-
-### Default User Resolution
-
-The service maps JWT claims to Superset users:
-
-```python
-def default_user_resolver(claims: Dict[str, Any]) -> User:
-    """Default user resolution from JWT claims."""
-
-    # Extract username from configurable claim
-    username = claims.get(app.config.get("MCP_JWT_USER_CLAIM", "sub"))
-
-    # Find Superset user
-    user = security_manager.find_user(username=username)
-
-    if not user:
-        # Try email lookup
-        email = claims.get(app.config.get("MCP_JWT_EMAIL_CLAIM", "email"))
-        if email:
-            user = security_manager.find_user(email=email)
-
-    if not user and app.config.get("MCP_FALLBACK_USER"):
-        # Use fallback user for development
-        user = security_manager.find_user(username=app.config["MCP_FALLBACK_USER"])
-
-    return user
-```
-
-### Custom User Resolution
-
-Implement custom user resolution logic:
-
-```python
-def custom_user_resolver(claims: Dict[str, Any]) -> User:
-    """Custom user resolution for enterprise environments."""
-
-    # Extract custom claims
-    employee_id = claims.get("employee_id")
-    tenant_id = claims.get("tenant_id")
-
-    # Multi-tenant user lookup
-    user = find_user_by_employee_id(employee_id, tenant_id)
-
-    if user:
-        # Set additional context
-        user.mcp_tenant_id = tenant_id
-        user.mcp_groups = claims.get("groups", [])
-
-    return user
-
-# Use custom resolver
-MCP_USER_RESOLVER = custom_user_resolver
-```
-
-## Security Features
-
-### Token Validation
-
-Comprehensive JWT validation:
-
-- **Signature verification**: RS256 with JWKS key rotation support
-- **Expiration checking**: Automatic token expiry validation
-- **Audience validation**: Prevents token reuse across services
-- **Issuer validation**: Ensures tokens from trusted sources only
-- **Scope validation**: Enforces tool-level permissions
-
-### Request Security
-
-- **HTTPS enforcement**: Production deployments should use HTTPS
-- **Rate limiting**: Configurable per-user rate limits
-- **Request logging**: All authenticated requests logged with user context
-- **Input validation**: Comprehensive request schema validation
-
-### Audit Logging
-
-Every tool call is logged with security context:
-
-```json
-{
-  "timestamp": "2024-01-25T14:30:00Z",
-  "user_id": "user@company.com",
-  "tool_name": "get_chart_data",
-  "source": "mcp",
-  "jwt_subject": "user@company.com",
-  "jwt_scopes": ["chart:read", "analytics:export"],
-  "tenant_id": "company_123",
-  "request_id": "req_12345",
-  "execution_time": 0.145,
-  "status": "success"
-}
-```
-
-## Testing Authentication
-
-### Generate Test Tokens
-
-For development and testing:
-
-```python
-from fastmcp.server.auth.providers.bearer import RSAKeyPair
-
-# Generate test keypair
-keypair = RSAKeyPair.generate()
-print("Public key:", keypair.public_key)
-
-# Create test token
-token = keypair.create_token(
-    subject="test@example.com",
-    issuer="https://test.example.com",
-    audience="superset-mcp-api",
-    scopes=["dashboard:read", "chart:read", "dataset:read"],
-    expires_in=3600  # 1 hour
-)
-print("Test token:", token)
-```
-
-### Test Configuration
-
-```python
-# Test configuration with generated keypair
-MCP_AUTH_ENABLED = True
-MCP_JWT_PUBLIC_KEY = """-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA...
------END PUBLIC KEY-----"""
-MCP_JWT_ISSUER = "https://test.example.com"
-MCP_JWT_AUDIENCE = "superset-mcp-api"
-MCP_FALLBACK_USER = "admin"
-```
-
-### Manual Testing
-
-```bash
-# Test with curl
-curl -X POST http://localhost:5008/call_tool \
-  -H "Authorization: Bearer $TEST_TOKEN" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "tool": "get_superset_instance_info",
-    "arguments": {"include_statistics": true}
-  }'
-```
-
-## Troubleshooting
-
-### Common Issues
-
-**Token Validation Errors:**
-```
-Error: Invalid JWT signature
-Solution: Verify JWKS_URI is accessible and contains correct keys
-```
-
-**User Not Found:**
-```
-Error: User not found for JWT subject
-Solution: Check MCP_JWT_USER_CLAIM configuration and user exists in Superset
-```
-
-**Insufficient Scopes:**
-```
-Error: Missing required scope 'chart:read'
-Solution: Update JWT token to include required scopes
-```
-
-### Debug Configuration
-
-Enable debug logging for authentication issues:
-
-```python
-# Enhanced logging for auth debugging
-import logging
-logging.getLogger('superset.mcp_service.auth').setLevel(logging.DEBUG)
-
-# Log all JWT validation steps
-MCP_AUTH_DEBUG = True
-```
-
-This authentication guide provides comprehensive coverage for securing the MCP service in production environments while maintaining development flexibility.

docs/docs/mcp-service/development.mdx

@@ -1,705 +0,0 @@
----
-title: Development Guide
-sidebar_position: 2
-version: 1
----
-
-# MCP Service Development Guide
-
-This guide covers the internal architecture, development workflows, and patterns for extending the Superset MCP service.
-
-> 🚀 **New to MCP?** Start with the [Overview](./overview) to understand what the service does before diving into development.
->
-> 📚 **Need API examples?** Check the [API Reference](./api-reference) to see how existing tools work.
->
-> 🔐 **Planning production use?** Review [Authentication](./authentication) for security considerations.
-
-## Internal Architecture
-
-### Component Overview
-
-The MCP service follows a layered architecture with clear separation of concerns:
-
-```mermaid
-graph TB
-    subgraph "Transport Layer"
-        HTTP[HTTP Server :5008]
-        FastMCP[FastMCP Protocol Handler]
-    end
-
-    subgraph "Auth & Middleware Layer"
-        AuthHook[Auth Hook Decorator]
-        JWT[JWT Validator]
-        RBAC[RBAC Engine]
-        Audit[Audit Logger]
-    end
-
-    subgraph "Tool Layer"
-        Tools[16 MCP Tools<br/>Tool Decorated]
-        Schemas[Pydantic Schemas]
-        Validation[Request Validation]
-    end
-
-    subgraph "Business Logic Layer"
-        Generic[Generic Tool Abstractions]
-        ModelList[ModelListTool]
-        ModelGet[ModelGetInfoTool]
-        ModelFilter[ModelGetAvailableFiltersTool]
-    end
-
-    subgraph "Data Access Layer"
-        DAOs[Superset DAOs]
-        Commands[Superset Commands]
-        Cache[Cache Manager]
-    end
-
-    subgraph "Storage Layer"
-        MetaDB[(Metadata DB)]
-        DataWH[(Data Warehouse)]
-        Redis[(Redis Cache)]
-    end
-
-    HTTP --> FastMCP
-    FastMCP --> AuthHook
-    AuthHook --> JWT
-    JWT --> RBAC
-    RBAC --> Audit
-    Audit --> Tools
-
-    Tools --> Schemas
-    Schemas --> Validation
-    Validation --> Generic
-
-    Generic --> ModelList
-    Generic --> ModelGet
-    Generic --> ModelFilter
-
-    ModelList --> DAOs
-    ModelGet --> DAOs
-    ModelFilter --> DAOs
-
-    Tools --> Commands
-    Commands --> Cache
-
-    DAOs --> MetaDB
-    Commands --> MetaDB
-    Commands --> DataWH
-    Cache --> Redis
-```
-
-### Request Flow
-
-Every MCP tool call follows this execution pattern:
-
-```mermaid
-sequenceDiagram
-    participant Client as LLM Client
-    participant MCP as FastMCP Server
-    participant Auth as Auth Hook
-    participant Tool as MCP Tool
-    participant Generic as Generic Abstraction
-    participant DAO as Superset DAO
-    participant DB as Database
-
-    Client->>+MCP: tool_call(request)
-    MCP->>+Auth: validate_and_authorize()
-    Auth->>Auth: Validate JWT token
-    Auth->>Auth: Check required scopes
-    Auth->>Auth: Set Flask g.user context
-    Auth->>Auth: Log audit event
-    Auth->>+Tool: execute_tool(validated_request)
-
-    Tool->>Tool: Parse Pydantic request schema
-    Tool->>+Generic: Use generic abstraction
-    Generic->>+DAO: Query Superset data
-    DAO->>+DB: Execute SQL
-    DB-->>-DAO: Return results
-    DAO-->>-Generic: Return objects
-    Generic->>Generic: Apply pagination/filtering
-    Generic-->>-Tool: Return formatted data
-
-    Tool->>Tool: Build Pydantic response schema
-    Tool-->>-Auth: Return response
-    Auth->>Auth: Log success audit event
-    Auth-->>-MCP: Return validated response
-    MCP-->>-Client: JSON response
-```
-
-### Tool Registration System
-
-Tools are automatically discovered and registered through the decorator pattern:
-
-```python
-# superset/mcp_service/mcp_app.py
-from fastmcp import FastMCP
-
-# Global MCP instance
-mcp = FastMCP("Superset MCP Service")
-
-# Tools register themselves via decorators
-@mcp.tool
-@mcp_auth_hook(['chart:read'])
-def get_chart_info(request: GetChartInfoRequest) -> GetChartInfoResponse:
-    # Tool implementation
-    pass
-
-# All tool modules imported to trigger registration
-from superset.mcp_service.chart.tool import *
-from superset.mcp_service.dashboard.tool import *
-from superset.mcp_service.dataset.tool import *
-from superset.mcp_service.system.tool import *
-```
-
-## Development Patterns
-
-### Tool Implementation Pattern
-
-All tools follow this standardized pattern:
-
-```python
-# Example: superset/mcp_service/chart/tool/get_chart_info.py
-from superset.mcp_service.auth import mcp_auth_hook
-from superset.mcp_service.mcp_app import mcp
-from superset.mcp_service.schemas.chart_schemas import (
-    GetChartInfoRequest,
-    GetChartInfoResponse,
-    ChartError
-)
-
-@mcp.tool
-@mcp_auth_hook(['chart:read'])
-def get_chart_info(request: GetChartInfoRequest) -> GetChartInfoResponse:
-    """
-    Get detailed information about a specific chart.
-
-    Supports lookup by ID or UUID with comprehensive metadata.
-    """
-    try:
-        # CRITICAL: Import Superset modules inside function
-        from superset.daos.chart import ChartDAO
-        from superset.models.slice import Slice
-
-        # Use generic abstraction for common operations
-        from superset.mcp_service.generic_tools import ModelGetInfoTool
-
-        tool = ModelGetInfoTool(
-            dao=ChartDAO,
-            model=Slice,
-            response_schema=GetChartInfoResponse,
-            identifier_field_map={
-                'id': 'id',
-                'uuid': 'uuid'
-            }
-        )
-
-        return tool.execute(request)
-
-    except Exception as e:
-        return ChartError(
-            error=f"Failed to get chart info: {str(e)}",
-            error_type="ChartInfoError"
-        )
-```
-
-### Schema Design Patterns
-
-Pydantic schemas follow these conventions:
-
-```python
-# Request Schema Pattern
-class GetChartInfoRequest(BaseModel):
-    """Request to get detailed chart information."""
-
-    identifier: Union[int, str] = Field(
-        ...,
-        description="Chart ID (numeric) or UUID (string)"
-    )
-
-    include_form_data: bool = Field(
-        default=True,
-        description="Whether to include chart configuration"
-    )
-
-    use_cache: bool = Field(
-        default=True,
-        description="Whether to use cached data"
-    )
-
-# Response Schema Pattern
-class GetChartInfoResponse(BaseModel):
-    """Detailed chart information response."""
-
-    chart_id: int = Field(description="Chart numeric ID")
-    uuid: Optional[str] = Field(description="Chart UUID")
-    slice_name: str = Field(description="Chart display name")
-    viz_type: str = Field(description="Visualization type")
-    datasource_id: Optional[int] = Field(description="Dataset ID")
-    form_data: Optional[Dict[str, Any]] = Field(description="Chart configuration")
-    explore_url: Optional[str] = Field(description="Explore URL for editing")
-
-    # Cache status for transparency
-    cache_status: Optional[CacheStatus] = Field(description="Cache hit information")
-
-# Error Schema Pattern
-class ChartError(BaseModel):
-    """Chart operation error response."""
-
-    error: str = Field(description="Error message")
-    error_type: str = Field(description="Error type identifier")
-    suggestions: Optional[List[str]] = Field(description="Suggested fixes")
-```
-
-### Generic Tool Abstractions
-
-Common operations are abstracted into reusable classes:
-
-```python
-# superset/mcp_service/generic_tools.py
-from typing import Type, Dict, Any, List, Optional
-from pydantic import BaseModel
-
-class ModelListTool:
-    """Generic tool for list operations with pagination and filtering."""
-
-    def __init__(self,
-                 dao: Type,
-                 model: Type,
-                 response_schema: Type[BaseModel],
-                 default_columns: List[str] = None,
-                 searchable_columns: List[str] = None):
-        self.dao = dao
-        self.model = model
-        self.response_schema = response_schema
-        self.default_columns = default_columns or []
-        self.searchable_columns = searchable_columns or []
-
-    def execute(self, request: BaseModel) -> BaseModel:
-        """Execute list operation with pagination and filtering."""
-
-        # Build query with filters
-        query = self.dao.find_all()
-
-        # Apply search if provided
-        if hasattr(request, 'search') and request.search:
-            query = self._apply_search(query, request.search)
-
-        # Apply filters if provided
-        if hasattr(request, 'filters') and request.filters:
-            query = self._apply_filters(query, request.filters)
-
-        # Apply pagination
-        total = query.count()
-
-        if hasattr(request, 'page') and hasattr(request, 'page_size'):
-            offset = (request.page - 1) * request.page_size
-            query = query.offset(offset).limit(request.page_size)
-
-        # Execute query and serialize
-        results = query.all()
-        serialized = [self._serialize_model(obj) for obj in results]
-
-        return self.response_schema(
-            results=serialized,
-            total_count=total,
-            page=getattr(request, 'page', 1),
-            page_size=getattr(request, 'page_size', len(serialized))
-        )
-
-class ModelGetInfoTool:
-    """Generic tool for getting single object by multiple identifier types."""
-
-    def __init__(self,
-                 dao: Type,
-                 model: Type,
-                 response_schema: Type[BaseModel],
-                 identifier_field_map: Dict[str, str]):
-        self.dao = dao
-        self.model = model
-        self.response_schema = response_schema
-        self.identifier_field_map = identifier_field_map
-
-    def execute(self, request: BaseModel) -> BaseModel:
-        """Execute get operation with multi-identifier support."""
-
-        identifier = request.identifier
-
-        # Determine identifier type and field
-        if isinstance(identifier, int):
-            field = self.identifier_field_map.get('id', 'id')
-            obj = self.dao.find_by_id(identifier)
-        elif isinstance(identifier, str):
-            if len(identifier) == 36 and '-' in identifier:  # UUID format
-                field = self.identifier_field_map.get('uuid', 'uuid')
-                obj = self.dao.find_by_uuid(identifier)
-            else:  # Assume slug
-                field = self.identifier_field_map.get('slug', 'slug')
-                obj = getattr(self.dao, 'find_by_slug', lambda x: None)(identifier)
-
-        if not obj:
-            raise ValueError(f"Object not found with identifier: {identifier}")
-
-        # Serialize and return
-        serialized = self._serialize_model(obj)
-        return self.response_schema(**serialized)
-```
-
-## Adding New Tools
-
-### Step-by-Step Process
-
-1. **Define the Domain**
-
-   Choose the appropriate domain folder:
-   - `dashboard/` - Dashboard operations
-   - `chart/` - Chart operations
-   - `dataset/` - Dataset operations
-   - `system/` - System-level operations
-
-2. **Create Schemas**
-
-   ```bash
-   # Create schema file
-   touch superset/mcp_service/schemas/my_domain_schemas.py
-   ```
-
-   ```python
-   # Define request/response schemas
-   class MyToolRequest(BaseModel):
-       param1: str = Field(description="Parameter description")
-       param2: Optional[int] = Field(default=None, description="Optional parameter")
-
-   class MyToolResponse(BaseModel):
-       result: str = Field(description="Result description")
-       metadata: Dict[str, Any] = Field(description="Additional metadata")
-   ```
-
-3. **Implement the Tool**
-
-   ```bash
-   # Create tool file
-   touch superset/mcp_service/my_domain/tool/my_tool.py
-   ```
-
-   ```python
-   @mcp.tool
-   @mcp_auth_hook(['required:scope'])
-   def my_tool(request: MyToolRequest) -> MyToolResponse:
-       """Tool description for LLM."""
-
-       # Import Superset modules inside function
-       from superset.daos.my_dao import MyDAO
-
-       # Implement business logic
-       result = MyDAO.do_something(request.param1)
-
-       return MyToolResponse(
-           result=result,
-           metadata={"processed_at": datetime.utcnow()}
-       )
-   ```
-
-4. **Register the Tool**
-
-   ```python
-   # Add to superset/mcp_service/my_domain/tool/__init__.py
-   from .my_tool import my_tool
-
-   __all__ = ['my_tool']
-   ```
-
-   ```python
-   # Import in superset/mcp_service/mcp_app.py
-   from superset.mcp_service.my_domain.tool import *
-   ```
-
-5. **Add Tests**
-
-   ```bash
-   # Create test file
-   touch tests/unit_tests/mcp_service/test_my_tool.py
-   ```
-
-   ```python
-   import pytest
-   from superset.mcp_service.my_domain.tool.my_tool import my_tool
-   from superset.mcp_service.schemas.my_domain_schemas import MyToolRequest
-
-   class TestMyTool:
-       def test_my_tool_success(self):
-           request = MyToolRequest(param1="test")
-           response = my_tool(request)
-           assert response.result == "expected_result"
-   ```
-
-### Tool Best Practices
-
-1. **Import Inside Functions**
-   ```python
-   # ❌ DON'T: Import at module level
-   from superset.daos.chart import ChartDAO
-
-   @mcp.tool
-   def my_tool():
-       # Tool implementation
-       pass
-
-   # ✅ DO: Import inside function
-   @mcp.tool
-   def my_tool():
-       from superset.daos.chart import ChartDAO
-       # Tool implementation
-       pass
-   ```
-
-2. **Use Generic Abstractions**
-   ```python
-   # ✅ Leverage existing patterns
-   @mcp.tool
-   def list_my_objects(request):
-       from superset.mcp_service.generic_tools import ModelListTool
-
-       tool = ModelListTool(
-           dao=MyDAO,
-           model=MyModel,
-           response_schema=ListMyObjectsResponse
-       )
-       return tool.execute(request)
-   ```
-
-3. **Comprehensive Error Handling**
-   ```python
-   @mcp.tool
-   def my_tool(request):
-       try:
-           # Tool implementation
-           return success_response
-       except PermissionError as e:
-           return MyToolError(
-               error="Permission denied",
-               error_type="PermissionError",
-               suggestions=["Check user permissions"]
-           )
-       except Exception as e:
-           return MyToolError(
-               error=f"Unexpected error: {str(e)}",
-               error_type="InternalError"
-           )
-   ```
-
-## Testing Patterns
-
-### Unit Test Structure
-
-```python
-# tests/unit_tests/mcp_service/test_chart_tools.py
-import pytest
-from unittest.mock import Mock, patch
-from superset.mcp_service.chart.tool.get_chart_info import get_chart_info
-from superset.mcp_service.schemas.chart_schemas import GetChartInfoRequest
-
-class TestGetChartInfo:
-    """Test suite for get_chart_info tool."""
-
-    @patch('superset.mcp_service.chart.tool.get_chart_info.ChartDAO')
-    def test_get_chart_info_by_id_success(self, mock_dao):
-        """Test successful chart lookup by ID."""
-
-        # Setup mock
-        mock_chart = Mock()
-        mock_chart.id = 1
-        mock_chart.slice_name = "Test Chart"
-        mock_chart.viz_type = "line"
-        mock_dao.find_by_id.return_value = mock_chart
-
-        # Execute
-        request = GetChartInfoRequest(identifier=1)
-        response = get_chart_info(request)
-
-        # Verify
-        assert response.chart_id == 1
-        assert response.slice_name == "Test Chart"
-        mock_dao.find_by_id.assert_called_once_with(1)
-
-    @patch('superset.mcp_service.chart.tool.get_chart_info.ChartDAO')
-    def test_get_chart_info_not_found(self, mock_dao):
-        """Test chart not found scenario."""
-
-        # Setup mock
-        mock_dao.find_by_id.return_value = None
-
-        # Execute
-        request = GetChartInfoRequest(identifier=999)
-        response = get_chart_info(request)
-
-        # Verify error response
-        assert hasattr(response, 'error')
-        assert "not found" in response.error.lower()
-```
-
-### Integration Test Patterns
-
-```python
-# tests/integration_tests/mcp_service/test_chart_integration.py
-import pytest
-from superset.app import create_app
-from superset.mcp_service.mcp_app import mcp
-from tests.integration_tests.base_tests import SupersetTestCase
-
-class TestChartIntegration(SupersetTestCase):
-    """Integration tests for chart tools."""
-
-    def setUp(self):
-        super().setUp()
-        self.app = create_app()
-        self.app_context = self.app.app_context()
-        self.app_context.push()
-
-    def tearDown(self):
-        self.app_context.pop()
-        super().tearDown()
-
-    def test_chart_workflow_integration(self):
-        """Test complete chart workflow."""
-
-        # Create chart
-        create_request = {
-            "dataset_id": "1",
-            "config": {
-                "chart_type": "table",
-                "columns": [{"name": "region"}]
-            }
-        }
-
-        create_response = mcp.call_tool("generate_chart", create_request)
-        chart_id = create_response["chart_id"]
-
-        # Get chart info
-        info_request = {"identifier": chart_id}
-        info_response = mcp.call_tool("get_chart_info", info_request)
-
-        assert info_response["chart_id"] == chart_id
-        assert info_response["viz_type"] == "table"
-
-        # Get chart data
-        data_request = {"identifier": chart_id, "limit": 10}
-        data_response = mcp.call_tool("get_chart_data", data_request)
-
-        assert "data" in data_response
-        assert len(data_response["data"]) <= 10
-```
-
-## Performance Considerations
-
-### Caching Strategy
-
-The MCP service leverages Superset's existing cache layers:
-
-```python
-# Cache control in tools
-@mcp.tool
-def get_chart_data(request: GetChartDataRequest):
-    """Tool with cache control."""
-
-    cache_config = {
-        'use_cache': request.use_cache,
-        'force_refresh': request.force_refresh,
-        'cache_timeout': request.cache_timeout
-    }
-
-    # Use Superset's cache infrastructure
-    result = execute_with_cache(query, cache_config)
-
-    return ChartDataResponse(
-        data=result.data,
-        cache_status=result.cache_status
-    )
-```
-
-### Query Optimization
-
-```python
-# Efficient pagination
-def list_objects(query, page, page_size):
-    """Optimized pagination pattern."""
-
-    # Count query optimization
-    total = query.count()
-
-    # Limit columns for list operations
-    query = query.options(load_only('id', 'name', 'created_on'))
-
-    # Apply pagination
-    offset = (page - 1) * page_size
-    results = query.offset(offset).limit(page_size).all()
-
-    return results, total
-```
-
-## Security Considerations
-
-### Authentication Flow
-
-```python
-# JWT validation and user context
-@mcp_auth_hook(['chart:read'])
-def secure_tool(request):
-    """Tool with proper security context."""
-
-    # g.user is set by auth hook
-    user_id = g.user.id
-
-    # Apply user-specific filtering
-    query = ChartDAO.find_all().filter(
-        Chart.owners.contains(g.user)
-    )
-
-    return execute_query(query)
-```
-
-### Input Validation
-
-```python
-# Comprehensive request validation
-class CreateChartRequest(BaseModel):
-    """Validated chart creation request."""
-
-    dataset_id: Union[int, str] = Field(
-        ...,
-        description="Dataset ID or UUID"
-    )
-
-    config: ChartConfig = Field(
-        ...,
-        description="Chart configuration"
-    )
-
-    @validator('dataset_id')
-    def validate_dataset_id(cls, v):
-        """Validate dataset exists and user has access."""
-        # Validation logic
-        return v
-
-    @validator('config')
-    def validate_chart_config(cls, v):
-        """Validate chart configuration."""
-        # Configuration validation
-        return v
-```
-
-This development guide provides comprehensive coverage of the MCP service's internal architecture and development patterns, enabling team members to effectively extend and maintain the system.
-
-## Related Documentation
-
-### 📚 **Ready to Use Your New Tools?**
-Test your implementations with examples from the [API Reference](./api-reference).
-
-### 🔐 **Securing Your Extensions?**
-Add authentication to your tools using the [Authentication Guide](./authentication).
-
-### 🏗️ **Understanding the Big Picture?**
-See the complete system design in the [Architecture Overview](./architecture).
-
-### 🏢 **Building Enterprise Features?**
-Explore advanced patterns in the [Preset Integration Guide](./preset-integration).
-
-> 📖 **Back to Documentation Index**: [MCP Service](./intro)

docs/docs/mcp-service/intro.mdx

@@ -1,124 +0,0 @@
----
-title: MCP Service
-sidebar_position: 1
-version: 1
----
-
-# Superset MCP Service
-
-The Superset Model Context Protocol (MCP) service provides programmatic access to Superset dashboards, charts, datasets, and instance metadata. Built for LLM agents and automation tools.
-
-## What is MCP?
-
-The Model Context Protocol (MCP) is an open standard that allows AI assistants to securely connect to data sources and tools. Superset's MCP service exposes **16 production-ready tools** that enable:
-
-- 📊 **Data Exploration**: List and query dashboards, charts, and datasets
-- 🔧 **Chart Creation**: Generate visualizations programmatically
-- 📈 **Data Export**: Extract data in multiple formats (JSON, CSV, Excel)
-- 🔗 **Navigation**: Generate explore links and SQL Lab sessions
-
-## Quick Start
-
-### Installation
-
-:::note
-The MCP service is included with Superset development setup. FastMCP dependencies are installed automatically with `make install`.
-:::
-
-```bash
-# MCP service is included with Superset development setup
-git clone https://github.com/apache/superset.git
-cd superset
-make venv && source venv/bin/activate
-make install
-
-# Start Superset
-superset run -p 8088 --with-threads --reload --debugger
-
-# Start MCP service (separate terminal)
-source venv/bin/activate
-superset mcp run --port 5008 --debug
-```
-
-### Claude Desktop Integration
-
-```json
-{
-  "mcpServers": {
-    "Superset MCP": {
-      "command": "/path/to/superset/superset/mcp_service/run_proxy.sh",
-      "args": [],
-      "env": {}
-    }
-  }
-}
-```
-
-## Key Features
-
-### 🔧 **16 Production Tools**
-| Category | Tools | Purpose |
-|----------|-------|---------|
-| **Dashboard** (5) | List, get info, create, add charts | Dashboard management |
-| **Chart** (8) | Full CRUD, data export, previews | Chart operations |
-| **Dataset** (3) | List, get info, discover filters | Dataset exploration |
-| **System** (2) | Instance info, explore links | System integration |
-| **SQL Lab** (1) | Pre-configured sessions | SQL development |
-
-### 🔐 **Enterprise Security**
-- **JWT Bearer Authentication**: Production-ready with configurable factory pattern
-- **RBAC Integration**: Scope-based permissions with Superset's security model
-- **Audit Logging**: Comprehensive MCP context tracking
-
-### 📊 **Advanced Capabilities**
-- **Multi-format Export**: JSON, CSV, Excel data export
-- **Chart Previews**: Screenshots, ASCII art, table representations
-- **Cache Control**: Leverage Superset's existing cache infrastructure
-- **Request Schemas**: Eliminates LLM parameter validation issues
-
-## Example Usage
-
-```python
-# List dashboards
-dashboards = client.call_tool("list_dashboards", {
-    "search": "sales",
-    "page_size": 10
-})
-
-# Create a chart
-chart = client.call_tool("generate_chart", {
-    "dataset_id": "1",
-    "config": {
-        "chart_type": "line",
-        "x": {"name": "date"},
-        "y": [{"name": "revenue", "aggregate": "SUM"}]
-    }
-})
-
-# Export chart data
-data = client.call_tool("get_chart_data", {
-    "identifier": chart["chart_id"],
-    "format": "json",
-    "limit": 1000
-})
-```
-
-## Status
-
-✅ **Phase 1 Complete** - Core functionality stable, authentication production-ready, comprehensive testing coverage.
-
-## Documentation Structure
-
-### Getting Started
-- **[Overview](./overview)** - Features, use cases, and examples
-- **[API Reference](./api-reference)** - Complete tool documentation
-
-### Development
-- **[Development Guide](./development)** - Internal architecture and adding tools
-- **[Architecture](./architecture)** - System design and patterns
-
-### Production
-- **[Authentication](./authentication)** - JWT setup and security
-- **[Preset Integration](./preset-integration)** - Enterprise features
-
-> 🚀 **Ready to start?** Continue with the [Overview](./overview) for detailed examples and use cases.

docs/docs/mcp-service/overview.mdx

@@ -1,196 +0,0 @@
----
-title: MCP Service Overview
-sidebar_position: 1
-version: 1
----
-
-# Superset MCP Service
-
-The Superset Model Context Protocol (MCP) service provides a modular, schema-driven interface for programmatic access to Superset dashboards, charts, datasets, and instance metadata. Built on FastMCP, it's designed for LLM agents and automation tools.
-
-**Status:** ✅ Phase 1 Complete. Core functionality stable, authentication production-ready, comprehensive testing coverage.
-
-## What is MCP?
-
-The Model Context Protocol (MCP) is an open standard for connecting AI assistants to data sources and tools. Superset's MCP service exposes 16 tools that allow LLM agents to:
-
-- **Explore data**: List and query dashboards, charts, and datasets
-- **Create visualizations**: Generate charts and dashboards programmatically
-- **Export data**: Extract chart data in multiple formats
-- **Navigate interfaces**: Generate explore links and SQL Lab sessions
-
-## Key Features
-
-### 🔧 **16 Production-Ready Tools**
-- **Dashboard Tools (5)**: List, get info, create dashboards, add charts
-- **Chart Tools (8)**: Full CRUD operations, data export, screenshot previews
-- **Dataset Tools (3)**: List, get info, discover filterable columns
-- **System Tools (2)**: Instance info, explore link generation
-- **SQL Lab Tools (1)**: Pre-configured SQL sessions
-
-### 🔐 **Enterprise Authentication**
-- **JWT Bearer Authentication**: Production-ready with configurable factory pattern
-- **RBAC Integration**: Scope-based permissions with Superset's security model
-- **Audit Logging**: Comprehensive MCP context tracking with impersonation support
-
-### 📊 **Advanced Capabilities**
-- **Multi-format Export**: JSON, CSV, Excel data export
-- **Chart Previews**: Screenshots, ASCII art, and table representations
-- **Cache Control**: Comprehensive control over Superset's cache layers
-- **Request Schema Pattern**: Eliminates LLM parameter validation issues
-
-## Architecture Overview
-
-```mermaid
-graph TB
-    subgraph "Client Layer"
-        LLM[LLM/Agent Client]
-        Claude[Claude Desktop]
-        SDK[Custom SDK]
-    end
-
-    subgraph "MCP Service Layer"
-        FastMCP[FastMCP Server<br/>Port 5008]
-        Auth[JWT Auth Hook]
-        Tools[16 MCP Tools]
-    end
-
-    subgraph "Superset Integration"
-        DAOs[Superset DAOs]
-        Commands[Superset Commands]
-        Cache[Cache Layer]
-    end
-
-    subgraph "Data Layer"
-        DB[(Superset Database)]
-        DataWarehouse[(Data Warehouse)]
-    end
-
-    LLM --> FastMCP
-    Claude --> FastMCP
-    SDK --> FastMCP
-
-    FastMCP --> Auth
-    Auth --> Tools
-
-    Tools --> DAOs
-    Tools --> Commands
-    Tools --> Cache
-
-    DAOs --> DB
-    Commands --> DB
-    Commands --> DataWarehouse
-```
-
-## Getting Started
-
-### Quick Setup
-
-```bash
-# Clone and install Superset
-git clone https://github.com/apache/superset.git
-cd superset
-make venv && source venv/bin/activate
-make install
-
-# Start Superset
-superset run -p 8088 --with-threads --reload --debugger
-
-# Start MCP service (in separate terminal)
-source venv/bin/activate
-superset mcp run --port 5008 --debug
-```
-
-### Connect to Claude Desktop
-
-:::note
-The MCP service runs on HTTP and requires a proxy for Claude Desktop integration.
-:::
-
-```bash
-# Install FastMCP proxy
-pip install fastmcp
-```
-
-Configure Claude Desktop (`~/.config/Claude/claude_desktop_config.json`):
-
-```json
-{
-  "mcpServers": {
-    "Superset MCP": {
-      "command": "/path/to/superset/superset/mcp_service/run_proxy.sh",
-      "args": [],
-      "env": {}
-    }
-  }
-}
-```
-
-## Use Cases
-
-### Data Exploration
-- "List all dashboards related to sales"
-- "Show me the charts in the Q4 Performance dashboard"
-- "What datasets are available for customer analysis?"
-
-### Chart Creation
-- "Create a line chart showing revenue trends by month"
-- "Generate a table showing top 10 products by sales"
-- "Build a bar chart comparing regional performance"
-
-### Data Export
-- "Export the sales data from this chart as CSV"
-- "Get the underlying data for this dashboard as JSON"
-- "Show me a preview of this chart as ASCII art"
-
-### Dashboard Management
-- "Create a new dashboard with these 4 charts"
-- "Add this revenue chart to the executive dashboard"
-- "Generate an explore link for this chart configuration"
-
-## Example Workflow
-
-```python
-# List available dashboards
-dashboards = client.call_tool("list_dashboards", {
-    "search": "sales",
-    "page_size": 10
-})
-
-# Get detailed dashboard info
-dashboard = client.call_tool("get_dashboard_info", {
-    "identifier": dashboards["dashboards"][0]["id"]
-})
-
-# Create a new chart
-chart = client.call_tool("generate_chart", {
-    "dataset_id": "1",
-    "config": {
-        "chart_type": "line",
-        "x": {"name": "date"},
-        "y": [{"name": "revenue", "aggregate": "SUM"}]
-    }
-})
-
-# Export chart data
-data = client.call_tool("get_chart_data", {
-    "identifier": chart["chart_id"],
-    "format": "json",
-    "limit": 1000
-})
-```
-
-## Next Steps
-
-### Ready to Use MCP?
-- **[📚 API Reference](./api-reference)** - Try all 16 tools with request/response examples
-- **[🔐 Authentication](./authentication)** - Set up JWT security for production use
-
-### Want to Extend MCP?
-- **[🔧 Development Guide](./development)** - Learn internal architecture and add new tools
-- **[🏗️ Architecture](./architecture)** - Understand system design and deployment patterns
-
-### Enterprise Deployment?
-- **[🏢 Preset Integration](./preset-integration)** - RBAC extensions and OIDC integration for enterprise
-
-> 💡 **Getting started?** Return to the [MCP Service intro](./intro) for a complete overview.

docs/docs/mcp-service/preset-integration.mdx

@@ -1,483 +0,0 @@
----
-title: Preset.io Integration
-sidebar_position: 6
-version: 1
----
-
-# Preset.io Integration Guide
-
-This document outlines integration points for the Preset.io team to extend the Superset MCP service with enterprise features, RBAC customizations, and OIDC integration.
-
-## RBAC Extension Points
-
-### Custom Authorization Factory
-
-The MCP service supports custom authorization logic through the factory pattern:
-
-```python
-# In preset_config.py or superset_config.py
-def create_preset_mcp_auth(app):
-    """Custom auth factory for Preset.io environments."""
-    from superset.mcp_service.auth import create_auth_provider
-    from preset.auth.mcp import PresetMCPAuthProvider
-
-    return PresetMCPAuthProvider(
-        jwks_uri=app.config["PRESET_JWKS_URI"],
-        issuer=app.config["PRESET_JWT_ISSUER"],
-        audience=app.config["PRESET_JWT_AUDIENCE"],
-        tenant_resolver=preset_tenant_resolver,
-        rbac_manager=app.security_manager,
-    )
-
-MCP_AUTH_FACTORY = create_preset_mcp_auth
-```
-
-### Multi-Tenant RBAC
-
-Extend the base auth hook for tenant-aware permissions:
-
-```python
-# preset/mcp/auth.py
-from superset.mcp_service.auth import mcp_auth_hook
-from functools import wraps
-
-def preset_tenant_auth_hook(required_permissions=None):
-    """Preset-specific auth hook with tenant isolation."""
-    def decorator(func):
-        @wraps(func)
-        @mcp_auth_hook(required_permissions)
-        def wrapper(*args, **kwargs):
-            # Extract tenant from JWT claims
-            tenant_id = g.user.tenant_id if hasattr(g.user, 'tenant_id') else None
-
-            # Inject tenant context
-            g.mcp_tenant_id = tenant_id
-            g.mcp_tenant_context = get_tenant_context(tenant_id)
-
-            return func(*args, **kwargs)
-        return wrapper
-    return decorator
-```
-
-### Custom Permission Scopes
-
-Define Preset-specific permission scopes:
-
-```python
-# preset/mcp/permissions.py
-PRESET_MCP_SCOPES = {
-    # Tenant-level permissions
-    "tenant:admin": "Full tenant administration",
-    "tenant:read": "Read tenant resources",
-
-    # Workspace-level permissions
-    "workspace:admin": "Full workspace administration",
-    "workspace:read": "Read workspace resources",
-
-    # Enhanced dashboard permissions
-    "dashboard:publish": "Publish dashboards to marketplace",
-    "dashboard:embed": "Generate embed tokens",
-
-    # Enhanced chart permissions
-    "chart:export": "Export chart data and configs",
-    "chart:alerts": "Manage chart alerts and notifications",
-
-    # Dataset permissions with row-level security
-    "dataset:rls": "Apply row-level security filters",
-    "dataset:pii": "Access PII-flagged columns",
-}
-
-def get_preset_required_scopes(tool_name: str, context: dict = None) -> List[str]:
-    """Map tool calls to Preset-specific permission requirements."""
-    base_scopes = get_base_required_scopes(tool_name)
-
-    # Add tenant-aware scopes
-    if context and context.get('tenant_id'):
-        base_scopes.append(f"tenant:{context['tenant_id']}")
-
-    # Add workspace-aware scopes
-    if context and context.get('workspace_id'):
-        base_scopes.append(f"workspace:{context['workspace_id']}")
-
-    return base_scopes
-```
-
-### Row-Level Security Integration
-
-Extend data access tools with RLS:
-
-```python
-# preset/mcp/rls.py
-def apply_preset_rls_filters(query_context: dict, user_context: dict) -> dict:
-    """Apply Preset row-level security filters to query context."""
-
-    # Get user's RLS rules from Preset metadata
-    rls_rules = get_user_rls_rules(
-        user_id=user_context['user_id'],
-        tenant_id=user_context['tenant_id'],
-        workspace_id=user_context.get('workspace_id')
-    )
-
-    # Apply RLS filters to query
-    for rule in rls_rules:
-        if rule.applies_to_dataset(query_context['datasource']['id']):
-            query_context = rule.apply_filter(query_context)
-
-    return query_context
-
-# Usage in custom tools
-@mcp.tool
-@preset_tenant_auth_hook(['dataset:read', 'dataset:rls'])
-def preset_get_chart_data(request: GetChartDataRequest) -> ChartDataResponse:
-    """Get chart data with Preset RLS applied."""
-
-    # Apply RLS before executing query
-    query_context = build_query_context(request)
-    query_context = apply_preset_rls_filters(
-        query_context,
-        {'user_id': g.user.id, 'tenant_id': g.mcp_tenant_id}
-    )
-
-    return execute_chart_data_query(query_context)
-```
-
-## OIDC Integration Points
-
-### Preset OIDC Provider
-
-Custom OIDC integration for Preset environments:
-
-```python
-# preset/mcp/oidc.py
-from superset.mcp_service.auth.providers.bearer import BearerAuthProvider
-import requests
-from typing import Dict, Any
-
-class PresetOIDCAuthProvider(BearerAuthProvider):
-    """OIDC-specific auth provider for Preset.io."""
-
-    def __init__(self,
-                 oidc_discovery_url: str,
-                 client_id: str,
-                 client_secret: str = None,
-                 **kwargs):
-
-        # Discover OIDC endpoints
-        self.discovery_doc = self._fetch_discovery_document(oidc_discovery_url)
-
-        super().__init__(
-            jwks_uri=self.discovery_doc['jwks_uri'],
-            issuer=self.discovery_doc['issuer'],
-            **kwargs
-        )
-
-        self.client_id = client_id
-        self.client_secret = client_secret
-
-    def _fetch_discovery_document(self, discovery_url: str) -> Dict[str, Any]:
-        """Fetch OIDC discovery document."""
-        response = requests.get(discovery_url)
-        response.raise_for_status()
-        return response.json()
-
-    def validate_token(self, token: str) -> Dict[str, Any]:
-        """Validate JWT token with OIDC-specific claims."""
-        claims = super().validate_token(token)
-
-        # Validate OIDC-specific claims
-        if claims.get('aud') != self.client_id:
-            raise ValueError("Invalid audience claim")
-
-        # Extract Preset-specific claims
-        claims['preset_tenant_id'] = claims.get('tenant_id')
-        claims['preset_workspace_id'] = claims.get('workspace_id')
-        claims['preset_roles'] = claims.get('roles', [])
-
-        return claims
-
-    def resolve_user(self, claims: Dict[str, Any]) -> Any:
-        """Resolve Superset user from OIDC claims."""
-        from preset.auth.user_resolver import resolve_preset_user
-
-        return resolve_preset_user(
-            subject=claims['sub'],
-            email=claims.get('email'),
-            tenant_id=claims.get('preset_tenant_id'),
-            roles=claims.get('preset_roles', [])
-        )
-```
-
-### Configuration for OIDC
-
-```python
-# In preset_config.py
-def create_preset_oidc_auth(app):
-    """Factory for Preset OIDC authentication."""
-    from preset.mcp.oidc import PresetOIDCAuthProvider
-
-    return PresetOIDCAuthProvider(
-        oidc_discovery_url=app.config["PRESET_OIDC_DISCOVERY_URL"],
-        client_id=app.config["PRESET_OIDC_CLIENT_ID"],
-        client_secret=app.config["PRESET_OIDC_CLIENT_SECRET"],
-        audience=app.config["PRESET_MCP_AUDIENCE"],
-        required_scopes=app.config.get("PRESET_MCP_REQUIRED_SCOPES", [])
-    )
-
-# MCP Configuration
-MCP_AUTH_ENABLED = True
-MCP_AUTH_FACTORY = create_preset_oidc_auth
-
-# OIDC Configuration
-PRESET_OIDC_DISCOVERY_URL = "https://auth.preset.io/.well-known/openid_configuration"
-PRESET_OIDC_CLIENT_ID = "preset-mcp-service"
-PRESET_OIDC_CLIENT_SECRET = os.environ.get("PRESET_OIDC_CLIENT_SECRET")
-PRESET_MCP_AUDIENCE = "preset-superset-mcp"
-PRESET_MCP_REQUIRED_SCOPES = [
-    "openid", "profile", "email",
-    "superset:read", "superset:write"
-]
-```
-
-## Preset-Specific Tools
-
-### Tenant Management Tools
-
-```python
-# preset/mcp/tools/tenant.py
-@mcp.tool
-@preset_tenant_auth_hook(['tenant:read'])
-def get_tenant_info(request: GetTenantInfoRequest) -> TenantInfoResponse:
-    """Get Preset tenant information and quotas."""
-
-    tenant_id = g.mcp_tenant_id
-    tenant = get_tenant_by_id(tenant_id)
-
-    return TenantInfoResponse(
-        tenant_id=tenant.id,
-        name=tenant.name,
-        plan=tenant.plan,
-        quotas=tenant.quotas,
-        usage=get_tenant_usage(tenant_id),
-        workspaces=list_tenant_workspaces(tenant_id)
-    )
-
-@mcp.tool
-@preset_tenant_auth_hook(['workspace:read'])
-def list_workspace_assets(request: ListWorkspaceAssetsRequest) -> ListWorkspaceAssetsResponse:
-    """List all assets in a Preset workspace."""
-
-    workspace_id = request.workspace_id
-    tenant_id = g.mcp_tenant_id
-
-    # Validate workspace belongs to tenant
-    validate_workspace_access(workspace_id, tenant_id)
-
-    assets = {
-        'dashboards': list_workspace_dashboards(workspace_id),
-        'charts': list_workspace_charts(workspace_id),
-        'datasets': list_workspace_datasets(workspace_id)
-    }
-
-    return ListWorkspaceAssetsResponse(
-        workspace_id=workspace_id,
-        assets=assets,
-        total_count=sum(len(v) for v in assets.values())
-    )
-```
-
-### Embed Token Generation
-
-```python
-# preset/mcp/tools/embed.py
-@mcp.tool
-@preset_tenant_auth_hook(['dashboard:embed'])
-def generate_embed_token(request: GenerateEmbedTokenRequest) -> EmbedTokenResponse:
-    """Generate secure embed token for dashboard/chart."""
-
-    # Validate resource access
-    resource = validate_embed_resource_access(
-        resource_type=request.resource_type,
-        resource_id=request.resource_id,
-        tenant_id=g.mcp_tenant_id
-    )
-
-    # Generate signed embed token
-    embed_token = create_embed_token(
-        resource=resource,
-        user_id=g.user.id,
-        tenant_id=g.mcp_tenant_id,
-        permissions=request.permissions,
-        expiry=request.expiry_hours
-    )
-
-    return EmbedTokenResponse(
-        embed_token=embed_token,
-        embed_url=f"{get_preset_base_url()}/embed/{embed_token}",
-        expires_at=embed_token.expires_at
-    )
-```
-
-## Audit and Compliance Extensions
-
-### Enhanced Audit Logging
-
-```python
-# preset/mcp/audit.py
-from superset.mcp_service.auth import get_audit_context
-
-def create_preset_audit_context(user_context: dict, tool_name: str,
-                               request_data: dict) -> dict:
-    """Create Preset-specific audit context."""
-
-    base_context = get_audit_context(user_context, tool_name, request_data)
-
-    # Add Preset-specific fields
-    preset_context = {
-        **base_context,
-        'tenant_id': user_context.get('tenant_id'),
-        'workspace_id': user_context.get('workspace_id'),
-        'preset_user_role': user_context.get('preset_role'),
-        'data_classification': classify_request_data(request_data),
-        'compliance_flags': get_compliance_flags(tool_name, request_data)
-    }
-
-    return preset_context
-
-def log_preset_mcp_access(audit_context: dict):
-    """Log MCP access to Preset audit systems."""
-
-    # Log to Superset's audit system
-    log_superset_audit_event(audit_context)
-
-    # Log to Preset's compliance system
-    log_preset_compliance_event(audit_context)
-
-    # Log to external SIEM if configured
-    if app.config.get('PRESET_SIEM_ENABLED'):
-        log_to_siem(audit_context)
-```
-
-### Data Classification
-
-```python
-# preset/mcp/classification.py
-def classify_request_data(request_data: dict) -> dict:
-    """Classify data sensitivity in MCP requests."""
-
-    classification = {
-        'contains_pii': False,
-        'data_level': 'public',
-        'retention_policy': 'standard'
-    }
-
-    # Check for PII in request
-    if contains_pii_fields(request_data):
-        classification['contains_pii'] = True
-        classification['data_level'] = 'restricted'
-        classification['retention_policy'] = 'pii_compliant'
-
-    # Check for sensitive datasets
-    if references_sensitive_datasets(request_data):
-        classification['data_level'] = 'confidential'
-
-    return classification
-```
-
-## Deployment Considerations
-
-### Multi-Region Deployment
-
-```python
-# preset/mcp/deployment.py
-def get_region_specific_config():
-    """Get region-specific MCP configuration."""
-
-    region = os.environ.get('PRESET_REGION', 'us-east-1')
-
-    config_map = {
-        'us-east-1': {
-            'jwks_uri': 'https://auth-us.preset.io/.well-known/jwks.json',
-            'base_url': 'https://app.preset.io',
-            'data_residency': 'US'
-        },
-        'eu-west-1': {
-            'jwks_uri': 'https://auth-eu.preset.io/.well-known/jwks.json',
-            'base_url': 'https://eu.preset.io',
-            'data_residency': 'EU'
-        }
-    }
-
-    return config_map.get(region, config_map['us-east-1'])
-
-# Usage in config
-region_config = get_region_specific_config()
-PRESET_JWKS_URI = region_config['jwks_uri']
-SUPERSET_WEBSERVER_ADDRESS = region_config['base_url']
-```
-
-### Health Check Extensions
-
-```python
-# preset/mcp/health.py
-@mcp.tool
-def preset_health_check() -> HealthCheckResponse:
-    """Preset-specific health check for MCP service."""
-
-    checks = {
-        'mcp_service': check_mcp_service_health(),
-        'database': check_database_health(),
-        'auth_provider': check_auth_provider_health(),
-        'tenant_isolation': check_tenant_isolation(),
-        'rls_engine': check_rls_engine_health()
-    }
-
-    overall_status = 'healthy' if all(
-        check['status'] == 'healthy' for check in checks.values()
-    ) else 'degraded'
-
-    return HealthCheckResponse(
-        status=overall_status,
-        checks=checks,
-        region=os.environ.get('PRESET_REGION'),
-        version=get_preset_mcp_version()
-    )
-```
-
-## Configuration Templates
-
-### Production Configuration
-
-```python
-# preset_production_config.py
-from preset.mcp.auth import create_preset_oidc_auth
-from preset.mcp.audit import create_preset_audit_context
-
-# MCP Service Configuration
-MCP_AUTH_ENABLED = True
-MCP_AUTH_FACTORY = create_preset_oidc_auth
-MCP_AUDIT_CONTEXT_FACTORY = create_preset_audit_context
-
-# Preset OIDC Configuration
-PRESET_OIDC_DISCOVERY_URL = "https://auth.preset.io/.well-known/openid_configuration"
-PRESET_OIDC_CLIENT_ID = "preset-mcp-production"
-PRESET_MCP_AUDIENCE = "preset-superset-mcp"
-
-# Security Configuration
-PRESET_MCP_REQUIRED_SCOPES = [
-    "openid", "profile", "email",
-    "tenant:read", "workspace:read",
-    "dashboard:read", "chart:read", "dataset:read"
-]
-
-# Audit Configuration
-PRESET_AUDIT_ENABLED = True
-PRESET_SIEM_ENABLED = True
-PRESET_COMPLIANCE_MODE = "SOC2"
-
-# Performance Configuration
-PRESET_MCP_CACHE_ENABLED = True
-PRESET_MCP_RATE_LIMIT = "1000/hour"
-PRESET_MCP_TIMEOUT = 30
-```
-
-This integration guide provides the Preset.io team with concrete extension points for implementing enterprise features while maintaining compatibility with the base MCP service architecture.

docs/sidebars.js

@@ -87,16 +87,6 @@ const sidebars = {
         },
       ],
     },
-    {
-      type: 'category',
-      label: 'MCP Service',
-      items: [
-        {
-          type: 'autogenerated',
-          dirName: 'mcp-service',
-        },
-      ],
-    },
     {
       type: 'doc',
       label: 'FAQ',

pyproject.toml

@@ -111,7 +111,7 @@ athena = ["pyathena[pandas]>=2, <3"]
 aurora-data-api = ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"]
 bigquery = [
     "pandas-gbq>=0.19.1",
-    "sqlalchemy-bigquery>=1.15.0",
+    "sqlalchemy-bigquery>=1.6.1",
     "google-cloud-bigquery>=3.10.0",
 ]
 clickhouse = ["clickhouse-connect>=0.5.14, <1.0"]
@@ -133,7 +133,6 @@ solr = ["sqlalchemy-solr >= 0.2.0"]
 elasticsearch = ["elasticsearch-dbapi>=0.2.9, <0.3.0"]
 exasol = ["sqlalchemy-exasol >= 2.4.0, <3.0"]
 excel = ["xlrd>=1.2.0, <1.3"]
-fastmcp = ["fastmcp>=2.8.1"]
 firebird = ["sqlalchemy-firebird>=0.7.0, <0.8"]
 firebolt = ["firebolt-sqlalchemy>=1.0.0, <2"]
 gevent = ["gevent>=23.9.1"]
@@ -203,7 +202,6 @@ development = [
     "pyinstrument>=4.0.2,<5",
     "pylint",
     "pytest<8.0.0", # hairy issue with pytest >=8 where current_app proxies are not set in time
-    "pytest-asyncio", # need this due to not using latest pytest
     "pytest-cov",
     "pytest-mock",
     "python-ldap>=3.4.4",

requirements/base.txt

@@ -11,7 +11,9 @@ apispec==6.6.1
 apsw==3.50.1.0
     # via shillelagh
 async-timeout==4.0.3
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   redis
 attrs==25.3.0
     # via
     #   cattrs
@@ -97,6 +99,11 @@ email-validator==2.2.0
     # via flask-appbuilder
 et-xmlfile==2.0.0
     # via openpyxl
+exceptiongroup==1.3.0
+    # via
+    #   cattrs
+    #   trio
+    #   trio-websocket
 flask==2.3.3
     # via
     #   apache-superset (pyproject.toml)
@@ -154,6 +161,7 @@ greenlet==3.1.1
     # via
     #   apache-superset (pyproject.toml)
     #   shillelagh
+    #   sqlalchemy
 gunicorn==23.0.0
     # via apache-superset (pyproject.toml)
 h11==0.16.0
@@ -310,7 +318,7 @@ python-dateutil==2.9.0.post0
     #   holidays
     #   pandas
     #   shillelagh
-python-dotenv==1.1.0
+python-dotenv==1.1.1
     # via apache-superset (pyproject.toml)
 python-geohash==0.8.5
     # via apache-superset (pyproject.toml)
@@ -395,9 +403,11 @@ typing-extensions==4.14.0
     #   apache-superset (pyproject.toml)
     #   alembic
     #   cattrs
+    #   exceptiongroup
     #   limits
     #   pyopenssl
     #   referencing
+    #   rich
     #   selenium
     #   shillelagh
 tzdata==2025.2

requirements/development.in

@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
--e .[development,bigquery,druid,fastmcp,gevent,gsheets,mysql,postgres,presto,prophet,trino,thumbnails]
+-e .[development,bigquery,druid,gevent,gsheets,mysql,postgres,presto,prophet,trino,thumbnails]

requirements/development.txt

@@ -10,14 +10,6 @@ amqp==5.3.1
     # via
     #   -c requirements/base.txt
     #   kombu
-annotated-types==0.7.0
-    # via pydantic
-anyio==4.9.0
-    # via
-    #   httpx
-    #   mcp
-    #   sse-starlette
-    #   starlette
 apispec==6.6.1
     # via
     #   -c requirements/base.txt
@@ -28,18 +20,19 @@ apsw==3.50.1.0
     #   shillelagh
 astroid==3.3.10
     # via pylint
+async-timeout==4.0.3
+    # via
+    #   -c requirements/base.txt
+    #   redis
 attrs==25.3.0
     # via
     #   -c requirements/base.txt
     #   cattrs
-    #   cyclopts
     #   jsonschema
     #   outcome
     #   referencing
     #   requests-cache
     #   trio
-authlib==1.6.1
-    # via fastmcp
 babel==2.17.0
     # via
     #   -c requirements/base.txt
@@ -88,8 +81,6 @@ celery==5.5.2
 certifi==2025.6.15
     # via
     #   -c requirements/base.txt
-    #   httpcore
-    #   httpx
     #   requests
     #   selenium
 cffi==1.17.1
@@ -114,7 +105,6 @@ click==8.2.1
     #   click-repl
     #   flask
     #   flask-appbuilder
-    #   uvicorn
 click-didyoumean==0.3.1
     # via
     #   -c requirements/base.txt
@@ -154,13 +144,10 @@ cryptography==44.0.3
     # via
     #   -c requirements/base.txt
     #   apache-superset
-    #   authlib
     #   paramiko
     #   pyopenssl
 cycler==0.12.1
     # via matplotlib
-cyclopts==3.22.2
-    # via fastmcp
 db-dtypes==1.3.1
     # via pandas-gbq
 defusedxml==0.7.1
@@ -185,23 +172,21 @@ dnspython==2.7.0
     #   email-validator
 docker==7.0.0
     # via apache-superset
-docstring-parser==0.17.0
-    # via cyclopts
-docutils==0.21.2
-    # via rich-rst
 email-validator==2.2.0
     # via
     #   -c requirements/base.txt
     #   flask-appbuilder
-    #   pydantic
 et-xmlfile==2.0.0
     # via
     #   -c requirements/base.txt
     #   openpyxl
 exceptiongroup==1.3.0
-    # via fastmcp
-fastmcp==2.10.6
-    # via apache-superset
+    # via
+    #   -c requirements/base.txt
+    #   cattrs
+    #   pytest
+    #   trio
+    #   trio-websocket
 filelock==3.12.2
     # via virtualenv
 flask==2.3.3
@@ -339,6 +324,7 @@ greenlet==3.1.1
     #   apache-superset
     #   gevent
     #   shillelagh
+    #   sqlalchemy
 grpcio==1.71.0
     # via
     #   apache-superset
@@ -353,8 +339,6 @@ gunicorn==23.0.0
 h11==0.16.0
     # via
     #   -c requirements/base.txt
-    #   httpcore
-    #   uvicorn
     #   wsproto
 hashids==1.3.1
     # via
@@ -365,14 +349,6 @@ holidays==0.25
     #   -c requirements/base.txt
     #   apache-superset
     #   prophet
-httpcore==1.0.9
-    # via httpx
-httpx==0.28.1
-    # via
-    #   fastmcp
-    #   mcp
-httpx-sse==0.4.1
-    # via mcp
 humanize==4.12.3
     # via
     #   -c requirements/base.txt
@@ -382,9 +358,7 @@ identify==2.5.36
 idna==3.10
     # via
     #   -c requirements/base.txt
-    #   anyio
     #   email-validator
-    #   httpx
     #   requests
     #   trio
     #   url-normalize
@@ -416,7 +390,6 @@ jsonschema==4.23.0
     # via
     #   -c requirements/base.txt
     #   flask-appbuilder
-    #   mcp
     #   openapi-schema-validator
     #   openapi-spec-validator
 jsonschema-path==0.3.4
@@ -476,8 +449,6 @@ matplotlib==3.9.0
     # via prophet
 mccabe==0.7.0
     # via pylint
-mcp==1.12.0
-    # via fastmcp
 mdurl==0.1.2
     # via
     #   -c requirements/base.txt
@@ -516,8 +487,6 @@ odfpy==1.4.1
     # via
     #   -c requirements/base.txt
     #   pandas
-openapi-pydantic==0.5.1
-    # via fastmcp
 openapi-schema-validator==0.6.3
     # via
     #   -c requirements/base.txt
@@ -650,16 +619,6 @@ pycparser==2.22
     # via
     #   -c requirements/base.txt
     #   cffi
-pydantic==2.11.7
-    # via
-    #   fastmcp
-    #   mcp
-    #   openapi-pydantic
-    #   pydantic-settings
-pydantic-core==2.33.2
-    # via pydantic
-pydantic-settings==2.10.1
-    # via mcp
 pydata-google-auth==1.9.0
     # via pandas-gbq
 pydruid==0.6.9
@@ -695,8 +654,6 @@ pyparsing==3.2.3
     #   -c requirements/base.txt
     #   apache-superset
     #   matplotlib
-pyperclip==1.9.0
-    # via fastmcp
 pysocks==1.7.1
     # via
     #   -c requirements/base.txt
@@ -704,11 +661,8 @@ pysocks==1.7.1
 pytest==7.4.4
     # via
     #   apache-superset
-    #   pytest-asyncio
     #   pytest-cov
     #   pytest-mock
-pytest-asyncio==0.23.8
-    # via apache-superset
 pytest-cov==6.0.0
     # via apache-superset
 pytest-mock==3.10.0
@@ -728,20 +682,16 @@ python-dateutil==2.9.0.post0
     #   pyhive
     #   shillelagh
     #   trino
-python-dotenv==1.1.0
+python-dotenv==1.1.1
     # via
     #   -c requirements/base.txt
     #   apache-superset
-    #   fastmcp
-    #   pydantic-settings
 python-geohash==0.8.5
     # via
     #   -c requirements/base.txt
     #   apache-superset
 python-ldap==3.4.4
     # via apache-superset
-python-multipart==0.0.20
-    # via mcp
 pytz==2025.2
     # via
     #   -c requirements/base.txt
@@ -796,12 +746,7 @@ rfc3339-validator==0.1.4
 rich==13.9.4
     # via
     #   -c requirements/base.txt
-    #   cyclopts
-    #   fastmcp
     #   flask-limiter
-    #   rich-rst
-rich-rst==1.3.1
-    # via cyclopts
 rpds-py==0.25.0
     # via
     #   -c requirements/base.txt
@@ -846,7 +791,6 @@ slack-sdk==3.35.0
 sniffio==1.3.1
     # via
     #   -c requirements/base.txt
-    #   anyio
     #   trio
 sortedcontainers==2.4.0
     # via
@@ -863,7 +807,7 @@ sqlalchemy==1.4.54
     #   shillelagh
     #   sqlalchemy-bigquery
     #   sqlalchemy-utils
-sqlalchemy-bigquery==1.15.0
+sqlalchemy-bigquery==1.12.0
     # via apache-superset
 sqlalchemy-utils==0.38.3
     # via
@@ -876,20 +820,21 @@ sqlglot==27.3.0
     #   apache-superset
 sqloxide==0.1.51
     # via apache-superset
-sse-starlette==2.4.1
-    # via mcp
 sshtunnel==0.4.0
     # via
     #   -c requirements/base.txt
     #   apache-superset
-starlette==0.47.2
-    # via mcp
 statsd==4.0.1
     # via apache-superset
 tabulate==0.9.0
     # via
     #   -c requirements/base.txt
     #   apache-superset
+tomli==2.2.1
+    # via
+    #   coverage
+    #   pylint
+    #   pytest
 tomlkit==0.13.3
     # via pylint
 tqdm==4.67.1
@@ -911,23 +856,16 @@ typing-extensions==4.14.0
     # via
     #   -c requirements/base.txt
     #   alembic
-    #   anyio
     #   apache-superset
+    #   astroid
     #   cattrs
     #   exceptiongroup
     #   limits
-    #   pydantic
-    #   pydantic-core
     #   pyopenssl
     #   referencing
+    #   rich
     #   selenium
     #   shillelagh
-    #   starlette
-    #   typing-inspection
-typing-inspection==0.4.1
-    # via
-    #   pydantic
-    #   pydantic-settings
 tzdata==2025.2
     # via
     #   -c requirements/base.txt
@@ -946,8 +884,6 @@ urllib3==2.5.0
     #   requests
     #   requests-cache
     #   selenium
-uvicorn==0.35.0
-    # via mcp
 vine==5.1.0
     # via
     #   -c requirements/base.txt

superset-frontend/package-lock.json

@@ -53,8 +53,8 @@
         "@visx/scale": "^3.5.0",
         "@visx/tooltip": "^3.0.0",
         "@visx/xychart": "^3.5.1",
-        "ag-grid-community": "^34.0.2",
-        "ag-grid-react": "34.0.2",
+        "ag-grid-community": "33.1.1",
+        "ag-grid-react": "33.1.1",
         "antd": "^5.24.6",
         "chrono-node": "^2.7.8",
         "classnames": "^2.2.5",
@@ -10877,12 +10877,6 @@
         "url": "https://opencollective.com/immer"
       }
     },
-    "node_modules/@reduxjs/toolkit/node_modules/reselect": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
-      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
-      "license": "MIT"
-    },
     "node_modules/@rjsf/core": {
       "version": "5.24.1",
       "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-5.24.1.tgz",
@@ -18753,27 +18747,27 @@
       }
     },
     "node_modules/ag-charts-types": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-12.0.2.tgz",
-      "integrity": "sha512-AWM1Y+XW+9VMmV3AbzdVEnreh/I2C9Pmqpc2iLmtId3Xbvmv7O56DqnuDb9EXjK5uPxmyUerTP+utL13UGcztw==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-11.1.1.tgz",
+      "integrity": "sha512-bRmUcf5VVhEEekhX8Vk0NSwa8Te8YM/zchjyYKR2CX4vDYiwoohM1Jg9RFvbIhVbLC1S6QrPEbx5v2C6RDfpSA==",
       "license": "MIT"
     },
     "node_modules/ag-grid-community": {
-      "version": "34.0.2",
-      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-34.0.2.tgz",
-      "integrity": "sha512-hVJp5vrmwHRB10YjfSOVni5YJkO/v+asLjT72S4YnIFSx8lAgyPmByNJgtojk1aJ5h6Up93jTEmGDJeuKiWWLA==",
+      "version": "33.1.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-33.1.1.tgz",
+      "integrity": "sha512-CNubIro0ipj4nfQ5WJPG9Isp7UI6MMDvNzrPdHNf3W+IoM8Uv3RUhjEn7xQqpQHuu6o/tMjrqpacipMUkhzqnw==",
       "license": "MIT",
       "dependencies": {
-        "ag-charts-types": "12.0.2"
+        "ag-charts-types": "11.1.1"
       }
     },
     "node_modules/ag-grid-react": {
-      "version": "34.0.2",
-      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-34.0.2.tgz",
-      "integrity": "sha512-1KBXkTvwtZiYVlSuDzBkiqfHjZgsATOmpLZdAtdmsCSOOOEWai0F9zHHgBuHfyciAE4nrbQWfojkx8IdnwsKFw==",
+      "version": "33.1.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-33.1.1.tgz",
+      "integrity": "sha512-xJ+t2gpqUUwpFqAeDvKz/GLVR4unkOghfQBr8iIY9RAdGFarYFClJavsOa8XPVVUqEB9OIuPVFnOdtocbX0jeA==",
       "license": "MIT",
       "dependencies": {
-        "ag-grid-community": "34.0.2",
+        "ag-grid-community": "33.1.1",
         "prop-types": "^15.8.1"
       },
       "peerDependencies": {
@@ -24611,12 +24605,6 @@
         "d3-time": "1 - 2"
       }
     },
-    "node_modules/encodable/node_modules/reselect": {
-      "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
-      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
-      "license": "MIT"
-    },
     "node_modules/encodeurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -50641,9 +50629,9 @@
       "license": "MIT"
     },
     "node_modules/reselect": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
-      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
+      "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
       "license": "MIT"
     },
     "node_modules/resize-observer-polyfill": {
@@ -59097,7 +59085,7 @@
         "csstype": "^3.1.3",
         "d3-format": "^1.3.2",
         "d3-interpolate": "^3.0.1",
-        "d3-scale": "^4.0.2",
+        "d3-scale": "^3.0.0",
         "d3-time": "^3.1.0",
         "d3-time-format": "^4.1.0",
         "dayjs": "^1.11.13",
@@ -59120,7 +59108,7 @@
         "rehype-raw": "^7.0.0",
         "rehype-sanitize": "^6.0.0",
         "remark-gfm": "^4.0.1",
-        "reselect": "^5.1.1",
+        "reselect": "^4.0.0",
         "rison": "^0.1.1",
         "seedrandom": "^3.0.5",
         "xss": "^1.0.14"
@@ -59199,19 +59187,16 @@
       "license": "BSD-3-Clause"
     },
     "packages/superset-ui-core/node_modules/d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-      "license": "ISC",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
-      },
-      "engines": {
-        "node": ">=12"
+        "d3-array": "^2.3.0",
+        "d3-format": "1 - 2",
+        "d3-interpolate": "1.2.0 - 2",
+        "d3-time": "^2.1.1",
+        "d3-time-format": "2 - 3"
       }
     },
     "packages/superset-ui-core/node_modules/d3-scale/node_modules/d3-interpolate": {
@@ -61183,8 +61168,8 @@
         "@react-icons/all-files": "^4.1.0",
         "@types/d3-array": "^2.9.0",
         "@types/react-table": "^7.7.20",
-        "ag-grid-community": "^34.0.2",
-        "ag-grid-react": "^34.0.2",
+        "ag-grid-community": "^33.1.1",
+        "ag-grid-react": "^33.1.1",
         "classnames": "^2.5.1",
         "d3-array": "^2.4.0",
         "lodash": "^4.17.21",
@@ -61220,10 +61205,8 @@
       },
       "peerDependencies": {
         "@ant-design/icons": "^5.2.6",
-        "@reduxjs/toolkit": "*",
         "@superset-ui/chart-controls": "*",
         "@superset-ui/core": "*",
-        "@types/react-redux": "*",
         "geostyler": "^14.1.3",
         "geostyler-data": "^1.0.0",
         "geostyler-openlayers-parser": "^4.0.0",

superset-frontend/package.json

@@ -121,8 +121,8 @@
     "@visx/scale": "^3.5.0",
     "@visx/tooltip": "^3.0.0",
     "@visx/xychart": "^3.5.1",
-    "ag-grid-community": "^34.0.2",
-    "ag-grid-react": "34.0.2",
+    "ag-grid-community": "33.1.1",
+    "ag-grid-react": "33.1.1",
     "antd": "^5.24.6",
     "chrono-node": "^2.7.8",
     "classnames": "^2.2.5",

superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/customControls.tsx

@@ -41,53 +41,6 @@ import {
 import { checkColumnType } from '../utils/checkColumnType';
 import { isSortable } from '../utils/isSortable';
 
-// Aggregation choices with computation methods for plugins and controls
-export const aggregationChoices = {
-  raw: {
-    label: 'Overall value',
-    compute: (data: number[]) => {
-      if (!data.length) return null;
-      return data[0];
-    },
-  },
-  LAST_VALUE: {
-    label: 'Last Value',
-    compute: (data: number[]) => {
-      if (!data.length) return null;
-      return data[0];
-    },
-  },
-  sum: {
-    label: 'Total (Sum)',
-    compute: (data: number[]) =>
-      data.length ? data.reduce((a, b) => a + b, 0) : null,
-  },
-  mean: {
-    label: 'Average (Mean)',
-    compute: (data: number[]) =>
-      data.length ? data.reduce((a, b) => a + b, 0) / data.length : null,
-  },
-  min: {
-    label: 'Minimum',
-    compute: (data: number[]) => (data.length ? Math.min(...data) : null),
-  },
-  max: {
-    label: 'Maximum',
-    compute: (data: number[]) => (data.length ? Math.max(...data) : null),
-  },
-  median: {
-    label: 'Median',
-    compute: (data: number[]) => {
-      if (!data.length) return null;
-      const sorted = [...data].sort((a, b) => a - b);
-      const mid = Math.floor(sorted.length / 2);
-      return sorted.length % 2 === 0
-        ? (sorted[mid - 1] + sorted[mid]) / 2
-        : sorted[mid];
-    },
-  },
-} as const;
-
 export const contributionModeControl = {
   name: 'contributionMode',
   config: {
@@ -116,12 +69,17 @@ export const aggregationControl = {
     default: 'LAST_VALUE',
     clearable: false,
     renderTrigger: false,
-    choices: Object.entries(aggregationChoices).map(([value, { label }]) => [
-      value,
-      t(label),
-    ]),
+    choices: [
+      ['raw', t('None')],
+      ['LAST_VALUE', t('Last Value')],
+      ['sum', t('Total (Sum)')],
+      ['mean', t('Average (Mean)')],
+      ['min', t('Minimum')],
+      ['max', t('Maximum')],
+      ['median', t('Median')],
+    ],
     description: t(
-      'Method to compute the displayed value. "Overall value" calculates a single metric across the entire filtered time period, ideal for non-additive metrics like ratios, averages, or distinct counts. Other methods operate over the time series data points.',
+      'Aggregation method used to compute the Big Number from the Trendline.For non-additive metrics like ratios, averages, distinct counts, etc use NONE.',
     ),
     provideFormDataToProps: true,
     mapStateToProps: ({ form_data }: ControlPanelState) => ({

superset-frontend/packages/superset-ui-core/package.json

@@ -37,7 +37,7 @@
     "d3-format": "^1.3.2",
     "dayjs": "^1.11.13",
     "d3-interpolate": "^3.0.1",
-    "d3-scale": "^4.0.2",
+    "d3-scale": "^3.0.0",
     "d3-time": "^3.1.0",
     "d3-time-format": "^4.1.0",
     "dompurify": "^3.2.4",
@@ -59,7 +59,7 @@
     "rehype-raw": "^7.0.0",
     "rehype-sanitize": "^6.0.0",
     "remark-gfm": "^4.0.1",
-    "reselect": "^5.1.1",
+    "reselect": "^4.0.0",
     "rison": "^0.1.1",
     "seedrandom": "^3.0.5",
     "@visx/responsive": "^3.12.0",

superset-frontend/packages/superset-ui-core/src/chart/models/ChartProps.ts

@@ -17,8 +17,11 @@
  * under the License.
  */
 
+/** Type checking is disabled for this file due to reselect only supporting
+ * TS declarations for selectors with up to 12 arguments. */
+// @ts-nocheck
 import { RefObject } from 'react';
-import { createSelector, lruMemoize } from 'reselect';
+import { createSelector } from 'reselect';
 import {
   AppSection,
   Behavior,
@@ -34,7 +37,7 @@ import {
   SetDataMaskHook,
 } from '../types/Base';
 import { QueryData, DataRecordFilters } from '..';
-import { supersetTheme, SupersetTheme } from '../../theme';
+import { SupersetTheme } from '../../theme';
 
 // TODO: more specific typing for these fields of ChartProps
 type AnnotationData = PlainObject;
@@ -106,8 +109,6 @@ export interface ChartPropsConfig {
   theme: SupersetTheme;
   /* legend index */
   legendIndex?: number;
-  inContextMenu?: boolean;
-  emitCrossFilters?: boolean;
 }
 
 const DEFAULT_WIDTH = 800;
@@ -160,11 +161,7 @@ export default class ChartProps<FormData extends RawFormData = RawFormData> {
 
   theme: SupersetTheme;
 
-  constructor(
-    config: ChartPropsConfig & { formData?: FormData } = {
-      theme: supersetTheme,
-    },
-  ) {
+  constructor(config: ChartPropsConfig & { formData?: FormData } = {}) {
     const {
       annotationData = {},
       datasource = {},
@@ -279,16 +276,5 @@ ChartProps.createSelector = function create(): ChartPropsSelector {
         emitCrossFilters,
         theme,
       }),
-    // Below config is to retain usage of 1-sized `lruMemoize` object in Reselect v4
-    // Reselect v5 introduces `weakMapMemoize` which is more performant but potentially memory-leaky
-    // due to infinite cache size.
-    // Source: https://github.com/reduxjs/reselect/releases/tag/v5.0.1
-    {
-      memoize: lruMemoize,
-      argsMemoize: lruMemoize,
-      memoizeOptions: {
-        maxSize: 10,
-      },
-    },
   );
 };

superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/TelemetryPixel.test.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { render } from '@superset-ui/core/spec';
-import { TelemetryPixel } from '.';
+import TelemetryPixel from '.';
 
 const OLD_ENV = process.env;
 

superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/index.tsx

@@ -39,7 +39,7 @@ interface TelemetryPixelProps {
 
 const PIXEL_ID = '0d3461e1-abb1-4691-a0aa-5ed50de66af0';
 
-export const TelemetryPixel = ({
+const TelemetryPixel = ({
   version = 'unknownVersion',
   sha = 'unknownSHA',
   build = 'unknownBuild',
@@ -56,3 +56,4 @@ export const TelemetryPixel = ({
     />
   );
 };
+export default TelemetryPixel;

superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx

@@ -0,0 +1,116 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { Dropdown, Icons } from '@superset-ui/core/components';
+import type { MenuItem } from '@superset-ui/core/components/Menu';
+import { t, useTheme } from '@superset-ui/core';
+import { ThemeAlgorithm, ThemeMode } from '../../theme/types';
+
+export interface ThemeSelectProps {
+  setThemeMode: (newMode: ThemeMode) => void;
+  tooltipTitle?: string;
+  themeMode: ThemeMode;
+  hasLocalOverride?: boolean;
+  onClearLocalSettings?: () => void;
+  allowOSPreference?: boolean;
+}
+
+const ThemeSelect: React.FC<ThemeSelectProps> = ({
+  setThemeMode,
+  tooltipTitle = 'Select theme',
+  themeMode,
+  hasLocalOverride = false,
+  onClearLocalSettings,
+  allowOSPreference = true,
+}) => {
+  const theme = useTheme();
+
+  const handleSelect = (mode: ThemeMode) => {
+    setThemeMode(mode);
+  };
+
+  const themeIconMap: Record<ThemeAlgorithm | ThemeMode, React.ReactNode> = {
+    [ThemeAlgorithm.DEFAULT]: <Icons.SunOutlined />,
+    [ThemeAlgorithm.DARK]: <Icons.MoonOutlined />,
+    [ThemeMode.SYSTEM]: <Icons.FormatPainterOutlined />,
+    [ThemeAlgorithm.COMPACT]: <Icons.CompressOutlined />,
+  };
+
+  // Use different icon when local theme is active
+  const triggerIcon = hasLocalOverride ? (
+    <Icons.FormatPainterOutlined style={{ color: theme.colorErrorText }} />
+  ) : (
+    themeIconMap[themeMode] || <Icons.FormatPainterOutlined />
+  );
+
+  const menuItems: MenuItem[] = [
+    {
+      type: 'group',
+      label: t('Theme'),
+    },
+    {
+      key: ThemeMode.DEFAULT,
+      label: t('Light'),
+      icon: <Icons.SunOutlined />,
+      onClick: () => handleSelect(ThemeMode.DEFAULT),
+    },
+    {
+      key: ThemeMode.DARK,
+      label: t('Dark'),
+      icon: <Icons.MoonOutlined />,
+      onClick: () => handleSelect(ThemeMode.DARK),
+    },
+    ...(allowOSPreference
+      ? [
+          {
+            key: ThemeMode.SYSTEM,
+            label: t('Match system'),
+            icon: <Icons.FormatPainterOutlined />,
+            onClick: () => handleSelect(ThemeMode.SYSTEM),
+          },
+        ]
+      : []),
+  ];
+
+  // Add clear settings option only when there's a local theme active
+  if (onClearLocalSettings && hasLocalOverride) {
+    menuItems.push(
+      { type: 'divider' } as MenuItem,
+      {
+        key: 'clear-local',
+        label: t('Clear local theme'),
+        icon: <Icons.ClearOutlined />,
+        onClick: onClearLocalSettings,
+      } as MenuItem,
+    );
+  }
+
+  return (
+    <Dropdown
+      menu={{
+        items: menuItems,
+        selectedKeys: [themeMode],
+      }}
+      trigger={['hover']}
+    >
+      {triggerIcon}
+    </Dropdown>
+  );
+};
+
+export default ThemeSelect;

superset-frontend/packages/superset-ui-core/src/components/ThemeSubMenu/ThemeSubMenu.test.tsx

@@ -1,273 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import {
-  render,
-  screen,
-  userEvent,
-  waitFor,
-  within,
-} from '@superset-ui/core/spec';
-import { ThemeMode } from '@superset-ui/core';
-import { Menu } from '@superset-ui/core/components';
-import { ThemeSubMenu } from '.';
-
-// Mock the translation function
-jest.mock('@superset-ui/core', () => ({
-  ...jest.requireActual('@superset-ui/core'),
-  t: (key: string) => key,
-}));
-
-describe('ThemeSubMenu', () => {
-  const defaultProps = {
-    allowOSPreference: true,
-    setThemeMode: jest.fn(),
-    themeMode: ThemeMode.DEFAULT,
-    hasLocalOverride: false,
-    onClearLocalSettings: jest.fn(),
-  };
-
-  const renderThemeSubMenu = (props = defaultProps) =>
-    render(
-      <Menu>
-        <ThemeSubMenu {...props} />
-      </Menu>,
-    );
-
-  const findMenuWithText = async (text: string) => {
-    await waitFor(() => {
-      const found = screen
-        .getAllByRole('menu')
-        .some(m => within(m).queryByText(text));
-
-      if (!found) throw new Error(`Menu with text "${text}" not yet rendered`);
-    });
-
-    return screen.getAllByRole('menu').find(m => within(m).queryByText(text))!;
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders Light and Dark theme options by default', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Light');
-
-    expect(within(menu!).getByText('Light')).toBeInTheDocument();
-    expect(within(menu!).getByText('Dark')).toBeInTheDocument();
-  });
-
-  it('does not render Match system option when allowOSPreference is false', async () => {
-    renderThemeSubMenu({ ...defaultProps, allowOSPreference: false });
-    userEvent.hover(await screen.findByRole('menuitem'));
-
-    await waitFor(() => {
-      expect(screen.queryByText('Match system')).not.toBeInTheDocument();
-    });
-  });
-
-  it('renders with allowOSPreference as true by default', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Match system');
-
-    expect(within(menu).getByText('Match system')).toBeInTheDocument();
-  });
-
-  it('renders clear option when both hasLocalOverride and onClearLocalSettings are provided', async () => {
-    const mockClear = jest.fn();
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: mockClear,
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Clear local theme');
-
-    expect(within(menu).getByText('Clear local theme')).toBeInTheDocument();
-  });
-
-  it('does not render clear option when hasLocalOverride is false', async () => {
-    const mockClear = jest.fn();
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: false,
-      onClearLocalSettings: mockClear,
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-
-    await waitFor(() => {
-      expect(screen.queryByText('Clear local theme')).not.toBeInTheDocument();
-    });
-  });
-
-  it('calls setThemeMode with DEFAULT when Light is clicked', async () => {
-    const mockSet = jest.fn();
-    renderThemeSubMenu({ ...defaultProps, setThemeMode: mockSet });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Light');
-    userEvent.click(within(menu).getByText('Light'));
-
-    expect(mockSet).toHaveBeenCalledWith(ThemeMode.DEFAULT);
-  });
-
-  it('calls setThemeMode with DARK when Dark is clicked', async () => {
-    const mockSet = jest.fn();
-    renderThemeSubMenu({ ...defaultProps, setThemeMode: mockSet });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Dark');
-    userEvent.click(within(menu).getByText('Dark'));
-
-    expect(mockSet).toHaveBeenCalledWith(ThemeMode.DARK);
-  });
-
-  it('calls setThemeMode with SYSTEM when Match system is clicked', async () => {
-    const mockSet = jest.fn();
-    renderThemeSubMenu({ ...defaultProps, setThemeMode: mockSet });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Match system');
-    userEvent.click(within(menu).getByText('Match system'));
-
-    expect(mockSet).toHaveBeenCalledWith(ThemeMode.SYSTEM);
-  });
-
-  it('calls onClearLocalSettings when Clear local theme is clicked', async () => {
-    const mockClear = jest.fn();
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: mockClear,
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Clear local theme');
-    userEvent.click(within(menu).getByText('Clear local theme'));
-
-    expect(mockClear).toHaveBeenCalledTimes(1);
-  });
-
-  it('displays sun icon for DEFAULT theme', () => {
-    renderThemeSubMenu({ ...defaultProps, themeMode: ThemeMode.DEFAULT });
-    expect(screen.getByTestId('sun')).toBeInTheDocument();
-  });
-
-  it('displays moon icon for DARK theme', () => {
-    renderThemeSubMenu({ ...defaultProps, themeMode: ThemeMode.DARK });
-    expect(screen.getByTestId('moon')).toBeInTheDocument();
-  });
-
-  it('displays format-painter icon for SYSTEM theme', () => {
-    renderThemeSubMenu({ ...defaultProps, themeMode: ThemeMode.SYSTEM });
-    expect(screen.getByTestId('format-painter')).toBeInTheDocument();
-  });
-
-  it('displays override icon when hasLocalOverride is true', () => {
-    renderThemeSubMenu({ ...defaultProps, hasLocalOverride: true });
-    expect(screen.getByTestId('format-painter')).toBeInTheDocument();
-  });
-
-  it('renders Theme group header', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Theme');
-
-    expect(within(menu).getByText('Theme')).toBeInTheDocument();
-  });
-
-  it('renders sun icon for Light theme option', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Light');
-    const lightOption = within(menu).getByText('Light').closest('li');
-
-    expect(within(lightOption!).getByTestId('sun')).toBeInTheDocument();
-  });
-
-  it('renders moon icon for Dark theme option', async () => {
-    renderThemeSubMenu();
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Dark');
-    const darkOption = within(menu).getByText('Dark').closest('li');
-
-    expect(within(darkOption!).getByTestId('moon')).toBeInTheDocument();
-  });
-
-  it('renders format-painter icon for Match system option', async () => {
-    renderThemeSubMenu({ ...defaultProps, allowOSPreference: true });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Match system');
-    const matchOption = within(menu).getByText('Match system').closest('li');
-
-    expect(
-      within(matchOption!).getByTestId('format-painter'),
-    ).toBeInTheDocument();
-  });
-
-  it('renders clear icon for Clear local theme option', async () => {
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: jest.fn(),
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const menu = await findMenuWithText('Clear local theme');
-    const clearOption = within(menu)
-      .getByText('Clear local theme')
-      .closest('li');
-
-    expect(within(clearOption!).getByTestId('clear')).toBeInTheDocument();
-  });
-
-  it('renders divider before clear option when clear option is present', async () => {
-    renderThemeSubMenu({
-      ...defaultProps,
-      hasLocalOverride: true,
-      onClearLocalSettings: jest.fn(),
-    });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-
-    const menu = await findMenuWithText('Clear local theme');
-    const divider = within(menu).queryByRole('separator');
-
-    expect(divider).toBeInTheDocument();
-  });
-
-  it('does not render divider when clear option is not present', async () => {
-    renderThemeSubMenu({ ...defaultProps });
-
-    userEvent.hover(await screen.findByRole('menuitem'));
-    const divider = document.querySelector('.ant-menu-item-divider');
-
-    expect(divider).toBeNull();
-  });
-});

superset-frontend/packages/superset-ui-core/src/components/ThemeSubMenu/index.tsx

@@ -1,170 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { useMemo } from 'react';
-import { Icons, Menu } from '@superset-ui/core/components';
-import {
-  css,
-  styled,
-  t,
-  ThemeMode,
-  useTheme,
-  ThemeAlgorithm,
-} from '@superset-ui/core';
-
-const StyledThemeSubMenu = styled(Menu.SubMenu)`
-  ${({ theme }) => css`
-    [data-icon='caret-down'] {
-      color: ${theme.colorIcon};
-      font-size: ${theme.fontSizeXS}px;
-      margin-left: ${theme.sizeUnit}px;
-    }
-    &.ant-menu-submenu-active {
-      .ant-menu-title-content {
-        color: ${theme.colorPrimary};
-      }
-    }
-  `}
-`;
-
-const StyledThemeSubMenuItem = styled(Menu.Item)<{ selected: boolean }>`
-  ${({ theme, selected }) => css`
-    &:hover {
-      color: ${theme.colorPrimary} !important;
-      cursor: pointer !important;
-    }
-    ${selected &&
-    css`
-      background-color: ${theme.colors.primary.light4} !important;
-      color: ${theme.colors.primary.dark1} !important;
-    `}
-  `}
-`;
-
-export interface ThemeSubMenuOption {
-  key: ThemeMode;
-  label: string;
-  icon: React.ReactNode;
-  onClick: () => void;
-}
-
-export interface ThemeSubMenuProps {
-  setThemeMode: (newMode: ThemeMode) => void;
-  themeMode: ThemeMode;
-  hasLocalOverride?: boolean;
-  onClearLocalSettings?: () => void;
-  allowOSPreference?: boolean;
-}
-
-export const ThemeSubMenu: React.FC<ThemeSubMenuProps> = ({
-  setThemeMode,
-  themeMode,
-  hasLocalOverride = false,
-  onClearLocalSettings,
-  allowOSPreference = true,
-}: ThemeSubMenuProps) => {
-  const theme = useTheme();
-
-  const handleSelect = (mode: ThemeMode) => {
-    setThemeMode(mode);
-  };
-
-  const themeIconMap: Record<ThemeAlgorithm | ThemeMode, React.ReactNode> =
-    useMemo(
-      () => ({
-        [ThemeAlgorithm.DEFAULT]: <Icons.SunOutlined />,
-        [ThemeAlgorithm.DARK]: <Icons.MoonOutlined />,
-        [ThemeMode.SYSTEM]: <Icons.FormatPainterOutlined />,
-        [ThemeAlgorithm.COMPACT]: <Icons.CompressOutlined />,
-      }),
-      [],
-    );
-
-  const selectedThemeModeIcon = useMemo(
-    () =>
-      hasLocalOverride ? (
-        <Icons.FormatPainterOutlined
-          style={{ color: theme.colors.error.base }}
-        />
-      ) : (
-        themeIconMap[themeMode]
-      ),
-    [hasLocalOverride, theme.colors.error.base, themeIconMap, themeMode],
-  );
-
-  const themeOptions: ThemeSubMenuOption[] = [
-    {
-      key: ThemeMode.DEFAULT,
-      label: t('Light'),
-      icon: <Icons.SunOutlined />,
-      onClick: () => handleSelect(ThemeMode.DEFAULT),
-    },
-    {
-      key: ThemeMode.DARK,
-      label: t('Dark'),
-      icon: <Icons.MoonOutlined />,
-      onClick: () => handleSelect(ThemeMode.DARK),
-    },
-    ...(allowOSPreference
-      ? [
-          {
-            key: ThemeMode.SYSTEM,
-            label: t('Match system'),
-            icon: <Icons.FormatPainterOutlined />,
-            onClick: () => handleSelect(ThemeMode.SYSTEM),
-          },
-        ]
-      : []),
-  ];
-
-  // Add clear settings option only when there's a local theme active
-  const clearOption =
-    onClearLocalSettings && hasLocalOverride
-      ? {
-          key: 'clear-local',
-          label: t('Clear local theme'),
-          icon: <Icons.ClearOutlined />,
-          onClick: onClearLocalSettings,
-        }
-      : null;
-
-  return (
-    <StyledThemeSubMenu
-      key="theme-sub-menu"
-      title={selectedThemeModeIcon}
-      icon={<Icons.CaretDownOutlined iconSize="xs" />}
-    >
-      <Menu.ItemGroup title={t('Theme')} />
-      {themeOptions.map(option => (
-        <StyledThemeSubMenuItem
-          key={option.key}
-          onClick={option.onClick}
-          selected={option.key === themeMode}
-        >
-          {option.icon} {option.label}
-        </StyledThemeSubMenuItem>
-      ))}
-      {clearOption && [
-        <Menu.Divider key="theme-divider" />,
-        <Menu.Item key={clearOption.key} onClick={clearOption.onClick}>
-          {clearOption.icon} {clearOption.label}
-        </Menu.Item>,
-      ]}
-    </StyledThemeSubMenu>
-  );
-};

superset-frontend/packages/superset-ui-core/src/components/UnsavedChangesModal/index.tsx

@@ -16,8 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { t } from '@superset-ui/core';
-import { Icons, Modal, Typography, Button } from '@superset-ui/core/components';
+import { t, css, useTheme } from '@superset-ui/core';
+import {
+  Icons,
+  Modal,
+  Typography,
+  Button,
+  Flex,
+} from '@superset-ui/core/components';
 import type { FC, ReactElement } from 'react';
 
 export type UnsavedChangesModalProps = {
@@ -36,30 +42,66 @@ export const UnsavedChangesModal: FC<UnsavedChangesModalProps> = ({
   onConfirmNavigation,
   title = 'Unsaved Changes',
   body = "If you don't save, changes will be lost.",
-}: UnsavedChangesModalProps): ReactElement => (
-  <Modal
-    centered
-    responsive
-    onHide={onHide}
-    show={showModal}
-    width="444px"
-    title={
-      <>
-        <Icons.WarningOutlined iconSize="m" style={{ marginRight: 8 }} />
-        {title}
-      </>
-    }
-    footer={
-      <>
-        <Button buttonStyle="secondary" onClick={onConfirmNavigation}>
-          {t('Discard')}
-        </Button>
-        <Button buttonStyle="primary" onClick={handleSave}>
-          {t('Save')}
-        </Button>
-      </>
-    }
-  >
-    <Typography.Text>{body}</Typography.Text>
-  </Modal>
-);
+}): ReactElement => {
+  const theme = useTheme();
+
+  return (
+    <Modal
+      name={title}
+      centered
+      responsive
+      onHide={onHide}
+      show={showModal}
+      width="444px"
+      title={
+        <Flex>
+          <Icons.WarningOutlined
+            iconColor={theme.colorWarning}
+            css={css`
+              margin-right: ${theme.sizeUnit * 2}px;
+            `}
+            iconSize="l"
+          />
+          <Typography.Title
+            css={css`
+              && {
+                margin: 0;
+                margin-bottom: 0;
+              }
+            `}
+            level={5}
+          >
+            {title}
+          </Typography.Title>
+        </Flex>
+      }
+      footer={
+        <Flex
+          justify="flex-end"
+          css={css`
+            width: 100%;
+          `}
+        >
+          <Button
+            htmlType="button"
+            buttonSize="small"
+            buttonStyle="secondary"
+            onClick={onConfirmNavigation}
+          >
+            {t('Discard')}
+          </Button>
+          <Button
+            htmlType="button"
+            buttonSize="small"
+            buttonStyle="primary"
+            onClick={handleSave}
+          >
+            {t('Save')}
+          </Button>
+        </Flex>
+      }
+    >
+      <Typography.Text>{body}</Typography.Text>
+    </Modal>
+  );
+};

superset-frontend/packages/superset-ui-core/src/components/index.ts

@@ -164,8 +164,6 @@ export * from './Steps';
 export * from './Table';
 export * from './TableView';
 export * from './Tag';
-export * from './TelemetryPixel';
-export * from './ThemeSubMenu';
 export * from './UnsavedChangesModal';
 export * from './constants';
 export * from './Result';

superset-frontend/packages/superset-ui-core/src/theme/index.tsx

@@ -26,9 +26,7 @@ import {
   type ThemeStorage,
   type ThemeControllerOptions,
   type ThemeContextType,
-  type SupersetThemeConfig,
   ThemeAlgorithm,
-  ThemeMode,
 } from './types';
 
 export {
@@ -68,16 +66,7 @@ const themeObject: Theme = Theme.fromConfig({
 const { theme } = themeObject;
 const supersetTheme = theme;
 
-export {
-  Theme,
-  ThemeAlgorithm,
-  ThemeMode,
-  themeObject,
-  styled,
-  theme,
-  supersetTheme,
-};
-
+export { Theme, themeObject, styled, theme, supersetTheme };
 export type {
   SupersetTheme,
   SerializableThemeConfig,
@@ -85,7 +74,6 @@ export type {
   ThemeStorage,
   ThemeControllerOptions,
   ThemeContextType,
-  SupersetThemeConfig,
 };
 
 // Export theme utility functions

superset-frontend/packages/superset-ui-core/src/theme/types.ts

@@ -429,16 +429,3 @@ export interface ThemeContextType {
   canDetectOSPreference: () => boolean;
   createDashboardThemeProvider: (themeId: string) => Promise<Theme | null>;
 }
-
-/**
- * Configuration object for complete theme setup including default, dark themes and settings
- */
-export interface SupersetThemeConfig {
-  theme_default: AnyThemeConfig;
-  theme_dark?: AnyThemeConfig;
-  theme_settings?: {
-    enforced?: boolean;
-    allowSwitching?: boolean;
-    allowOSPreference?: boolean;
-  };
-}

superset-frontend/packages/superset-ui-core/test/chart/models/ChartProps.test.ts

@@ -119,7 +119,7 @@ describe('ChartProps', () => {
       });
       expect(props1).not.toBe(props2);
     });
-    it('selector returns a new chartProps if some input fields change and returns memoized chart props', () => {
+    it('selector returns a new chartProps if some input fields change', () => {
       const props1 = selector({
         width: 800,
         height: 600,
@@ -145,7 +145,7 @@ describe('ChartProps', () => {
         theme: supersetTheme,
       });
       expect(props1).not.toBe(props2);
-      expect(props1).toBe(props3);
+      expect(props1).not.toBe(props3);
     });
   });
 });

superset-frontend/plugins/legacy-plugin-chart-parallel-coordinates/src/vendor/parcoords/d3.parcoords.js

@@ -1385,7 +1385,7 @@ export default function (config) {
         p[0] = p[0] - __.margin.left;
         p[1] = p[1] - __.margin.top;
 
-        ((dims = dimensionsForPoint(p)),
+        (dims = dimensionsForPoint(p)),
           (strum = {
             p1: p,
             dims: dims,
@@ -1393,7 +1393,7 @@ export default function (config) {
             maxX: xscale(dims.right),
             minY: 0,
             maxY: h(),
-          }));
+          });
 
         strums[dims.i] = strum;
         strums.active = dims.i;
@@ -1942,7 +1942,7 @@ export default function (config) {
         p[0] = p[0] - __.margin.left;
         p[1] = p[1] - __.margin.top;
 
-        ((dims = dimensionsForPoint(p)),
+        (dims = dimensionsForPoint(p)),
           (arc = {
             p1: p,
             dims: dims,
@@ -1953,7 +1953,7 @@ export default function (config) {
             startAngle: undefined,
             endAngle: undefined,
             arc: d3.svg.arc().innerRadius(0),
-          }));
+          });
 
         arcs[dims.i] = arc;
         arcs.active = dims.i;

superset-frontend/plugins/plugin-chart-ag-grid-table/package.json

@@ -27,8 +27,8 @@
     "@react-icons/all-files": "^4.1.0",
     "@types/d3-array": "^2.9.0",
     "@types/react-table": "^7.7.20",
-    "ag-grid-community": "^34.0.2",
-    "ag-grid-react": "^34.0.2",
+    "ag-grid-community": "^33.1.1",
+    "ag-grid-react": "^33.1.1",
     "classnames": "^2.5.1",
     "d3-array": "^2.4.0",
     "lodash": "^4.17.21",

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.test.ts

@@ -49,53 +49,38 @@ describe('BigNumberWithTrendline buildQuery', () => {
     aggregation: null,
   };
 
-  it('creates raw metric query when aggregation is "raw"', () => {
-    const queryContext = buildQuery({ ...baseFormData, aggregation: 'raw' });
+  it('creates raw metric query when aggregation is null', () => {
+    const queryContext = buildQuery({ ...baseFormData });
     const bigNumberQuery = queryContext.queries[1];
 
-    expect(bigNumberQuery.post_processing).toEqual([]);
-    expect(bigNumberQuery.is_timeseries).toBe(false);
-    expect(bigNumberQuery.columns).toEqual([]);
+    expect(bigNumberQuery.post_processing).toEqual([{ operation: 'pivot' }]);
+    expect(bigNumberQuery.is_timeseries).toBe(true);
   });
 
-  it('returns single query for aggregation methods that can be computed client-side', () => {
+  it('adds aggregation operator when aggregation is "sum"', () => {
     const queryContext = buildQuery({ ...baseFormData, aggregation: 'sum' });
+    const bigNumberQuery = queryContext.queries[1];
 
-    expect(queryContext.queries.length).toBe(1);
-    expect(queryContext.queries[0].post_processing).toEqual([
+    expect(bigNumberQuery.post_processing).toEqual([
       { operation: 'pivot' },
-      { operation: 'rolling' },
-      { operation: 'resample' },
-      { operation: 'flatten' },
+      { operation: 'aggregation', options: { operator: 'sum' } },
     ]);
+    expect(bigNumberQuery.is_timeseries).toBe(true);
   });
 
-  it('returns single query for LAST_VALUE aggregation', () => {
+  it('skips aggregation when aggregation is LAST_VALUE', () => {
     const queryContext = buildQuery({
       ...baseFormData,
       aggregation: 'LAST_VALUE',
     });
+    const bigNumberQuery = queryContext.queries[1];
 
-    expect(queryContext.queries.length).toBe(1);
-    expect(queryContext.queries[0].post_processing).toEqual([
-      { operation: 'pivot' },
-      { operation: 'rolling' },
-      { operation: 'resample' },
-      { operation: 'flatten' },
-    ]);
+    expect(bigNumberQuery.post_processing).toEqual([{ operation: 'pivot' }]);
+    expect(bigNumberQuery.is_timeseries).toBe(true);
   });
 
-  it('returns two queries only for raw aggregation', () => {
-    const queryContext = buildQuery({ ...baseFormData, aggregation: 'raw' });
+  it('always returns two queries', () => {
+    const queryContext = buildQuery({ ...baseFormData });
     expect(queryContext.queries.length).toBe(2);
-
-    const queryContextLastValue = buildQuery({
-      ...baseFormData,
-      aggregation: 'LAST_VALUE',
-    });
-    expect(queryContextLastValue.queries.length).toBe(1);
-
-    const queryContextSum = buildQuery({ ...baseFormData, aggregation: 'sum' });
-    expect(queryContextSum.queries.length).toBe(1);
   });
 });

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.ts

@@ -39,37 +39,28 @@ export default function buildQuery(formData: QueryFormData) {
     ? ensureIsArray(getXAxisColumn(formData))
     : [];
 
-  return buildQueryContext(formData, baseQueryObject => {
-    const queries = [
-      {
-        ...baseQueryObject,
-        columns: [...timeColumn],
-        ...(timeColumn.length ? {} : { is_timeseries: true }),
-        post_processing: [
-          pivotOperator(formData, baseQueryObject),
-          rollingWindowOperator(formData, baseQueryObject),
-          resampleOperator(formData, baseQueryObject),
-          flattenOperator(formData, baseQueryObject),
-        ].filter(Boolean),
-      },
-    ];
-
-    // Only add second query for raw metrics which need different query structure
-    // All other aggregations (sum, mean, min, max, median, LAST_VALUE) can be computed client-side from trendline data
-    if (formData.aggregation === 'raw') {
-      queries.push({
-        ...baseQueryObject,
-        columns: [...(isRawMetric ? [] : timeColumn)],
-        is_timeseries: !isRawMetric,
-        post_processing: isRawMetric
-          ? []
-          : ([
-              pivotOperator(formData, baseQueryObject),
-              aggregationOperator(formData, baseQueryObject),
-            ].filter(Boolean) as any[]),
-      });
-    }
-
-    return queries;
-  });
+  return buildQueryContext(formData, baseQueryObject => [
+    {
+      ...baseQueryObject,
+      columns: [...timeColumn],
+      ...(timeColumn.length ? {} : { is_timeseries: true }),
+      post_processing: [
+        pivotOperator(formData, baseQueryObject),
+        rollingWindowOperator(formData, baseQueryObject),
+        resampleOperator(formData, baseQueryObject),
+        flattenOperator(formData, baseQueryObject),
+      ],
+    },
+    {
+      ...baseQueryObject,
+      columns: [...(isRawMetric ? [] : timeColumn)],
+      is_timeseries: !isRawMetric,
+      post_processing: isRawMetric
+        ? []
+        : [
+            pivotOperator(formData, baseQueryObject),
+            aggregationOperator(formData, baseQueryObject),
+          ],
+    },
+  ]);
 }

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts

@@ -20,41 +20,6 @@ import { GenericDataType } from '@superset-ui/core';
 import transformProps from './transformProps';
 import { BigNumberWithTrendlineChartProps, BigNumberDatum } from '../types';
 
-// Mock chart-controls to avoid styled-components issues in Jest
-jest.mock('@superset-ui/chart-controls', () => ({
-  aggregationChoices: {
-    raw: {
-      label: 'Force server-side aggregation',
-      compute: (data: number[]) => data[0] ?? null,
-    },
-    LAST_VALUE: {
-      label: 'Last Value',
-      compute: (data: number[]) => data[0] ?? null,
-    },
-    sum: {
-      label: 'Total (Sum)',
-      compute: (data: number[]) => data.reduce((a, b) => a + b, 0),
-    },
-    mean: {
-      label: 'Average (Mean)',
-      compute: (data: number[]) =>
-        data.reduce((a, b) => a + b, 0) / data.length,
-    },
-    min: { label: 'Minimum', compute: (data: number[]) => Math.min(...data) },
-    max: { label: 'Maximum', compute: (data: number[]) => Math.max(...data) },
-    median: {
-      label: 'Median',
-      compute: (data: number[]) => {
-        const sorted = [...data].sort((a, b) => a - b);
-        const mid = Math.floor(sorted.length / 2);
-        return sorted.length % 2 === 0
-          ? (sorted[mid - 1] + sorted[mid]) / 2
-          : sorted[mid];
-      },
-    },
-  },
-}));
-
 jest.mock('@superset-ui/core', () => ({
   GenericDataType: { Temporal: 2, String: 1 },
   extractTimegrain: jest.fn(() => 'P1D'),
@@ -253,7 +218,7 @@ describe('BigNumberWithTrendline transformProps', () => {
           coltypes: ['NUMERIC'],
         },
       ],
-      formData: { ...baseFormData, aggregation: 'sum' },
+      formData: { ...baseFormData, aggregation: 'SUM' },
       rawFormData: baseRawFormData,
       hooks: baseHooks,
       datasource: baseDatasource,

superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts

@@ -29,7 +29,6 @@ import {
   tooltipHtml,
 } from '@superset-ui/core';
 import { EChartsCoreOption, graphic } from 'echarts/core';
-import { aggregationChoices } from '@superset-ui/chart-controls';
 import {
   BigNumberVizProps,
   BigNumberDatum,
@@ -44,31 +43,6 @@ const formatPercentChange = getNumberFormatter(
   NumberFormats.PERCENT_SIGNED_1_POINT,
 );
 
-// Client-side aggregation function using shared aggregationChoices
-function computeClientSideAggregation(
-  data: [number | null, number | null][],
-  aggregation: string | undefined | null,
-): number | null {
-  if (!data.length) return null;
-
-  // Find the aggregation method, handling case variations
-  const methodKey = Object.keys(aggregationChoices).find(
-    key => key.toLowerCase() === (aggregation || '').toLowerCase(),
-  );
-
-  // Use the compute method from aggregationChoices, fallback to LAST_VALUE
-  const selectedMethod = methodKey
-    ? aggregationChoices[methodKey as keyof typeof aggregationChoices]
-    : aggregationChoices.LAST_VALUE;
-
-  // Extract values from tuple array and filter out nulls
-  const values = data
-    .map(([, value]) => value)
-    .filter((v): v is number => v !== null);
-
-  return selectedMethod.compute(values);
-}
-
 export default function transformProps(
   chartProps: BigNumberWithTrendlineChartProps,
 ): BigNumberVizProps {
@@ -152,33 +126,27 @@ export default function transformProps(
       // sort in time descending order
       .sort((a, b) => (a[0] !== null && b[0] !== null ? b[0] - a[0] : 0));
   }
-  if (sortedData.length > 0) {
-    timestamp = sortedData[0][0];
-
-    // Raw aggregation uses server-side data, all others use client-side
-    if (aggregation === 'raw' && hasAggregatedData && aggregatedData) {
-      // Use server-side aggregation for raw
-      if (
-        aggregatedData[metricName] !== null &&
-        aggregatedData[metricName] !== undefined
-      ) {
-        bigNumber = aggregatedData[metricName];
-      } else {
-        const metricKeys = Object.keys(aggregatedData).filter(
-          key =>
-            key !== xAxisLabel &&
-            aggregatedData[key] !== null &&
-            typeof aggregatedData[key] === 'number',
-        );
-        bigNumber =
-          metricKeys.length > 0 ? aggregatedData[metricKeys[0]] : null;
-      }
+  if (hasAggregatedData && aggregatedData) {
+    if (
+      aggregatedData[metricName] !== null &&
+      aggregatedData[metricName] !== undefined
+    ) {
+      bigNumber = aggregatedData[metricName];
     } else {
-      // Use client-side aggregation for all other methods
-      bigNumber = computeClientSideAggregation(sortedData, aggregation);
+      const metricKeys = Object.keys(aggregatedData).filter(
+        key =>
+          key !== xAxisLabel &&
+          aggregatedData[key] !== null &&
+          typeof aggregatedData[key] === 'number',
+      );
+      bigNumber = metricKeys.length > 0 ? aggregatedData[metricKeys[0]] : null;
     }
 
-    // Handle null bigNumber case
+    timestamp = sortedData.length > 0 ? sortedData[0][0] : null;
+  } else if (sortedData.length > 0) {
+    bigNumber = sortedData[0][1];
+    timestamp = sortedData[0][0];
+
     if (bigNumber === null) {
       bigNumberFallback = sortedData.find(d => d[1] !== null);
       bigNumber = bigNumberFallback ? bigNumberFallback[1] : null;

superset-frontend/plugins/plugin-chart-echarts/test/BigNumber/transformProps.test.ts

@@ -128,10 +128,9 @@ describe('BigNumberWithTrendline', () => {
       expect(lastDatum?.[0]).toStrictEqual(100);
       expect(lastDatum?.[1]).toBeNull();
 
-      // should get the last non-null value
+      // should note this is a fallback
       expect(transformed.bigNumber).toStrictEqual(1.2345);
-      // bigNumberFallback is only set when bigNumber is null after aggregation
-      expect(transformed.bigNumberFallback).toBeNull();
+      expect(transformed.bigNumberFallback).not.toBeNull();
 
       // should successfully formatTime by granularity
       // @ts-ignore

superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx

@@ -34,12 +34,6 @@ const parseLabel = value => {
   return String(value);
 };
 
-function displayCell(value, allowRenderHtml) {
-  if (allowRenderHtml && typeof value === 'string') {
-    return safeHtmlSpan(value);
-  }
-  return parseLabel(value);
-}
 function displayHeaderCell(
   needToggle,
   ArrowIcon,
@@ -748,7 +742,7 @@ export class TableRenderer extends Component {
           onContextMenu={e => this.props.onContextMenu(e, colKey, rowKey)}
           style={style}
         >
-          {displayCell(agg.format(aggValue), allowRenderHtml)}
+          {agg.format(aggValue)}
         </td>
       );
     });
@@ -765,7 +759,7 @@ export class TableRenderer extends Component {
           onClick={rowTotalCallbacks[flatRowKey]}
           onContextMenu={e => this.props.onContextMenu(e, undefined, rowKey)}
         >
-          {displayCell(agg.format(aggValue), allowRenderHtml)}
+          {agg.format(aggValue)}
         </td>
       );
     }
@@ -829,7 +823,7 @@ export class TableRenderer extends Component {
           onContextMenu={e => this.props.onContextMenu(e, colKey, undefined)}
           style={{ padding: '5px' }}
         >
-          {displayCell(agg.format(aggValue), this.props.allowRenderHtml)}
+          {agg.format(aggValue)}
         </td>
       );
     });
@@ -846,7 +840,7 @@ export class TableRenderer extends Component {
           onClick={grandTotalCallback}
           onContextMenu={e => this.props.onContextMenu(e, undefined, undefined)}
         >
-          {displayCell(agg.format(aggValue), this.props.allowRenderHtml)}
+          {agg.format(aggValue)}
         </td>
       );
     }

superset-frontend/src/components/Chart/chartAction.js

@@ -164,7 +164,7 @@ const v1ChartDataRequest = async (
   ownState,
   parseMethod,
 ) => {
-  const payload = await buildV1ChartDataPayload({
+  const payload = buildV1ChartDataPayload({
     formData,
     resultType,
     resultFormat,
@@ -255,7 +255,7 @@ export function runAnnotationQuery({
   isDashboardRequest = false,
   force = false,
 }) {
-  return async function (dispatch, getState) {
+  return function (dispatch, getState) {
     const { charts, common } = getState();
     const sliceKey = key || Object.keys(charts)[0];
     const queryTimeout = timeout || common.conf.SUPERSET_WEBSERVER_TIMEOUT;
@@ -310,19 +310,17 @@ export function runAnnotationQuery({
       fd.annotation_layers[annotationIndex].overrides = sliceFormData;
     }
 
-    const payload = await buildV1ChartDataPayload({
-      formData: fd,
-      force,
-      resultFormat: 'json',
-      resultType: 'full',
-    });
-
     return SupersetClient.post({
       url,
       signal,
       timeout: queryTimeout * 1000,
       headers: { 'Content-Type': 'application/json' },
-      jsonPayload: payload,
+      jsonPayload: buildV1ChartDataPayload({
+        formData: fd,
+        force,
+        resultFormat: 'json',
+        resultType: 'full',
+      }),
     })
       .then(({ json }) => {
         const data = json?.result?.[0]?.annotation_data?.[annotation.name];
@@ -422,8 +420,6 @@ export function exploreJSON(
     const setDataMask = dataMask => {
       dispatch(updateDataMask(formData.slice_id, dataMask));
     };
-    dispatch(chartUpdateStarted(controller, formData, key));
-
     const chartDataRequest = getChartDataRequest({
       setDataMask,
       formData,
@@ -435,6 +431,8 @@ export function exploreJSON(
       ownState,
     });
 
+    dispatch(chartUpdateStarted(controller, formData, key));
+
     const [useLegacyApi] = getQuerySettings(formData);
     const chartDataRequestCaught = chartDataRequest
       .then(({ response, json }) =>

superset-frontend/src/components/Chart/chartActions.test.js

@@ -64,7 +64,6 @@ describe('chart actions', () => {
   let dispatch;
   let getExploreUrlStub;
   let getChartDataUriStub;
-  let buildV1ChartDataPayloadStub;
   let waitForAsyncDataStub;
   let fakeMetadata;
 
@@ -86,13 +85,6 @@ describe('chart actions', () => {
     getChartDataUriStub = sinon
       .stub(exploreUtils, 'getChartDataUri')
       .callsFake(({ qs }) => URI(MOCK_URL).query(qs));
-    buildV1ChartDataPayloadStub = sinon
-      .stub(exploreUtils, 'buildV1ChartDataPayload')
-      .resolves({
-        some_param: 'fake query!',
-        result_type: 'full',
-        result_format: 'json',
-      });
     fakeMetadata = { useLegacyApi: true };
     getChartMetadataRegistry.mockImplementation(() => ({
       get: () => fakeMetadata,
@@ -112,7 +104,6 @@ describe('chart actions', () => {
   afterEach(() => {
     getExploreUrlStub.restore();
     getChartDataUriStub.restore();
-    buildV1ChartDataPayloadStub.restore();
     fetchMock.resetHistory();
     waitForAsyncDataStub.restore();
 
@@ -371,7 +362,7 @@ describe('chart actions timeout', () => {
     jest.clearAllMocks();
   });
 
-  it('should use the timeout from arguments when given', async () => {
+  it('should use the timeout from arguments when given', () => {
     const postSpy = jest.spyOn(SupersetClient, 'post');
     postSpy.mockImplementation(() => Promise.resolve({ json: { result: [] } }));
     const timeout = 10; // Set the timeout value here
@@ -379,7 +370,7 @@ describe('chart actions timeout', () => {
     const key = 'chartKey'; // Set the chart key here
 
     const store = mockStore(initialState);
-    await store.dispatch(
+    store.dispatch(
       actions.runAnnotationQuery({
         annotation: {
           value: 'annotationValue',
@@ -403,14 +394,14 @@ describe('chart actions timeout', () => {
     expect(postSpy).toHaveBeenCalledWith(expectedPayload);
   });
 
-  it('should use the timeout from common.conf when not passed as an argument', async () => {
+  it('should use the timeout from common.conf when not passed as an argument', () => {
     const postSpy = jest.spyOn(SupersetClient, 'post');
     postSpy.mockImplementation(() => Promise.resolve({ json: { result: [] } }));
     const formData = { datasource: 'table__1' }; // Set the formData here
     const key = 'chartKey'; // Set the chart key here
 
     const store = mockStore(initialState);
-    await store.dispatch(
+    store.dispatch(
       actions.runAnnotationQuery({
         annotation: {
           value: 'annotationValue',

superset-frontend/src/embedded/EmbeddedContextProviders.tsx

@@ -1,93 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { Route } from 'react-router-dom';
-import { getExtensionsRegistry } from '@superset-ui/core';
-import { Provider as ReduxProvider } from 'react-redux';
-import { QueryParamProvider } from 'use-query-params';
-import { DndProvider } from 'react-dnd';
-import { HTML5Backend } from 'react-dnd-html5-backend';
-import { FlashProvider, DynamicPluginProvider } from 'src/components';
-import { EmbeddedUiConfigProvider } from 'src/components/UiConfigContext';
-import { SupersetThemeProvider } from 'src/theme/ThemeProvider';
-import { ThemeController } from 'src/theme/ThemeController';
-import type { ThemeStorage } from '@superset-ui/core';
-import { store } from 'src/views/store';
-import getBootstrapData from 'src/utils/getBootstrapData';
-
-/**
- * In-memory implementation of ThemeStorage interface for embedded contexts.
- * Persistent storage is not required for embedded dashboards.
- */
-class ThemeMemoryStorageAdapter implements ThemeStorage {
-  private storage = new Map<string, string>();
-
-  getItem(key: string): string | null {
-    return this.storage.get(key) || null;
-  }
-
-  setItem(key: string, value: string): void {
-    this.storage.set(key, value);
-  }
-
-  removeItem(key: string): void {
-    this.storage.delete(key);
-  }
-}
-
-const themeController = new ThemeController({
-  storage: new ThemeMemoryStorageAdapter(),
-});
-
-export const getThemeController = (): ThemeController => themeController;
-
-const { common } = getBootstrapData();
-const extensionsRegistry = getExtensionsRegistry();
-
-export const EmbeddedContextProviders: React.FC = ({ children }) => {
-  const RootContextProviderExtension = extensionsRegistry.get(
-    'root.context.provider',
-  );
-
-  return (
-    <SupersetThemeProvider themeController={themeController}>
-      <ReduxProvider store={store}>
-        <DndProvider backend={HTML5Backend}>
-          <FlashProvider messages={common.flash_messages}>
-            <EmbeddedUiConfigProvider>
-              <DynamicPluginProvider>
-                <QueryParamProvider
-                  ReactRouterRoute={Route}
-                  stringifyOptions={{ encode: false }}
-                >
-                  {RootContextProviderExtension ? (
-                    <RootContextProviderExtension>
-                      {children}
-                    </RootContextProviderExtension>
-                  ) : (
-                    children
-                  )}
-                </QueryParamProvider>
-              </DynamicPluginProvider>
-            </EmbeddedUiConfigProvider>
-          </FlashProvider>
-        </DndProvider>
-      </ReduxProvider>
-    </SupersetThemeProvider>
-  );
-};

superset-frontend/src/embedded/index.tsx

@@ -21,27 +21,20 @@ import 'src/public-path';
 import { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route } from 'react-router-dom';
-import {
-  type SupersetThemeConfig,
-  makeApi,
-  t,
-  logging,
-} from '@superset-ui/core';
+import { makeApi, t, logging, themeObject } from '@superset-ui/core';
 import Switchboard from '@superset-ui/switchboard';
 import getBootstrapData, { applicationRoot } from 'src/utils/getBootstrapData';
 import setupClient from 'src/setup/setupClient';
 import setupPlugins from 'src/setup/setupPlugins';
 import { useUiConfig } from 'src/components/UiConfigContext';
+import { RootContextProviders } from 'src/views/RootContextProviders';
 import { store, USER_LOADED } from 'src/views/store';
 import { Loading } from '@superset-ui/core/components';
 import { ErrorBoundary } from 'src/components';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import ToastContainer from 'src/components/MessageToasts/ToastContainer';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
-import {
-  EmbeddedContextProviders,
-  getThemeController,
-} from './EmbeddedContextProviders';
+import { AnyThemeConfig } from 'packages/superset-ui-core/src/theme/types';
 import { embeddedApi } from './api';
 import { getDataMaskChangeTrigger } from './utils';
 
@@ -51,7 +44,9 @@ const debugMode = process.env.WEBPACK_MODE === 'development';
 const bootstrapData = getBootstrapData();
 
 function log(...info: unknown[]) {
-  if (debugMode) logging.debug(`[superset]`, ...info);
+  if (debugMode) {
+    logging.debug(`[superset]`, ...info);
+  }
 }
 
 const LazyDashboardPage = lazy(
@@ -90,12 +85,12 @@ const EmbededLazyDashboardPage = () => {
 
 const EmbeddedRoute = () => (
   <Suspense fallback={<Loading />}>
-    <EmbeddedContextProviders>
+    <RootContextProviders>
       <ErrorBoundary>
         <EmbededLazyDashboardPage />
       </ErrorBoundary>
       <ToastContainer position="top" />
-    </EmbeddedContextProviders>
+    </RootContextProviders>
   </Suspense>
 );
 
@@ -250,13 +245,12 @@ window.addEventListener('message', function embeddedPageInitializer(event) {
     Switchboard.defineMethod('getDataMask', embeddedApi.getDataMask);
     Switchboard.defineMethod(
       'setThemeConfig',
-      (payload: { themeConfig: SupersetThemeConfig }) => {
+      (payload: { themeConfig: AnyThemeConfig }) => {
         const { themeConfig } = payload;
         log('Received setThemeConfig request:', themeConfig);
 
         try {
-          const themeController = getThemeController();
-          themeController.setThemeConfig(themeConfig);
+          themeObject.setConfig(themeConfig);
           return { success: true, message: 'Theme applied' };
         } catch (error) {
           logging.error('Failed to apply theme config:', error);
@@ -264,22 +258,8 @@ window.addEventListener('message', function embeddedPageInitializer(event) {
         }
       },
     );
-
     Switchboard.start();
   }
 });
 
-// Clean up theme controller on page unload
-window.addEventListener('beforeunload', () => {
-  try {
-    const controller = getThemeController();
-    if (controller) {
-      log('Destroying theme controller');
-      controller.destroy();
-    }
-  } catch (error) {
-    logging.warn('Failed to destroy theme controller:', error);
-  }
-});
-
 log('embed page is ready to receive messages');

superset-frontend/src/explore/components/controls/ViewQuery.test.tsx

@@ -91,7 +91,7 @@ afterEach(() => {
 });
 
 const getFormatSwitch = () =>
-  screen.getByRole('switch', { name: 'formatted original' });
+  screen.getByRole('switch', { name: 'Show original SQL' });
 
 test('renders the component with Formatted SQL and buttons', async () => {
   const { container } = setup(mockProps);

superset-frontend/src/explore/components/controls/ViewQuery.tsx

@@ -26,17 +26,11 @@ import {
 } from 'react';
 import { useSelector } from 'react-redux';
 import rison from 'rison';
-import { styled, SupersetClient, t, useTheme } from '@superset-ui/core';
-import {
-  Icons,
-  Switch,
-  Button,
-  Skeleton,
-  Card,
-  Space,
-} from '@superset-ui/core/components';
+import { styled, SupersetClient, t } from '@superset-ui/core';
+import { Icons, Switch, Button, Skeleton } from '@superset-ui/core/components';
 import { CopyToClipboard } from 'src/components';
 import { RootState } from 'src/dashboard/types';
+import { CopyButton } from 'src/explore/components/DataTableControl';
 import { findPermission } from 'src/utils/findPermission';
 import CodeSyntaxHighlighter, {
   SupportedLanguage,
@@ -44,6 +38,14 @@ import CodeSyntaxHighlighter, {
 } from '@superset-ui/core/components/CodeSyntaxHighlighter';
 import { useHistory } from 'react-router-dom';
 
+const CopyButtonViewQuery = styled(CopyButton)`
+  ${({ theme }) => `
+		&& {
+			margin: 0 0 ${theme.sizeUnit}px;
+		}
+  `}
+`;
+
 export interface ViewQueryProps {
   sql: string;
   datasource: string;
@@ -56,14 +58,26 @@ const StyledSyntaxContainer = styled.div`
   flex-direction: column;
 `;
 
+const StyledHeaderMenuContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin-top: ${({ theme }) => -theme.sizeUnit * 4}px;
+  align-items: flex-end;
+`;
+
+const StyledHeaderActionContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  column-gap: ${({ theme }) => theme.sizeUnit * 2}px;
+`;
+
 const StyledThemedSyntaxHighlighter = styled(CodeSyntaxHighlighter)`
   flex: 1;
 `;
 
-const StyledFooter = styled.div`
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+const StyledLabel = styled.label`
+  font-size: ${({ theme }) => theme.fontSize}px;
 `;
 
 const DATASET_BACKEND_QUERY = {
@@ -73,7 +87,6 @@ const DATASET_BACKEND_QUERY = {
 
 const ViewQuery: FC<ViewQueryProps> = props => {
   const { sql, language = 'sql', datasource } = props;
-  const theme = useTheme();
   const datasetId = datasource.split('__')[0];
   const [formattedSQL, setFormattedSQL] = useState<string>();
   const [showFormatSQL, setShowFormatSQL] = useState(true);
@@ -140,57 +153,46 @@ const ViewQuery: FC<ViewQueryProps> = props => {
   }, [sql]);
 
   return (
-    <Card bodyStyle={{ padding: theme.sizeUnit * 4 }}>
-      <StyledSyntaxContainer key={sql}>
-        {!formattedSQL && <Skeleton active />}
-        {formattedSQL && (
-          <StyledThemedSyntaxHighlighter
-            language={language}
-            customStyle={{ flex: 1, marginBottom: theme.sizeUnit * 3 }}
-          >
-            {currentSQL}
-          </StyledThemedSyntaxHighlighter>
-        )}
-
-        <StyledFooter>
-          <Space size={theme.sizeUnit * 2}>
-            <CopyToClipboard
-              text={currentSQL}
-              shouldShowText={false}
-              copyNode={
-                <Button
-                  buttonStyle="secondary"
-                  buttonSize="small"
-                  icon={<Icons.CopyOutlined />}
-                >
-                  {t('Copy')}
-                </Button>
-              }
-            />
-            {canAccessSQLLab && (
-              <Button
-                buttonStyle="secondary"
+    <StyledSyntaxContainer key={sql}>
+      <StyledHeaderMenuContainer>
+        <StyledHeaderActionContainer>
+          <CopyToClipboard
+            text={currentSQL}
+            shouldShowText={false}
+            copyNode={
+              <CopyButtonViewQuery
                 buttonSize="small"
-                onClick={navToSQLLab}
+                icon={<Icons.CopyOutlined />}
               >
-                {t('View in SQL Lab')}
-              </Button>
-            )}
-          </Space>
-
-          <Space size={theme.sizeUnit * 2} align="center">
-            <Icons.ConsoleSqlOutlined />
-            <Switch
-              id="formatSwitch"
-              checked={showFormatSQL}
-              onChange={formatCurrentQuery}
-              checkedChildren={t('formatted')}
-              unCheckedChildren={t('original')}
-            />
-          </Space>
-        </StyledFooter>
-      </StyledSyntaxContainer>
-    </Card>
+                {t('Copy')}
+              </CopyButtonViewQuery>
+            }
+          />
+          {canAccessSQLLab && (
+            <Button onClick={navToSQLLab}>{t('View in SQL Lab')}</Button>
+          )}
+        </StyledHeaderActionContainer>
+        <StyledHeaderActionContainer>
+          <Switch
+            id="formatSwitch"
+            checked={!showFormatSQL}
+            onChange={formatCurrentQuery}
+          />
+          <StyledLabel htmlFor="formatSwitch">
+            {t('Show original SQL')}
+          </StyledLabel>
+        </StyledHeaderActionContainer>
+      </StyledHeaderMenuContainer>
+      {!formattedSQL && <Skeleton active />}
+      {formattedSQL && (
+        <StyledThemedSyntaxHighlighter
+          language={language}
+          customStyle={{ flex: 1 }}
+        >
+          {currentSQL}
+        </StyledThemedSyntaxHighlighter>
+      )}
+    </StyledSyntaxContainer>
   );
 };
 

superset-frontend/src/explore/components/controls/ViewQueryModal.tsx

@@ -42,7 +42,6 @@ const ViewQueryModalContainer = styled.div`
   height: 100%;
   display: flex;
   flex-direction: column;
-  gap: ${({ theme }) => theme.sizeUnit * 4}px;
 `;
 
 const ViewQueryModal: FC<Props> = ({ latestQueryFormData }) => {
@@ -87,10 +86,9 @@ const ViewQueryModal: FC<Props> = ({ latestQueryFormData }) => {
 
   return (
     <ViewQueryModalContainer>
-      {result.map((item, index) =>
+      {result.map(item =>
         item.query ? (
           <ViewQuery
-            key={`query-${index}`}
             datasource={latestQueryFormData.datasource}
             sql={item.query}
             language="sql"

superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx

@@ -41,9 +41,6 @@ import {
 import TableChartPlugin from '../../../../../plugins/plugin-chart-table/src';
 import VizTypeControl, { VIZ_TYPE_CONTROL_TEST_ID } from './index';
 
-// Mock scrollIntoView to avoid errors in test environment
-jest.mock('scroll-into-view-if-needed', () => jest.fn());
-
 jest.useFakeTimers();
 
 class MainPreset extends Preset {
@@ -259,22 +256,4 @@ describe('VizTypeControl', () => {
 
     expect(defaultProps.onChange).toHaveBeenCalledWith(VizType.Line);
   });
-
-  it('Search input is focused when modal opens', async () => {
-    // Mock the focus method to track if it was called
-    const focusSpy = jest.fn();
-    const originalFocus = HTMLInputElement.prototype.focus;
-    HTMLInputElement.prototype.focus = focusSpy;
-
-    await waitForRenderWrapper();
-
-    const searchInput = screen.getByTestId(getTestId('search-input'));
-
-    // Verify that focus() was called on the search input
-    expect(focusSpy).toHaveBeenCalled();
-    expect(searchInput).toBeInTheDocument();
-
-    // Restore the original focus method
-    HTMLInputElement.prototype.focus = originalFocus;
-  });
 });

superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx

@@ -575,13 +575,6 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) {
     setIsSearchFocused(true);
   }, []);
 
-  // Auto-focus the search input when the modal opens
-  useEffect(() => {
-    if (searchInputRef.current) {
-      searchInputRef.current.focus();
-    }
-  }, []);
-
   const changeSearch: ChangeEventHandler<HTMLInputElement> = useCallback(
     event => setSearchInputValue(event.target.value),
     [],

superset-frontend/src/explore/exploreUtils/exploreUtils.test.jsx

@@ -191,8 +191,8 @@ describe('exploreUtils', () => {
   });
 
   describe('buildV1ChartDataPayload', () => {
-    it('generate valid request payload despite no registered buildQuery', async () => {
-      const v1RequestPayload = await buildV1ChartDataPayload({
+    it('generate valid request payload despite no registered buildQuery', () => {
+      const v1RequestPayload = buildV1ChartDataPayload({
         formData: { ...formData, viz_type: 'my_custom_viz' },
       });
       expect(v1RequestPayload.hasOwnProperty('queries')).toBeTruthy();

superset-frontend/src/explore/exploreUtils/index.js

@@ -207,7 +207,7 @@ export const getQuerySettings = formData => {
   ];
 };
 
-export const buildV1ChartDataPayload = async ({
+export const buildV1ChartDataPayload = ({
   formData,
   force,
   resultFormat,
@@ -242,7 +242,7 @@ export const buildV1ChartDataPayload = async ({
 export const getLegacyEndpointType = ({ resultType, resultFormat }) =>
   resultFormat === 'csv' ? resultFormat : resultType;
 
-export const exportChart = async ({
+export const exportChart = ({
   formData,
   resultFormat = 'json',
   resultType = 'full',
@@ -262,7 +262,7 @@ export const exportChart = async ({
     payload = formData;
   } else {
     url = ensureAppRoot('/api/v1/chart/data');
-    payload = await buildV1ChartDataPayload({
+    payload = buildV1ChartDataPayload({
       formData,
       force,
       resultFormat,

superset-frontend/src/features/datasets/AddDataset/Footer/Footer.test.tsx

@@ -16,12 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  render,
-  screen,
-  waitFor,
-  userEvent,
-} from 'spec/helpers/testing-library';
+import { render, screen } from 'spec/helpers/testing-library';
 import Footer from 'src/features/datasets/AddDataset/Footer';
 
 const mockHistoryPush = jest.fn();
@@ -32,14 +27,6 @@ jest.mock('react-router-dom', () => ({
   }),
 }));
 
-// Mock the API call
-const mockCreateResource = jest.fn();
-jest.mock('src/views/CRUD/hooks', () => ({
-  useSingleViewResource: () => ({
-    createResource: mockCreateResource,
-  }),
-}));
-
 const mockedProps = {
   url: 'realwebsite.com',
 };
@@ -47,7 +34,7 @@ const mockedProps = {
 const mockPropsWithDataset = {
   url: 'realwebsite.com',
   datasetObject: {
-    db: {
+    database: {
       id: '1',
       database_name: 'examples',
     },
@@ -60,10 +47,6 @@ const mockPropsWithDataset = {
 };
 
 describe('Footer', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
   test('renders a Footer with a cancel button and a disabled create button', () => {
     render(<Footer {...mockedProps} />, { useRedux: true });
 
@@ -72,28 +55,21 @@ describe('Footer', () => {
     });
 
     const createButton = screen.getByRole('button', {
-      name: /Create dataset and create chart/i,
+      name: /Create/i,
     });
 
     expect(saveButton).toBeVisible();
     expect(createButton).toBeDisabled();
   });
 
-  test('renders a Create Dataset dropdown button when a table is selected', () => {
+  test('renders a Create Dataset button when a table is selected', () => {
     render(<Footer {...mockPropsWithDataset} />, { useRedux: true });
 
     const createButton = screen.getByRole('button', {
-      name: /Create dataset and create chart/i,
+      name: /Create/i,
     });
 
     expect(createButton).toBeEnabled();
-
-    // Check that it's a dropdown button with the correct text
-    expect(createButton).toHaveTextContent('Create dataset and create chart');
-
-    // Check for the dropdown arrow
-    const dropdownArrow = screen.getByRole('img', { hidden: true });
-    expect(dropdownArrow).toBeInTheDocument();
   });
 
   test('create button becomes disabled when table already has a dataset', () => {
@@ -102,119 +78,9 @@ describe('Footer', () => {
     });
 
     const createButton = screen.getByRole('button', {
-      name: /Create dataset and create chart/i,
+      name: /Create/i,
     });
 
     expect(createButton).toBeDisabled();
   });
-
-  test('shows dropdown menu when dropdown arrow is clicked', async () => {
-    render(<Footer {...mockPropsWithDataset} />, { useRedux: true });
-
-    // Find and click the dropdown trigger (the arrow part)
-    const dropdownTrigger = screen.getByRole('button', { name: 'down' });
-    userEvent.click(dropdownTrigger);
-
-    // Check that the dropdown menu option is visible
-    await waitFor(() => {
-      expect(screen.getByText('Create dataset only')).toBeVisible();
-    });
-  });
-
-  test('navigates to chart creation when main button is clicked', async () => {
-    mockCreateResource.mockResolvedValue(123); // Mock successful dataset creation
-
-    render(<Footer {...mockPropsWithDataset} />, { useRedux: true });
-
-    const createButton = screen.getByRole('button', {
-      name: /Create dataset and create chart/i,
-    });
-
-    userEvent.click(createButton);
-
-    await waitFor(() => {
-      expect(mockCreateResource).toHaveBeenCalledWith({
-        database: '1',
-        catalog: undefined,
-        schema: 'public',
-        table_name: 'real_info',
-      });
-      expect(mockHistoryPush).toHaveBeenCalledWith(
-        '/chart/add/?dataset=real_info',
-      );
-    });
-  });
-
-  test('navigates to dataset list when "Create dataset only" menu option is clicked', async () => {
-    mockCreateResource.mockResolvedValue(123);
-
-    render(<Footer {...mockPropsWithDataset} />, { useRedux: true });
-
-    // Open dropdown menu
-    const dropdownTrigger = screen.getByRole('button', { name: 'down' });
-    userEvent.click(dropdownTrigger);
-
-    // Click the "Create dataset only" option
-    await waitFor(() => {
-      const datasetOnlyOption = screen.getByText('Create dataset only');
-      userEvent.click(datasetOnlyOption);
-    });
-
-    await waitFor(() => {
-      expect(mockCreateResource).toHaveBeenCalledWith({
-        database: '1',
-        catalog: undefined,
-        schema: 'public',
-        table_name: 'real_info',
-      });
-      expect(mockHistoryPush).toHaveBeenCalledWith('/tablemodelview/list/');
-    });
-  });
-
-  test('handles dataset creation failure gracefully', async () => {
-    mockCreateResource.mockResolvedValue(null); // Mock failed dataset creation
-
-    render(<Footer {...mockPropsWithDataset} />, { useRedux: true });
-
-    const createButton = screen.getByRole('button', {
-      name: /Create dataset and create chart/i,
-    });
-
-    userEvent.click(createButton);
-
-    await waitFor(() => {
-      expect(mockCreateResource).toHaveBeenCalled();
-      // Should not navigate if creation failed
-      expect(mockHistoryPush).not.toHaveBeenCalled();
-    });
-  });
-
-  test('passes correct data to createResource with catalog', async () => {
-    const mockPropsWithCatalog = {
-      ...mockPropsWithDataset,
-      datasetObject: {
-        ...mockPropsWithDataset.datasetObject,
-        catalog: 'test_catalog',
-      },
-    };
-
-    mockCreateResource.mockResolvedValue(456);
-
-    render(<Footer {...mockPropsWithCatalog} />, { useRedux: true });
-
-    const createButton = screen.getByRole('button', {
-      name: /Create dataset and create chart/i,
-    });
-
-    userEvent.click(createButton);
-
-    await waitFor(() => {
-      expect(mockCreateResource).toHaveBeenCalledWith({
-        database: '1',
-        catalog: 'test_catalog',
-        schema: 'public',
-        table_name: 'real_info',
-      });
-    });
-  });
 });

superset-frontend/src/features/datasets/AddDataset/Footer/index.tsx

@@ -17,14 +17,8 @@
  * under the License.
  */
 import { useHistory } from 'react-router-dom';
-import {
-  Button,
-  DropdownButton,
-  Menu,
-  Flex,
-} from '@superset-ui/core/components';
-import { t, useTheme } from '@superset-ui/core';
-import { Icons } from '@superset-ui/core/components/Icons';
+import { Button } from '@superset-ui/core/components';
+import { t } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
 import { logEvent } from 'src/logger/actions';
 import withToasts from 'src/components/MessageToasts/withToasts';
@@ -61,7 +55,6 @@ function Footer({
   datasets,
 }: FooterProps) {
   const history = useHistory();
-  const theme = useTheme();
   const { createResource } = useSingleViewResource<Partial<DatasetObject>>(
     'dataset',
     t('dataset'),
@@ -92,7 +85,7 @@ function Footer({
 
   const tooltipText = t('Select a database table.');
 
-  const onSave = (createChart: boolean = true) => {
+  const onSave = () => {
     if (datasetObject) {
       const data = {
         database: datasetObject.db?.id,
@@ -107,57 +100,32 @@ function Footer({
         if (typeof response === 'number') {
           logEvent(LOG_ACTIONS_DATASET_CREATION_SUCCESS, datasetObject);
           // When a dataset is created the response we get is its ID number
-          if (createChart) {
-            history.push(`/chart/add/?dataset=${datasetObject.table_name}`);
-          } else {
-            history.push('/tablemodelview/list/');
-          }
+          history.push(`/chart/add/?dataset=${datasetObject.table_name}`);
         }
       });
     }
   };
 
-  const onSaveOnly = () => {
-    onSave(false);
-  };
-
   const CREATE_DATASET_TEXT = t('Create dataset and create chart');
-  const CREATE_DATASET_ONLY_TEXT = t('Create dataset only');
   const disabledCheck =
     !datasetObject?.table_name ||
     !hasColumns ||
     datasets?.includes(datasetObject?.table_name);
 
-  const dropdownMenu = (
-    <Menu>
-      <Menu.Item key="create-only" onClick={onSaveOnly}>
-        {CREATE_DATASET_ONLY_TEXT}
-      </Menu.Item>
-    </Menu>
-  );
-
   return (
-    <Flex align="center" justify="flex-end" gap="8px">
+    <>
       <Button buttonStyle="secondary" onClick={cancelButtonOnClick}>
         {t('Cancel')}
       </Button>
-      <DropdownButton
-        type="primary"
+      <Button
+        buttonStyle="primary"
         disabled={disabledCheck}
         tooltip={!datasetObject?.table_name ? tooltipText : undefined}
-        onClick={() => onSave(true)}
-        popupRender={() => dropdownMenu}
-        icon={
-          <Icons.DownOutlined
-            iconSize="xs"
-            iconColor={theme.colors.grayscale.light5}
-          />
-        }
-        trigger={['click']}
+        onClick={onSave}
       >
         {CREATE_DATASET_TEXT}
-      </DropdownButton>
-    </Flex>
+      </Button>
+    </>
   );
 }
 

superset-frontend/src/features/home/RightMenu.tsx

@@ -17,11 +17,13 @@
  * under the License.
  */
 import { Fragment, useState, useEffect, FC, PureComponent } from 'react';
+
 import rison from 'rison';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { useQueryParams, BooleanParam } from 'use-query-params';
 import { get, isEmpty } from 'lodash';
+
 import {
   t,
   styled,
@@ -31,15 +33,10 @@ import {
   getExtensionsRegistry,
   useTheme,
 } from '@superset-ui/core';
-import {
-  Label,
-  Tooltip,
-  ThemeSubMenu,
-  Menu,
-  Icons,
-  Typography,
-  TelemetryPixel,
-} from '@superset-ui/core/components';
+import { Menu } from '@superset-ui/core/components/Menu';
+import { Label, Tooltip } from '@superset-ui/core/components';
+import { Icons } from '@superset-ui/core/components/Icons';
+import { Typography } from '@superset-ui/core/components/Typography';
 import { ensureAppRoot } from 'src/utils/pathUtils';
 import { findPermission } from 'src/utils/findPermission';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
@@ -52,7 +49,9 @@ import { RootState } from 'src/dashboard/types';
 import DatabaseModal from 'src/features/databases/DatabaseModal';
 import UploadDataModal from 'src/features/databases/UploadDataModel';
 import { uploadUserPerms } from 'src/views/CRUD/utils';
+import TelemetryPixel from '@superset-ui/core/components/TelemetryPixel';
 import { useThemeContext } from 'src/theme/ThemeProvider';
+import ThemeSelect from '@superset-ui/core/components/ThemeSelect';
 import LanguagePicker from './LanguagePicker';
 import {
   ExtensionConfigs,
@@ -139,7 +138,6 @@ const RightMenu = ({
     datasetAdded?: boolean;
   }) => void;
 }) => {
-  const theme = useTheme();
   const user = useSelector<any, UserWithPermissionsAndRoles>(
     state => state.user,
   );
@@ -373,6 +371,7 @@ const RightMenu = ({
     localStorage.removeItem('redux');
   };
 
+  const theme = useTheme();
   return (
     <StyledDiv align={align}>
       {canDatabase && (
@@ -494,15 +493,16 @@ const RightMenu = ({
             })}
           </StyledSubMenu>
         )}
-
         {canSetMode() && (
-          <ThemeSubMenu
-            setThemeMode={setThemeMode}
-            themeMode={themeMode}
-            hasLocalOverride={hasDevOverride()}
-            onClearLocalSettings={clearLocalOverrides}
-            allowOSPreference={canDetectOSPreference()}
-          />
+          <span>
+            <ThemeSelect
+              setThemeMode={setThemeMode}
+              themeMode={themeMode}
+              hasLocalOverride={hasDevOverride()}
+              onClearLocalSettings={clearLocalOverrides}
+              allowOSPreference={canDetectOSPreference()}
+            />
+          </span>
         )}
 
         <StyledSubMenu

superset-frontend/src/theme/ThemeController.ts

@@ -17,15 +17,13 @@
  * under the License.
  */
 import {
-  type AnyThemeConfig,
-  type SupersetTheme,
-  type SupersetThemeConfig,
-  type ThemeControllerOptions,
-  type ThemeStorage,
   Theme,
-  ThemeMode,
+  AnyThemeConfig,
+  ThemeStorage,
+  ThemeControllerOptions,
   themeObject as supersetThemeObject,
 } from '@superset-ui/core';
+import { SupersetTheme, ThemeMode } from '@superset-ui/core/theme/types';
 import {
   getAntdConfig,
   normalizeThemeConfig,
@@ -96,7 +94,7 @@ export class ThemeController {
 
   private currentMode: ThemeMode;
 
-  private hasCustomThemes: boolean;
+  private readonly hasBootstrapThemes: boolean;
 
   private onChangeCallbacks: Set<(theme: Theme) => void> = new Set();
 
@@ -111,13 +109,15 @@ export class ThemeController {
 
   private dashboardCrudTheme: AnyThemeConfig | null = null;
 
-  constructor({
-    storage = new LocalStorageAdapter(),
-    modeStorageKey = STORAGE_KEYS.THEME_MODE,
-    themeObject = supersetThemeObject,
-    defaultTheme = (supersetThemeObject.theme as AnyThemeConfig) ?? {},
-    onChange = undefined,
-  }: ThemeControllerOptions = {}) {
+  constructor(options: ThemeControllerOptions = {}) {
+    const {
+      storage = new LocalStorageAdapter(),
+      modeStorageKey = STORAGE_KEYS.THEME_MODE,
+      themeObject = supersetThemeObject,
+      defaultTheme = (supersetThemeObject.theme as AnyThemeConfig) ?? {},
+      onChange = null,
+    } = options;
+
     this.storage = storage;
     this.modeStorageKey = modeStorageKey;
 
@@ -129,14 +129,14 @@ export class ThemeController {
       bootstrapDefaultTheme,
       bootstrapDarkTheme,
       bootstrapThemeSettings,
-      hasCustomThemes,
+      hasBootstrapThemes,
     }: BootstrapThemeData = this.loadBootstrapData();
 
-    this.hasCustomThemes = hasCustomThemes;
+    this.hasBootstrapThemes = hasBootstrapThemes;
     this.themeSettings = bootstrapThemeSettings || {};
 
     // Set themes based on bootstrap data availability
-    if (this.hasCustomThemes) {
+    if (this.hasBootstrapThemes) {
       this.darkTheme = bootstrapDarkTheme || bootstrapDefaultTheme || null;
       this.defaultTheme =
         bootstrapDefaultTheme || bootstrapDarkTheme || defaultTheme;
@@ -424,42 +424,6 @@ export class ThemeController {
     return allowOSPreference === true;
   }
 
-  /**
-   * Sets an entire new theme configuration, replacing all existing theme data and settings.
-   * This method is designed for use cases like embedded dashboards where themes are provided
-   * dynamically from external sources.
-   * @param config - The complete theme configuration object
-   */
-  public setThemeConfig(config: SupersetThemeConfig): void {
-    this.defaultTheme = config.theme_default;
-    this.darkTheme = config.theme_dark || null;
-    this.hasCustomThemes = true;
-
-    this.themeSettings = {
-      enforced: config.theme_settings?.enforced ?? false,
-      allowSwitching: config.theme_settings?.allowSwitching ?? true,
-      allowOSPreference: config.theme_settings?.allowOSPreference ?? true,
-    };
-
-    let newMode: ThemeMode;
-    try {
-      this.validateModeUpdatePermission(this.currentMode);
-      const hasRequiredTheme = this.isValidThemeMode(this.currentMode);
-      newMode = hasRequiredTheme
-        ? this.currentMode
-        : this.determineInitialMode();
-    } catch {
-      newMode = this.determineInitialMode();
-    }
-
-    this.currentMode = newMode;
-
-    const themeToApply =
-      this.getThemeForMode(this.currentMode) || this.defaultTheme;
-
-    this.updateTheme(themeToApply);
-  }
-
   /**
    * Handles system theme changes with error recovery.
    */
@@ -583,7 +547,7 @@ export class ThemeController {
       bootstrapDefaultTheme: hasValidDefault ? defaultTheme : null,
       bootstrapDarkTheme: hasValidDark ? darkTheme : null,
       bootstrapThemeSettings: hasValidSettings ? themeSettings : null,
-      hasCustomThemes: hasValidDefault || hasValidDark,
+      hasBootstrapThemes: hasValidDefault || hasValidDark,
     };
   }
 
@@ -643,7 +607,7 @@ export class ThemeController {
       resolvedMode = ThemeController.getSystemPreferredMode();
     }
 
-    if (!this.hasCustomThemes) {
+    if (!this.hasBootstrapThemes) {
       const baseTheme = this.defaultTheme.token as Partial<SupersetTheme>;
       return getAntdConfig(baseTheme, resolvedMode === ThemeMode.DARK);
     }

superset-frontend/src/theme/ThemeProvider.tsx

@@ -24,12 +24,8 @@ import {
   useMemo,
   useState,
 } from 'react';
-import {
-  type AnyThemeConfig,
-  type ThemeContextType,
-  Theme,
-  ThemeMode,
-} from '@superset-ui/core';
+import { Theme, AnyThemeConfig, ThemeContextType } from '@superset-ui/core';
+import { ThemeMode } from '@superset-ui/core/theme/types';
 import { ThemeController } from './ThemeController';
 
 const ThemeContext = createContext<ThemeContextType | null>(null);

superset-frontend/src/theme/tests/ThemeController.test.ts

@@ -17,17 +17,12 @@
  * under the License.
  */
 import { theme as antdThemeImport } from 'antd';
-import {
-  type AnyThemeConfig,
-  type SupersetThemeConfig,
-  Theme,
-  ThemeAlgorithm,
-  ThemeMode,
-} from '@superset-ui/core';
+import { Theme } from '@superset-ui/core';
 import type {
   BootstrapThemeDataConfig,
   CommonBootstrapData,
 } from 'src/types/bootstrapTypes';
+import { ThemeAlgorithm, ThemeMode } from '@superset-ui/core/theme/types';
 import getBootstrapData from 'src/utils/getBootstrapData';
 import { LocalStorageAdapter, ThemeController } from '../ThemeController';
 
@@ -48,7 +43,7 @@ const mockThemeFromConfig = jest.fn();
 const mockSetConfig = jest.fn();
 
 // Mock data constants
-const DEFAULT_THEME: AnyThemeConfig = {
+const DEFAULT_THEME = {
   token: {
     colorBgBase: '#ededed',
     colorTextBase: '#120f0f',
@@ -60,7 +55,7 @@ const DEFAULT_THEME: AnyThemeConfig = {
   },
 };
 
-const DARK_THEME: AnyThemeConfig = {
+const DARK_THEME = {
   token: {
     colorBgBase: '#141118',
     colorTextBase: '#fdc7c7',
@@ -70,7 +65,7 @@ const DARK_THEME: AnyThemeConfig = {
     colorSuccess: '#3c7c1b',
     colorWarning: '#dc9811',
   },
-  algorithm: ThemeAlgorithm.DARK,
+  algorithm: ThemeMode.DARK,
 };
 
 const THEME_SETTINGS = {
@@ -1054,298 +1049,4 @@ describe('ThemeController', () => {
       );
     });
   });
-
-  describe('setThemeConfig', () => {
-    beforeEach(() => {
-      mockGetBootstrapData.mockReturnValue(
-        createMockBootstrapData({
-          default: {},
-          dark: {},
-          settings: {},
-        }),
-      );
-
-      controller = new ThemeController({
-        themeObject: mockThemeObject,
-        defaultTheme: { token: {} },
-      });
-
-      jest.clearAllMocks();
-    });
-
-    it('should set complete theme configuration', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-        theme_settings: {
-          enforced: false,
-          allowSwitching: true,
-          allowOSPreference: true,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(mockSetConfig).toHaveBeenCalledTimes(1);
-      expect(mockSetConfig).toHaveBeenCalledWith(
-        expect.objectContaining({
-          token: expect.objectContaining(DEFAULT_THEME.token),
-          algorithm: antdThemeImport.defaultAlgorithm,
-        }),
-      );
-
-      expect(controller.getCurrentMode()).toBe(ThemeMode.SYSTEM);
-      expect(controller.canSetTheme()).toBe(true);
-      expect(controller.canSetMode()).toBe(true);
-    });
-
-    it('should handle theme_default only', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(mockSetConfig).toHaveBeenCalledTimes(1);
-      expect(mockSetConfig).toHaveBeenCalledWith(
-        expect.objectContaining({
-          token: expect.objectContaining(DEFAULT_THEME.token),
-          algorithm: antdThemeImport.defaultAlgorithm,
-        }),
-      );
-
-      expect(controller.canSetTheme()).toBe(true);
-      expect(controller.canSetMode()).toBe(true);
-    });
-
-    it('should handle theme_default and theme_dark without settings', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(mockSetConfig).toHaveBeenCalledTimes(1);
-      expect(mockSetConfig).toHaveBeenCalledWith(
-        expect.objectContaining({
-          token: expect.objectContaining(DEFAULT_THEME.token),
-        }),
-      );
-
-      jest.clearAllMocks();
-      controller.setThemeMode(ThemeMode.DARK);
-
-      expect(mockSetConfig).toHaveBeenCalledTimes(1);
-      expect(mockSetConfig).toHaveBeenCalledWith(
-        expect.objectContaining({
-          token: expect.objectContaining(DARK_THEME.token),
-          algorithm: antdThemeImport.darkAlgorithm,
-        }),
-      );
-    });
-
-    it('should handle enforced theme settings', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-        theme_settings: {
-          enforced: true,
-          allowSwitching: false,
-          allowOSPreference: false,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(controller.canSetTheme()).toBe(false);
-      expect(controller.canSetMode()).toBe(false);
-      expect(controller.getCurrentMode()).toBe(ThemeMode.DEFAULT);
-
-      expect(() => {
-        controller.setThemeMode(ThemeMode.DARK);
-      }).toThrow('User does not have permission to update the theme mode');
-    });
-
-    it('should handle allowOSPreference: false setting', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-        theme_settings: {
-          enforced: false,
-          allowSwitching: true,
-          allowOSPreference: false,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(controller.getCurrentMode()).toBe(ThemeMode.DEFAULT);
-      expect(controller.canSetMode()).toBe(true);
-
-      expect(() => {
-        controller.setThemeMode(ThemeMode.SYSTEM);
-      }).toThrow('System theme mode is not allowed');
-    });
-
-    it('should re-determine initial mode based on new settings', () => {
-      mockMatchMedia.mockReturnValue({
-        matches: true,
-        addEventListener: jest.fn(),
-        removeEventListener: jest.fn(),
-      });
-
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-        theme_settings: {
-          enforced: false,
-          allowSwitching: false,
-          allowOSPreference: true,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(controller.getCurrentMode()).toBe(ThemeMode.SYSTEM);
-      expect(controller.canSetMode()).toBe(false);
-    });
-
-    it('should apply appropriate theme after configuration', () => {
-      controller.setThemeMode(ThemeMode.DARK);
-      jest.clearAllMocks();
-
-      const themeConfig = {
-        theme_default: {
-          token: {
-            colorPrimary: '#00ff00',
-          },
-        },
-        theme_dark: {
-          token: {
-            colorPrimary: '#ff0000',
-            colorBgBase: '#000000',
-          },
-          algorithm: 'dark',
-        },
-      };
-
-      controller.setThemeConfig(themeConfig as SupersetThemeConfig);
-
-      expect(mockSetConfig).toHaveBeenCalledTimes(1);
-      expect(mockSetConfig).toHaveBeenCalledWith(
-        expect.objectContaining({
-          token: expect.objectContaining({
-            colorPrimary: '#ff0000',
-            colorBgBase: '#000000',
-          }),
-          algorithm: antdThemeImport.darkAlgorithm,
-        }),
-      );
-    });
-
-    it('should handle missing theme_dark gracefully', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_settings: {
-          allowSwitching: true,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      jest.clearAllMocks();
-      controller.setThemeMode(ThemeMode.DARK);
-
-      expect(mockSetConfig).toHaveBeenCalledTimes(1);
-      expect(mockSetConfig).toHaveBeenCalledWith(
-        expect.objectContaining({
-          token: expect.objectContaining(DEFAULT_THEME.token),
-          algorithm: antdThemeImport.defaultAlgorithm,
-        }),
-      );
-    });
-
-    it('should preserve existing theme mode when possible', () => {
-      controller.setThemeMode(ThemeMode.DARK);
-      const initialMode = controller.getCurrentMode();
-
-      jest.clearAllMocks();
-
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-        theme_settings: {
-          allowSwitching: true,
-          allowOSPreference: false,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(controller.getCurrentMode()).toBe(initialMode);
-    });
-
-    it('should trigger onChange callbacks', () => {
-      const changeCallback = jest.fn();
-      controller.onChange(changeCallback);
-
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(changeCallback).toHaveBeenCalledTimes(1);
-      expect(changeCallback).toHaveBeenCalledWith(mockThemeObject);
-    });
-
-    it('should handle partial theme_settings', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_settings: {
-          enforced: true,
-        },
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(controller.canSetTheme()).toBe(false);
-      expect(controller.canSetMode()).toBe(false);
-    });
-
-    it('should handle error in theme application', () => {
-      mockSetConfig.mockImplementationOnce(() => {
-        throw new Error('Theme application error');
-      });
-
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-      };
-
-      expect(() => {
-        controller.setThemeConfig(themeConfig);
-      }).not.toThrow();
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Failed to apply theme:',
-        expect.any(Error),
-      );
-    });
-
-    it('should update stored theme mode', () => {
-      const themeConfig = {
-        theme_default: DEFAULT_THEME,
-        theme_dark: DARK_THEME,
-      };
-
-      controller.setThemeConfig(themeConfig);
-
-      expect(mockLocalStorage.setItem).toHaveBeenCalledWith(
-        'superset-theme-mode',
-        expect.any(String),
-      );
-    });
-  });
 });

superset-frontend/src/theme/tests/ThemeProvider.test.tsx

@@ -17,7 +17,8 @@
  * under the License.
  */
 import { ReactNode } from 'react';
-import { type ThemeContextType, Theme, ThemeMode } from '@superset-ui/core';
+import { Theme } from '@superset-ui/core';
+import { ThemeContextType, ThemeMode } from '@superset-ui/core/theme/types';
 import { act, render, screen } from '@superset-ui/core/spec';
 import { renderHook } from '@testing-library/react-hooks';
 import { SupersetThemeProvider, useThemeContext } from '../ThemeProvider';

superset-frontend/src/types/bootstrapTypes.ts

@@ -16,6 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import {
+  ColorSchemeConfig,
+  FeatureFlagMap,
+  JsonObject,
+  LanguagePack,
+  Locale,
+  SequentialSchemeConfig,
+} from '@superset-ui/core';
 import { FormatLocaleDefinition } from 'd3-format';
 import { TimeLocaleDefinition } from 'd3-time-format';
 import { isPlainObject } from 'lodash';
@@ -23,14 +31,8 @@ import { Languages } from 'src/features/home/LanguagePicker';
 import type { FlashMessage } from 'src/components';
 import type {
   AnyThemeConfig,
-  ColorSchemeConfig,
-  FeatureFlagMap,
-  JsonObject,
-  LanguagePack,
-  Locale,
-  SequentialSchemeConfig,
   SerializableThemeConfig,
-} from '@superset-ui/core';
+} from '@superset-ui/core/theme/types';
 
 export type User = {
   createdOn?: string;
@@ -187,7 +189,7 @@ export interface BootstrapThemeData {
   bootstrapDefaultTheme: AnyThemeConfig | null;
   bootstrapDarkTheme: AnyThemeConfig | null;
   bootstrapThemeSettings: SerializableThemeSettings | null;
-  hasCustomThemes: boolean;
+  hasBootstrapThemes: boolean;
 }
 
 export function isUser(user: any): user is User {

superset-websocket/package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.0.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "cookie": "^1.0.2",
+        "cookie": "^0.7.0",
         "hot-shots": "^11.1.0",
         "ioredis": "^5.6.1",
         "jsonwebtoken": "^9.0.2",
@@ -20,6 +20,7 @@
       },
       "devDependencies": {
         "@eslint/js": "^9.25.1",
+        "@types/cookie": "^0.6.0",
         "@types/eslint__js": "^8.42.3",
         "@types/ioredis": "^4.27.8",
         "@types/jest": "^29.5.14",
@@ -1720,6 +1721,12 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "dev": true
+    },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -3038,11 +3045,11 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
-      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.0.tgz",
+      "integrity": "sha512-qCf+V4dtlNhSRXGAZatc1TasyFO6GjohcOul807YOb5ik3+kQSnb4d7iajeCL8QHaJ4uZEjCgiCJerKXwdRVlQ==",
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.6"
       }
     },
     "node_modules/create-jest": {
@@ -8395,6 +8402,12 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "dev": true
+    },
     "@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -9304,9 +9317,9 @@
       "dev": true
     },
     "cookie": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
-      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA=="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.0.tgz",
+      "integrity": "sha512-qCf+V4dtlNhSRXGAZatc1TasyFO6GjohcOul807YOb5ik3+kQSnb4d7iajeCL8QHaJ4uZEjCgiCJerKXwdRVlQ=="
     },
     "create-jest": {
       "version": "29.7.0",

superset-websocket/package.json

@@ -17,7 +17,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "cookie": "^1.0.2",
+    "cookie": "^0.7.0",
     "hot-shots": "^11.1.0",
     "ioredis": "^5.6.1",
     "jsonwebtoken": "^9.0.2",
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.25.1",
+    "@types/cookie": "^0.6.0",
     "@types/eslint__js": "^8.42.3",
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^29.5.14",
@@ -51,7 +52,7 @@
     "typescript-eslint": "^8.19.0"
   },
   "engines": {
-    "node": "^20.19.4",
-    "npm": "^10.8.2"
+    "node": "^16.9.1",
+    "npm": "^7.5.4 || ^8.1.2"
   }
 }

superset-websocket/spec/config.test.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 import { buildConfig } from '../src/config';
-import { expect, test } from '@jest/globals';
 
 test('buildConfig() builds configuration and applies env var overrides', () => {
   let config = buildConfig();

superset-websocket/spec/index.test.ts

@@ -19,26 +19,15 @@
 const jwt = require('jsonwebtoken');
 const config = require('../config.test.json');
 
-import {
-  describe,
-  expect,
-  test,
-  beforeEach,
-  afterEach,
-  jest,
-} from '@jest/globals';
+import { describe, expect, test, beforeEach, afterEach } from '@jest/globals';
 import * as http from 'http';
 import * as net from 'net';
 import { WebSocket } from 'ws';
 
-interface MockedRedisXrange {
-  (): Promise<server.StreamResult[]>;
-}
-
 // NOTE: these mock variables needs to start with "mock" due to
 // calls to `jest.mock` being hoisted to the top of the file.
 // https://jestjs.io/docs/es6-class-mocks#calling-jestmock-with-the-module-factory-parameter
-const mockRedisXrange = jest.fn() as jest.MockedFunction<MockedRedisXrange>;
+const mockRedisXrange = jest.fn();
 
 jest.mock('ws');
 jest.mock('ioredis', () => {
@@ -70,7 +59,7 @@ import * as server from '../src/index';
 import { statsd } from '../src/index';
 
 describe('server', () => {
-  let statsdIncrementMock: jest.SpiedFunction<typeof statsd.increment>;
+  let statsdIncrementMock: jest.SpyInstance;
 
   beforeEach(() => {
     mockRedisXrange.mockClear();
@@ -330,12 +319,10 @@ describe('server', () => {
 
   describe('wsConnection', () => {
     let ws: WebSocket;
-    let wsEventMock: jest.SpiedFunction<typeof ws.on>;
-    let trackClientSpy: jest.SpiedFunction<typeof server.trackClient>;
-    let fetchRangeFromStreamSpy: jest.SpiedFunction<
-      typeof server.fetchRangeFromStream
-    >;
-    let dateNowSpy: jest.SpiedFunction<typeof Date.now>;
+    let wsEventMock: jest.SpyInstance;
+    let trackClientSpy: jest.SpyInstance;
+    let fetchRangeFromStreamSpy: jest.SpyInstance;
+    let dateNowSpy: jest.SpyInstance;
     let socketInstanceExpected: server.SocketInstance;
 
     const getRequest = (token: string, url: string): http.IncomingMessage => {
@@ -444,8 +431,8 @@ describe('server', () => {
 
   describe('httpUpgrade', () => {
     let socket: net.Socket;
-    let socketDestroySpy: jest.SpiedFunction<typeof socket.destroy>;
-    let wssUpgradeSpy: jest.SpiedFunction<typeof server.wss.handleUpgrade>;
+    let socketDestroySpy: jest.SpyInstance;
+    let wssUpgradeSpy: jest.SpyInstance;
 
     const getRequest = (token: string, url: string): http.IncomingMessage => {
       const request = new http.IncomingMessage(new net.Socket());
@@ -509,8 +496,8 @@ describe('server', () => {
 
   describe('checkSockets', () => {
     let ws: WebSocket;
-    let pingSpy: jest.SpiedFunction<typeof ws.ping>;
-    let terminateSpy: jest.SpiedFunction<typeof ws.terminate>;
+    let pingSpy: jest.SpyInstance;
+    let terminateSpy: jest.SpyInstance;
     let socketInstance: server.SocketInstance;
 
     beforeEach(() => {

superset-websocket/src/index.ts

@@ -21,7 +21,7 @@ import * as net from 'net';
 import WebSocket from 'ws';
 import { v4 as uuidv4 } from 'uuid';
 import jwt, { Algorithm } from 'jsonwebtoken';
-import { parse } from 'cookie';
+import cookie from 'cookie';
 import Redis, { RedisOptions } from 'ioredis';
 import StatsD from 'hot-shots';
 
@@ -285,7 +285,7 @@ export const processStreamResults = (results: StreamResult[]): void => {
  * configured via 'jwtCookieName' in the config.
  */
 const readChannelId = (request: http.IncomingMessage): string => {
-  const cookies = parse(request.headers.cookie || '');
+  const cookies = cookie.parse(request.headers.cookie || '');
   const token = cookies[opts.jwtCookieName];
 
   if (!token) throw new Error('JWT not present');

superset/cli/mcp.py

@@ -1,43 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""CLI module for MCP service"""
-
-import os
-
-import click
-
-from superset.mcp_service.server import run_server
-
-
-@click.group()
-def mcp() -> None:
-    """Model Context Protocol service commands"""
-    pass
-
-
-@mcp.command()
-@click.option("--host", default="127.0.0.1", help="Host to bind to")
-@click.option("--port", default=5008, help="Port to bind to")
-@click.option("--debug", is_flag=True, help="Enable debug mode")
-@click.option("--sql-debug", is_flag=True, help="Enable SQL query logging")
-def run(host: str, port: int, debug: bool, sql_debug: bool) -> None:
-    """Run the MCP service"""
-    if sql_debug:
-        os.environ["SQLALCHEMY_DEBUG"] = "1"
-        click.echo("🔍 SQL Debug mode enabled")
-
-    run_server(host=host, port=port, debug=debug)

superset/commands/dataset/importers/v1/utils.py

@@ -199,11 +199,6 @@ def load_data(data_uri: str, dataset: SqlaTable, database: Database) -> None:
     :raises DatasetUnAllowedDataURI: If a dataset is trying
     to load data from a URI that is not allowed.
     """
-    from superset.examples.helpers import normalize_example_data_url
-
-    # Convert example URLs to align with configuration
-    data_uri = normalize_example_data_url(data_uri)
-
     validate_data_uri(data_uri)
     logger.info("Downloading data from %s", data_uri)
     data = request.urlopen(data_uri)  # pylint: disable=consider-using-with  # noqa: S310

superset/commands/explore/form_data/create.py

@@ -37,10 +37,6 @@ class CreateFormDataCommand(BaseCommand):
     def __init__(self, cmd_params: CommandParameters):
         self._cmd_params = cmd_params
 
-    def _get_session_id(self) -> str:
-        """Get session ID. Can be overridden in subclasses."""
-        return session.get("_id")
-
     def run(self) -> str:
         self.validate()
         try:
@@ -51,7 +47,7 @@ class CreateFormDataCommand(BaseCommand):
             form_data = self._cmd_params.form_data
             check_access(datasource_id, chart_id, datasource_type)
             contextual_key = cache_key(
-                self._get_session_id(), tab_id, datasource_id, chart_id, datasource_type
+                session.get("_id"), tab_id, datasource_id, chart_id, datasource_type
             )
             key = cache_manager.explore_form_data_cache.get(contextual_key)
             if not key or not tab_id:

superset/commands/importers/v1/utils.py

@@ -190,12 +190,6 @@ def load_configs(
                         db_ssh_tunnel_priv_key_passws[config["uuid"]]
                     )
 
-                # Normalize example data URLs before schema validation
-                if prefix == "datasets" and "data" in config:
-                    from superset.examples.helpers import normalize_example_data_url
-
-                    config["data"] = normalize_example_data_url(config["data"])
-
                 schema.load(config)
                 configs[file_name] = config
             except ValidationError as exc:

superset/connectors/sqla/models.py

@@ -1368,23 +1368,10 @@ class SqlaTable(
         return get_template_processor(table=self, database=self.database, **kwargs)
 
     def get_sqla_table(self) -> TableClause:
-        # For databases that support cross-catalog queries (like BigQuery),
-        # include the catalog in the table identifier to generate
-        # project.dataset.table format
-        if self.catalog and self.database.db_engine_spec.supports_cross_catalog_queries:
-            # SQLAlchemy doesn't have built-in catalog support for TableClause,
-            # so we need to construct the full identifier manually
-            if self.schema:
-                full_name = f"{self.catalog}.{self.schema}.{self.table_name}"
-            else:
-                full_name = f"{self.catalog}.{self.table_name}"
-
-            return table(full_name)
-
+        tbl = table(self.table_name)
         if self.schema:
-            return table(self.table_name, schema=self.schema)
-
-        return table(self.table_name)
+            tbl.schema = self.schema
+        return tbl
 
     def get_from_clause(
         self,
@@ -1693,9 +1680,6 @@ class SqlaTable(
                     table=self,
                 )
                 new_column.is_dttm = new_column.is_temporal
-                # Set description from comment field if available
-                if col.get("comment"):
-                    new_column.description = col["comment"]
                 db_engine_spec.alter_new_orm_column(new_column)
             else:
                 new_column = old_column
@@ -1703,9 +1687,6 @@ class SqlaTable(
                     results.modified.append(col["column_name"])
                 new_column.type = col["type"]
                 new_column.expression = ""
-                # Set description from comment field if available
-                if col.get("comment"):
-                    new_column.description = col["comment"]
             new_column.groupby = True
             new_column.filterable = True
             columns.append(new_column)

superset/daos/base.py

@@ -16,87 +16,18 @@
 # under the License.
 from __future__ import annotations
 
-import logging
-import uuid as uuid_lib
-from enum import Enum
-from typing import (
-    Any,
-    Dict,
-    Generic,
-    get_args,
-    List,
-    Optional,
-    Sequence,
-    Tuple,
-    TypeVar,
-)
+from typing import Any, Generic, get_args, TypeVar
 
 from flask_appbuilder.models.filters import BaseFilter
 from flask_appbuilder.models.sqla import Model
 from flask_appbuilder.models.sqla.interface import SQLAInterface
-from pydantic import BaseModel, Field
-from sqlalchemy import asc, cast, desc, or_, Text
 from sqlalchemy.exc import StatementError
-from sqlalchemy.inspection import inspect
-from sqlalchemy.orm import ColumnProperty, joinedload, RelationshipProperty
 
 from superset.extensions import db
 
 T = TypeVar("T", bound=Model)
 
 
-class ColumnOperatorEnum(str, Enum):
-    eq = "eq"
-    ne = "ne"
-    sw = "sw"
-    ew = "ew"
-    in_ = "in"
-    nin = "nin"
-    gt = "gt"
-    gte = "gte"
-    lt = "lt"
-    lte = "lte"
-    like = "like"
-    ilike = "ilike"
-    is_null = "is_null"
-    is_not_null = "is_not_null"
-
-    @classmethod
-    def operator_map(cls) -> Dict[ColumnOperatorEnum, Any]:
-        return {
-            cls.eq: lambda col, val: col == val,
-            cls.ne: lambda col, val: col != val,
-            cls.sw: lambda col, val: col.like(f"{val}%"),
-            cls.ew: lambda col, val: col.like(f"%{val}"),
-            cls.in_: lambda col, val: col.in_(
-                val if isinstance(val, (list, tuple)) else [val]
-            ),
-            cls.nin: lambda col, val: ~col.in_(
-                val if isinstance(val, (list, tuple)) else [val]
-            ),
-            cls.gt: lambda col, val: col > val,
-            cls.gte: lambda col, val: col >= val,
-            cls.lt: lambda col, val: col < val,
-            cls.lte: lambda col, val: col <= val,
-            cls.like: lambda col, val: col.like(f"%{val}%"),
-            cls.ilike: lambda col, val: col.ilike(f"%{val}%"),
-            cls.is_null: lambda col, _: col.is_(None),
-            cls.is_not_null: lambda col, _: col.isnot(None),
-        }
-
-    def apply(self, column: Any, value: Any) -> Any:
-        op_func = self.operator_map().get(self)
-        if not op_func:
-            raise ValueError(f"Unsupported operator: {self}")
-        return op_func(column, value)
-
-
-class ColumnOperator(BaseModel):
-    col: str = Field(..., description="Column name to filter on")
-    opr: ColumnOperatorEnum = Field(..., description="Operator")
-    value: Any = Field(None, description="Value for the filter")
-
-
 class BaseDAO(Generic[T]):
     """
     Base DAO, implement base CRUD sqlalchemy operations
@@ -119,128 +50,45 @@ class BaseDAO(Generic[T]):
         )[0]
 
     @classmethod
-    def _apply_base_filter(
-        cls, query: Any, skip_base_filter: bool = False, data_model: Any = None
-    ) -> Any:
-        """
-        Apply the base_filter to the query if it exists and skip_base_filter is False.
-        """
-        if cls.base_filter and not skip_base_filter:
-            if data_model is None:
-                data_model = SQLAInterface(cls.model_cls, db.session)
-            query = cls.base_filter(  # pylint: disable=not-callable
-                cls.id_column_name, data_model
-            ).apply(query, None)
-        return query
-
-    @classmethod
-    def _convert_value_for_column(cls, column: Any, value: Any) -> Any:
-        """
-        Convert a value to the appropriate type for a given SQLAlchemy column.
-
-        Args:
-            column: SQLAlchemy column object
-            value: Value to convert
-
-        Returns:
-            Converted value or None if conversion fails
-        """
-        if (
-            hasattr(column.type, "python_type")
-            and column.type.python_type == uuid_lib.UUID
-        ):
-            if isinstance(value, str):
-                try:
-                    return uuid_lib.UUID(value)
-                except (ValueError, AttributeError):
-                    return None
-        return value
-
-    @classmethod
-    def _find_by_column(
+    def find_by_id(
         cls,
-        column_name: str,
-        value: str | int,
+        model_id: str | int,
         skip_base_filter: bool = False,
     ) -> T | None:
         """
-        Private method to find a model by any column value.
-
-        Args:
-            column_name: Name of the column to search by
-            value: Value to search for
-            skip_base_filter: Whether to skip base filtering
-
-        Returns:
-            Model instance or None if not found
+        Find a model by id, if defined applies `base_filter`
         """
         query = db.session.query(cls.model_cls)
-        query = cls._apply_base_filter(query, skip_base_filter)
-
-        if not hasattr(cls.model_cls, column_name):
-            return None
-
-        column = getattr(cls.model_cls, column_name)
-        converted_value = cls._convert_value_for_column(column, value)
-        if converted_value is None:
-            return None
-
+        if cls.base_filter and not skip_base_filter:
+            data_model = SQLAInterface(cls.model_cls, db.session)
+            query = cls.base_filter(  # pylint: disable=not-callable
+                cls.id_column_name, data_model
+            ).apply(query, None)
+        id_column = getattr(cls.model_cls, cls.id_column_name)
         try:
-            return query.filter(column == converted_value).one_or_none()
+            return query.filter(id_column == model_id).one_or_none()
         except StatementError:
             # can happen if int is passed instead of a string or similar
             return None
 
-    @classmethod
-    def find_by_id(
-        cls,
-        model_id: str | int,
-        skip_base_filter: bool = False,
-        id_column: str | None = None,
-    ) -> T | None:
-        """
-        Find a model by ID using specified or default ID column.
-
-        Args:
-            model_id: ID value to search for
-            skip_base_filter: Whether to skip base filtering
-            id_column: Column name to use (defaults to cls.id_column_name)
-
-        Returns:
-            Model instance or None if not found
-        """
-        column = id_column or cls.id_column_name
-        return cls._find_by_column(column, model_id, skip_base_filter)
-
     @classmethod
     def find_by_ids(
         cls,
-        model_ids: Sequence[str | int],
+        model_ids: list[str] | list[int],
         skip_base_filter: bool = False,
-        id_column: str | None = None,
     ) -> list[T]:
         """
         Find a List of models by a list of ids, if defined applies `base_filter`
-
-        :param model_ids: List of IDs to find
-        :param skip_base_filter: If true, skip applying the base filter
-        :param id_column: Optional column name to use for ID lookup
-                         (defaults to id_column_name)
         """
-        column = id_column or cls.id_column_name
-        id_col = getattr(cls.model_cls, column, None)
+        id_col = getattr(cls.model_cls, cls.id_column_name, None)
         if id_col is None:
             return []
-
-        # Convert IDs to appropriate types based on column type
-        converted_ids: list[str | int | uuid_lib.UUID] = []
-        for id_val in model_ids:
-            converted_value = cls._convert_value_for_column(id_col, id_val)
-            if converted_value is not None:
-                converted_ids.append(converted_value)
-
-        query = db.session.query(cls.model_cls).filter(id_col.in_(converted_ids))
-        query = cls._apply_base_filter(query, skip_base_filter)
+        query = db.session.query(cls.model_cls).filter(id_col.in_(model_ids))
+        if cls.base_filter and not skip_base_filter:
+            data_model = SQLAInterface(cls.model_cls, db.session)
+            query = cls.base_filter(  # pylint: disable=not-callable
+                cls.id_column_name, data_model
+            ).apply(query, None)
         return query.all()
 
     @classmethod
@@ -249,7 +97,11 @@ class BaseDAO(Generic[T]):
         Get all that fit the `base_filter`
         """
         query = db.session.query(cls.model_cls)
-        query = cls._apply_base_filter(query)
+        if cls.base_filter:
+            data_model = SQLAInterface(cls.model_cls, db.session)
+            query = cls.base_filter(  # pylint: disable=not-callable
+                cls.id_column_name, data_model
+            ).apply(query, None)
         return query.all()
 
     @classmethod
@@ -258,7 +110,11 @@ class BaseDAO(Generic[T]):
         Get the first that fit the `base_filter`
         """
         query = db.session.query(cls.model_cls)
-        query = cls._apply_base_filter(query)
+        if cls.base_filter:
+            data_model = SQLAInterface(cls.model_cls, db.session)
+            query = cls.base_filter(  # pylint: disable=not-callable
+                cls.id_column_name, data_model
+            ).apply(query, None)
         return query.filter_by(**filter_by).one_or_none()
 
     @classmethod
@@ -328,247 +184,3 @@ class BaseDAO(Generic[T]):
 
         for item in items:
             db.session.delete(item)
-
-    @classmethod
-    def apply_column_operators(
-        cls, query: Any, column_operators: Optional[List[ColumnOperator]] = None
-    ) -> Any:
-        """
-        Apply column operators (list of ColumnOperator) to the query using
-        ColumnOperatorEnum logic. Raises ValueError if a filter references a
-        non-existent column.
-        """
-        if not column_operators:
-            return query
-        for c in column_operators:
-            if not isinstance(c, ColumnOperator):
-                continue
-            col = c.col
-            opr = c.opr
-            value = c.value
-            if not col or not hasattr(cls.model_cls, col):
-                model_name = cls.model_cls.__name__ if cls.model_cls else "Unknown"
-                logging.error(
-                    f"Invalid filter: column '{col}' does not exist on {model_name}"
-                )
-                raise ValueError(
-                    f"Invalid filter: column '{col}' does not exist on {model_name}"
-                )
-            column = getattr(cls.model_cls, col)
-            try:
-                # Always use ColumnOperatorEnum's apply method
-                operator_enum = ColumnOperatorEnum(opr)
-                query = query.filter(operator_enum.apply(column, value))
-            except Exception as e:
-                logging.error(f"Error applying filter on column '{col}': {e}")
-                raise
-        return query
-
-    @classmethod
-    def get_filterable_columns_and_operators(cls) -> Dict[str, List[str]]:
-        """
-        Returns a dict mapping filterable columns (including hybrid/computed fields if
-        present) to their supported operators. Used by MCP tools to dynamically expose
-        filter options. Custom fields supported by the DAO but not present on the model
-        should be documented here.
-        """
-        from sqlalchemy.ext.hybrid import hybrid_property
-
-        mapper = inspect(cls.model_cls)
-        columns = {c.key: c for c in mapper.columns}
-        # Add hybrid properties
-        hybrids = {
-            name: attr
-            for name, attr in vars(cls.model_cls).items()
-            if isinstance(attr, hybrid_property)
-        }
-        # You may add custom fields here, e.g.:
-        # custom_fields = {"tags": ["eq", "in_", "like"], ...}
-        custom_fields: Dict[str, List[str]] = {}
-        # Map SQLAlchemy types to supported operators
-        type_operator_map = {
-            "string": [
-                "eq",
-                "ne",
-                "sw",
-                "ew",
-                "in_",
-                "nin",
-                "like",
-                "ilike",
-                "is_null",
-                "is_not_null",
-            ],
-            "boolean": ["eq", "ne", "is_null", "is_not_null"],
-            "number": [
-                "eq",
-                "ne",
-                "gt",
-                "gte",
-                "lt",
-                "lte",
-                "in_",
-                "nin",
-                "is_null",
-                "is_not_null",
-            ],
-            "datetime": [
-                "eq",
-                "ne",
-                "gt",
-                "gte",
-                "lt",
-                "lte",
-                "in_",
-                "nin",
-                "is_null",
-                "is_not_null",
-            ],
-        }
-        import sqlalchemy as sa
-
-        filterable = {}
-        for name, col in columns.items():
-            if isinstance(col.type, (sa.String, sa.Text)):
-                filterable[name] = type_operator_map["string"]
-            elif isinstance(col.type, (sa.Boolean,)):
-                filterable[name] = type_operator_map["boolean"]
-            elif isinstance(col.type, (sa.Integer, sa.Float, sa.Numeric)):
-                filterable[name] = type_operator_map["number"]
-            elif isinstance(col.type, (sa.DateTime, sa.Date, sa.Time)):
-                filterable[name] = type_operator_map["datetime"]
-            else:
-                # Fallback to eq/ne/null
-                filterable[name] = ["eq", "ne", "is_null", "is_not_null"]
-        # Add hybrid properties as string fields by default
-        for name in hybrids:
-            filterable[name] = type_operator_map["string"]
-        # Add custom fields
-        filterable.update(custom_fields)
-        return filterable
-
-    @classmethod
-    def _build_query(
-        cls,
-        column_operators: Optional[List[ColumnOperator]] = None,
-        search: Optional[str] = None,
-        search_columns: Optional[List[str]] = None,
-        custom_filters: Optional[Dict[str, BaseFilter]] = None,
-        skip_base_filter: bool = False,
-        data_model: Optional[SQLAInterface] = None,
-    ) -> Any:
-        """
-        Build a SQLAlchemy query with base filter, column operators, search, and
-        custom filters.
-        """
-        if data_model is None:
-            data_model = SQLAInterface(cls.model_cls, db.session)
-        query = data_model.session.query(cls.model_cls)
-        query = cls._apply_base_filter(
-            query, skip_base_filter=skip_base_filter, data_model=data_model
-        )
-        if search and search_columns:
-            search_filters = []
-            for column_name in search_columns:
-                if hasattr(cls.model_cls, column_name):
-                    column = getattr(cls.model_cls, column_name)
-                    search_filters.append(cast(column, Text).ilike(f"%{search}%"))
-            if search_filters:
-                query = query.filter(or_(*search_filters))
-        if custom_filters:
-            for filter_class in custom_filters.values():
-                query = filter_class.apply(query, None)
-        if column_operators:
-            query = cls.apply_column_operators(query, column_operators)
-        return query
-
-    @classmethod
-    def list(  # noqa: C901
-        cls,
-        column_operators: Optional[List[ColumnOperator]] = None,
-        order_column: str = "changed_on",
-        order_direction: str = "desc",
-        page: int = 0,
-        page_size: int = 100,
-        search: Optional[str] = None,
-        search_columns: Optional[List[str]] = None,
-        custom_filters: Optional[Dict[str, BaseFilter]] = None,
-        columns: Optional[List[str]] = None,
-    ) -> Tuple[List[Any], int]:
-        """
-        Generic list method for filtered, sorted, and paginated results.
-        If columns is specified, returns a list of tuples (one per row),
-        otherwise returns model instances.
-        """
-        data_model = SQLAInterface(cls.model_cls, db.session)
-
-        column_attrs = []
-        relationship_loads = []
-        if columns is None:
-            columns = []
-        for name in columns:
-            attr = getattr(cls.model_cls, name, None)
-            if attr is None:
-                continue
-            prop = getattr(attr, "property", None)
-            if isinstance(prop, ColumnProperty):
-                column_attrs.append(attr)
-            elif isinstance(prop, RelationshipProperty):
-                relationship_loads.append(joinedload(attr))
-            # Ignore properties and other non-queryable attributes
-
-        if relationship_loads:
-            # If any relationships are requested, query the full model and joinedload
-            # relationships
-            query = data_model.session.query(cls.model_cls)
-            for loader in relationship_loads:
-                query = query.options(loader)
-        elif column_attrs:
-            # Only columns requested
-            query = data_model.session.query(*column_attrs)
-        else:
-            # Fallback: query the full model
-            query = data_model.session.query(cls.model_cls)
-        query = cls._apply_base_filter(query, data_model=data_model)
-        if search and search_columns:
-            search_filters = []
-            for column_name in search_columns:
-                if hasattr(cls.model_cls, column_name):
-                    column = getattr(cls.model_cls, column_name)
-                    search_filters.append(cast(column, Text).ilike(f"%{search}%"))
-            if search_filters:
-                query = query.filter(or_(*search_filters))
-        if custom_filters:
-            for filter_class in custom_filters.values():
-                query = filter_class.apply(query, None)
-        if column_operators:
-            query = cls.apply_column_operators(query, column_operators)
-        total_count = query.count()
-        if hasattr(cls.model_cls, order_column):
-            column = getattr(cls.model_cls, order_column)
-            if order_direction.lower() == "desc":
-                query = query.order_by(desc(column))
-            else:
-                query = query.order_by(asc(column))
-        page = page
-        page_size = max(page_size, 1)
-        query = query.offset(page * page_size).limit(page_size)
-        items = query.all()
-        # If columns are specified, SQLAlchemy returns Row objects (not tuples or
-        # model instances)
-        return items, total_count
-
-    @classmethod
-    def count(
-        cls,
-        column_operators: Optional[List[ColumnOperator]] = None,
-        skip_base_filter: bool = False,
-    ) -> int:
-        """
-        Count the number of records for the model, optionally filtered by column
-        operators.
-        """
-        query = cls._build_query(
-            column_operators=column_operators, skip_base_filter=skip_base_filter
-        )
-        return query.count()

superset/daos/chart.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 
 import logging
 from datetime import datetime
-from typing import Dict, List, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from superset.charts.filters import ChartFilter
 from superset.daos.base import BaseDAO
@@ -36,20 +36,6 @@ logger = logging.getLogger(__name__)
 class ChartDAO(BaseDAO[Slice]):
     base_filter = ChartFilter
 
-    @classmethod
-    def get_filterable_columns_and_operators(cls) -> Dict[str, List[str]]:
-        filterable = super().get_filterable_columns_and_operators()
-        # Add custom fields for charts
-        filterable.update(
-            {
-                "tags": ["eq", "in_", "like"],
-                "owner": ["eq", "in_"],
-                "viz_type": ["eq", "in_", "like"],
-                "datasource_name": ["eq", "in_", "like"],
-            }
-        )
-        return filterable
-
     @staticmethod
     def favorited_ids(charts: list[Slice]) -> list[FavStar]:
         ids = [chart.id for chart in charts]

superset/daos/dashboard.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 
 import logging
 from datetime import datetime
-from typing import Any, Dict, List
+from typing import Any
 
 from flask import g
 from flask_appbuilder.models.sqla.interface import SQLAInterface
@@ -48,20 +48,6 @@ logger = logging.getLogger(__name__)
 class DashboardDAO(BaseDAO[Dashboard]):
     base_filter = DashboardAccessFilter
 
-    @classmethod
-    def get_filterable_columns_and_operators(cls) -> Dict[str, List[str]]:
-        filterable = super().get_filterable_columns_and_operators()
-        # Add custom fields for dashboards
-        filterable.update(
-            {
-                "tags": ["eq", "in_", "like"],
-                "owner": ["eq", "in_"],
-                "published": ["eq"],
-                "favorite": ["eq"],
-            }
-        )
-        return filterable
-
     @classmethod
     def get_by_id_or_slug(cls, id_or_slug: int | str) -> Dashboard:
         if is_uuid(id_or_slug):

superset/daos/dataset.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 
 import logging
 from datetime import datetime
-from typing import Any, Dict, List
+from typing import Any
 
 import dateutil.parser
 from sqlalchemy.exc import SQLAlchemyError
@@ -37,13 +37,6 @@ logger = logging.getLogger(__name__)
 
 
 class DatasetDAO(BaseDAO[SqlaTable]):
-    """
-    DAO for datasets. Supports filtering on model fields, hybrid properties, and custom
-    fields:
-    - tags: list of tags (eq, in_, like)
-    - owner: user id (eq, in_)
-    """
-
     base_filter = DatasourceFilter
 
     @staticmethod
@@ -358,18 +351,6 @@ class DatasetDAO(BaseDAO[SqlaTable]):
             .one_or_none()
         )
 
-    @classmethod
-    def get_filterable_columns_and_operators(cls) -> Dict[str, List[str]]:
-        filterable = super().get_filterable_columns_and_operators()
-        # Add custom fields
-        filterable.update(
-            {
-                "tags": ["eq", "in_", "like"],
-                "owner": ["eq", "in_"],
-            }
-        )
-        return filterable
-
 
 class DatasetColumnDAO(BaseDAO[TableColumn]):
     pass

superset/examples/bart_lines.py

@@ -38,7 +38,7 @@ def load_bart_lines(only_metadata: bool = False, force: bool = False) -> None:
 
         if not only_metadata and (not table_exists or force):
             df = read_example_data(
-                "examples://bart-lines.json.gz", encoding="latin-1", compression="gzip"
+                "bart-lines.json.gz", encoding="latin-1", compression="gzip"
             )
             df["path_json"] = df.path.map(json.dumps)
             df["polyline"] = df.path.map(polyline.encode)

superset/examples/birth_names.py

@@ -57,7 +57,7 @@ def gen_filter(
 
 
 def load_data(tbl_name: str, database: Database, sample: bool = False) -> None:
-    pdf = read_example_data("examples://birth_names2.json.gz", compression="gzip")
+    pdf = read_example_data("birth_names2.json.gz", compression="gzip")
 
     # TODO(bkyryliuk): move load examples data into the pytest fixture
     if database.backend == "presto":
@@ -584,8 +584,8 @@ def create_dashboard(slices: list[Slice]) -> Dashboard:
         }
     }"""
     )
-    # pylint: disable=line-too-long
-    pos = json.loads(  # noqa: TID251
+    # pylint: disable=echarts_timeseries_line-too-long
+    pos = json.loads(
         textwrap.dedent(
             """\
         {
@@ -859,11 +859,11 @@ def create_dashboard(slices: list[Slice]) -> Dashboard:
         """  # noqa: E501
         )
     )
-    # pylint: enable=line-too-long
+    # pylint: enable=echarts_timeseries_line-too-long
     # dashboard v2 doesn't allow add markup slice
     dash.slices = [slc for slc in slices if slc.viz_type != "markup"]
     update_slice_ids(pos)
     dash.dashboard_title = "USA Births Names"
-    dash.position_json = json.dumps(pos, indent=4)  # noqa: TID251
+    dash.position_json = json.dumps(pos, indent=4)
     dash.slug = "births"
     return dash

superset/examples/configs/datasets/examples/FCC_2018_Survey.yaml

@@ -1490,4 +1490,4 @@ columns:
     python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/fcc_survey_2018.csv.gz
+data: https://github.com/apache-superset/examples-data/raw/master/datasets/examples/fcc_survey_2018.csv.gz

superset/examples/configs/datasets/examples/channel_members.yaml

@@ -60,4 +60,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/channel_members.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/channel_members.csv

superset/examples/configs/datasets/examples/channels.yaml

@@ -360,4 +360,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/channels.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/channels.csv

superset/examples/configs/datasets/examples/cleaned_sales_data.yaml

@@ -344,4 +344,4 @@ columns:
   extra: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/sales.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/lowercase_columns_examples/datasets/examples/sales.csv

superset/examples/configs/datasets/examples/covid_vaccines.yaml

@@ -204,4 +204,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/covid_vaccines.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/lowercase_columns_examples/datasets/examples/covid_vaccines.csv

superset/examples/configs/datasets/examples/exported_stats.yaml

@@ -260,4 +260,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/exported_stats.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/exported_stats.csv

superset/examples/configs/datasets/examples/messages.yaml

@@ -480,4 +480,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/messages.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/messages.csv

superset/examples/configs/datasets/examples/threads.yaml

@@ -180,4 +180,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/threads.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/threads.csv

superset/examples/configs/datasets/examples/unicode_test.test.yaml

@@ -90,4 +90,4 @@ columns:
   python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/unicode_test.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/unicode_test.csv

superset/examples/configs/datasets/examples/users.yaml

@@ -220,4 +220,4 @@ columns:
     python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/users.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/users.csv

superset/examples/configs/datasets/examples/users_channels.yaml

@@ -60,4 +60,4 @@ columns:
     python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/slack/users_channels.csv
+data: https://raw.githubusercontent.com/apache-superset/examples-data/master/datasets/examples/slack/users_channels.csv

superset/examples/configs/datasets/examples/video_game_sales.yaml

@@ -153,4 +153,4 @@ columns:
     python_date_format: null
 version: 1.0.0
 database_uuid: a2dc77af-e654-49bb-b321-40f6b559a1ee
-data: examples://datasets/examples/video_game_sales.csv
+data: https://github.com/apache-superset/examples-data/raw/lowercase_columns_examples/datasets/examples/video_game_sales.csv

superset/examples/country_map.py

@@ -49,7 +49,7 @@ def load_country_map_data(only_metadata: bool = False, force: bool = False) -> N
 
         if not only_metadata and (not table_exists or force):
             data = read_example_data(
-                "examples://birth_france_data_for_country_map.csv", encoding="utf-8"
+                "birth_france_data_for_country_map.csv", encoding="utf-8"
             )
             data["dttm"] = datetime.datetime.now().date()
             data.to_sql(

superset/examples/energy.py

@@ -50,7 +50,7 @@ def load_energy(
         table_exists = database.has_table(Table(tbl_name, schema))
 
         if not only_metadata and (not table_exists or force):
-            pdf = read_example_data("examples://energy.json.gz", compression="gzip")
+            pdf = read_example_data("energy.json.gz", compression="gzip")
             pdf = pdf.head(100) if sample else pdf
             pdf.to_sql(
                 tbl_name,

superset/examples/flights.py

@@ -38,12 +38,12 @@ def load_flights(only_metadata: bool = False, force: bool = False) -> None:
 
         if not only_metadata and (not table_exists or force):
             pdf = read_example_data(
-                "examples://flight_data.csv.gz", encoding="latin-1", compression="gzip"
+                "flight_data.csv.gz", encoding="latin-1", compression="gzip"
             )
 
             # Loading airports info to join and get lat/long
             airports = read_example_data(
-                "examples://airports.csv.gz", encoding="latin-1", compression="gzip"
+                "airports.csv.gz", encoding="latin-1", compression="gzip"
             )
             airports = airports.set_index("IATA_CODE")
 

superset/examples/helpers.py

@@ -54,8 +54,6 @@ from superset.connectors.sqla.models import SqlaTable
 from superset.models.slice import Slice
 from superset.utils import json
 
-EXAMPLES_PROTOCOL = "examples://"
-
 # ---------------------------------------------------------------------------
 # Public sample‑data mirror configuration
 # ---------------------------------------------------------------------------
@@ -127,20 +125,6 @@ def get_example_url(filepath: str) -> str:
     return f"{BASE_URL}{filepath}"
 
 
-def normalize_example_data_url(url: str) -> str:
-    """Convert example data URLs to use the configured CDN.
-
-    Transforms examples:// URLs to the configured CDN URL.
-    Non-example URLs are returned unchanged.
-    """
-    if url.startswith(EXAMPLES_PROTOCOL):
-        relative_path = url[len(EXAMPLES_PROTOCOL) :]
-        return get_example_url(relative_path)
-
-    # Not an examples URL, return unchanged
-    return url
-
-
 def read_example_data(
     filepath: str,
     max_attempts: int = 5,
@@ -148,7 +132,9 @@ def read_example_data(
     **kwargs: Any,
 ) -> pd.DataFrame:
     """Load CSV or JSON from example data mirror with retry/backoff."""
-    url = normalize_example_data_url(filepath)
+    from superset.examples.helpers import get_example_url
+
+    url = get_example_url(filepath)
     is_json = filepath.endswith(".json") or filepath.endswith(".json.gz")
 
     for attempt in range(1, max_attempts + 1):

superset/examples/long_lat.py

@@ -48,7 +48,7 @@ def load_long_lat_data(only_metadata: bool = False, force: bool = False) -> None
 
         if not only_metadata and (not table_exists or force):
             pdf = read_example_data(
-                "examples://san_francisco.csv.gz", encoding="utf-8", compression="gzip"
+                "san_francisco.csv.gz", encoding="utf-8", compression="gzip"
             )
             start = datetime.datetime.now().replace(
                 hour=0, minute=0, second=0, microsecond=0