Update env var keys (#9)

Signed-off-by: Manabu McCloskey <[email protected]>

Author: nabuskey

README.md

@@ -60,9 +60,17 @@ task start-mcp-bg             # Start MCP Server
 task start-inspector-bg       # Start MCP Inspector
 
 # Opens http://localhost:6274 for interactive testing
-# When done: task stop-all
+# When done, run `task stop-all`
 ```
 
+### 📊 Sample Data
+The repository includes real Spark event logs for testing:
+- `spark-bcec39f6201b42b9925124595baad260` - ✅ Successful ETL job
+- `spark-110be3a8424d4a2789cb88134418217b` - 🔄 Data processing job
+- `spark-cc4d115f011443d787f03a71a476a745` - 📈 Multi-stage analytics job
+
+See **[TESTING.md](TESTING.md)** for using them.
+
 ### ⚙️ Configuration
 Edit `config.yaml` for your Spark History Server:
 ```yaml
@@ -73,6 +81,11 @@ servers:
     auth:  # optional
       username: "user"
       password: "pass"
+mcp:
+  transports:
+    - streamable-http # streamable-http or stdio.
+  port: "18888"
+  debug: true
 ```
 
 ## 📸 Screenshots
@@ -131,14 +144,6 @@ helm install spark-history-mcp ./deploy/kubernetes/helm/spark-history-mcp/ \
 
 📚 See [`deploy/kubernetes/helm/`](deploy/kubernetes/helm/) for complete deployment manifests and configuration options.
 
-## 📊 Sample Data
-The repository includes real Spark event logs for testing:
-- `spark-bcec39f6201b42b9925124595baad260` - ✅ Successful ETL job
-- `spark-110be3a8424d4a2789cb88134418217b` - 🔄 Data processing job
-- `spark-cc4d115f011443d787f03a71a476a745` - 📈 Multi-stage analytics job
-
-📖 **Advanced testing**: **[TESTING.md](TESTING.md)**
-
 ## ⚙️ Configuration
 
 ### 🌐 Multi-server Setup
@@ -156,26 +161,24 @@ servers:
 
 ### 🔐 Environment Variables
 ```bash
-SPARK_USERNAME=your_username
-SPARK_PASSWORD=your_password
-SPARK_TOKEN=your_jwt_token
-MCP_PORT=18888
-MCP_DEBUG=false
+SHS_SPARK_USERNAME=your_username
+SHS_SPARK_PASSWORD=your_password
+SHS_SPARK_TOKEN=your_jwt_token
+SHS_MCP_PORT=18888
+SHS_MCP_DEBUG=false
 ```
 
 ## 🤖 AI Agent Integration
 
 ### Quick Start Options
 
-| Integration | Transport | Entry Point | Best For |
-|-------------|-----------|-------------|----------|
-| **[Local Testing](TESTING.md)** | HTTP | `main.py` | Development, testing tools |
-| **[Claude Desktop](examples/integrations/claude-desktop/)** | STDIO | `main_stdio.py` | Interactive analysis |
-| **[Amazon Q CLI](examples/integrations/amazon-q-cli/)** | STDIO | `main_stdio.py` | Command-line automation |
-| **[LlamaIndex](examples/integrations/llamaindex.md)** | HTTP | `main.py` | Knowledge systems, RAG |
-| **[LangGraph](examples/integrations/langgraph.md)** | HTTP | `main.py` | Multi-agent workflows |
-
-**Note**: Claude Desktop and Amazon Q CLI use STDIO transport with 6 core tools. LlamaIndex/LangGraph use HTTP transport with 18 comprehensive tools.
+| Integration | Transport | Best For |
+|-------------|-----------|----------|
+| **[Local Testing](TESTING.md)** | HTTP | Development, testing tools |
+| **[Claude Desktop](examples/integrations/claude-desktop/)** | STDIO | Interactive analysis |
+| **[Amazon Q CLI](examples/integrations/amazon-q-cli/)** | STDIO | Command-line automation |
+| **[LlamaIndex](examples/integrations/llamaindex.md)** | HTTP | Knowledge systems, RAG |
+| **[LangGraph](examples/integrations/langgraph.md)** | HTTP | Multi-agent workflows |
 
 ## 🎯 Example Use Cases
 

Taskfile.yml

@@ -134,15 +134,15 @@ tasks:
     cmds:
       - echo "Starting MCP Inspector at http://localhost:6274"
       - echo "Press Ctrl+C to stop the inspector"
-      - DANGEROUSLY_OMIT_AUTH=true npx @modelcontextprotocol/inspector uv run main.py
+      - DANGEROUSLY_OMIT_AUTH=true npx --yes @modelcontextprotocol/inspector
 
   start-inspector-bg:
     desc: Start MCP Inspector in background
     silent: true
     cmds:
       - |
         echo "Starting MCP Inspector in background..."
-        nohup sh -c 'DANGEROUSLY_OMIT_AUTH=true npx @modelcontextprotocol/inspector uv run main.py' > inspector.log 2>&1 &
+        nohup sh -c 'DANGEROUSLY_OMIT_AUTH=true npx --yes @modelcontextprotocol/inspector' > inspector.log 2>&1 &
         sleep 3
         echo "✅ MCP Inspector started at http://localhost:6274"
 

app.py

@@ -45,9 +45,9 @@ async def app_lifespan(server: FastMCP) -> AsyncIterator[AppContext]:
 def run():
     config = Config.from_file("config.yaml")
 
-    mcp.settings.port = int(os.getenv("MCP_PORT", config.mcp.port))
-    mcp.settings.debug = bool(os.getenv("MCP_DEBUG", config.mcp.debug))
-    mcp.run(transport=config.mcp.transports[0])
+    mcp.settings.port = int(os.getenv("SHS_MCP_PORT", config.mcp.port))
+    mcp.settings.debug = bool(os.getenv("SHS_MCP_DEBUG", config.mcp.debug))
+    mcp.run(transport=os.getenv("SHS_MCP_TRANSPORT", config.mcp.transports[0]))
 
 
 mcp = FastMCP("Spark Events", lifespan=app_lifespan)

config.py

@@ -15,11 +15,11 @@ class AuthConfig(BaseModel):
     def __init__(self, **data):
         # Support environment variables for sensitive data
         if not data.get("username"):
-            data["username"] = os.getenv("SPARK_USERNAME")
+            data["username"] = os.getenv("SHS_SPARK_USERNAME")
         if not data.get("password"):
-            data["password"] = os.getenv("SPARK_PASSWORD")
+            data["password"] = os.getenv("SHS_SPARK_PASSWORD")
         if not data.get("token"):
-            data["token"] = os.getenv("SPARK_TOKEN")
+            data["token"] = os.getenv("SHS_SPARK_TOKEN")
         super().__init__(**data)
 
 

config.yaml

@@ -4,18 +4,18 @@ servers:
     url: "http://localhost:18080"
     # Optional authentication (can also use environment variables)
     # auth:
-    #   username: "your_username"  # or use SPARK_USERNAME env var
-    #   password: "your_password"  # or use SPARK_PASSWORD env var
-    #   token: "your_token"       # or use SPARK_TOKEN env var
+    #   username: "your_username"  # or use SHS_SPARK_USERNAME env var
+    #   password: "your_password"  # or use SHS_SPARK_PASSWORD env var
+    #   token: "your_token"       # or use SHS_SPARK_TOKEN env var
 
   # Production server example
   # production:
   #   url: "https://spark-history.company.com:18080"
   #   auth:
       # Use environment variables for production
-      # username: ${SPARK_USERNAME}
-      # password: ${SPARK_PASSWORD}
-      # token: ${SPARK_TOKEN}
+      # username: ${SHS_SPARK_USERNAME}
+      # password: ${SHS_SPARK_PASSWORD}
+      # token: ${SHS_SPARK_TOKEN}
 
   # Staging server example
   # staging:
@@ -31,8 +31,8 @@ mcp:
   debug: true
 
 # Environment Variables:
-# SPARK_USERNAME - Default username for authentication
-# SPARK_PASSWORD - Default password for authentication
-# SPARK_TOKEN - Default token for authentication
-# MCP_PORT - Port for MCP server (default: 18888)
-# MCP_DEBUG - Enable debug mode (default: false)
+# SHS_SPARK_USERNAME - Default username for authentication
+# SHS_SPARK_PASSWORD - Default password for authentication
+# SHS_SPARK_TOKEN - Default token for authentication
+# SHS_MCP_PORT - Port for MCP server (default: 18888)
+# SHS_MCP_DEBUG - Enable debug mode (default: false)

examples/integrations/amazon-q-cli/README.md

@@ -35,8 +35,9 @@ curl http://localhost:18080/api/v1/applications
 ```bash
 q mcp add \
   --name spark-history-server-mcp \
-  --command /Users/username/.local/bin/uv \
-  --args "run,--project,/Users/username/spark-history-server-mcp,python,main_stdio.py" \
+  --command uv \
+  --args "run,main.py" \
+  --env SHS_MCP_TRANSPORT=stdio \
   --scope workspace
 ```
 

examples/integrations/claude-desktop/README.md

@@ -38,8 +38,7 @@ curl http://localhost:18080/api/v1/applications
     "mcpServers": {
         "spark-history-server-mcp": {
             "command": "uv",
-            "args": ["run", "--project", "/Users/username/spark-history-server-mcp", "python", "main_stdio.py"],
-            "cwd": "/Users/username/spark-history-server-mcp"
+            "args": ["run", "main.py"]
         }
     }
 }