uhuhuhu

api_monitor.py

@@ -121,7 +121,7 @@ def validate_api_configuration(
     5. If sample_response looks valid: Use config_id in activate_monitoring() to activate monitoring
 
     ARGUMENTS:
-    - mcp_api_key: MCP API key serves as user identifier
+    - mcp_api_key: MCP API key serves as user identifier. Leave as empty string "" to use the environment variable MCP_API_KEY.
     - name: User-friendly name for the monitoring task
     - description: Description of what is being monitored
     - method: HTTP method (GET, POST, PUT, DELETE)
@@ -153,7 +153,7 @@ def validate_api_configuration(
         start_at: ""
 
     2. Weather monitoring with free API:
-        mcp_api_key: "your_mcp_key_here"
+        mcp_api_key: ""
         name: "Weather Monitor"
         description: "Monitor current weather conditions every 2 hours for one week using Open-Meteo free API"
         method: "GET"
@@ -182,14 +182,16 @@ def validate_api_configuration(
     """
     try:
         # Validate input parameters
-        if not mcp_api_key or not mcp_api_key.strip():
+        if not mcp_api_key or not mcp_api_key.strip() or mcp_api_key == "" :
             mcp_api_key = os.environ["MCP_API_KEY"]
             if not mcp_api_key or not mcp_api_key.strip():
                 return {
                     "success": False,
                     "message": "MCP API key is required",
                     "config_id": None,
-                }  # Verify the MCP API key with the key generation server
+                }  
+            
+        # Verify the MCP API key with the key generation server
         key_verification = verify_mcp_api_key(mcp_api_key)
         if not key_verification["success"]:
             return {
@@ -379,7 +381,7 @@ async def activate_monitoring(config_id, mcp_api_key):
 
     ARGUMENTS:
     - config_id: The ID from successful validate_api_configuration() execution (required)
-    - mcp_api_key: User's MCP API key for verification (must match validation step)
+    - mcp_api_key: User's MCP API key for verification (must match validation step). Leave as empty string "" to use the environment variable MCP_API_KEY.
 
     Input Examples:
 
@@ -432,6 +434,14 @@ async def activate_monitoring(config_id, mcp_api_key):
 
     # attempt to create the scheduler
     try:
+        if not mcp_api_key or not mcp_api_key.strip() or mcp_api_key == "" :
+            mcp_api_key = os.environ["MCP_API_KEY"]
+            if not mcp_api_key or not mcp_api_key.strip():
+                return {
+                    "success": False,
+                    "message": "MCP API key is required",
+                    "config_id": None,
+                }  
         # Verify the MCP API key with the key generation server first
         key_verification = verify_mcp_api_key(mcp_api_key)
         if not key_verification["success"]:
@@ -678,7 +688,7 @@ def retrieve_monitored_data(config_id, mcp_api_key, mode="summary"):
 
     ARGUMENTS:
     - config_id: The ID of the API configuration to retrieve data for (required)
-    - mcp_api_key: User's MCP API key for verification (must match validation step)
+    - mcp_api_key: User's MCP API key for verification (must match validation step). Leave as empty string "" to use the environment variable MCP_API_KEY.
     - mode: Data return mode - "summary" (LLM-optimized), "details" (full responses, minimal metadata), "full" (everything)
 
     Input Examples:
@@ -759,6 +769,14 @@ def retrieve_monitored_data(config_id, mcp_api_key, mode="summary"):
     ERROR HANDLING: If config_id not found or invalid, returns success=False with error message
     """
     try:
+        if not mcp_api_key or not mcp_api_key.strip() or mcp_api_key == "" :
+            mcp_api_key = os.environ["MCP_API_KEY"]
+            if not mcp_api_key or not mcp_api_key.strip():
+                return {
+                    "success": False,
+                    "message": "MCP API key is required",
+                    "config_id": None,
+                }  
         # Verify the MCP API key with the key generation server first
         key_verification = verify_mcp_api_key(mcp_api_key)
         if not key_verification["success"]: